From e1642afb01af85c13d3aeb5c0e70840684a03f2a Mon Sep 17 00:00:00 2001 From: Faye Duxovni Date: Tue, 15 Mar 2022 13:43:54 -0400 Subject: [PATCH 001/797] kernel: common-config.nix: enable FANOTIFY_ACCESS_PERMISSIONS Required for, eg, ClamAV's OnAccessPrevention feature. --- pkgs/os-specific/linux/kernel/common-config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 717fdaee72a5..103f6127c659 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -353,7 +353,9 @@ let # Filesystem options - in particular, enable extended attributes and # ACLs for all filesystems that support them. filesystem = { - FANOTIFY = yes; + FANOTIFY = yes; + FANOTIFY_ACCESS_PERMISSIONS = yes; + TMPFS = yes; TMPFS_POSIX_ACL = yes; FS_ENCRYPTION = if (versionAtLeast version "5.1") then yes else whenAtLeast "4.9" (option module); From eabc6d2902f792064890a8fd48c6078e68248da4 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 27 Apr 2022 23:40:29 -0700 Subject: [PATCH 002/797] lib/systems/platforms.nix: fix broken mips32 detection Prior to this commit, nixpkgs would assume that every little-endian mips32 system was a "fuloong2f_n32". Not only are there plenty of mips32 chips other than the fuloong, but the fuloong is actually a mips64 chip! Note that the "n32" ABI is (confusingly) an ABI for 64-bit mips chips (like the "x32" ABI for amd64 chips -- both are ABIs which use 32-bit pointers on an otherwise-64-bit system). This error causes far-ranging problems. One of them was particularly difficult to track down: it caused GCC to select 128-bit `long double` types, which is invalid for the mips32 ABI. This isn't noticed until you try to build musl-libc, which is careful to check for these things. Prior to this commit, nix-build . -A pkgsCross.mipsel-linux-gnu.pkgsStatic.hello would fail. With this commit and #170736, it succeeds. --- lib/systems/platforms.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index d65ff6487b7a..5290b67cde8a 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -564,7 +564,7 @@ rec { else if platform.isRiscV then riscv-multiplatform - else if platform.parsed.cpu == lib.systems.parse.cpuTypes.mipsel then fuloong2f_n32 + else if platform.parsed.cpu == lib.systems.parse.cpuTypes.mipsel then (import ./examples.nix { lib = lib; }).mipsel-linux-gnu else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv From 4d46ee8691f11a7c7f4592fb645b4ba4c49dfbe2 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 28 Apr 2022 03:52:15 -0700 Subject: [PATCH 003/797] platforms.nix: use `inherit` syntax --- lib/systems/platforms.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 5290b67cde8a..447a02458257 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -564,7 +564,7 @@ rec { else if platform.isRiscV then riscv-multiplatform - else if platform.parsed.cpu == lib.systems.parse.cpuTypes.mipsel then (import ./examples.nix { lib = lib; }).mipsel-linux-gnu + else if platform.parsed.cpu == lib.systems.parse.cpuTypes.mipsel then (import ./examples.nix { inherit lib; }).mipsel-linux-gnu else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv From 6c8d7891746e9627c4518c5bd0b3c0077d85ba05 Mon Sep 17 00:00:00 2001 From: Anton Bulakh Date: Sat, 9 Jul 2022 16:20:14 +0300 Subject: [PATCH 004/797] starsector: fix jvm compatibility, startup crashes and sound, add passthru.updateScript --- pkgs/games/starsector/default.nix | 32 ++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index e929ef98fbf6..bbc781d6ab27 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -1,32 +1,27 @@ { lib -, alsa-lib , fetchzip , libXxf86vm , makeWrapper +, openal , openjdk , stdenv , xorg , copyDesktopItems , makeDesktopItem +, writeScript }: stdenv.mkDerivation rec { pname = "starsector"; - version = "0.95.1a-RC5"; + version = "0.95.1a-RC6"; src = fetchzip { url = "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-${version}.zip"; - sha256 = "sha256-V8/WQPvPIrF3Tg7JVO+GfeYqWhkWWrnHSVcFXGQqDAA="; + sha256 = "sha256-+0zGJHM+SMonx3sytCQNQA/QBgzdPMEfQvOjrCDSOs8="; }; - nativeBuildInputs = [ - copyDesktopItems - makeWrapper - ]; - buildInputs = with xorg; [ - alsa-lib - libXxf86vm - ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + buildInputs = [ xorg.libXxf86vm openal ]; dontBuild = true; @@ -47,7 +42,7 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin - rm -r jre_linux # remove jre7 + rm -r jre_linux # remove bundled jre7 rm starfarer.api.zip cp -r ./* $out @@ -66,10 +61,13 @@ stdenv.mkDerivation rec { # it tries to run everything with relative paths, which makes it CWD dependent # also point mod, screenshot, and save directory to $XDG_DATA_HOME + # additionally, add some GC options to improve performance of the game postPatch = '' substituteInPlace starsector.sh \ --replace "./jre_linux/bin/java" "${openjdk}/bin/java" \ - --replace "./native/linux" "$out/native/linux" + --replace "./native/linux" "$out/native/linux" \ + --replace "=." "=\''${XDG_DATA_HOME:-\$HOME/.local/share}/starsector" \ + --replace "-XX:+CompilerThreadHintNoPreempt" "-XX:+UnlockDiagnosticVMOptions -XX:-BytecodeVerificationRemote -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSConcurrentMTEnabled -XX:+DisableExplicitGC" ''; meta = with lib; { @@ -79,4 +77,12 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ bbigras ]; }; + + passthru.updateScript = writeScript "starsector-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnugrep common-updater-scripts + set -eou pipefail; + version=$(curl -s https://fractalsoftworks.com/preorder/ | grep -oP "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-\K.*?(?=\.zip)" | head -1) + update-source-version ${pname} "$version" --file=./pkgs/games/starsector/default.nix + ''; } From ee1b9e6f7bd43f05684805ae376caf16330fa96e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 16 Jul 2022 15:30:49 +0200 Subject: [PATCH 005/797] qt6.full: add --- pkgs/development/libraries/qt-6/default.nix | 29 +++++++++++++++++++++ pkgs/development/libraries/qt-6/qt-env.nix | 20 ++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 50 insertions(+) create mode 100644 pkgs/development/libraries/qt-6/qt-env.nix diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 8c12cc2fb671..d6950538e741 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -19,6 +19,7 @@ , gst-plugins-base , gtk3 , dconf +, libglvnd , buildPackages # options @@ -50,6 +51,34 @@ let inherit (srcs.qtbase) src version; inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake; }; + env = callPackage ./qt-env.nix {}; + full = env "qt-full-${qtbase.version}" ([ + qt3d + qt5compat + qtcharts + qtconnectivity + qtdeclarative + qtdoc + qtimageformats + qtlottie + qtmultimedia + qtnetworkauth + qtpositioning + qtsensors + qtserialbus + qtserialport + qtshadertools + qtquick3d + qtsvg + qtscxml + qttools + qttranslations + qtvirtualkeyboard + qtwebchannel + qtwebengine + qtwebsockets + qtwebview + ] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ]); qt3d = callPackage ./modules/qt3d.nix { }; qt5compat = callPackage ./modules/qt5compat.nix { }; diff --git a/pkgs/development/libraries/qt-6/qt-env.nix b/pkgs/development/libraries/qt-6/qt-env.nix new file mode 100644 index 000000000000..0b41f0c07351 --- /dev/null +++ b/pkgs/development/libraries/qt-6/qt-env.nix @@ -0,0 +1,20 @@ +{ buildEnv, qtbase }: name: paths: + +buildEnv { + inherit name; + paths = [ qtbase ] ++ paths; + + pathsToLink = [ "/bin" "/mkspecs" "/include" "/lib" "/share" "/libexec" ]; + extraOutputsToInstall = [ "out" "dev" ]; + + postBuild = '' + rm "$out/bin/qmake" + cp "${qtbase.dev}/bin/qmake" "$out/bin" + cat >"$out/bin/qt.conf" < Date: Thu, 4 Aug 2022 21:18:46 -0700 Subject: [PATCH 006/797] openssl: Rosetta Stone entry for mips32 --- pkgs/development/libraries/openssl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0b4050c76cce..201a4c44c313 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -84,6 +84,7 @@ let x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; riscv64-linux = "./Configure linux64-riscv64"; + mipsel-linux = "./Configure linux-mips32"; mips64el-linux = if stdenv.hostPlatform.isMips64n64 then "./Configure linux64-mips64" From db5e8a7141dbd0b20f01db1db0837f987bb29819 Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Fri, 12 Aug 2022 12:55:20 +0200 Subject: [PATCH 007/797] remove Nix language syntax summary this belongs to the Nix package manager manual --- .../configuration/config-syntax.chapter.md | 1 - .../manual/configuration/summary.section.md | 46 --- .../configuration/config-syntax.chapter.xml | 1 - .../from_md/configuration/summary.section.xml | 332 ------------------ 4 files changed, 380 deletions(-) delete mode 100644 nixos/doc/manual/configuration/summary.section.md delete mode 100644 nixos/doc/manual/from_md/configuration/summary.section.xml diff --git a/nixos/doc/manual/configuration/config-syntax.chapter.md b/nixos/doc/manual/configuration/config-syntax.chapter.md index 56d093c0f6e8..9f8d45d58899 100644 --- a/nixos/doc/manual/configuration/config-syntax.chapter.md +++ b/nixos/doc/manual/configuration/config-syntax.chapter.md @@ -15,5 +15,4 @@ NixOS configuration files. - ``` diff --git a/nixos/doc/manual/configuration/summary.section.md b/nixos/doc/manual/configuration/summary.section.md deleted file mode 100644 index 8abbbe257fd9..000000000000 --- a/nixos/doc/manual/configuration/summary.section.md +++ /dev/null @@ -1,46 +0,0 @@ -# Syntax Summary {#sec-nix-syntax-summary} - -Below is a summary of the most important syntactic constructs in the Nix -expression language. It's not complete. In particular, there are many -other built-in functions. See the [Nix -manual](https://nixos.org/nix/manual/#chap-writing-nix-expressions) for -the rest. - -| Example | Description | -|-----------------------------------------------|--------------------------------------------------------------------------------------------------------------------| -| *Basic values* | | -| `"Hello world"` | A string | -| `"${pkgs.bash}/bin/sh"` | A string containing an expression (expands to `"/nix/store/hash-bash-version/bin/sh"`) | -| `true`, `false` | Booleans | -| `123` | An integer | -| `./foo.png` | A path (relative to the containing Nix expression) | -| *Compound values* | | -| `{ x = 1; y = 2; }` | A set with attributes named `x` and `y` | -| `{ foo.bar = 1; }` | A nested set, equivalent to `{ foo = { bar = 1; }; }` | -| `rec { x = "foo"; y = x + "bar"; }` | A recursive set, equivalent to `{ x = "foo"; y = "foobar"; }` | -| `[ "foo" "bar" ]` | A list with two elements | -| *Operators* | | -| `"foo" + "bar"` | String concatenation | -| `1 + 2` | Integer addition | -| `"foo" == "f" + "oo"` | Equality test (evaluates to `true`) | -| `"foo" != "bar"` | Inequality test (evaluates to `true`) | -| `!true` | Boolean negation | -| `{ x = 1; y = 2; }.x` | Attribute selection (evaluates to `1`) | -| `{ x = 1; y = 2; }.z or 3` | Attribute selection with default (evaluates to `3`) | -| `{ x = 1; y = 2; } // { z = 3; }` | Merge two sets (attributes in the right-hand set taking precedence) | -| *Control structures* | | -| `if 1 + 1 == 2 then "yes!" else "no!"` | Conditional expression | -| `assert 1 + 1 == 2; "yes!"` | Assertion check (evaluates to `"yes!"`). See [](#sec-assertions) for using assertions in modules | -| `let x = "foo"; y = "bar"; in x + y` | Variable definition | -| `with pkgs.lib; head [ 1 2 3 ]` | Add all attributes from the given set to the scope (evaluates to `1`) | -| *Functions (lambdas)* | | -| `x: x + 1` | A function that expects an integer and returns it increased by 1 | -| `(x: x + 1) 100` | A function call (evaluates to 101) | -| `let inc = x: x + 1; in inc (inc (inc 100))` | A function bound to a variable and subsequently called by name (evaluates to 103) | -| `{ x, y }: x + y` | A function that expects a set with required attributes `x` and `y` and concatenates them | -| `{ x, y ? "bar" }: x + y` | A function that expects a set with required attribute `x` and optional `y`, using `"bar"` as default value for `y` | -| `{ x, y, ... }: x + y` | A function that expects a set with required attributes `x` and `y` and ignores any other attributes | -| `{ x, y } @ args: x + y` | A function that expects a set with required attributes `x` and `y`, and binds the whole set to `args` | -| *Built-in functions* | | -| `import ./foo.nix` | Load and return Nix expression in given file | -| `map (x: x + x) [ 1 2 3 ]` | Apply a function to every element of a list (evaluates to `[ 2 4 6 ]`) | diff --git a/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml b/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml index 01446e53e38f..baf9639554cc 100644 --- a/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/config-syntax.chapter.xml @@ -17,5 +17,4 @@ - diff --git a/nixos/doc/manual/from_md/configuration/summary.section.xml b/nixos/doc/manual/from_md/configuration/summary.section.xml deleted file mode 100644 index 96a178c4930e..000000000000 --- a/nixos/doc/manual/from_md/configuration/summary.section.xml +++ /dev/null @@ -1,332 +0,0 @@ -
- Syntax Summary - - Below is a summary of the most important syntactic constructs in the - Nix expression language. It’s not complete. In particular, there are - many other built-in functions. See the - Nix - manual for the rest. - - - - - - - - - Example - - - Description - - - - - - - Basic values - - - - - - - "Hello world" - - - A string - - - - - "${pkgs.bash}/bin/sh" - - - A string containing an expression (expands to - "/nix/store/hash-bash-version/bin/sh") - - - - - true, false - - - Booleans - - - - - 123 - - - An integer - - - - - ./foo.png - - - A path (relative to the containing Nix expression) - - - - - Compound values - - - - - - - { x = 1; y = 2; } - - - A set with attributes named x and - y - - - - - { foo.bar = 1; } - - - A nested set, equivalent to - { foo = { bar = 1; }; } - - - - - rec { x = "foo"; y = x + "bar"; } - - - A recursive set, equivalent to - { x = "foo"; y = "foobar"; } - - - - - [ "foo" "bar" ] - - - A list with two elements - - - - - Operators - - - - - - - "foo" + "bar" - - - String concatenation - - - - - 1 + 2 - - - Integer addition - - - - - "foo" == "f" + "oo" - - - Equality test (evaluates to true) - - - - - "foo" != "bar" - - - Inequality test (evaluates to true) - - - - - !true - - - Boolean negation - - - - - { x = 1; y = 2; }.x - - - Attribute selection (evaluates to 1) - - - - - { x = 1; y = 2; }.z or 3 - - - Attribute selection with default (evaluates to - 3) - - - - - { x = 1; y = 2; } // { z = 3; } - - - Merge two sets (attributes in the right-hand set taking - precedence) - - - - - Control structures - - - - - - - if 1 + 1 == 2 then "yes!" else "no!" - - - Conditional expression - - - - - assert 1 + 1 == 2; "yes!" - - - Assertion check (evaluates to - "yes!"). See - for using assertions in - modules - - - - - let x = "foo"; y = "bar"; in x + y - - - Variable definition - - - - - with pkgs.lib; head [ 1 2 3 ] - - - Add all attributes from the given set to the scope - (evaluates to 1) - - - - - Functions (lambdas) - - - - - - - x: x + 1 - - - A function that expects an integer and returns it increased - by 1 - - - - - (x: x + 1) 100 - - - A function call (evaluates to 101) - - - - - let inc = x: x + 1; in inc (inc (inc 100)) - - - A function bound to a variable and subsequently called by - name (evaluates to 103) - - - - - { x, y }: x + y - - - A function that expects a set with required attributes - x and y and - concatenates them - - - - - { x, y ? "bar" }: x + y - - - A function that expects a set with required attribute - x and optional y, - using "bar" as default value - for y - - - - - { x, y, ... }: x + y - - - A function that expects a set with required attributes - x and y and ignores - any other attributes - - - - - { x, y } @ args: x + y - - - A function that expects a set with required attributes - x and y, and binds the - whole set to args - - - - - Built-in functions - - - - - - - import ./foo.nix - - - Load and return Nix expression in given file - - - - - map (x: x + x) [ 1 2 3 ] - - - Apply a function to every element of a list (evaluates to - [ 2 4 6 ]) - - - - - -
From aad7f1d6b36819115cdfa4ccaa9d39237bfa57c5 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 22 Aug 2022 14:37:41 -0700 Subject: [PATCH 008/797] doc/../rust.section.md: prominently mention `buildRustXX` names This was a source of massive confusion for me when I first learned my way around nixpkgs' rust machinery. I seek to save others from that confusion. * `buildRustPackage` should have been named `buildRustPackageUsingCargo` * `buildRustCrate` should have been named `buildRustPackageUsingNix` It is, unfortunately, too late to fix this. Let's do the next best thing and make the names `buildRustPackage` and `buildRustCrate` very prominent in the documentation, so readers see immediately that they need to learn the following jargon: * `buildRustPackage` means "build this Rust crate by calling `cargo` in one (or two) monolithic derivations" * `buildRustCrate` means "build this Rust crate by calling `rustc` in one derivation for each crate" --- doc/languages-frameworks/rust.section.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index e19783e29e6a..b499c6300905 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -15,7 +15,7 @@ For other versions such as daily builds (beta and nightly), use either `rustup` from nixpkgs (which will manage the rust installation in your home directory), or use a community maintained [Rust overlay](#using-community-rust-overlays). -## Compiling Rust applications with Cargo {#compiling-rust-applications-with-cargo} +## `buildRustPackage`: Compiling Rust applications with Cargo {#compiling-rust-applications-with-cargo} Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`: @@ -596,7 +596,7 @@ buildPythonPackage rec { } ``` -## Compiling Rust crates using Nix instead of Cargo {#compiling-rust-crates-using-nix-instead-of-cargo} +## `buildRustCrate`: Compiling Rust crates using Nix instead of Cargo {#compiling-rust-crates-using-nix-instead-of-cargo} ### Simple operation {#simple-operation} From d3afad859a147a439f5b5cfe0fcfa2ba9d8a8a08 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 29 Sep 2022 04:20:00 +0000 Subject: [PATCH 009/797] martian-mono: init at 0.9.1 --- pkgs/data/fonts/martian-mono/default.nix | 35 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/data/fonts/martian-mono/default.nix diff --git a/pkgs/data/fonts/martian-mono/default.nix b/pkgs/data/fonts/martian-mono/default.nix new file mode 100644 index 000000000000..98f20082be98 --- /dev/null +++ b/pkgs/data/fonts/martian-mono/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "martian-mono"; + version = "0.9.2"; + + src = fetchzip { + url = "https://github.com/evilmartians/mono/releases/download/v${version}/martian-mono-${version}-otf.zip"; + sha256 = "sha256-whIR7BaEflm/VsF60Xck6ZJDLzTugaTOogHzcEtwCsM="; + stripRoot = false; + }; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + doCheck = false; + dontFixup = true; + + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/share/fonts/opentype/ *.otf + + runHook postInstall + ''; + + meta = with lib; { + description = "Free and open-source monospaced font from Evil Martians"; + homepage = "https://github.com/evilmartians/mono"; + changelog = "https://github.com/evilmartians/mono/raw/v${version}/Changelog.md"; + license = licenses.ofl; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1ccb4d98efd..a15ce3a0e921 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26604,6 +26604,8 @@ with pkgs; manrope = callPackage ../data/fonts/manrope { }; + martian-mono = callPackage ../data/fonts/martian-mono { }; + marwaita = callPackage ../data/themes/marwaita { }; marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; From e24daea3d3d46bd0ae87b29b9315bd2d0df9c389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 15 Oct 2022 16:50:22 +0200 Subject: [PATCH 010/797] tailscale: improve formatting on warning message --- nixos/modules/services/networking/tailscale.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index eb3afe118c64..26997dd96013 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -41,7 +41,11 @@ in { }; config = mkIf cfg.enable { - warnings = optional (firewallOn && rpfIsStrict) "Strict reverse path filtering breaks Tailscale exit node use and some subnet routing setups. Consider setting `networking.firewall.checkReversePath` = 'loose'"; + warnings = optional (firewallOn && rpfIsStrict) '' + Strict reverse path filtering breaks Tailscale exit node use and some subnet routing setups. Consider setting: + + networking.firewall.checkReversePath = "loose"; + ''; environment.systemPackages = [ cfg.package ]; # for the CLI systemd.packages = [ cfg.package ]; systemd.services.tailscaled = { From 12f9d8e7303af57ed2d462c17b772c36fd05d0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 8 Oct 2022 10:15:02 +0200 Subject: [PATCH 011/797] buildPythonPackage: better error message if no setuptools is used. Before packages did not had to set `format = "other";` if had a custom installPhase and would not produce a dist folder. The current error message is hard to understand by new users: > Executing pythonOutputDistPhase > mv: cannot stat 'dist': No such file or directory This commit improves the error message. --- .../python/hooks/python-output-dist-hook.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh index e73e45cd597a..83b79d01fa40 100644 --- a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh @@ -3,7 +3,21 @@ echo "Sourcing python-catch-conflicts-hook.sh" pythonOutputDistPhase() { echo "Executing pythonOutputDistPhase" - mv "dist" "$dist" + if [[ -d dist ]]; then + mv "dist" "$dist" + else + cat >&2 < Date: Wed, 19 Oct 2022 17:05:13 +0200 Subject: [PATCH 012/797] nixos/steam: add package option --- nixos/modules/programs/steam.nix | 33 ++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index adbbf5d9ed4b..1b69aac98863 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -4,17 +4,31 @@ with lib; let cfg = config.programs.steam; - - steam = pkgs.steam.override { - extraLibraries = pkgs: with config.hardware.opengl; - if pkgs.hostPlatform.is64bit - then [ package ] ++ extraPackages - else [ package32 ] ++ extraPackages32; - }; in { options.programs.steam = { enable = mkEnableOption (lib.mdDoc "steam"); + package = mkOption { + type = types.package; + default = pkgs.steam.override { + extraLibraries = pkgs: with config.hardware.opengl; + if pkgs.hostPlatform.is64bit + then [ package ] ++ extraPackages + else [ package32 ] ++ extraPackages32; + }; + defaultText = literalExpression '' + pkgs.steam.override { + extraLibraries = pkgs: with config.hardware.opengl; + if pkgs.hostPlatform.is64bit + then [ package ] ++ extraPackages + else [ package32 ] ++ extraPackages32; + } + ''; + description = lib.mdDoc '' + steam package to use. + ''; + }; + remotePlay.openFirewall = mkOption { type = types.bool; default = false; @@ -44,7 +58,10 @@ in { hardware.steam-hardware.enable = true; - environment.systemPackages = [ steam steam.run ]; + environment.systemPackages = [ + cfg.package + cfg.package.run + ]; networking.firewall = lib.mkMerge [ (mkIf cfg.remotePlay.openFirewall { From 7e2aec079c099f55b991b80356239076705d1bff Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 22 Oct 2022 19:52:10 +0200 Subject: [PATCH 013/797] nixos/filesystems: escape mount options in fstab Some mount options might include path names and those often contain spaces and therefore must be escaped. An example which prompted me to make this change is the path of a btrfs subvolume. --- nixos/modules/tasks/filesystems.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 994747601309..ea825667c34f 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -167,7 +167,7 @@ let else throw "No device specified for mount point ‘${fs.mountPoint}’.") + " " + escape (rootPrefix + fs.mountPoint) + " " + fs.fsType - + " " + builtins.concatStringsSep "," (fs.options ++ (extraOpts fs)) + + " " + escape (builtins.concatStringsSep "," (fs.options ++ (extraOpts fs))) + " " + (optionalString (!excludeChecks) ("0 " + (if skipCheck fs then "0" else if fs.mountPoint == "/" then "1" else "2"))) + "\n" From 1447e791a0b8a038895e299e199be978b022f8f2 Mon Sep 17 00:00:00 2001 From: binsky Date: Sun, 23 Oct 2022 15:19:53 +0200 Subject: [PATCH 014/797] threema-desktop: 1.2.13 -> 1.2.21 --- .../instant-messengers/threema-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 852abe8e6dc4..6a21fe8a9ef0 100644 --- a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "threema-desktop"; - version = "1.2.13"; + version = "1.2.21"; src = fetchurl { # As Threema only offers a Latest Release url, the plan is to upload each # new release url to web.archive.org until their Github releases page gets populated. - url = "https://web.archive.org/web/20220621152620id_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; - sha256 = "sha256-X16GMxUIKUloj0FxhzWQKUBf4zwfSBVg0cwLgGxHPHE="; + url = "https://web.archive.org/web/20220915175906if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; + sha256 = "0icxn5whsvwmdmfbkfk4xnl3dn4iif5s5yw5hsimmyx066fq0qhb"; }; nativeBuildInputs = [ From 56ab2dc73face43b7b1e412e01cbd4d562b8c1f1 Mon Sep 17 00:00:00 2001 From: schnusch Date: Sun, 23 Oct 2022 23:39:38 +0200 Subject: [PATCH 015/797] mpvScripts.sponsorblock: unstable-2021-12-23 -> unstable-2022-09-24 --- pkgs/applications/video/mpv/scripts/sponsorblock.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 9a4060e59330..2db4cf53d004 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -3,13 +3,13 @@ # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` stdenvNoCC.mkDerivation { pname = "mpv_sponsorblock"; - version = "unstable-2021-12-23"; + version = "unstable-2022-09-24"; src = fetchFromGitHub { owner = "po5"; repo = "mpv_sponsorblock"; - rev = "6743bd47d4cfce3ae3d5dd4f587f3193bd4fb9b2"; - sha256 = "06c37f33cdpz1w1jacjf1wnbh4f9b1xpipxzkg5ixf46cbwssmsj"; + rev = "248d108c1280e05de551c42867aebb72cf0c83b9"; + sha256 = "1aacchyci34xyx7rcyd2r02i4rlqq8q61l6dcci8yd4g4hjiqqld"; }; dontBuild = true; From c19dbef946b86c72d7d944a51d3a38dd36d08a61 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 27 Oct 2022 01:06:16 +0800 Subject: [PATCH 016/797] perlPackages.IOAsync: 0.801 -> 0.802 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b16f8844856e..4b6de1b4986f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11998,10 +11998,10 @@ let IOAsync = buildPerlModule { pname = "IO-Async"; - version = "0.801"; + version = "0.802"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.801.tar.gz"; - hash = "sha256-ieRZuhe3alcrsbS7EgMBVB6MyTJCQXFmI2tsbbDhybk="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.802.tar.gz"; + hash = "sha256-5YJzFXd2fEfqxDXvKQRmPUp1Cw5oAqSmGJo38Mswhzg"; }; preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox propagatedBuildInputs = [ Future StructDumb ]; From 355a7527cc9d8559a097715db7db7fa7477889b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:38:00 +0200 Subject: [PATCH 017/797] phpExtensions.datadog_trace: cleanup --- pkgs/development/php-packages/datadog_trace/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index 9b91d85fefe5..38beba92e21e 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -7,7 +7,7 @@ buildPecl rec { src = fetchFromGitHub { owner = "DataDog"; repo = "dd-trace-php"; - rev = "${version}"; + rev = version; sha256 = "sha256-AYRBzE0Detg/IHXYutZUfPRMtfthxdkSjqD0M+VcTpY="; }; From 0b5af74cb6638fdc7f14393f0fbd06fadcd9a135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:38:08 +0200 Subject: [PATCH 018/797] phpExtensions.event: cleanup description --- pkgs/development/php-packages/event/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix index 9bdfaa3b4b2c..a497d934627a 100644 --- a/pkgs/development/php-packages/event/default.nix +++ b/pkgs/development/php-packages/event/default.nix @@ -23,10 +23,7 @@ buildPecl { internalDeps = [ php.extensions.sockets ]; meta = with lib; { - description = '' - This is an extension to efficiently schedule I/O, time and signal based - events using the best I/O notification mechanism available for specific platform. - ''; + description = "Efficiently schedule I/O, time and signal based events using the best I/O notification mechanism available"; license = licenses.php301; homepage = "https://bitbucket.org/osmanov/pecl-event/"; maintainers = teams.php.members; From e5ef9dc5bf3f037599970956ab3aee7b049f34d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:40:05 +0200 Subject: [PATCH 019/797] phpExtensions.openswoole: split longDescription on new lines --- pkgs/development/php-packages/openswoole/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index d43ed40f8cee..414b144ba8ef 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -15,7 +15,11 @@ buildPecl { description = "Coroutine-based concurrency library and high performance programmatic server for PHP"; homepage = "https://www.openswoole.com/"; license = licenses.asl20; - longDescription = "Open Swoole allows you to build high-performance, async multi-tasking webservices and applications using an easy to use Coroutine API.\nOpen Swoole is a complete async solution that has built-in support for async programming via coroutines.\nIt offers a range of multi-threaded I/O modules (HTTP Server, WebSockets, TaskWorkers, Process Pools) out of the box and support for popular PHP clients like PDO for MySQL, and CURL.\nYou can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process."; + longDescription = '' + Open Swoole allows you to build high-performance, async multi-tasking webservices and applications using an easy to use Coroutine API.\nOpen Swoole is a complete async solution that has built-in support for async programming via coroutines. + It offers a range of multi-threaded I/O modules (HTTP Server, WebSockets, TaskWorkers, Process Pools) out of the box and support for popular PHP clients like PDO for MySQL, and CURL. + You can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process. + ''; maintainers = teams.php.members; }; } From 1592f4ca84871195b17695656f412f8c2aecdf93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:40:33 +0200 Subject: [PATCH 020/797] phpExtensions.php-cs-fixer: update homepage --- pkgs/development/php-packages/php-cs-fixer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 0d297a35a83c..7085ea167796 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -27,7 +27,7 @@ mkDerivation { meta = with lib; { description = "A tool to automatically fix PHP coding standards issues"; license = licenses.mit; - homepage = "http://cs.sensiolabs.org/"; + homepage = "https://cs.symfony.com/"; maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; } From 44d0f3783387cdd7dfe05a32ff9c623eeebd0b57 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 16 Oct 2022 09:57:50 +0200 Subject: [PATCH 021/797] testers.testBuildFailure: init --- doc/builders/testers.chapter.md | 40 +++++++++++++ pkgs/build-support/testers/default.nix | 12 +++- pkgs/build-support/testers/expect-failure.sh | 62 ++++++++++++++++++++ pkgs/build-support/testers/test/default.nix | 51 +++++++++++++++- 4 files changed, 163 insertions(+), 2 deletions(-) create mode 100644 pkgs/build-support/testers/expect-failure.sh diff --git a/doc/builders/testers.chapter.md b/doc/builders/testers.chapter.md index ad1e1036d508..57f66a428482 100644 --- a/doc/builders/testers.chapter.md +++ b/doc/builders/testers.chapter.md @@ -35,6 +35,46 @@ passthru.tests.version = testers.testVersion { }; ``` +## `testBuildFailure` {#tester-testBuildFailure} + +Make sure that a build does not succeed. This is useful for testing testers. + +This returns a derivation with an override on the builder, with the following effects: + + - Fail the build when the original builder succeeds + - Move `$out` to `$out/result`, if it exists (assuming `out` is the default output) + - Save the build log to `$out/testBuildFailure.log` (same) + +Example: + +```nix +runCommand "example" { + failed = testers.testBuildFailure (runCommand "fail" {} '' + echo ok-ish >$out + echo failing though + exit 3 + ''); +} '' + grep -F 'ok-ish' $failed/result + grep -F 'failing though' $failed/testBuildFailure.log + [[ 3 = $(cat $failed/testBuildFailure.exit) ]] + touch $out +''; +``` + +While `testBuildFailure` is designed to keep changes to the original builder's +environment to a minimum, some small changes are inevitable. + + - The file `$TMPDIR/testBuildFailure.log` is present. It should not be deleted. + - `stdout` and `stderr` are a pipe instead of a tty. This could be improved. + - One or two extra processes are present in the sandbox during the original + builder's execution. + - The derivation and output hashes are different, but not unusual. + - The derivation includes a dependency on `buildPackages.bash` and + `expect-failure.sh`, which is built to include a transitive dependency on + `buildPackages.coreutils` and possibly more. These are not added to `PATH` + or any other environment variable, so they should be hard to observe. + ## `testEqualDerivation` {#tester-testEqualDerivation} Checks that two packages produce the exact same build instructions. diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index 7244d3d38575..fd08e9c6c47f 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -1,6 +1,16 @@ -{ pkgs, lib, callPackage, runCommand, stdenv }: +{ pkgs, buildPackages, lib, callPackage, runCommand, stdenv, substituteAll, }: # Documentation is in doc/builders/testers.chapter.md { + # See https://nixos.org/manual/nixpkgs/unstable/#tester-testBuildFailure + # or doc/builders/testers.chapter.md + testBuildFailure = drv: drv.overrideAttrs (orig: { + builder = buildPackages.bash; + args = [ + (substituteAll { coreutils = buildPackages.coreutils; src = ./expect-failure.sh; }) + orig.realBuilder or stdenv.shell + ] ++ orig.args or ["-e" (orig.builder or ../../stdenv/generic/default-builder.sh)]; + }); + testEqualDerivation = callPackage ./test-equal-derivation.nix { }; testVersion = diff --git a/pkgs/build-support/testers/expect-failure.sh b/pkgs/build-support/testers/expect-failure.sh new file mode 100644 index 000000000000..23e8698cf479 --- /dev/null +++ b/pkgs/build-support/testers/expect-failure.sh @@ -0,0 +1,62 @@ +# Run a builder, flip exit code, save log and fix outputs +# +# Sub-goals: +# - Delegate to another original builder passed via args +# - Save the build log to output for further checks +# - Make the derivation succeed if the original builder fails +# - Make the derivation fail if the original builder returns exit code 0 +# +# Requirements: +# This runs before, without and after stdenv. Do not modify the environment; +# especially not before invoking the original builder. For example, use +# "@" substitutions instead of PATH. +# Do not export any variables. + +# Stricter bash +set -eu + +# ------------------------ +# Run the original builder + +echo "testBuildFailure: Expecting non-zero exit from builder and args: ${*@Q}" + +("$@" 2>&1) | @coreutils@/bin/tee $TMPDIR/testBuildFailure.log \ + | while read ln; do + echo "original builder: $ln" + done + +r=${PIPESTATUS[0]} +if [[ $r = 0 ]]; then + echo "testBuildFailure: The builder did not fail, but a failure was expected!" + exit 1 +fi +echo "testBuildFailure: Original builder produced exit code: $r" + +# ----------------------------------------- +# Write the build log to the default output + +outs=( $outputs ) +defOut=${outs[0]} +defOutPath=${!defOut} + +if [[ ! -d $defOutPath ]]; then + if [[ -e $defOutPath ]]; then + @coreutils@/bin/mv $defOutPath $TMPDIR/out-node + @coreutils@/bin/mkdir $defOutPath + @coreutils@/bin/mv $TMPDIR/out-node $defOutPath/result + fi +fi + +@coreutils@/bin/mkdir -p $defOutPath +@coreutils@/bin/mv $TMPDIR/testBuildFailure.log $defOutPath/testBuildFailure.log +echo $r >$defOutPath/testBuildFailure.exit + +# ------------------------------------------------------ +# Put empty directories in place for any missing outputs + +for outputName in ${outputs:-out}; do + outputPath="${!outputName}" + if [[ ! -e "${outputPath}" ]]; then + @coreutils@/bin/mkdir "${outputPath}"; + fi +done diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix index 30e778cf652e..22869baae159 100644 --- a/pkgs/build-support/testers/test/default.nix +++ b/pkgs/build-support/testers/test/default.nix @@ -1,4 +1,4 @@ -{ testers, lib, pkgs, ... }: +{ testers, lib, pkgs, hello, runCommand, ... }: let pkgs-with-overlay = pkgs.extend(final: prev: { proof-of-overlay-hello = prev.hello; @@ -24,4 +24,53 @@ lib.recurseIntoAttrs { machine.succeed("hello | figlet >/dev/console") ''; }); + + testBuildFailure = lib.recurseIntoAttrs { + happy = runCommand "testBuildFailure-happy" { + failed = testers.testBuildFailure (runCommand "fail" {} '' + echo ok-ish >$out + echo failing though + echo also stderr 1>&2 + exit 3 + ''); + } '' + grep -F 'failing though' $failed/testBuildFailure.log + grep -F 'also stderr' $failed/testBuildFailure.log + grep -F 'ok-ish' $failed/result + [[ 3 = $(cat $failed/testBuildFailure.exit) ]] + touch $out + ''; + + helloDoesNotFail = runCommand "testBuildFailure-helloDoesNotFail" { + failed = testers.testBuildFailure (testers.testBuildFailure hello); + + # Add hello itself as a prerequisite, so we don't try to run this test if + # there's an actual failure in hello. + inherit hello; + } '' + echo "Checking $failed/testBuildFailure.log" + grep -F 'testBuildFailure: The builder did not fail, but a failure was expected' $failed/testBuildFailure.log + [[ 1 = $(cat $failed/testBuildFailure.exit) ]] + touch $out + ''; + + multiOutput = runCommand "testBuildFailure-multiOutput" { + failed = testers.testBuildFailure (runCommand "fail" { + # dev will be the default output + outputs = ["dev" "doc" "out"]; + } '' + echo i am failing + exit 1 + ''); + } '' + grep -F 'i am failing' $failed/testBuildFailure.log >/dev/null + [[ 1 = $(cat $failed/testBuildFailure.exit) ]] + + # Checking our note that dev is the default output + echo $failed/_ | grep -- '-dev/_' >/dev/null + + touch $out + ''; + }; + } From e20a362908fa6d4393efb05390e7dd38a64237da Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 15 Oct 2022 17:24:09 +0200 Subject: [PATCH 022/797] testers.testEqualContents: init --- doc/builders/testers.chapter.md | 24 ++++ pkgs/build-support/testers/default.nix | 38 +++++++ pkgs/build-support/testers/test/default.nix | 116 +++++++++++++++++++- 3 files changed, 177 insertions(+), 1 deletion(-) diff --git a/doc/builders/testers.chapter.md b/doc/builders/testers.chapter.md index 57f66a428482..58bb06f23137 100644 --- a/doc/builders/testers.chapter.md +++ b/doc/builders/testers.chapter.md @@ -75,6 +75,30 @@ environment to a minimum, some small changes are inevitable. `buildPackages.coreutils` and possibly more. These are not added to `PATH` or any other environment variable, so they should be hard to observe. +## `testEqualContents` {#tester-equalContents} + +Check that two paths have the same contents. + +Example: + +```nix +testers.testEqualContents { + assertion = "sed -e performs replacement"; + expected = writeText "expected" '' + foo baz baz + ''; + actual = runCommand "actual" { + # not really necessary for a package that's in stdenv + nativeBuildInputs = [ gnused ]; + base = writeText "base" '' + foo bar baz + ''; + } '' + sed -e 's/bar/baz/g' $base >$out + ''; +} +``` + ## `testEqualDerivation` {#tester-testEqualDerivation} Checks that two packages produce the exact same build instructions. diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index fd08e9c6c47f..c565b6e72535 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -13,6 +13,44 @@ testEqualDerivation = callPackage ./test-equal-derivation.nix { }; + # See https://nixos.org/manual/nixpkgs/unstable/#tester-testEqualContents + # or doc/builders/testers.chapter.md + testEqualContents = { + assertion, + actual, + expected, + }: runCommand "equal-contents-${lib.strings.toLower assertion}" { + inherit assertion actual expected; + } '' + echo "Checking:" + echo "$assertion" + if ! diff -U5 -r "$actual" "$expected" --color=always + then + echo + echo 'Contents must be equal, but were not!' + echo + echo "+: expected, at $expected" + echo "-: unexpected, at $actual" + exit 1 + else + find "$expected" -type f -executable > expected-executables | sort + find "$actual" -type f -executable > actual-executables | sort + if ! diff -U0 actual-executables expected-executables --color=always + then + echo + echo "Contents must be equal, but some files' executable bits don't match" + echo + echo "+: make this file executable in the actual contents" + echo "-: make this file non-executable in the actual contents" + exit 1 + else + echo "expected $expected and actual $actual match." + echo 'OK' + touch $out + fi + fi + ''; + testVersion = { package, command ? "${package.meta.mainProgram or package.pname or package.name} --version", diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix index 22869baae159..d6dfbe34fd21 100644 --- a/pkgs/build-support/testers/test/default.nix +++ b/pkgs/build-support/testers/test/default.nix @@ -68,9 +68,123 @@ lib.recurseIntoAttrs { # Checking our note that dev is the default output echo $failed/_ | grep -- '-dev/_' >/dev/null - + echo 'All good.' touch $out ''; }; + testEqualContents = lib.recurseIntoAttrs { + happy = testers.testEqualContents { + assertion = "The same directory contents at different paths are recognized as equal"; + expected = runCommand "expected" {} '' + mkdir -p $out/c + echo a >$out/a + echo b >$out/b + echo d >$out/c/d + ''; + actual = runCommand "actual" {} '' + mkdir -p $out/c + echo a >$out/a + echo b >$out/b + echo d >$out/c/d + ''; + }; + + unequalExe = + runCommand "testEqualContents-unequalExe" { + log = testers.testBuildFailure (testers.testEqualContents { + assertion = "The same directory contents at different paths are recognized as equal"; + expected = runCommand "expected" {} '' + mkdir -p $out/c + echo a >$out/a + chmod a+x $out/a + echo b >$out/b + echo d >$out/c/d + ''; + actual = runCommand "actual" {} '' + mkdir -p $out/c + echo a >$out/a + echo b >$out/b + chmod a+x $out/b + echo d >$out/c/d + ''; + }); + } '' + ( + set -x + grep -F -- "executable bits don't match" $log/testBuildFailure.log + grep -E -- '+.*-actual/a' $log/testBuildFailure.log + grep -E -- '-.*-actual/b' $log/testBuildFailure.log + grep -F -- "--- actual-executables" $log/testBuildFailure.log + grep -F -- "+++ expected-executables" $log/testBuildFailure.log + ) || { + echo "Test failed: could not find pattern in build log $log" + exit 1 + } + echo 'All good.' + touch $out + ''; + + fileDiff = + runCommand "testEqualContents-fileDiff" { + log = testers.testBuildFailure (testers.testEqualContents { + assertion = "The same directory contents at different paths are recognized as equal"; + expected = runCommand "expected" {} '' + mkdir -p $out/c + echo a >$out/a + echo b >$out/b + echo d >$out/c/d + ''; + actual = runCommand "actual" {} '' + mkdir -p $out/c + echo a >$out/a + echo B >$out/b + echo d >$out/c/d + ''; + }); + } '' + ( + set -x + grep -F -- "Contents must be equal but were not" $log/testBuildFailure.log + grep -E -- '+++ .*-actual/b' $log/testBuildFailure.log + grep -E -- '--- .*-actual/b' $log/testBuildFailure.log + grep -F -- "-B" $log/testBuildFailure.log + grep -F -- "+b" $log/testBuildFailure.log + ) || { + echo "Test failed: could not find pattern in build log $log" + exit 1 + } + echo 'All good.' + touch $out + ''; + + fileMissing = + runCommand "testEqualContents-fileMissing" { + log = testers.testBuildFailure (testers.testEqualContents { + assertion = "The same directory contents at different paths are recognized as equal"; + expected = runCommand "expected" {} '' + mkdir -p $out/c + echo a >$out/a + echo b >$out/b + echo d >$out/c/d + ''; + actual = runCommand "actual" {} '' + mkdir -p $out/c + echo a >$out/a + echo d >$out/c/d + ''; + }); + } '' + ( + set -x + grep -F -- "Contents must be equal but were not" $log/testBuildFailure.log + grep -E -- 'Only in .*-expected: b' $log/testBuildFailure.log + ) || { + echo "Test failed: could not find pattern in build log $log" + exit 1 + } + echo 'All good.' + touch $out + ''; + }; } From 3cf3fef37260eb9c9cbf00096c48064f11dc83a9 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 27 Oct 2022 14:05:19 +0200 Subject: [PATCH 023/797] testers: Add missing doc link comments --- pkgs/build-support/testers/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index c565b6e72535..6ab0ee843cb0 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -11,6 +11,8 @@ ] ++ orig.args or ["-e" (orig.builder or ../../stdenv/generic/default-builder.sh)]; }); + # See https://nixos.org/manual/nixpkgs/unstable/#tester-testEqualDerivation + # or doc/builders/testers.chapter.md testEqualDerivation = callPackage ./test-equal-derivation.nix { }; # See https://nixos.org/manual/nixpkgs/unstable/#tester-testEqualContents @@ -51,6 +53,8 @@ fi ''; + # See https://nixos.org/manual/nixpkgs/unstable/#tester-testVersion + # or doc/builders/testers.chapter.md testVersion = { package, command ? "${package.meta.mainProgram or package.pname or package.name} --version", From 332770b9547ac2ceda2c71bdf97102e111fdd5ef Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 20 Oct 2022 11:06:17 +0200 Subject: [PATCH 024/797] cyrus_sasl: make compatible with openssl3 --- pkgs/development/libraries/cyrus-sasl/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 632c8427e4db..db23009b8fa9 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, openldap, libkrb5, db, gettext +{ lib, stdenv, fetchurl, fetchpatch, openssl, openldap, libkrb5, db, gettext , pam, libxcrypt, fixDarwinDylibNames, autoreconfHook, enableLdap ? false , buildPackages, pruneLibtoolFiles, nixosTests }: @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { patches = [ # Fix cross-compilation ./cyrus-sasl-ac-try-run-fix.patch + # make compatible with openssl3. can probably be dropped with any release after 2.1.28 + (fetchpatch { + url = "https://github.com/cyrusimap/cyrus-sasl/compare/cb549ef71c5bb646fe583697ebdcaba93267a237...c2bd3afbca57f176d8c650670ce371444bb7fcc0.patch"; + hash = "sha256-bYeIkvle1Ms7Lnoob4eLd4RbPFHtPkKRZvfHNCBJY/s="; + }) ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; From a0869efd093e05863b9e538ea4c512a32f711ad1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 20 Oct 2022 11:06:22 +0200 Subject: [PATCH 025/797] Revert "cyrus_sasl: pin to openssl_1_1" This reverts commit 1f48d6fd5000461e7501942f4f2da9b62330bfe8. --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3df8b0cad68..968bcbdf37f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18381,7 +18381,6 @@ with pkgs; cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { libkrb5 = if stdenv.isFreeBSD then libheimdal else libkrb5; - openssl = openssl_1_1; }; # Make bdb5 the default as it is the last release under the custom From 4d30c4aaea76d92792c7cdeff4c4849fe62bdea4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 20 Oct 2022 11:06:42 +0200 Subject: [PATCH 026/797] Revert "openldap: pin to openssl_1_1" This reverts commit de5a1214ce07075f3800fe4a9e2c10821a32bf10. --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 968bcbdf37f8..f6b6a384cf2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21469,9 +21469,7 @@ with pkgs; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; - openldap = callPackage ../development/libraries/openldap { - openssl = openssl_1_1; - }; + openldap = callPackage ../development/libraries/openldap { }; opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio { inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa; From 017fd895276dc0e45e9a596b1aa1ad199bfc7c4d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 20 Oct 2022 11:55:20 +0200 Subject: [PATCH 027/797] Revert "python3: pin to openssl_1_1" This reverts commit 8dfc998207dca2e2928cd1f204e4f37444aa40a6. --- .../interpreters/python/cpython/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 424258167150..e84b4918afb8 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -7,7 +7,6 @@ , mailcap, mimetypesSupport ? true , ncurses , openssl -, openssl_1_1 , readline , sqlite , tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false @@ -77,10 +76,6 @@ assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode)) with lib; let - # cpython does support/build with openssl 3.0, but some libraries using the ssl module seem to have issues with it - # null check for Minimal - openssl' = if openssl != null then openssl_1_1 else null; - buildPackages = pkgsBuildHost; inherit (passthru) pythonForBuild; @@ -121,7 +116,7 @@ let ]; buildInputs = filter (p: p != null) ([ - zlib bzip2 expat xz libffi gdbm sqlite readline ncurses openssl' ] + zlib bzip2 expat xz libffi gdbm sqlite readline ncurses openssl ] ++ optionals x11Support [ tcl tk libX11 xorgproto ] ++ optionals (bluezSupport && stdenv.isLinux) [ bluez ] ++ optionals stdenv.isDarwin [ configd ]) @@ -327,8 +322,8 @@ in with passthru; stdenv.mkDerivation { "--with-threads" ] ++ optionals (sqlite != null && isPy3k) [ "--enable-loadable-sqlite-extensions" - ] ++ optionals (openssl' != null) [ - "--with-openssl=${openssl'.dev}" + ] ++ optionals (openssl != null) [ + "--with-openssl=${openssl.dev}" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_buggy_getaddrinfo=no" # Assume little-endian IEEE 754 floating point when cross compiling @@ -493,7 +488,7 @@ in with passthru; stdenv.mkDerivation { # Enforce that we don't have references to the OpenSSL -dev package, which we # explicitly specify in our configure flags above. disallowedReferences = - lib.optionals (openssl' != null && !static) [ openssl'.dev ] + lib.optionals (openssl != null && !static) [ openssl.dev ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. From 66e6f6f8522001975334b9a27538fc0d8b1adfe4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 22 Oct 2022 11:10:30 +0200 Subject: [PATCH 028/797] openldap: disable failing test --- pkgs/development/libraries/openldap/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 97a84356f818..5db0a7c8bfa9 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -92,6 +92,8 @@ stdenv.mkDerivation rec { preCheck = '' substituteInPlace tests/scripts/all \ --replace "/bin/rm" "rm" + # fails saying "SASL(-1): generic failure: internal error: failed to init cipher 'rc4'" + rm tests/scripts/test076-authid-rewrite ''; doCheck = true; From d168b8cf2ff5094b7c387e0d99456fdbd79a2550 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 00:11:30 +0000 Subject: [PATCH 029/797] iosevka-bin: 16.0.0 -> 16.3.6 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++-------------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index fe231ee97f8d..d7f107b78428 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "16.0.0"; + version = "16.3.6"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index a65c702487ee..e5d7447ed59a 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1akz0vnizqqamk300fknrqay5n72296s43mgf8s2pp6b9vc4m0m1"; - iosevka-aile = "1frkwcgkzs81dl4sdlv6rv8n226anp3qy8b0zng5ybcrnjsnxapy"; - iosevka-curly = "0d1h66hayn1aldczd340j75wz1xxbrqvqszx0n798q9difnvbwn6"; - iosevka-curly-slab = "0bpd7xhhba904pqnc6f4dq575dyap0wh3sm996ad253g264jk3gk"; - iosevka-etoile = "1qqvwaaw91mnabxhwrgdbsna4zn1pp2mpk51k5ffplcwcwhqkh1h"; - iosevka-slab = "1wil56m16yy9mx1yx6c5m12bxm82gwdni9cb52374d7dn5ahj6mf"; - iosevka-ss01 = "1k1xxvsddqpblmc5ymlv7cga39y8zmhpl0kj5akinv3787p73h8s"; - iosevka-ss02 = "145r4jizn4nwrnar8knrsm52g10sfv4x18hqlqn6nfjp4jw1fjia"; - iosevka-ss03 = "1mjad7nyj2wdq7g718c1ilrrvzm200prjmkf8m4f2w0rsamv80y4"; - iosevka-ss04 = "1zcl3g7h9zb9gall3q8pfdsv86xq43s5az50icp29d8n23nkqy29"; - iosevka-ss05 = "0gq1x9lvpibl0irl53aq1v5rjpprvyrlarp611jkh038fdqb9kp6"; - iosevka-ss06 = "0rqp5r4h08ypyqz93xpjmj79k1x0dh89vj9qg1sgzn2b3yql6h55"; - iosevka-ss07 = "1r4d4cp8lw3h61wfn1wdp4l8gxa1gjmhv0qafqh5f2m89sa03mdc"; - iosevka-ss08 = "16rxpmfird3gbr50p2aqhvlg3gn4m0g8khyb1jhs4bq9xa9a9sx6"; - iosevka-ss09 = "1q0ghxshs4x3srmkp1dz35bbz4pgkkqh63zjx1bakfs14mpw6k69"; - iosevka-ss10 = "0q9068raiqf4bhps9b3cyp6vy6dccy2nd4dsnabs3ls0hf5ld5pw"; - iosevka-ss11 = "05vsq8yjrvdj49sgxza8db9zn4csr9w9l9zlb6y11jw9z50ji3r6"; - iosevka-ss12 = "0y5wpaax562c4fs68x34mdp023fmj5ma0hfawyqig12g05wkqw5w"; - iosevka-ss13 = "0fz62080ni0sqhi7k51pr5yhapdjpi68hibljqz2rylrb9nhvl29"; - iosevka-ss14 = "0myhih7xg1b2pr29gl1qvfj15c3fpxr6h97hm4inxlhzqlsd35xv"; - iosevka-ss15 = "0dk7712xrrp2s0f0cdp99vc6jafpsppkjk8xbyf7vjk2pylq9kva"; - iosevka-ss16 = "1nn8qpin1rkybkq570mpl6fvl1sy8cgvrvkg7z5blbrwvn5qd5vs"; - iosevka-ss17 = "17c2ij3zldhjbxcs7c979xy82bmcy76c4m84xwkpbqnq0iggqhh6"; - iosevka-ss18 = "009sk8ic52h2vrh52xibj8grl68aav62wky05kzrhfrg1m5v6arb"; - sgr-iosevka = "1y454cn4zchhb25jx62sw7nyy07b8dsi9h9xbnbclwxfdw3hlk8j"; - sgr-iosevka-aile = "096q8dj462kp8ngsxb3rjyv7gl3ds8anh8mb03rycm59h7im9jki"; - sgr-iosevka-curly = "0vz2izq0chi2hl8zszmyag3d2vs44js18x3ff8mr4xhgpj3gamyh"; - sgr-iosevka-curly-slab = "0aangqga94b80ahsfc74b41g3nkhf73wsxfzy1lsdrmajvi4k24s"; - sgr-iosevka-etoile = "1n1p4rdbx2zfrhrh4m30dldkg5is6d0j68f8dfp8y2rb6bwrx1nx"; - sgr-iosevka-fixed = "0776j3fpklbjckm4rq8rh4v8gabdvxmki2rd99br2qcmsg5gx9ch"; - sgr-iosevka-fixed-curly = "02hpxdfd1mhm4yflx4kj2b57kw0wcqghsswlwyk9m0ll710f6a2q"; - sgr-iosevka-fixed-curly-slab = "04klqh85mm0zanpjimdfbwaf1kjih9d0bdr6vxzc9fsim47zzfyd"; - sgr-iosevka-fixed-slab = "0iir8czjf7rsxi19rbj2mgg375a1f82vzq1s6ir7i4his90ihqy0"; - sgr-iosevka-fixed-ss01 = "0s2k2js7b40j124p6mi1pad3hjfmby4yiv5l8szb3ksikgb6i9xg"; - sgr-iosevka-fixed-ss02 = "1ng32i29vkbzvadx792alrx20f35jxnpzjbh198z7k07gsxm63cx"; - sgr-iosevka-fixed-ss03 = "061z9yqfxpr0nhwsd4vhh842jpw0dbfgymbiqxf7gsmjxw7dwb9x"; - sgr-iosevka-fixed-ss04 = "0m4yd8wlpx43nf0757w249rrh1fb53k132g6wpah9xdfzndhgdf5"; - sgr-iosevka-fixed-ss05 = "1188sqah28x3nmscr462107y6xqdxs5z9s40a50bii51ii3wr4q3"; - sgr-iosevka-fixed-ss06 = "1qdz4asqmbvhs3v2izwbs69jkjsm7q1rz0y6jd95rp4ilz4zc9zl"; - sgr-iosevka-fixed-ss07 = "1q33yp9ahmry7fb3m0vxiyx7c7z69xk6gdhlp0syacwbxif0adxh"; - sgr-iosevka-fixed-ss08 = "0p43r707hiy27ndq45b85fchrz6vwcj3qymycxckfcdmds0c8dn6"; - sgr-iosevka-fixed-ss09 = "0f30kyqr8g2jgzlc87b0p242qina3zgbs7a2cy35adzdvnasg8ln"; - sgr-iosevka-fixed-ss10 = "0zdrsz918617xl1ninv4nyfc8zd5x91yjjf09gd7vrvxrq0pc7gh"; - sgr-iosevka-fixed-ss11 = "05nqp90932gq72lhcr4csba9xvi2c06jhvhai786jqmnmy2q63r1"; - sgr-iosevka-fixed-ss12 = "1vqriqa8g85f7y4qpr1ngcfyrd9p511fk2a83ny50d9ggqqmm3vg"; - sgr-iosevka-fixed-ss13 = "0m8sh1k3wqqm1618xn5p9p50mkcl1pzm7dmnbbwadmp812kj3l06"; - sgr-iosevka-fixed-ss14 = "0k2invfidpk088xa9m09gl09lgmrdz5nszbbi8cm3a4ngsrvnxzi"; - sgr-iosevka-fixed-ss15 = "0n5mqz7msjfbmdy25fbmg2va7jqaf81ymn6s340qblwv437b1v6f"; - sgr-iosevka-fixed-ss16 = "1ivd8hv52zd7ai1f0mnm7111622j4xg1sz3l9qpi6bbh6f8wiz8y"; - sgr-iosevka-fixed-ss17 = "1w460i7fxdzf1mdkc4sykdykb718xvjk5im68d0341zz9byfa9dk"; - sgr-iosevka-fixed-ss18 = "1gc5qfjswyp8farvrg4v8miyw5db668w8zyb21jkcxy4vfahh1fz"; - sgr-iosevka-slab = "059xva7waxzazcs23lil00ll7mc0pahjdpj8pks7851h3n1bxf3b"; - sgr-iosevka-ss01 = "1jfsz50krhjvhs9z0prl97b2dbsxfjny2ym8hyrcmhhqr7lwxxkv"; - sgr-iosevka-ss02 = "0y2b0mwmpvv3by6nnhz30bzdwqbmi6w7b800pnnfyh6s017613vv"; - sgr-iosevka-ss03 = "0ags2s26j4haqk3v7lf24yzymk2mqay5j9cak7dq2bmbm2mrp7sx"; - sgr-iosevka-ss04 = "1fhlfskdzxlmsv76m05s1abvg0hwkd39bbg2803f79b5a171h3y8"; - sgr-iosevka-ss05 = "1gpc5l6xk7cfaz0j0x4pan2yr87bhd7w8pwihki985rx387mwmqy"; - sgr-iosevka-ss06 = "079xxr09gxpvxp2m2zydv7dvkw5wpiqjzq5yvqx5j65j86dvihqq"; - sgr-iosevka-ss07 = "1bzpc32vsgrn45cxfdwwv1lijp387y7bbb9jc6fl8clnsklz5wdl"; - sgr-iosevka-ss08 = "1mdfxz51dr40x8mk73ifr75p7h0ac2w0gp4a67qlrwpz687nqz49"; - sgr-iosevka-ss09 = "0ghdx7gnficq39i71rwbi499paml0zb4xj4cjw0c194li1k3d1ph"; - sgr-iosevka-ss10 = "0ah10yf2w0px0y8pdra7rz57z16hv24q7mgn641shi809mcyiz9a"; - sgr-iosevka-ss11 = "08qnqiyigdbxm4wsr9gdifkyzvngncvfl8rw0is2a7clz9zpsyq2"; - sgr-iosevka-ss12 = "1yzr58il8aggqrn6l1ra0hg0xdsvrb7095qrdy1g5641df7ig91i"; - sgr-iosevka-ss13 = "1kz3gas5pxhhpwbnwrdy7qvw32vhzipzpncsdr1baakm4fngnxgz"; - sgr-iosevka-ss14 = "0860v52lnxjp0l21ak6p2n3vz5p8nfp23a7nrxrxxss3dx7cdr0x"; - sgr-iosevka-ss15 = "1w9ic5v6vjpw5fcrkv37xc4v4an2741i6q0461rf4xhv8vmbvj5k"; - sgr-iosevka-ss16 = "0qwmszs6gkpy0kdrilchpa6wm0gqvcfcii7rlhz6i931qdq3hx2j"; - sgr-iosevka-ss17 = "01d083l8ha9v2220kgzhjrvvk2822i46lvk2xvbb53mv6ml5pfyh"; - sgr-iosevka-ss18 = "0id0xs40n6hh08mqf32f6bxana3mh1h4yrdss55sln34rq5v0sin"; - sgr-iosevka-term = "0c32l3n97rlas2avyaqz9jzz7f1v52cp1jijzmal7zhdml6ahrkm"; - sgr-iosevka-term-curly = "1nr336ypclz2cs1al4xirw9w27yf3hh4myj5ky3m323mp5b5pzdn"; - sgr-iosevka-term-curly-slab = "1ylcpw9rcpmihf2zyxl7qkmq12bm7y823ks4q3ssj3z7ziddpj2d"; - sgr-iosevka-term-slab = "0ivwgfj1fhcf8a1d4bj0ym7w7q66rbgj65yfpzx4rzkgjimigpwl"; - sgr-iosevka-term-ss01 = "1rakana5w6qrzzbhschyawpfpxlhkrqbspzqrjzxbj87cxclrppc"; - sgr-iosevka-term-ss02 = "1azkwyk484gqnwi76bg11nswh17dbq3s4pn79rhxlankfmqa4bli"; - sgr-iosevka-term-ss03 = "1h426sam4d9zf8bwj28m4z33767fg0irbnrkiz4fnnbjjc1d6fwv"; - sgr-iosevka-term-ss04 = "0gr0906h6swh57j650hpq7xmfggkhv4rrbc60xhsbvwihpc8rya7"; - sgr-iosevka-term-ss05 = "009xb23xljp02gn7qb1x53grnsqw2dapkm1i0l6x8grz2bcm7bs9"; - sgr-iosevka-term-ss06 = "198k7wspvhzkgzwcykf5y1v67fhf6gd8wmnbnvslr0mxwvmq2bpn"; - sgr-iosevka-term-ss07 = "16x0yc5y0z3c7hwm95rlb4203glhmzvkmgqb1f8glzaxh40rv0sl"; - sgr-iosevka-term-ss08 = "02ngwyfadda47qmsjnxf9g052xbdj1fndxrq0bv043hvdxdcg6w2"; - sgr-iosevka-term-ss09 = "091l3078svrf3qynx8bvr6jgzwcbbj0zhm97f3lzrs39rzr94jih"; - sgr-iosevka-term-ss10 = "0vfbdly9lfgf2adk53qj662xivx0vhp08ssgqbv5laiflgchqbrc"; - sgr-iosevka-term-ss11 = "1mjhpi31ac0vjdarpp7xmpqblp6kgfdvag6didqk59s584zl7n3p"; - sgr-iosevka-term-ss12 = "11n6w0z0vwc1731x8j9cavhywmzw51ydlkwcr62c97kc6wafm7c1"; - sgr-iosevka-term-ss13 = "104najcndlcba59qn7kkyljd245l4skkhhj8aa4f53770grpp0m0"; - sgr-iosevka-term-ss14 = "0zvawavi0lkc1jws5ni0f24ddqqflp43zhajcx1gfspivnqh7qsa"; - sgr-iosevka-term-ss15 = "0ribbrcim0a75pxrwjj86rjvlzakn8l63n19mvpvp9ih431qigrz"; - sgr-iosevka-term-ss16 = "1bk3gr36dhjsm35q3q0gxbrlzqwfjm7i9yp19s350wxaadksj3n8"; - sgr-iosevka-term-ss17 = "0ly6g2ikps1nk68pkajlqmfiw6w439nxxgwr2j5f41r9zh2xhkpw"; - sgr-iosevka-term-ss18 = "12a0bpqv1nfj9znlq3v1345lr1wnb5qf0z411gqvgy66cs8r0dyn"; + iosevka = "1xjpzif2v3p78abny74wwrrcq05hahvk4rf0swhbjhsv7j1ycmnf"; + iosevka-aile = "1m1naxhf6ksasd3fq5npikgm8yv60salnhvb9b50rmyw6as2hmyb"; + iosevka-curly = "0xdb8ymcg0kmdcj7jhr3pqfyv6cw9ab1f1rgs0cvn6g97n4ag2yq"; + iosevka-curly-slab = "0396zjh043qv1j10f7m2pbibfyfkc6361rzjjgdqyvjhj0qh3wsi"; + iosevka-etoile = "0d89q4d8fvcl2130v45v873g31vvcd051wk461lid1mdmydvfs9d"; + iosevka-slab = "0jgsg1rnkx8mrcp74qbkc7dazlkh9wzyb6gn51yvwzv2gs2sj69m"; + iosevka-ss01 = "16c3kh3ynmwm0r83gv1swv2z4bhdm78a91hkdczzkngbzaa0mxhg"; + iosevka-ss02 = "1xmylqgh0972p1cz2vshlgnjpfg20k7x5alirjhpsvyj8n1v7jsx"; + iosevka-ss03 = "1qw2rwwhw4yd2s0876xp3z5kxxgf5x125vwy83wbcgca9hx7b1cw"; + iosevka-ss04 = "1nlw7na37rx9lk9g3b01v2wipglcj0lszyyk0s6j2g8cdmvcdqap"; + iosevka-ss05 = "1b3ckxpw28ail62x8g06rs6fn4gba7xfpnk2qaf8fl0lhvjyv0kf"; + iosevka-ss06 = "0ifrzd1kxhflf2kxbfsshp9chpiidx6nvvblws11276qz7qir9lq"; + iosevka-ss07 = "0bm2n688i8f40awi8k1jj8p6pz45p230pp7brlps99ljjq7ipqcb"; + iosevka-ss08 = "0qqhfcr9xmfr24rp4xq3xy8zld5l2pnqwbd801ljv6qy3zza9xhk"; + iosevka-ss09 = "0dgpzjnab2fwp2jns5fvgzh4n8w0qhxzx1fhxw4b5c99n5bnim07"; + iosevka-ss10 = "1nz8an3ar3lw3zfdyck1xh17hdkqdpg8rmwih4wxz93hpp5xhrbv"; + iosevka-ss11 = "1wmxs075ymvyzl9r687xh32iqp3xsaakdfh01m1iwpyglspyr8y0"; + iosevka-ss12 = "0c7abkq0ylzqv8ssizby5g6lnibqyiw2pfmyk8cccx9pq1ihr1jq"; + iosevka-ss13 = "0xalbmkgyj30a9y4wzqpcc8ix64jdll1sm972fc35ln8134m7fzl"; + iosevka-ss14 = "1638n30hhqv0rm2q1gqvj36knjn2n6jry6dz1xfczlaqm956395v"; + iosevka-ss15 = "05blb6va180fk4iw3ldgq17w11gqi0jflmcdgzjzxw5pxs8j1qwp"; + iosevka-ss16 = "1qgfrc5kj0x7yc77aqswy5668ymnxw9gw5rp71r4j5778wmslr5s"; + iosevka-ss17 = "03226nda56dhbia3nf5p603zz04avh5j1x24qz9z3irhqg4rn0js"; + iosevka-ss18 = "17vyf3msafgdhqhhby4qrn8p5pxdmvxwfgf44vx41iy860q89avh"; + sgr-iosevka = "0vxfkhx77b9hf63an7wzpgldlj6pbs27i65qsq45n869cyvzd9ga"; + sgr-iosevka-aile = "1iqxc42hc6398a61k84ibmjkl328sza9q3l81s04iav4kkrjd0g6"; + sgr-iosevka-curly = "0ww4h12xfpa8yxjxhgs3m819024vz6isw8gq88spj07p2w4jx4mp"; + sgr-iosevka-curly-slab = "1my79s02hhi803rakwia61c2rkpgzf6zw6xhzw6n1jkmjj1r77a7"; + sgr-iosevka-etoile = "0rp1fk156s2mxibyak8pzw871p33pjdizi2ix9ppxqdb2zyn64xd"; + sgr-iosevka-fixed = "0rldw2gq22hf2hy0brf03g12vw4rh8h5ascccsc6mljzzgwy6wir"; + sgr-iosevka-fixed-curly = "1sal7i1kybfgxfhr1c90rmjal8zhh4cbf6xqzs6zrz3zxhp1zj30"; + sgr-iosevka-fixed-curly-slab = "0spkivcqg4nzkd7r3gvym1v87d8r7cd353sw8sbllq9a93axcffs"; + sgr-iosevka-fixed-slab = "1kpzcsjdk74fbr16iqz7xm10arg8kmcnpv54xxn23h4xbxx6qy5z"; + sgr-iosevka-fixed-ss01 = "0j7kzcy7rwjqhl9hlhpbm4495b5ifl0kl9jh58nc0r17c3vfhhxq"; + sgr-iosevka-fixed-ss02 = "1lx6gx2qr82nzphxyd38xj50mrhn9y2c0lq2c1n6iq7zig7yybn6"; + sgr-iosevka-fixed-ss03 = "0clpiaa12mxksvbyrxahq56nh0dmn3y5x0dclx8clh7v39z652s6"; + sgr-iosevka-fixed-ss04 = "1lvr6vs6qbmkrgkzw5jvp3a3ib681y9784mwv25il5z7q6imlnng"; + sgr-iosevka-fixed-ss05 = "0bxqcd18657pvf6j64rhwvgpq6frqdhp65r8rb90bwfv12yqxrw7"; + sgr-iosevka-fixed-ss06 = "1fz1zvbvkyj04c8qh2xwshcnwswnzldvi6y7c1qzbfm357xsjblg"; + sgr-iosevka-fixed-ss07 = "01ndbbchf4azc4n8w26snd1l6078zxc8xzxy2vbw7vby3lify2i1"; + sgr-iosevka-fixed-ss08 = "1rv1rywpk53nf6kyc5wjsjf9j2aj1bzlr4gwk5s6m63klr7q10wx"; + sgr-iosevka-fixed-ss09 = "10rv346mjg12rihix0rr97vi5y63j4ia0q24rbs0546g4g309k6w"; + sgr-iosevka-fixed-ss10 = "0ry6abyjaq6dy39mkvzqglzrrpbgwfcq2lxy5j9kncjcwx72mpin"; + sgr-iosevka-fixed-ss11 = "0nq997c81pxjkgsr1gvkbaapv4qkqpf5w5pixhdkc22g2fp68w6s"; + sgr-iosevka-fixed-ss12 = "1v7irhjrf31mlj3h0v1bxnl1x187555zdrrv2fhycn7700im5pj2"; + sgr-iosevka-fixed-ss13 = "17m1fjlvh279wc1n2m7fhmrn3a8b2rqrnj34vps67f1m7bafh1yz"; + sgr-iosevka-fixed-ss14 = "1sm9z1zad7war4066rj5mdmc0qhl03bjq7wir01na42bw464yz2a"; + sgr-iosevka-fixed-ss15 = "0xsgjz0225vdzw5b9x8333anmshpva1w5kw7g6m0m2m21n3kvpc8"; + sgr-iosevka-fixed-ss16 = "1z5h9s9vqmmdjzkv6jzd2rxzkrdbchcbbdxilgvh0nkicpz7h1f6"; + sgr-iosevka-fixed-ss17 = "06va44pbrbp3yrpb6k58c5vkyrfjbl1sm2jhbpih0vxcpmqa209k"; + sgr-iosevka-fixed-ss18 = "03plkqbjmpbz200k062s5j9a42717fzi37c6d0jjmhqlyr62j478"; + sgr-iosevka-slab = "0xf2wzd5679j3csd5br4yfyh1m8vmijf42871szxbq85mw8k1q6f"; + sgr-iosevka-ss01 = "1v4cifbn4icgsnzvxqyg2sqza5m2378bmcqmw511cbkhrgzr15ff"; + sgr-iosevka-ss02 = "1d91qzbzlkwj0f9nfd4jvvy2lq0dy70w6dzkgggb75xm6rwn0251"; + sgr-iosevka-ss03 = "0praj6n5i1ahxnp3zji3jffvvzhpb1382inzihlgrbysjna4cqkv"; + sgr-iosevka-ss04 = "1lxifnvb61ad8v53cnj4zi4m1jnlh4gk1w6kk5w04yd0z749hyx1"; + sgr-iosevka-ss05 = "1a446rhyn69ss20ybf9mqy55i4ajq2jpwppmn6srfnrjx63706w6"; + sgr-iosevka-ss06 = "112k2gyv6r9ircw2rnrgsijw9v1fs64p5737ww6540kg8xrpz1kx"; + sgr-iosevka-ss07 = "0alc313vgf9649xgynq8h6d006phw9mbijn2m4qjzgjkw4v28xh8"; + sgr-iosevka-ss08 = "1c1xfj3jryfcgzmqyfmcz7nafhh5jzj7glcdaifviddbbdj5xi88"; + sgr-iosevka-ss09 = "1fw4qnn22fvz42mfbl1gwr4bwv53xjy0dqd7c6sy7886gxmkr04y"; + sgr-iosevka-ss10 = "1m62m1xb6xb9vwpgicag8vw817r8qf6gq6mv7kr18fs0mqv4h8sh"; + sgr-iosevka-ss11 = "0xa5wy6qnk9fgkm3yb0scwkhfxg59hchimzfzrbgvfylsdpq527y"; + sgr-iosevka-ss12 = "0c49wjypsxjgkm9s1py58lx8rybb3kzm6z3xysvmffqhyx4h03xa"; + sgr-iosevka-ss13 = "1hr0fbmhjq5ngp4hdm7zjxk3wggbk2yhx50byvbm39056v3pxbym"; + sgr-iosevka-ss14 = "0ibqdh2ddz9rv8icbfvba6jj5pcpi7l7kjkwsqx0081wqv1c3jxk"; + sgr-iosevka-ss15 = "004ibn5hrgcby93h2kz248x5qmz4xbirih1k3ic0xqda23yyqq7j"; + sgr-iosevka-ss16 = "1mad0yiwknl9f7z6c52fv12ngdgwr1yic74ssbzk529vrqmafwy1"; + sgr-iosevka-ss17 = "1igrbzw63jailzgqlv72h1iv3lz33qd3z9s0hv92w2kh2ig7q6kf"; + sgr-iosevka-ss18 = "0nsq4hg8mmnzi8dgdn0km03x72ja1vk7g7kbzr7m148kb1p4x5vv"; + sgr-iosevka-term = "1ax6i21cf4w8gwhml0rwvb3yk9hlhkjfn1pyjyglajnsbh8z4r3w"; + sgr-iosevka-term-curly = "0y7jkqddqkc2cnmgfsrq29c7id070y8gxj664q81k6alivpj62rs"; + sgr-iosevka-term-curly-slab = "021m8lmxss1qms0slsc83l78njvnjjyniarrkx95x9vpqs2dym0h"; + sgr-iosevka-term-slab = "0qkxy91hvxa36bz8q1wwf31qn18b2zvyabkpsjnv6yhpzimz4wm0"; + sgr-iosevka-term-ss01 = "0sxm07qr1l64n0p5f7dnssgi545i73gdahm18iyvijwqcvxg83rn"; + sgr-iosevka-term-ss02 = "0zlzvxbf2p27g7p5g19ixa5vf77fxd0b7bqky9pfzf72wpwd89jd"; + sgr-iosevka-term-ss03 = "09qd2np8z224h2z7yyqfz7csxdbr11kc4v9p8z4qnb8k8wg5akz9"; + sgr-iosevka-term-ss04 = "0jr5bk9x3nb9841nxlsl3wjwdy5si8g4rwh5axm5g5hwjxr29x8z"; + sgr-iosevka-term-ss05 = "1w41g52b2b5qzkhai3wk3fvsa5qi8h70wmbq0shq954gqzrlchnp"; + sgr-iosevka-term-ss06 = "0hmsq5jpnb9605scvh89wqdvyxsypm74aqwz8zsyn7siwfkhh3hc"; + sgr-iosevka-term-ss07 = "06spijbyw6dzwc73gzi9r14af9g47js0p94ddn54aq3sw2d1c9jq"; + sgr-iosevka-term-ss08 = "1yrr7lknz0h126gr6srxzfs4npl7vv8v32b2hzkixqzf1pfjv3mr"; + sgr-iosevka-term-ss09 = "1lf04m0f3l2pw1rm3klfynainxma8fs5x2zv9vgjd1vr07si0c5n"; + sgr-iosevka-term-ss10 = "1p9p3gpfd353jq1aab5dh16ppzx2qjii8x8hvaqnmhy1a1ip15jg"; + sgr-iosevka-term-ss11 = "1x1n5fjya6a01m0cwcdcf6xlynzgk2413axkr4p5glmqad7w82h8"; + sgr-iosevka-term-ss12 = "07bxpw4bsxbwsrjvbw3n6kj1bkvr9a730zp509zjzg72dy6i96ca"; + sgr-iosevka-term-ss13 = "1mw0nfknzk4qcf9nsg9904389li6sbpvgn48iydrk4bzyr41qza1"; + sgr-iosevka-term-ss14 = "13pvn4kkl4yz1hkrl04ifqbk9x7lym1i7w3d6nh8l3ch3783sjha"; + sgr-iosevka-term-ss15 = "1hqrn050qx5iljfbflzpzl4nl21jnnlih53kj9ik3scwb76pkfal"; + sgr-iosevka-term-ss16 = "1svj0wq7j0kzn4pnyn5lkd5sni3k6vv78r943zc6dlxrs7vbkljp"; + sgr-iosevka-term-ss17 = "0qmzpxgsibf8c0k6hzq7ps1gd0mb050z3dsjmjjammh0cwflax6p"; + sgr-iosevka-term-ss18 = "0qss7kz6mwzaxlff4m1lylf0a8sy65l7z6my7k6kif9iiy2595wx"; } From d1a4e0784baa88c326e54183a53ec0a1bae91d8d Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Thu, 6 Oct 2022 20:14:13 +0200 Subject: [PATCH 030/797] bottles: don't include system wine by default --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc456b3848e5..a99f41dc903b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27405,7 +27405,7 @@ with pkgs; bonzomatic = callPackage ../applications/editors/bonzomatic { }; bottles = callPackage ../applications/misc/bottles { - wine = wineWowPackages.minimal; + wine = null; }; brave = callPackage ../applications/networking/browsers/brave { }; From 7aa3e528bfce93c52986dca931be962532d5c985 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sat, 30 Jul 2022 23:32:16 -0300 Subject: [PATCH 031/797] icoextract: init at 0.1.4 for use with bottles --- .../python-modules/icoextract/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/icoextract/default.nix diff --git a/pkgs/development/python-modules/icoextract/default.nix b/pkgs/development/python-modules/icoextract/default.nix new file mode 100644 index 000000000000..8aa38c1d96ef --- /dev/null +++ b/pkgs/development/python-modules/icoextract/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, pefile, pillow}: + +buildPythonPackage rec { + pname = "icoextract"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + extension = "tar.gz"; + sha256 = "sha256-x0GEV0PUbkAzoUJgAqup9bHd7iYttGyzIZNdo8KsFyo="; + }; + + propagatedBuildInputs = [ + pefile + pillow + ]; + + # tests expect mingw and multiarch + doCheck = false; + + pythonImportsCheck = [ + "icoextract" + ]; + + meta = with lib; { + description = "Extract icons from Windows PE files"; + homepage = "https://github.com/jlu5/icoextract"; + license = licenses.mit; + maintainers = with maintainers; [ bryanasdev000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4714ffe9a52..9017298b8ecc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4369,6 +4369,8 @@ self: super: with self; { idasen = callPackage ../development/python-modules/idasen { }; + icoextract = callPackage ../development/python-modules/icoextract { }; + icontract = callPackage ../development/python-modules/icontract { }; identify = callPackage ../development/python-modules/identify { }; From 6b802f913f6bf12ec526f5d2ab33fc88bf4abfa5 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sat, 30 Jul 2022 23:34:45 -0300 Subject: [PATCH 032/797] fvs: init at 0.3.4 for use with bottles --- .../python-modules/fvs/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/fvs/default.nix diff --git a/pkgs/development/python-modules/fvs/default.nix b/pkgs/development/python-modules/fvs/default.nix new file mode 100644 index 000000000000..c60f3a1255af --- /dev/null +++ b/pkgs/development/python-modules/fvs/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, orjson}: + +buildPythonPackage rec { + pname = "fvs"; + version = "0.3.4"; + + src = fetchPypi { + inherit version; + pname = "FVS"; + extension = "tar.gz"; + sha256 = "sha256-yYd0HzdwbqB9kexJjBRRYmdsoWtZtcjCNRz0ZJVM5CI="; + }; + + propagatedBuildInputs = [ + orjson + ]; + + # no tests in src + doCheck = false; + + pythonImportsCheck = [ + "fvs" + ]; + + meta = with lib; { + description = "File Versioning System with hash comparison and data storage to create unlinked states that can be deleted"; + homepage = "https://github.com/mirkobrombin/FVS"; + license = licenses.mit; + maintainers = with maintainers; [ bryanasdev000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9017298b8ecc..044e58dcd9a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3534,6 +3534,8 @@ self: super: with self; { fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; + fvs = callPackage ../development/python-modules/fvs { }; + fx2 = callPackage ../development/python-modules/fx2 { }; galario = toPythonModule (pkgs.galario.override { From b82316bc919c1baed0563598adc5346fb05cbc4c Mon Sep 17 00:00:00 2001 From: talyz Date: Sat, 29 Oct 2022 13:17:23 +0200 Subject: [PATCH 033/797] nixos/keycloak: Escape admin password properly --- nixos/modules/services/web-apps/keycloak.nix | 2 +- nixos/tests/keycloak.nix | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index 521cf778a36b..2dfb73bd04dc 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -637,7 +637,7 @@ in cp $CREDENTIALS_DIRECTORY/ssl_{cert,key} /run/keycloak/ssl/ '' + '' export KEYCLOAK_ADMIN=admin - export KEYCLOAK_ADMIN_PASSWORD=${cfg.initialAdminPassword} + export KEYCLOAK_ADMIN_PASSWORD=${escapeShellArg cfg.initialAdminPassword} kc.sh start --optimized ''; }; diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index 6ce136330d43..2ade9e9c74ee 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -5,10 +5,13 @@ let certs = import ./common/acme/server/snakeoil-certs.nix; frontendUrl = "https://${certs.domain}"; - initialAdminPassword = "h4IhoJFnt2iQIR9"; keycloakTest = import ./make-test-python.nix ( { pkgs, databaseType, ... }: + let + initialAdminPassword = "h4Iho\"JFn't2>iQIR9"; + adminPasswordFile = pkgs.writeText "admin-password" "${initialAdminPassword}"; + in { name = "keycloak"; meta = with pkgs.lib.maintainers; { @@ -111,7 +114,7 @@ let keycloak.succeed(""" curl -sSf -d 'client_id=admin-cli' \ -d 'username=admin' \ - -d 'password=${initialAdminPassword}' \ + -d "password=$(<${adminPasswordFile})" \ -d 'grant_type=password' \ '${frontendUrl}/realms/master/protocol/openid-connect/token' \ | jq -r '"Authorization: bearer " + .access_token' >admin_auth_header @@ -119,10 +122,10 @@ let # Register the metrics SPI keycloak.succeed( - "${pkgs.jre}/bin/keytool -import -alias snakeoil -file ${certs.ca.cert} -storepass aaaaaa -keystore cacert.jks -noprompt", - "KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh config credentials --server '${frontendUrl}' --realm master --user admin --password '${initialAdminPassword}'", - "KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh update events/config -s 'eventsEnabled=true' -s 'adminEventsEnabled=true' -s 'eventsListeners+=metrics-listener'", - "curl -sSf '${frontendUrl}/realms/master/metrics' | grep '^keycloak_admin_event_UPDATE'" + """${pkgs.jre}/bin/keytool -import -alias snakeoil -file ${certs.ca.cert} -storepass aaaaaa -keystore cacert.jks -noprompt""", + """KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh config credentials --server '${frontendUrl}' --realm master --user admin --password "$(<${adminPasswordFile})" """, + """KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh update events/config -s 'eventsEnabled=true' -s 'adminEventsEnabled=true' -s 'eventsListeners+=metrics-listener'""", + """curl -sSf '${frontendUrl}/realms/master/metrics' | grep '^keycloak_admin_event_UPDATE'""" ) # Publish the realm, including a test OIDC client and user From 76bd24f8fc02bd204684912123a226b211c9d3c6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Jul 2022 15:02:32 +0200 Subject: [PATCH 034/797] postgresql: remove code for no longer supported versions --- pkgs/servers/sql/postgresql/default.nix | 45 ++++++++++--------- .../patches/disable-resolve_symlinks-94.patch | 12 ----- .../patches/disable-resolve_symlinks.patch | 12 +++-- .../patches/hardcode-pgxs-path-96.patch | 14 ------ .../patches/hardcode-pgxs-path.patch | 27 +++++------ .../postgresql/patches/less-is-more-96.patch | 12 ----- .../sql/postgresql/patches/less-is-more.patch | 10 ++--- 7 files changed, 47 insertions(+), 85 deletions(-) delete mode 100644 pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch delete mode 100644 pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch delete mode 100644 pkgs/servers/sql/postgresql/patches/less-is-more-96.patch diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 975f486629ad..2d999bdc52d5 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -7,7 +7,7 @@ let , pkg-config, libxml2, tzdata, libkrb5 # This is important to obtain a version of `libpq` that does not depend on systemd. - , enableSystemd ? (lib.versionAtLeast version "9.6" && !stdenv.isDarwin && !stdenv.hostPlatform.isStatic) + , enableSystemd ? !stdenv.isDarwin && !stdenv.hostPlatform.isStatic , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic # for postgresql.pkgs @@ -37,14 +37,22 @@ let outputs = [ "out" "lib" "doc" "man" ]; setOutputFlags = false; # $out retains configureFlags :-/ - buildInputs = - [ zlib readline openssl libxml2 icu ] + buildInputs = [ + zlib + readline + openssl + libxml2 + icu + ] ++ lib.optionals lz4Enabled [ lz4 ] ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals gssSupport [ libkrb5 ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; - nativeBuildInputs = [ makeWrapper pkg-config ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; enableParallelBuilding = !stdenv.isDarwin; @@ -71,25 +79,24 @@ let ++ lib.optionals gssSupport [ "--with-gssapi" ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ "--disable-spinlocks" ]; - patches = - [ (if atLeast "9.4" then ./patches/disable-resolve_symlinks-94.patch else ./patches/disable-resolve_symlinks.patch) - (if atLeast "9.6" then ./patches/less-is-more-96.patch else ./patches/less-is-more.patch) - (if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch) - ./patches/specify_pkglibdir_at_runtime.patch - ./patches/findstring.patch - ] - ++ lib.optional stdenv.isLinux (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch); + patches = [ + ./patches/disable-resolve_symlinks.patch + ./patches/less-is-more.patch + ./patches/hardcode-pgxs-path.patch + ./patches/specify_pkglibdir_at_runtime.patch + ./patches/findstring.patch + ] ++ lib.optionals stdenv.isLinux [ + (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch) + ]; installTargets = [ "install-world" ]; LC_ALL = "C"; - postConfigure = - let path = if atLeast "9.6" then "src/common/config_info.c" else "src/bin/pg_config/pg_config.c"; in - '' - # Hardcode the path to pgxs so pg_config returns the path in $out - substituteInPlace "${path}" --replace HARDCODED_PGXS_PATH $out/lib - ''; + postPatch = '' + # Hardcode the path to pgxs so pg_config returns the path in $out + substituteInPlace "src/common/config_info.c" --replace HARDCODED_PGXS_PATH "$out/lib" + ''; postInstall = '' @@ -162,8 +169,6 @@ let license = licenses.postgresql; maintainers = with maintainers; [ thoughtpolice danbst globin marsam ivan ]; platforms = platforms.unix; - knownVulnerabilities = optional (!atLeast "9.4") - "PostgreSQL versions older than 9.4 are not maintained anymore!"; }; }; diff --git a/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch b/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch deleted file mode 100644 index fadeea90ac4b..000000000000 --- a/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/common/exec.c 2014-09-04 20:19:12.236057588 +0200 -+++ b/src/common/exec.c 2014-09-04 20:19:50.550251633 +0200 -@@ -218,6 +218,9 @@ - static int - resolve_symlinks(char *path) - { -+ // On NixOS we *want* stuff relative to symlinks. -+ return 0; -+ - #ifdef HAVE_READLINK - struct stat buf; - char orig_wd[MAXPGPATH], diff --git a/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch b/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch index 3e6fd5e838a2..fadeea90ac4b 100644 --- a/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch +++ b/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch @@ -1,13 +1,11 @@ -diff --git a/src/port/exec.c b/src/port/exec.c -index c79e8ba..42c4091 100644 ---- a/src/port/exec.c -+++ b/src/port/exec.c -@@ -216,6 +216,9 @@ find_my_exec(const char *argv0, char *retpath) +--- a/src/common/exec.c 2014-09-04 20:19:12.236057588 +0200 ++++ b/src/common/exec.c 2014-09-04 20:19:50.550251633 +0200 +@@ -218,6 +218,9 @@ static int resolve_symlinks(char *path) { -+ // On NixOS we *want* stuff relative to symlinks. -+ return 0; ++ // On NixOS we *want* stuff relative to symlinks. ++ return 0; + #ifdef HAVE_READLINK struct stat buf; diff --git a/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch b/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch deleted file mode 100644 index 6cd449769baa..000000000000 --- a/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur postgresql-9.6.1-orig/src/common/config_info.c postgresql-9.6.1/src/common/config_info.c ---- postgresql-9.6.1-orig/src/common/config_info.c 2016-11-22 21:39:29.231929261 +0100 -+++ postgresql-9.6.1/src/common/config_info.c 2016-11-22 23:36:53.685163543 +0100 -@@ -118,7 +118,10 @@ - i++; - - configdata[i].name = pstrdup("PGXS"); -+ strlcpy(path, "HARDCODED_PGXS_PATH", sizeof(path)); -+/* commented out to be able to point to nix $out path - get_pkglib_path(my_exec_path, path); -+*/ - strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path)); - cleanup_path(path); - configdata[i].setting = pstrdup(path); diff --git a/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch b/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch index 355813ffe20e..6cd449769baa 100644 --- a/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch +++ b/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch @@ -1,17 +1,14 @@ ---- a/src/bin/pg_config/pg_config.c -+++ b/src/bin/pg_config/pg_config.c -@@ -220,11 +220,13 @@ show_sysconfdir(bool all) - static void - show_pgxs(bool all) - { -- char path[MAXPGPATH]; -+ char path[MAXPGPATH] = "HARDCODED_PGXS_PATH"; - - if (all) - printf("PGXS = "); -+ /* commented out to be able to point to nix $out path - get_pkglib_path(mypath, path); -+ */ +diff -Naur postgresql-9.6.1-orig/src/common/config_info.c postgresql-9.6.1/src/common/config_info.c +--- postgresql-9.6.1-orig/src/common/config_info.c 2016-11-22 21:39:29.231929261 +0100 ++++ postgresql-9.6.1/src/common/config_info.c 2016-11-22 23:36:53.685163543 +0100 +@@ -118,7 +118,10 @@ + i++; + + configdata[i].name = pstrdup("PGXS"); ++ strlcpy(path, "HARDCODED_PGXS_PATH", sizeof(path)); ++/* commented out to be able to point to nix $out path + get_pkglib_path(my_exec_path, path); ++*/ strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path)); cleanup_path(path); - printf("%s\n", path); + configdata[i].setting = pstrdup(path); diff --git a/pkgs/servers/sql/postgresql/patches/less-is-more-96.patch b/pkgs/servers/sql/postgresql/patches/less-is-more-96.patch deleted file mode 100644 index f14af9dc2207..000000000000 --- a/pkgs/servers/sql/postgresql/patches/less-is-more-96.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur postgresql-9.6.1-orig/src/include/fe_utils/print.h postgresql-9.6.1/src/include/fe_utils/print.h ---- postgresql-9.6.1-orig/src/include/fe_utils/print.h 2016-11-22 21:39:29.148932827 +0100 -+++ postgresql-9.6.1/src/include/fe_utils/print.h 2016-11-22 21:39:36.283626258 +0100 -@@ -18,7 +18,7 @@ - - /* This is not a particularly great place for this ... */ - #ifndef __CYGWIN__ --#define DEFAULT_PAGER "more" -+#define DEFAULT_PAGER "less" - #else - #define DEFAULT_PAGER "less" - #endif diff --git a/pkgs/servers/sql/postgresql/patches/less-is-more.patch b/pkgs/servers/sql/postgresql/patches/less-is-more.patch index d640d24bdaad..f14af9dc2207 100644 --- a/pkgs/servers/sql/postgresql/patches/less-is-more.patch +++ b/pkgs/servers/sql/postgresql/patches/less-is-more.patch @@ -1,9 +1,9 @@ -diff -Naur postgresql-9.2.7-orig/src/bin/psql/print.h postgresql-9.2.7/src/bin/psql/print.h ---- postgresql-9.2.7-orig/src/bin/psql/print.h 2014-02-17 14:38:15.000000000 -0500 -+++ postgresql-9.2.7/src/bin/psql/print.h 2014-03-04 14:42:28.874014415 -0500 -@@ -178,7 +178,7 @@ - extern const printTextFormat *get_line_style(const printTableOpt *opt); +diff -Naur postgresql-9.6.1-orig/src/include/fe_utils/print.h postgresql-9.6.1/src/include/fe_utils/print.h +--- postgresql-9.6.1-orig/src/include/fe_utils/print.h 2016-11-22 21:39:29.148932827 +0100 ++++ postgresql-9.6.1/src/include/fe_utils/print.h 2016-11-22 21:39:36.283626258 +0100 +@@ -18,7 +18,7 @@ + /* This is not a particularly great place for this ... */ #ifndef __CYGWIN__ -#define DEFAULT_PAGER "more" +#define DEFAULT_PAGER "less" From 10622598a73a1b74b73017ab4d9398fb98cb36f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 1 Nov 2022 15:33:07 +0100 Subject: [PATCH 035/797] python310Packages.zipp: 3.8.1 -> 3.10.0 --- pkgs/development/python-modules/zipp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index e773960730f6..cdabed860c92 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -9,14 +9,14 @@ let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.8.1"; + version = "3.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BbRfHuj4B9DMkoSFykCgfLSRzwkv9YfA35yx/RVISNI="; + sha256 = "sha256-enJi/ZML0+NsULmmSJeuw/r/89/e7JYjriK0DpP5m7g="; }; nativeBuildInputs = [ From e07e2f5925aee9a0d91c6b806e438eb2e3334bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 1 Nov 2022 15:33:48 +0100 Subject: [PATCH 036/797] python310Packages.tzdata: 2022.2 -> 2022.6 --- pkgs/development/python-modules/tzdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index d1fed0b21fa9..2e3cdafc8a12 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "tzdata"; - version = "2022.2"; + version = "2022.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-IfTw1yQVcu+n96T9q7BS5htV3EgnTmhCaXzN9SU+VFE="; + hash = "sha256-kfEdtFAzhZKMFVmMmFc+OvB+cikYG+5Tdb0w8Wld3K4="; }; nativeBuildInputs = [ From dd2f73892969e66a67d11b48a8f544db3d64ed14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 1 Nov 2022 15:40:53 +0100 Subject: [PATCH 037/797] python310Packages.incremental: 21.3.0 -> 22.10.0 --- pkgs/development/python-modules/incremental/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index 55123163dbf5..cf22ae79d8da 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -7,11 +7,11 @@ let incremental = buildPythonPackage rec { pname = "incremental"; - version = "21.3.0"; + version = "22.10.0"; src = fetchPypi { inherit pname version; - sha256 = "02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57"; + sha256 = "sha256-kS/uteD34BiOb0IkHS9FAALhG7wJN8ZYZQRYVMJMC9A="; }; propagatedBuildInputs = [ From d155128b531a9b3a7a5dd1fe435f426071a2a7b7 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Wed, 19 Oct 2022 23:23:15 +0200 Subject: [PATCH 038/797] bottles: 2022.5.28-trento-3 -> 2022.10.14.1 --- pkgs/applications/misc/bottles/default.nix | 98 +++++++++++-------- .../misc/bottles/vulkan_icd.patch | 13 +++ 2 files changed, 72 insertions(+), 39 deletions(-) create mode 100644 pkgs/applications/misc/bottles/vulkan_icd.patch diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index e5d846606a71..3ac928a3d36f 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -1,10 +1,28 @@ -{ lib, fetchFromGitHub, gitUpdater -, meson, ninja, pkg-config, wrapGAppsHook -, desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy, webkitgtk -, python3Packages, gettext -, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3, gtksourceview4, gnome -, steam, xdg-utils, pciutils, cabextract -, freetype, p7zip, gamemode, mangohud +{ lib +, fetchFromGitHub +, fetchFromGitLab +, gitUpdater +, python3Packages +, blueprint-compiler +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +, librsvg +, gtk4 +, gtksourceview5 +, libadwaita +, steam +, cabextract +, p7zip +, xdpyinfo +, imagemagick +, procps +, gamescope +, mangohud +, vmtouch , wine , bottlesExtraLibraries ? pkgs: [ ] # extra packages to add to steam.run multiPkgs , bottlesExtraPkgs ? pkgs: [ ] # extra packages to add to steam.run targetPkgs @@ -21,75 +39,77 @@ let in python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2022.5.28-trento-3"; + version = "2022.10.14.1"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "sha256-KIDLRqDLFTsVAczRpTchnUtKJfVHqbYzf8MhIR5UdYY="; + sha256 = "sha256-FO91GSGlc2f3TSLrlmRDPi5p933/Y16tdEpX4RcKhL0="; }; + patches = [ ./vulkan_icd.patch ]; + postPatch = '' chmod +x build-aux/meson/postinstall.py patchShebangs build-aux/meson/postinstall.py - substituteInPlace src/backend/wine/winecommand.py \ + substituteInPlace bottles/backend/wine/winecommand.py \ --replace \ - 'self.__get_runner()' \ - '(lambda r: (f"${steam-run}/bin/steam-run {r}", r)[r == "wine" or r == "wine64"])(self.__get_runner())' - ''; + "command = f\"{runner} {command}\"" \ + "command = f\"{''' if runner == 'wine' or runner == 'wine64' else '${steam-run}/bin/steam-run '}{runner} {command}\"" \ + --replace \ + "command = f\"{_picked['entry_point']} {command}\"" \ + "command = f\"${steam-run}/bin/steam-run {_picked['entry_point']} {command}\"" + ''; nativeBuildInputs = [ + blueprint-compiler meson ninja pkg-config - wrapGAppsHook - gettext + wrapGAppsHook4 + gtk4 # gtk4-update-icon-cache appstream-glib desktop-file-utils ]; buildInputs = [ - gdk-pixbuf - glib - gobject-introspection - gsettings-desktop-schemas - gspell - gtk3 - gtksourceview4 - libhandy - libnotify - webkitgtk - gnome.adwaita-icon-theme + librsvg + gtk4 + gtksourceview5 + libadwaita ]; propagatedBuildInputs = with python3Packages; [ pyyaml - pytoml requests - pycairo pygobject3 - lxml - dbus-python - gst-python - liblarch patool markdown + fvs + pefile + urllib3 + chardet + certifi + idna + pillow + orjson + icoextract ] ++ [ - steam-run - xdg-utils - pciutils cabextract - wine - freetype p7zip - gamemode # programs.gamemode.enable + xdpyinfo + imagemagick + procps + + gamescope mangohud + vmtouch + wine ]; format = "other"; - strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943 dontWrapGApps = true; # prevent double wrapping preFixup = '' diff --git a/pkgs/applications/misc/bottles/vulkan_icd.patch b/pkgs/applications/misc/bottles/vulkan_icd.patch new file mode 100644 index 000000000000..d638917151ea --- /dev/null +++ b/pkgs/applications/misc/bottles/vulkan_icd.patch @@ -0,0 +1,13 @@ +diff --git a/bottles/backend/utils/vulkan.py b/bottles/backend/utils/vulkan.py +index 6673493..07f70d1 100644 +--- a/bottles/backend/utils/vulkan.py ++++ b/bottles/backend/utils/vulkan.py +@@ -29,6 +29,8 @@ class VulkanUtils: + "/etc/vulkan", + "/usr/local/share/vulkan", + "/usr/local/etc/vulkan" ++ "/run/opengl-driver/share/vulkan/", ++ "/run/opengl-driver-32/share/vulkan/", + ] + if "FLATPAK_ID" in os.environ: + __vk_icd_dirs += [ From edd361904bce01c258b5bef7a85d94cda9952f3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Nov 2022 01:04:32 +0000 Subject: [PATCH 039/797] cmake: 3.24.2 -> 3.24.3 --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index d64b3bbe1a88..7f0d94a9f30e 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { + lib.optionalString isBootstrap "-boot" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.24.2"; + version = "3.24.3"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - sha256 = "sha256-DZAg8G893xf7U33CKOGlbJJ+5Qa0hvVf4twZ9pvwyNs="; + sha256 = "sha256-tTqhD6gr/4TM21kGWSe3LTvuSfTYYmEkn8CYSzs2cpE="; }; patches = [ From d65910761c9dc0b842977b7b31d86721513b88dc Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 31 Oct 2022 18:55:22 +0100 Subject: [PATCH 040/797] nixos/keycloak: Escape database password properly --- nixos/modules/services/web-apps/keycloak.nix | 25 +++++++++++++++++++- nixos/tests/keycloak.nix | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index 2dfb73bd04dc..d52190a28648 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -482,6 +482,10 @@ in assertion = (cfg.database.useSSL && cfg.database.type == "postgresql") -> (cfg.database.caCert != null); message = "A CA certificate must be specified (in 'services.keycloak.database.caCert') when PostgreSQL is used with SSL"; } + { + assertion = createLocalPostgreSQL -> config.services.postgresql.settings.standard_conforming_strings or true; + message = "Setting up a local PostgreSQL db for Keycloak requires `standard_conforming_strings` turned on to work reliably"; + } ]; environment.systemPackages = [ keycloakBuild ]; @@ -544,7 +548,13 @@ in create_role="$(mktemp)" trap 'rm -f "$create_role"' EXIT + # Read the password from the credentials directory and + # escape any single quotes by adding additional single + # quotes after them, following the rules laid out here: + # https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-CONSTANTS db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")" + db_password="''${db_password//\'/\'\'}" + echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB" > "$create_role" psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || psql -tA --file="$create_role" psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || psql -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"' @@ -566,8 +576,16 @@ in script = '' set -o errexit -o pipefail -o nounset -o errtrace shopt -s inherit_errexit + + # Read the password from the credentials directory and + # escape any single quotes by adding additional single + # quotes after them, following the rules laid out here: + # https://dev.mysql.com/doc/refman/8.0/en/string-literals.html db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")" - ( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';" + db_password="''${db_password//\'/\'\'}" + + ( echo "SET sql_mode = 'NO_BACKSLASH_ESCAPES';" + echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';" echo "CREATE DATABASE IF NOT EXISTS keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;" echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';" ) | mysql -N @@ -632,6 +650,11 @@ in ${secretReplacements} + # Escape any backslashes in the db parameters, since + # they're otherwise unexpectedly read as escape + # sequences. + sed -i '/db-/ s|\\|\\\\|g' /run/keycloak/conf/keycloak.conf + '' + optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) '' mkdir -p /run/keycloak/ssl cp $CREDENTIALS_DIRECTORY/ssl_{cert,key} /run/keycloak/ssl/ diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index 2ade9e9c74ee..228e57d1cdd6 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -40,7 +40,7 @@ let type = databaseType; username = "bogus"; name = "also bogus"; - passwordFile = "${pkgs.writeText "dbPassword" "wzf6vOCbPp6cqTH"}"; + passwordFile = "${pkgs.writeText "dbPassword" ''wzf6\"vO"Cb\nP>p#6;c&o?eu=q'THE'''H''''E''}"; }; plugins = with config.services.keycloak.package.plugins; [ keycloak-discord From e5bfecb949c582dd4b1399396eb58e6084c3d678 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 4 Nov 2022 02:44:46 +0000 Subject: [PATCH 041/797] lsof: 4.95.0 -> 4.96.4 --- pkgs/development/tools/misc/lsof/default.nix | 36 +++++++------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 9cf752af5b8f..ac80fc471e06 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,37 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, buildPackages, ncurses }: +{ lib, stdenv, fetchFromGitHub, buildPackages, perl, which, ncurses }: -let dialect = with lib; last (splitString "-" stdenv.hostPlatform.system); in +let + dialect = with lib; last (splitString "-" stdenv.hostPlatform.system); +in stdenv.mkDerivation rec { pname = "lsof"; - version = "4.95.0"; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - buildInputs = [ ncurses ]; + version = "4.96.4"; src = fetchFromGitHub { owner = "lsof-org"; repo = "lsof"; rev = version; - sha256 = "sha256-HgU7/HxLdUOfLU2E/dpusko6gBOoEKeWPJIFbBQGzFU="; + sha256 = "sha256-S+8KizjayqeiWsMySWjRoZQf7ODCjdMq5ULoetOdYiA="; }; patches = [ ./no-build-info.patch - - # Pull upstream fix for -fno-common toolchains: - # https://github.com/lsof-org/lsof/pull/226 - # https://github.com/lsof-org/lsof/pull/233 - (fetchpatch { - name = "add-extern.patch"; - url = "https://github.com/lsof-org/lsof/commit/180ffa29b0544f77cabbc54d7f77d50d33dd27d7.patch"; - sha256 = "sha256-zzcN9HrFYMTBeEekeAwi2RIcVukymgaqtpvFIBV6njU="; - }) - (fetchpatch { - name = "add-declaration.patch"; - url = "https://github.com/lsof-org/lsof/commit/8e47e1491636e8cf41baf834554391be45177b00.patch"; - sha256 = "sha256-kwkDQp7VApLenOLTPMY24Me+/xUhD56skHWRd4ZB1I4="; - }) ]; postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' @@ -40,9 +25,14 @@ stdenv.mkDerivation rec { sed -i 's|lcurses|lncurses|g' Configure ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ perl which ]; + buildInputs = [ ncurses ]; + # Stop build scripts from searching global include paths LSOF_INCLUDE = "${lib.getDev stdenv.cc.libc}/include"; configurePhase = "LINUX_CONF_CC=$CC_FOR_BUILD LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}"; + preBuild = '' for filepath in $(find dialects/${dialect} -type f); do sed -i "s,/usr/include,$LSOF_INCLUDE,g" $filepath @@ -67,8 +57,8 @@ stdenv.mkDerivation rec { socket (IPv6/IPv4/UNIX local), or partition (by opening a file from it). ''; - maintainers = [ maintainers.dezgeg ]; - platforms = platforms.unix; license = licenses.purdueBsd; + maintainers = with maintainers; [ dezgeg ]; + platforms = platforms.unix; }; } From a893ab2509808a7f9bea2f73ab9b9c5f44003b5b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Nov 2022 23:12:54 +0100 Subject: [PATCH 042/797] tenacity: unstable-2021-10-18 -> unstable-2022-06-30 --- pkgs/applications/audio/tenacity/default.nix | 27 +++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index 748ce090c776..525a743965c2 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -1,8 +1,9 @@ { stdenv , lib -, fetchFromSourcehut +, fetchFromGitHub +, fetchpatch , cmake -, wxGTK31 +, wxGTK32 , gtk3 , pkg-config , python3 @@ -48,15 +49,23 @@ stdenv.mkDerivation rec { pname = "tenacity"; - version = "unstable-2021-10-18"; + version = "unstable-2022-06-30"; - src = fetchFromSourcehut { - owner = "~tenacity"; - repo = "tenacity"; - rev = "697c0e764ccb19c1e2f3073ae08ecdac7aa710e4"; - sha256 = "1fc9xz8lyl8si08wkzncpxq92vizan60c3640qr4kbnxg7vi2iy4"; + src = fetchFromGitHub { + owner = "tenacityteam"; + repo = pname; + rev = "91f8b4340b159af551fff94a284c6b0f704a7932"; + sha256 = "sha256-4VWckXzqo2xspw9eUloDvjxQYbsHn6ghEDw+hYqJcCE="; }; + patches = [ + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/wxwidgets-gtk3-3.1.6-plus.patch?h=tenacity-wxgtk3-git&id=c2503538fa7d7001181905988179952d09f69659"; + postFetch = "echo >> $out"; + sha256 = "sha256-xRY1tizBJ9CBY6e9oZVz4CWx7DWPGD9A9Ysol4prBww="; + }) + ]; + postPatch = '' touch src/RevisionIdent.h @@ -124,7 +133,7 @@ stdenv.mkDerivation rec { sratom suil twolame - wxGTK31 + wxGTK32 gtk3 ] ++ lib.optionals stdenv.isLinux [ at-spi2-core From b8dfcc76d6a4622b7a48d1b9de68e6d4ee10c942 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 5 Nov 2022 03:41:49 +0100 Subject: [PATCH 043/797] grass: migrate to wxPython_4_2 --- pkgs/applications/gis/grass/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 5d1411bfcc07..bffbcf48fabd 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config bison flex makeWrapper wrapGAppsHook gdal geos libmysqlclient netcdf pdal - ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_1 ]); + ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]); buildInputs = [ cairo zlib proj libtiff libpng fftw sqlite From 9ec0744e2a8a368c1835c7c455d0e3fabfe759eb Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 5 Nov 2022 02:46:25 +0000 Subject: [PATCH 044/797] =?UTF-8?q?krane:=202.4.9=20=E2=86=92=203.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/krane/Gemfile.lock | 30 ++++++------ .../networking/cluster/krane/gemset.nix | 48 +++++++++---------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index b1eb6d8972a4..bcaaac26f9f9 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,27 +1,27 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.3.1) + activesupport (7.0.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) colorize (0.8.1) concurrent-ruby (1.1.10) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) ejson (1.3.1) - faraday (2.4.0) - faraday-net_http (~> 2.0) + faraday (2.6.0) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (2.1.0) + faraday-net_http (3.0.1) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - googleauth (1.2.0) + googleauth (1.3.0) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -43,8 +43,8 @@ GEM concurrent-ruby (~> 1.0) jsonpath (1.1.2) multi_json - jwt (2.4.1) - krane (2.4.9) + jwt (2.5.0) + krane (3.0.0) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -55,7 +55,7 @@ GEM oj (~> 3.0) statsd-instrument (>= 2.8, < 4) thor (>= 1.0, < 2.0) - kubeclient (4.9.3) + kubeclient (4.10.1) http (>= 3.0, < 5.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -64,12 +64,12 @@ GEM mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) - minitest (5.16.2) + minitest (5.16.3) multi_json (1.15.0) netrc (0.11.0) - oj (3.13.19) + oj (3.13.22) os (1.1.4) - public_suffix (4.0.7) + public_suffix (5.0.0) rake (13.0.6) recursive-open-struct (1.1.3) rest-client (2.1.0) @@ -83,7 +83,7 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - statsd-instrument (3.3.0) + statsd-instrument (3.5.0) thor (1.2.1) tzinfo (2.0.5) concurrent-ruby (~> 1.0) @@ -98,4 +98,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.3.9 + 2.3.24 diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index a42ccf61abbf..267eef133136 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15lbq28v48i6q118p02m5zs9c63y1kv2h5krb3ss6q2vyaxhnfz7"; + sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; colorize = { groups = ["default"]; @@ -68,20 +68,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i45f90mg367izgpxf6rrq9zbwwqba1pymwyja6q128vrj1pjajj"; + sha256 = "0mqv17hfmph4ylmb2bqyccy64gsgpmzapq5yrmf5yjsqkvw9rxbv"; type = "gem"; }; - version = "2.4.0"; + version = "2.6.0"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rfiwhggrqgwp00c82sk8v2h93l81nxgl0mf07pijxz1zjmbgswj"; + sha256 = "13b717ddw90iaf4vijy06srmkvrfbzsnyjap93yll0nibad4dbxq"; type = "gem"; }; - version = "2.1.0"; + version = "3.0.1"; }; ffi = { groups = ["default"]; @@ -110,10 +110,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "030bcdnffwndk8h270cmbndixb5h3ss860yifv6bkfys95s5fjpp"; + sha256 = "1hpwgwhk0lmnknkw8kbdfxn95qqs6aagpq815l5fkw9w6mi77pai"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; http = { dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"]; @@ -195,10 +195,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lsk71qh5d7bm1qqrjvcwhp4h71ckkdbzxnw4xkd9cin8gjfvvr6"; + sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.0"; }; krane = { dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"]; @@ -206,10 +206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03sfcn5zfbagkyn30zih73i7pycdfzk0c5wr99d6qxl90c9cddc2"; + sha256 = "1yg8ws7qygziqjc65ay5ahppf0j9jdli8nb2rnyh2iypfrjl4qiz"; type = "gem"; }; - version = "2.4.9"; + version = "3.0.0"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -217,10 +217,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ih04d0vgj91rl66iaqh8jmpskwz3g6mgajid0wlzi5skxqqxlym"; + sha256 = "10rg2l15xmv4sy3cjvw3r9rxkylf36p416fhlhpic9zlq8ang6c4"; type = "gem"; }; - version = "4.9.3"; + version = "4.10.1"; }; memoist = { groups = ["default"]; @@ -258,10 +258,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; + sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; type = "gem"; }; - version = "5.16.2"; + version = "5.16.3"; }; multi_json = { groups = ["default"]; @@ -288,10 +288,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b10apyzm1qyph42438z9nx2ln5v9sg0686ws9gdrv5wh482fnmf"; + sha256 = "0fbya3d5dv14ny8d55c8vqh52lj82pkzqnx9my05mjawg8q5r8gn"; type = "gem"; }; - version = "3.13.19"; + version = "3.13.22"; }; os = { groups = ["default"]; @@ -308,10 +308,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.0"; }; rake = { groups = ["default"]; @@ -370,10 +370,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1555jgxr0az43l6nc8ngz5vmhqgjaznz4mkg5w5x0q6sa78i2pf3"; + sha256 = "0gl2n26hb8g12n3alh1yg5qg7cjrp9f9fyc25crmaccm5m17v0sa"; type = "gem"; }; - version = "3.3.0"; + version = "3.5.0"; }; thor = { groups = ["default"]; From afbe7cc83568508f7f18d733678262f69b41eb3a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 4 Nov 2022 16:38:00 +1000 Subject: [PATCH 045/797] python3Packages.invoke: 1.7.1 -> 1.7.3 --- pkgs/development/python-modules/invoke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index a2180f5b964a..65f4fe105f66 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "invoke"; - version = "1.7.1"; + version = "1.7.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-e23q9YXu4KhIIF0LjAAUub9vKHqOt5iBimQt/x3xSxk="; + hash = "sha256-QbQoNC1GaoITXVqzcRloWpiXE3Qr5G5Co6OZ1oVXkxQ="; }; postPatch = '' From 84ef2aad5d423c7afb37826b7603b979bee577ef Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 6 Nov 2022 10:56:12 +0100 Subject: [PATCH 046/797] bundler: 2.3.24 -> 2.3.25 --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 9d2edcb749c5..5ba3503d9861 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.3.24"; - source.sha256 = "sha256-6qLrjDiS6HD5eSUrIZa9d+tVHh2/PNxOsWS6AexEOMQ="; + version = "2.3.25"; + source.sha256 = "sha256-/YHsRjXEGJtm/QeJU31cs4s4ELcHZfbh6C3aFbl1ka0="; dontPatchShebangs = true; passthru.updateScript = writeScript "gem-update-script" '' From bea4f0c359d27b2e93bd1a6a85cbc0461048459d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 1 Nov 2022 16:06:01 +0100 Subject: [PATCH 047/797] python310Packages.babel: 2.10.3 -> 2.11.0 --- pkgs/development/python-modules/babel/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix index 5273069d019c..eee9f58cc30d 100644 --- a/pkgs/development/python-modules/babel/default.nix +++ b/pkgs/development/python-modules/babel/default.nix @@ -1,21 +1,20 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pytz, pytestCheckHook, freezegun }: +{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, pytz, pytestCheckHook, freezegun }: buildPythonPackage rec { pname = "babel"; - version = "2.10.3"; + version = "2.11.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Babel"; inherit version; - sha256 = "sha256-dhRVNxHul0kPcyEm3Ad/jQrghOvGqW4j2xSCr6vbLFE="; + sha256 = "sha256-XvSzImsBgN7d7UIpZRyLDho6aig31FoHMnLzE+TPl/Y="; }; propagatedBuildInputs = [ pytz ]; checkInputs = [ pytestCheckHook freezegun ]; - doCheck = !stdenv.isDarwin; - meta = with lib; { homepage = "https://babel.pocoo.org/"; description = "Collection of internationalizing tools"; From a8fe73f1b324f05b3bf8e6e71e845dc5fdb609a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 1 Nov 2022 16:08:23 +0100 Subject: [PATCH 048/797] libva: 2.15.0 -> 2.16.0 --- pkgs/development/libraries/libva/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index ad4083bf6fea..045b060a04fb 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "sha256-NJA2FTPrhLj9+vmkBy+GcTiH57gBEQnYhZzYk3sEOBo="; + sha256 = "sha256-HTwJQpDND4PjiNpUjHtTgkQdkahm2BUe71UDRQpvo6M="; }; outputs = [ "dev" "out" ]; From 2477683031cbed6e6b336ffd1902f1f27ca1060e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 1 Nov 2022 15:42:47 +0100 Subject: [PATCH 049/797] python310Packages.h11: 0.13.0 -> 0.14.0 --- pkgs/development/python-modules/h11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix index 98dd8eef6cbd..5e58310106ac 100644 --- a/pkgs/development/python-modules/h11/default.nix +++ b/pkgs/development/python-modules/h11/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "h11"; - version = "0.13.0"; + version = "0.14.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cIE8ETUIeiSKTTjMDhoBgf+rIYgUGpPq9WeUDDlX/wY="; + sha256 = "sha256-jxn7vpnnJCD/NcALJ6NMuZN+kCqLgQ4siDAMbwo7aZ0="; }; checkInputs = [ pytestCheckHook ]; From 4b0fae518baeaff700db44abef9329d4bc6e9da1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 1 Nov 2022 15:35:01 +0100 Subject: [PATCH 050/797] python310Packages.pyopenssl: 22.0.0 -> 22.1.0 --- pkgs/development/python-modules/pyopenssl/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 1b847100a955..2a81ebf40efe 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -11,15 +11,20 @@ buildPythonPackage rec { pname = "pyopenssl"; - version = "22.0.0"; + version = "22.1.0"; + + outputs = [ "out" "dev" ]; src = fetchPypi { pname = "pyOpenSSL"; inherit version; - sha256 = "sha256-ZgsbFCWqxKG+odlBaKhdmfCzFEyGndQ5DSdinQCH8b8="; + sha256 = "sha256-eoO3snLdWVIi1nL1zimqAw8fuDdjDvIp9i5y45XOiWg="; }; - outputs = [ "out" "dev" ]; + postPatch = '' + # remove cryptography pin + sed "/cryptography/ s/,<[0-9]*//g" setup.py + ''; # Seems to fail unpredictably on Darwin. See https://hydra.nixos.org/build/49877419/nixlog/1 # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. From f5cf174a3fcf64dbb811295068175285af853299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 1 Nov 2022 15:35:53 +0100 Subject: [PATCH 051/797] python310Packages.pbr: 5.10.0 -> 5.11.0 --- pkgs/development/python-modules/pbr/default.nix | 4 ++-- pkgs/development/python-modules/pbr/tests.nix | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 0fe9ac5a7367..ff77f7526b80 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.10.0"; + version = "5.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-z8xP+OaYJW/BfqP/eWR4sFCFJYWqW6557NBbKrezm5o="; + sha256 = "sha256-uXvGaVsq/wIUQTPC5zmdWIUiPUK3kS/67CyjiY5nO/4="; }; # importlib-metadata could be added here if it wouldn't cause an infinite recursion diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix index aacb726d6a1d..b04751231872 100644 --- a/pkgs/development/python-modules/pbr/tests.nix +++ b/pkgs/development/python-modules/pbr/tests.nix @@ -24,6 +24,9 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; + preConfigure = '' + pythonOutputDistPhase() { touch $dist; } + ''; checkInputs = [ pbr From 753f883c35d0bd52002ce2d049a26bb1ae37c122 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 22 Oct 2022 23:55:04 +0200 Subject: [PATCH 052/797] stage-1: escape mount points and options mountFS adds these strings to fstab and then relies on `mount` parsing fstab. If they have spaces or tabs in them, that would break fstab and therefore not mount with the unhelpful error: No such file or directory. Co-authored-by: Lily Foster Co-authored-by: Luflosi --- nixos/modules/system/boot/stage-1-init.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 994aa0e33cbf..4596c160a957 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -342,6 +342,14 @@ checkFS() { return 0 } +escapeFstab() { + local original="$1" + + # Replace space + local escaped="${original// /\\040}" + # Replace tab + echo "${escaped//$'\t'/\\011}" +} # Function for mounting a file system. mountFS() { @@ -569,7 +577,7 @@ while read -u 3 mountPoint; do continue fi - mountFS "$device" "$mountPoint" "$options" "$fsType" + mountFS "$device" "$(escapeFstab "$mountPoint")" "$(escapeFstab "$options")" "$fsType" done exec 3>&- From c2b3c9794dfb5a9ec4aa643fca07c1ac8ad3f644 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Mon, 31 Oct 2022 15:31:10 +0100 Subject: [PATCH 053/797] nixosTests: test spaces in mount options via btrfs subvols Also enabled the btrfs tests for installer-systemd-stage-1 again --- nixos/release-combined.nix | 1 + nixos/tests/installer-systemd-stage-1.nix | 7 ++++--- nixos/tests/installer.nix | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index a11ee31ab8d0..1d25806a323b 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -76,6 +76,7 @@ in rec { (onFullSupported "nixos.tests.i3wm") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolDefault") + (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolEscape") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvols") (onSystems ["x86_64-linux"] "nixos.tests.installer.luksroot") (onSystems ["x86_64-linux"] "nixos.tests.installer.lvm") diff --git a/nixos/tests/installer-systemd-stage-1.nix b/nixos/tests/installer-systemd-stage-1.nix index d02387ee80e0..03f0ec8d746b 100644 --- a/nixos/tests/installer-systemd-stage-1.nix +++ b/nixos/tests/installer-systemd-stage-1.nix @@ -8,9 +8,10 @@ # them when fixed. inherit (import ./installer.nix { inherit system config pkgs; systemdStage1 = true; }) # bcache - # btrfsSimple - # btrfsSubvolDefault - # btrfsSubvols + btrfsSimple + btrfsSubvolDefault + btrfsSubvolEscape + btrfsSubvols # encryptedFSWithKeyfile # grub1 # luksroot diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index d9f64a781c57..9b3c8a762991 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -911,4 +911,25 @@ in { ) ''; }; + + # Test to see if we can deal with subvols that need to be escaped in fstab + btrfsSubvolEscape = makeInstallerTest "btrfsSubvolEscape" { + createPartitions = '' + machine.succeed( + "sgdisk -Z /dev/vda", + "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "mkfs.btrfs -L root /dev/vda3", + "btrfs device scan", + "mount LABEL=root /mnt", + "btrfs subvol create '/mnt/nixos in space'", + "btrfs subvol create /mnt/boot", + "umount /mnt", + "mount -o 'defaults,subvol=nixos in space' LABEL=root /mnt", + "mkdir /mnt/boot", + "mount -o defaults,subvol=boot LABEL=root /mnt/boot", + ) + ''; + }; } From 3055583921184057312e4869193b9c710dc2a0f5 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Mon, 7 Nov 2022 09:01:06 +0800 Subject: [PATCH 054/797] pcsclite: fix libsystemd switch --- pkgs/tools/security/pcsclite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index a4ade683b136..478cca8be0e2 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "--enable-confdir=/etc" # The OS should care on preparing the drivers into this location "--enable-usbdropdir=/var/lib/pcsc/drivers" - (lib.enableFeature stdenv.isLinux "systemd") + (lib.enableFeature stdenv.isLinux "libsystemd") (lib.enableFeature polkitSupport "polkit") ] ++ lib.optionals stdenv.isLinux [ "--enable-ipcdir=/run/pcscd" From 140bd1aef4e7a71ef0c5e1380d14ed81e6a92e52 Mon Sep 17 00:00:00 2001 From: illustris Date: Fri, 30 Sep 2022 22:13:14 +0530 Subject: [PATCH 055/797] hbase: update versions and remove EoL version - remove 1.7 - 2.4.11 -> 2.4.15 - init 2.5.1 - 3.0.0-alpha-2 -> 3.0.0-alpha-3 --- nixos/tests/all-tests.nix | 2 +- pkgs/servers/hbase/default.nix | 19 +++++++++---------- pkgs/top-level/all-packages.nix | 5 ++--- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 011d7b11b4f8..ea526a5ecd78 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -245,8 +245,8 @@ in { haproxy = handleTest ./haproxy.nix {}; hardened = handleTest ./hardened.nix {}; healthchecks = handleTest ./web-apps/healthchecks.nix {}; - hbase1 = handleTest ./hbase.nix { package=pkgs.hbase1; }; hbase2 = handleTest ./hbase.nix { package=pkgs.hbase2; }; + hbase_2_4 = handleTest ./hbase.nix { package=pkgs.hbase_2_4; }; hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; }; hedgedoc = handleTest ./hedgedoc.nix {}; herbstluftwm = handleTest ./herbstluftwm.nix {}; diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index 40b5dc7e0b65..aa00fe80743a 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -38,20 +38,19 @@ let common = { version, hash, jdk ? jdk11_headless, tests }: }; in { - hbase_1_7 = common { - version = "1.7.1"; - hash = "sha256-DrH2G79QLT8L0YTTmAGC9pUWU8semSaTOsrsQRCI2rY="; - jdk = jdk8_headless; - tests.standalone = nixosTests.hbase1; - }; hbase_2_4 = common { - version = "2.4.11"; - hash = "sha256-m0vjUtPaj8czHHh+rQNJJgrFAM744cHd06KE0ut7QeU="; + version = "2.4.15"; + hash = "sha256-KJXpfQ91POVd7ZnKQyIX5qzX4JIZqh3Zn2Pz0chW48g="; + tests.standalone = nixosTests.hbase_2_4; + }; + hbase_2_5 = common { + version = "2.5.1"; + hash = "sha256-ddSa4q43PSJv1W4lzzaXfv4LIThs4n8g8wYufHgsZVE="; tests.standalone = nixosTests.hbase2; }; hbase_3_0 = common { - version = "3.0.0-alpha-2"; - hash = "sha256-QPvgO1BeFWvMT5PdUm/SL92ZgvSvYIuJbzolbBTenz4="; + version = "3.0.0-alpha-3"; + hash = "sha256-TxuiUHc2pTb9nBth1H2XrDRLla2vqM+e1uBU+yY2/EM="; tests.standalone = nixosTests.hbase3; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b95a9bb2f5b1..93170054a041 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23121,9 +23121,8 @@ with pkgs; hasura-cli = callPackage ../servers/hasura/cli.nix { }; - inherit (callPackage ../servers/hbase {}) hbase_1_7 hbase_2_4 hbase_3_0; - hbase1 = hbase_1_7; - hbase2 = hbase_2_4; + inherit (callPackage ../servers/hbase {}) hbase_2_4 hbase_2_5 hbase_3_0; + hbase2 = hbase_2_5; hbase3 = hbase_3_0; hbase = hbase2; # when updating, point to the latest stable release From 7456ff8ca43ba8e5a5904f40fb7699bc34f8dc79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sat, 5 Nov 2022 15:15:25 +0000 Subject: [PATCH 056/797] =?UTF-8?q?libsoup=5F3:=203.2.1=20=E2=86=92=203.2.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libsoup/-/compare/3.2.1...3.2.2 --- pkgs/development/libraries/libsoup/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index a5c6498166f5..62abb162b00d 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.2.1"; + version = "3.2.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ses9LDvkn7vQUacfZTLJYmvOzqaXgxkGkM1+Tf3yjyk="; + sha256 = "sha256-g2c8aFuRD7fTnx8o7uWvvvtxwFeY/DUKw78biF4e+qE="; }; depsBuildBuild = [ From 2e02063e258414a54ae4dbda53f57d733a650510 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 13 Oct 2022 05:42:52 +0000 Subject: [PATCH 057/797] mysql-shell: 8.0.30 -> 8.0.31 --- .../development/tools/mysql-shell/default.nix | 37 ++++++++++--------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/default.nix index b84c88434017..26dd21ef0dd4 100644 --- a/pkgs/development/tools/mysql-shell/default.nix +++ b/pkgs/development/tools/mysql-shell/default.nix @@ -4,6 +4,11 @@ , cmake , fetchurl , git +, cctools +, developer_cmds +, DarwinTools +, makeWrapper +, CoreServices , bison , openssl , protobuf @@ -26,30 +31,24 @@ , python3 , cyrus_sasl , openldap -, numactl -, cctools -, CoreServices -, developer_cmds -, DarwinTools -, makeWrapper +, antlr }: let pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; - pythonPath = lib.makeSearchPath python3.sitePackages pythonDeps; in -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "mysql-shell"; - version = "8.0.30"; + version = "8.0.31"; srcs = [ (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz"; - sha256 = "sha256-/UJgcYkPG8RShZzybqdcMQDpNUTVWAfAa2p0Cm23fXA="; + sha256 = "sha256-VA9dqvPmw2WXP3hAJS2xRTvxBM8D/IPsWYIaYwRZI/s="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz"; - sha256 = "sha256-yYjVxrqaVmkqbNbpgTRltfyTaO1LRh35cFmi/BYMi4Q="; + sha256 = "sha256-Z7uMunWyjpXH95SFY/AfuEUo/LsaNduoOdTORP4Bm6o="; }) ]; @@ -62,7 +61,9 @@ stdenv.mkDerivation rec{ substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool ''; - nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] + ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ] + ++ lib.optionals stdenv.isDarwin [ cctools developer_cmds DarwinTools ]; buildInputs = [ boost @@ -84,13 +85,15 @@ stdenv.mkDerivation rec{ openldap v8 python3 - ] ++ pythonDeps ++ lib.optionals stdenv.isLinux [ - numactl - libtirpc - ] ++ lib.optionals stdenv.isDarwin [ cctools CoreServices developer_cmds DarwinTools ]; + antlr.runtime.cpp + ] ++ pythonDeps + ++ lib.optionals stdenv.isLinux [ libtirpc ] + ++ lib.optionals stdenv.isDarwin [ CoreServices ]; preConfigure = '' # Build MySQL + echo "Building mysqlclient mysqlxclient" + cmake -DWITH_BOOST=system -DWITH_SYSTEM_LIBS=ON -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \ -DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql-${version} -B ../mysql-${version}/build @@ -114,7 +117,7 @@ stdenv.mkDerivation rec{ CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ]; postFixup = '' - wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${pythonPath}" + wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${lib.makeSearchPath python3.sitePackages pythonDeps}" ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2b5555d7733..46c03c75d6fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -784,6 +784,7 @@ with pkgs; mysql-shell = callPackage ../development/tools/mysql-shell { inherit (darwin) cctools developer_cmds DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; + antlr = antlr4_10; boost = boost177; # Configure checks for specific version. protobuf = protobuf3_19; icu = icu69; From 906947555d257d0fa7f9b824dde63c3f1c7a6dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 8 Nov 2022 11:28:16 +0100 Subject: [PATCH 058/797] mesa: 22.2.2 -> 22.2.3 https://docs.mesa3d.org/relnotes/22.2.3.html I'm merging a bit optimistically, but it's just a patch update. At least I verified building atop current staging-next for x86_64-* --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 24ce9ff20771..ecf66a7f58a0 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -36,7 +36,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "22.2.2"; + version = "22.2.3"; branch = versions.major version; self = stdenv.mkDerivation { @@ -51,7 +51,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "2de11fb74fc5cc671b818e49fe203cea0cd1d8b69756e97cdb06a2f4e78948f9"; + sha256 = "ee7d026f7b1991dbae0861d359b671145c3a86f2a731353b885d2ea2d5c098d6"; }; # TODO: From dba9750e76ef3809b11ac7c341b9d300db04337c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Nov 2022 12:36:34 +0100 Subject: [PATCH 059/797] apparmor: 3.1.1 -> 3.1.2 https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.2 --- pkgs/os-specific/linux/apparmor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 933b4e176f76..2d1b57417e68 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -22,7 +22,7 @@ }: let - apparmor-version = "3.1.1"; + apparmor-version = "3.1.2"; apparmor-meta = component: with lib; { homepage = "https://apparmor.net/"; @@ -36,7 +36,7 @@ let owner = "apparmor"; repo = "apparmor"; rev = "v${apparmor-version}"; - hash = "sha256-phEHfrza0EeX2HEM5ts8wVCFlSLlnEtZd2MwbG/XbFY="; + hash = "sha256-0csF6dPel1CxbvNkg7fIrdPpnCM+hqht2a5nwPlR58A="; }; aa-teardown = writeShellScript "aa-teardown" '' From adead5e3a67c9e036c8dd12052c2df73206da8c5 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Tue, 8 Nov 2022 23:49:42 +1000 Subject: [PATCH 060/797] jpsxdec: 1.05 -> 1.06 --- pkgs/tools/games/jpsxdec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/games/jpsxdec/default.nix b/pkgs/tools/games/jpsxdec/default.nix index 54d3e2a968c0..d749353abc51 100644 --- a/pkgs/tools/games/jpsxdec/default.nix +++ b/pkgs/tools/games/jpsxdec/default.nix @@ -14,7 +14,7 @@ }: let pname = "jpsxdec"; - version = "1.05"; + version = "1.06"; description = "Cross-platform PlayStation 1 audio and video converter"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "m35"; repo = pname; rev = "v${version}"; - sha256 = "0wnfvvcyldf699b08lzlc0gshl7rn09a6q4i7jmr41izlcdszdbz"; + sha256 = "sha256-6PLEvK4NP0/ipdygyDFFcWTIfch5y0Hren40+8iqYJs="; }; nativeBuildInputs = [ ant jdk unoconv makeWrapper ]; From a851743ca1a7676debd1dd053cdfb7a6f5477394 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 8 Nov 2022 17:49:23 +0100 Subject: [PATCH 061/797] adguardhome: 0.107.16 -> 0.107.18 --- pkgs/servers/adguardhome/bins.nix | 20 ++++++++++---------- pkgs/servers/adguardhome/default.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index 9ba2f439471b..c175787fdce3 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,23 +1,23 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-rVc1ad8qwXfEuqZUrTsdzSQHUit3j8PQp3B0dD6FrcQ="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.16/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-XzM+ZAlpT33AQd7etCXZQos9Ifg7oM9DkzncP+EBvoo="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-GaeTdv467dVfSk2YuILmi2KphMfFYfLdpNI+dVx/UoU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.16/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-9pMZVSqU6Rqet73Lg/JBzX1PWmR9nxUSmKD6E4fAxSw="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-6fXU2vU3MgveWZhgrphOeczDc1GUBv7ZUehPF8+GUdY="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.16/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-AVFQpruoScSTFpsK3+7e1hXaJaKlK5dQ+8uga5+dHRY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-6rUC0R0bGS4omX9bybShk78mFaNRjUUkQqczZE2Wz5M="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.16/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-ncVQc8zJy9i8TNmDIjLQh58I3gIfTLgDwctBFD1HR2I="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-3cowMi081TIx65dgzBP+YkIj4IBwyK1Yd/gn2zL9kOI="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.16/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-tzc67MHg6idLW5b69zLZw/76tP6YEMlWNPosrsD4uTA="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.18/AdGuardHome_linux_arm64.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 2d2bafaa2048..0661186e69e2 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.16"; + version = "0.107.18"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' From 15484a9f2f840f44f52997974c5101d3536d2e33 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 8 Nov 2022 17:55:09 +0100 Subject: [PATCH 062/797] adguardhome: add myself as maintainer --- pkgs/servers/adguardhome/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 0661186e69e2..cd977fa511d6 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/AdguardTeam/AdGuardHome"; description = "Network-wide ads & trackers blocking DNS server"; platforms = builtins.attrNames sources; - maintainers = with maintainers; [ numkem iagoq ]; + maintainers = with maintainers; [ numkem iagoq rhoriguchi ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; }; From 9ef3a446da3ef9b2de7eff1d813dcc9ddc6efa16 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 8 Nov 2022 18:01:14 +0100 Subject: [PATCH 063/797] tautulli: 2.10.4 -> 2.10.5 --- pkgs/servers/tautulli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index f02b0f7e92e6..7cc62a443df4 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.10.4"; + version = "2.10.5"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G7rKPDozo5IyYOqfhoZcn1obASzJx8PpQt53CCmDZek="; + sha256 = "sha256-+lXiRM4D9tOE55guond9coFRC61X7CVPS2HjRDtqiII="; }; installPhase = '' From ce604a83c116e6e208e5c1c59ca4486ef271a806 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 8 Nov 2022 18:01:40 +0100 Subject: [PATCH 064/797] tautulli: add myself as maintainer --- pkgs/servers/tautulli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 7cc62a443df4..eb145bccf099 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -48,6 +48,6 @@ buildPythonApplication rec { homepage = "https://tautulli.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ csingley ]; + maintainers = with maintainers; [ csingley rhoriguchi ]; }; } From 6a5aab566fa90e8e5e0833f78d0fb53ea14cbb74 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 8 Nov 2022 20:47:31 +0100 Subject: [PATCH 065/797] libmtp: improve cross-compilation support It still doesn't build, but it gets further now. Also added configurePlatforms explicitly, not strictly needed for cross, but might help catch issues with cross earlier in some cases. --- pkgs/development/libraries/libmtp/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index e0c3e195b2da..4ca15f01a6d3 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -35,10 +35,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libusb1 ]; - preConfigure = "./autogen.sh"; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ "--with-udev=${placeholder "out"}/lib/udev" ]; + configurePlatforms = [ "build" "host" ]; + enableParallelBuilding = true; meta = with lib; { From 4729d5d7f62a989c1518cac96a3a971da00a7d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oto=20Pet=C5=99=C3=ADk?= Date: Sun, 24 Jul 2022 15:36:43 +0200 Subject: [PATCH 066/797] nixos/proxmox-image: allow building UEFI images Allow building other than Legacy-BIOS-only Proxmox images. Default is unchanged. To build UEFI proxmox image use: proxmox.qemuConf.bios = "ovmf"; (default is "seabios") To build image bootable using both "seabios" and "ovmf" use: partitionTableType = "hybrid"; BIOS can be switched in Proxmox between "seabios" and "ovmf" and VM still boots. (GRUB2-only, systemd-boot does not boot under "seabios") To build systemd-boot UEFI image: proxmox.qemuConf.bios = "ovmf"; boot.loader.systemd-boot.enable = true; --- .../from_md/release-notes/rl-2211.section.xml | 20 +++++++ .../manual/release-notes/rl-2211.section.md | 2 + .../modules/virtualisation/proxmox-image.nix | 59 ++++++++++++++++++- 3 files changed, 80 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 6347804e6856..72a73970570b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -980,6 +980,26 @@ 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. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 6e95431b330a..3e107e18dfd6 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -306,6 +306,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - `dockerTools.buildImage` deprecates the misunderstood `contents` parameter, 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 writting in DocBook are now deprecated. Using CommonMark is preferred and will become the default in a future release. diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix index 4fca8ce9e7eb..42c52c12edf0 100644 --- a/nixos/modules/virtualisation/proxmox-image.nix +++ b/nixos/modules/virtualisation/proxmox-image.nix @@ -53,6 +53,13 @@ with lib; Guest memory in MB ''; }; + bios = mkOption { + type = types.enum [ "seabios" "ovmf" ]; + default = "seabios"; + description = '' + Select BIOS implementation (seabios = Legacy BIOS, ovmf = UEFI). + ''; + }; # optional configs name = mkOption { @@ -99,6 +106,17 @@ with lib; Additional options appended to qemu-server.conf ''; }; + partitionTableType = mkOption { + type = types.enum [ "efi" "hybrid" "legacy" "legacy+gpt" ]; + description = '' + Partition table type to use. See make-disk-image.nix partitionTableType for details. + Defaults to 'legacy' for 'proxmox.qemuConf.bios="seabios"' (default), other bios values defaults to 'efi'. + Use 'hybrid' to build grub-based hybrid bios+efi images. + ''; + default = if config.proxmox.qemuConf.bios == "seabios" then "legacy" else "efi"; + defaultText = lib.literalExpression ''if config.proxmox.qemuConf.bios == "seabios" then "legacy" else "efi"''; + example = "hybrid"; + }; filenameSuffix = mkOption { type = types.str; default = config.proxmox.qemuConf.name; @@ -122,9 +140,33 @@ with lib; ${lib.concatStrings (lib.mapAttrsToList cfgLine properties)} #qmdump#map:virtio0:drive-virtio0:local-lvm:raw: ''; + inherit (cfg) partitionTableType; + supportEfi = partitionTableType == "efi" || partitionTableType == "hybrid"; + supportBios = partitionTableType == "legacy" || partitionTableType == "hybrid" || partitionTableType == "legacy+gpt"; + hasBootPartition = partitionTableType == "efi" || partitionTableType == "hybrid"; + hasNoFsPartition = partitionTableType == "hybrid" || partitionTableType == "legacy+gpt"; in { + assertions = [ + { + assertion = config.boot.loader.systemd-boot.enable -> config.proxmox.qemuConf.bios == "ovmf"; + message = "systemd-boot requires 'ovmf' bios"; + } + { + assertion = partitionTableType == "efi" -> config.proxmox.qemuConf.bios == "ovmf"; + message = "'efi' disk partitioning requires 'ovmf' bios"; + } + { + assertion = partitionTableType == "legacy" -> config.proxmox.qemuConf.bios == "seabios"; + message = "'legacy' disk partitioning requires 'seabios' bios"; + } + { + assertion = partitionTableType == "legacy+gpt" -> config.proxmox.qemuConf.bios == "seabios"; + message = "'legacy+gpt' disk partitioning requires 'seabios' bios"; + } + ]; system.build.VMA = import ../../lib/make-disk-image.nix { name = "proxmox-${cfg.filenameSuffix}"; + inherit partitionTableType; postVM = let # Build qemu with PVE's patch that adds support for the VMA format vma = (pkgs.qemu_kvm.override { @@ -181,7 +223,18 @@ with lib; boot = { growPartition = true; kernelParams = [ "console=ttyS0" ]; - loader.grub.device = lib.mkDefault "/dev/vda"; + loader.grub = { + device = lib.mkDefault (if (hasNoFsPartition || supportBios) then + # Even if there is a separate no-fs partition ("/dev/disk/by-partlabel/no-fs" i.e. "/dev/vda2"), + # which will be used the bootloader, do not set it as loader.grub.device. + # GRUB installation fails, unless the whole disk is selected. + "/dev/vda" + else + "nodev"); + efiSupport = lib.mkDefault supportEfi; + efiInstallAsRemovable = lib.mkDefault supportEfi; + }; + loader.timeout = 0; initrd.availableKernelModules = [ "uas" "virtio_blk" "virtio_pci" ]; }; @@ -191,6 +244,10 @@ with lib; autoResize = true; fsType = "ext4"; }; + fileSystems."/boot" = lib.mkIf hasBootPartition { + device = "/dev/disk/by-label/ESP"; + fsType = "vfat"; + }; services.qemuGuest.enable = lib.mkDefault true; }; From 4fc86adaa17692482c524264726e6a5e509ca5b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Nov 2022 07:46:59 +0000 Subject: [PATCH 067/797] polkadot: 0.9.30 -> 0.9.32 --- pkgs/applications/blockchains/polkadot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 00f15c27d857..31c610f255fe 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -10,13 +10,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.30"; + version = "0.9.32"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-lnClnra69vfszPjnrOldSkd3kgC34bgociicC6Kpupw="; + sha256 = "sha256-bE7PzvkHKAP/nqNkoBMTGvZZwmf8YY+cGnJ2EM/2xAs="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-mnfA0ecfmMMAy1TZeydbep6hCIu9yZQY7/c5hb1OMGc="; + cargoSha256 = "sha256-NI50KFXvQgUV+G1l5D2gnAo1EohnCpQWlFCZ0iP2CVQ="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From c0ce9be646d6109d1352c6e38c1b41d085c009aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 9 Nov 2022 09:22:33 +0100 Subject: [PATCH 068/797] kismet: 2020-09-R2 -> 2022-08-R1 --- .../networking/sniffers/kismet/default.nix | 105 +++++++++++++----- 1 file changed, 79 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index ad1ee0a0b302..1e4bb853742e 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -1,36 +1,43 @@ -{ lib, stdenv, fetchurl, pkg-config, libpcap, pcre, libnl, zlib, libmicrohttpd -, sqlite, protobuf, protobufc, libusb1, libcap, binutils, elfutils -, withNetworkManager ? false, glib, networkmanager -, withPython ? false, python3 -, withSensors ? false, lm_sensors}: - -# couldn't get python modules to build correctly, -# waiting for some other volunteer to fix it -assert !withPython; +{ lib +, stdenv +, binutils +, elfutils +, fetchurl +, glib +, libcap +, libmicrohttpd +, libnl +, libpcap +, libusb1 +, libwebsockets +, lm_sensors +, networkmanager +, pcre +, pkg-config +, openssl +, protobuf +, protobufc +, python3 +, sqlite +, withNetworkManager ? false +, withPython ? true +, withSensors ? false +, zlib +}: stdenv.mkDerivation rec { pname = "kismet"; - version = "2020-09-R2"; + version = "2022-08-R1"; src = fetchurl { url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz"; - sha256 = "1n6y6sgqf50bng8n0mhs2r1w0ak14mv654sqay72a78wh2s7ywzg"; + hash = "sha256-IUnM6sVSZQhlP00C3PemlOPaPcAAojcqHuS/mYgnl4E="; }; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - libpcap pcre libmicrohttpd libnl zlib sqlite protobuf protobufc - libusb1 libcap binutils elfutils - ] ++ lib.optionals withNetworkManager [ networkmanager glib ] - ++ lib.optional withSensors lm_sensors - ++ lib.optional withPython (python3.withPackages(ps: [ ps.setuptools ps.protobuf - ps.numpy ps.pyserial ])); - - configureFlags = [] - ++ lib.optional (!withNetworkManager) "--disable-libnm" - ++ lib.optional (!withPython) "--disable-python-tools" - ++ lib.optional (!withSensors) "--disable-lmsensors"; + postPatch = '' + substituteInPlace Makefile.in \ + --replace "-m 4550" "" + ''; postConfigure = '' sed -e 's/-o $(INSTUSR)//' \ @@ -40,12 +47,58 @@ stdenv.mkDerivation rec { -i Makefile ''; + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals withPython [ + python3 + ]; + + buildInputs = [ + binutils + elfutils + libcap + libmicrohttpd + libnl + libpcap + openssl + libusb1 + libwebsockets + pcre + protobuf + protobufc + sqlite + zlib + ] ++ lib.optionals withNetworkManager [ + networkmanager + glib + ] ++ lib.optional withSensors [ + lm_sensors + ]; + + propagatedBuildInputs = [ + ] ++ lib.optional withPython (python3.withPackages (ps: [ + ps.numpy + ps.protobuf + ps.pyserial + ps.setuptools + ps.websockets + ])); + + configureFlags = [ + ] ++ lib.optional (!withNetworkManager) [ + "--disable-libnm" + ] ++ lib.optional (!withPython) [ + "--disable-python-tools" + ] ++ lib.optional (!withSensors) [ + "--disable-lmsensors" + ]; + enableParallelBuilding = true; meta = with lib; { description = "Wireless network sniffer"; homepage = "https://www.kismetwireless.net/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } From 657dd4e8bf462565272633f08e7b8705f0d80433 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Mon, 24 Oct 2022 14:32:22 +0200 Subject: [PATCH 069/797] hwdata: 0.360 -> 0.363 --- pkgs/os-specific/linux/hwdata/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index fe789d51dbb5..c121ef6f6f53 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.360"; + version = "0.363"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "sha256-dF1Yeb3xH4keQzcydZ3h3kyuSZ1knW/2YAJ8xvFSoMo="; + sha256 = "sha256-A6GNrHc/t2SVyAyJWmzQTa+pD9wGESsz7DNruW2kH4s="; }; postPatch = '' @@ -19,9 +19,6 @@ stdenv.mkDerivation rec { doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) - outputHashMode = "recursive"; - outputHash = "sha256-gkgnHy1XwP87qpQiAm31AIAkxgGm5JYxMBr60kvd+gE="; - meta = { homepage = "https://github.com/vcrhonek/hwdata"; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; From f2de4779f74de8eff66f94c26f6a877f0535c450 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Nov 2022 17:33:07 +0000 Subject: [PATCH 070/797] entt: 3.10.3 -> 3.11.0 --- pkgs/development/libraries/entt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 01d4b88246a8..306cdd52f476 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.10.3"; + version = "3.11.0"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-pewAwvNRCBS6rm3AmHthiayGfP71lqkAO+x6rT957Xg="; + sha256 = "sha256-urB1oU4Riuo9+DKmMf317bqF4hTcm/zsSLn5fpZY27o="; }; nativeBuildInputs = [ cmake ]; From b2f9cd34e75409bd7cd68a90f8754e63f92f4738 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 9 Nov 2022 00:33:42 +0200 Subject: [PATCH 071/797] gobject-introspection: use wrapper.nix for the native package too so we can propagate the dev output during the build of i3ipc-glib with strictDeps enabled i noticed that gobject-introspection was not being detected and it was due to gobject-introspection path not being in the PKG_CONFIG_PATH variable this commit makes gobject-introspection get detected when build==host --- .../gobject-introspection/default.nix | 8 -- .../gobject-introspection/wrapper.nix | 120 ++++++++++++------ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 84 insertions(+), 47 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index bb306fb3a859..ec109cbee8dc 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -138,14 +138,6 @@ stdenv.mkDerivation (finalAttrs: { rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} ''; - # add self to buildInputs to avoid needing to add gobject-introspection to buildInputs in addition to nativeBuildInputs - # builds use target-pkg-config to look for gobject-introspection instead of just looking for binaries in $PATH - # wrapper uses depsTargetTargetPropagated so ignore it - preFixup = lib.optionalString (!lib.hasSuffix "-wrapped" finalAttrs.pname) '' - mkdir -p $dev/nix-support - echo "$out" > $dev/nix-support/propagated-target-target-deps - ''; - setupHook = ./setup-hook.sh; passthru = { diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix index f887b7d18c77..518dda781a64 100644 --- a/pkgs/development/libraries/gobject-introspection/wrapper.nix +++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -9,50 +9,96 @@ # to build, run # `nix build ".#pkgsCross.aarch64-multiplatform.buildPackages.gobject-introspection"` +# a comment for both depsTargetTargetPropagated's +# add self to buildInputs to avoid needing to add gobject-introspection to buildInputs in addition to nativeBuildInputs +# builds use target-pkg-config to look for gobject-introspection instead of just looking for binaries in $PATH + let - # ensure that `.override` works when gobject-introspection == gobject-introspection-wrapped + # ensure that `.override` works args = builtins.removeAttrs _args [ "buildPackages" "targetPackages" "gobject-introspection-unwrapped" ]; # passing this stdenv to `targetPackages...` breaks due to splicing not working in `.override`` argsForTarget = builtins.removeAttrs args [ "stdenv" ]; + + overridenUnwrappedGir = gobject-introspection-unwrapped.override args; + # if we have targetPackages.gobject-introspection then propagate that + overridenTargetUnwrappedGir = + if targetPackages ? gobject-introspection-unwrapped + then targetPackages.gobject-introspection-unwrapped.override argsForTarget + else overridenUnwrappedGir; in -(gobject-introspection-unwrapped.override args).overrideAttrs (previousAttrs: { - pname = "gobject-introspection-wrapped"; - depsTargetTargetPropagated = [ gobject-introspection-unwrapped ]; - postFixup = (previousAttrs.postFixup or "") + '' - mv $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped - mv $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped +# wrap both pkgsCrossX.buildPackages.gobject-introspection and {pkgs,pkgsSomethingExecutableOnBuildSystem).buildPackages.gobject-introspection +if (!stdenv.hostPlatform.canExecute stdenv.targetPlatform) && stdenv.targetPlatform.emulatorAvailable buildPackages +then + stdenv.mkDerivation + (builtins.removeAttrs overridenUnwrappedGir.drvAttrs [ "name" ] # so we can get a fresh name generated from the pname + // { + pname = "gobject-introspection-wrapped"; + passthru = overridenUnwrappedGir.passthru // { + unwrapped = overridenUnwrappedGir; + }; + phases = [ "fixupPhase" ]; # don't remove, it is valid to set phases here. + dontStrip = true; + depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ]; + postFixup = '' + ${lib.concatMapStrings (output: '' + mkdir -p ${"$" + "${output}"} + ${lib.getExe buildPackages.xorg.lndir} ${gobject-introspection-unwrapped.${output}} ${"$" + "${output}"} + '') gobject-introspection-unwrapped.outputs} - ( - export bash="${buildPackages.bash}" - export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)} - export emulatorwrapper="$dev/bin/g-ir-scanner-qemuwrapper" - export buildlddtree="${buildPackages.pax-utils}/bin/lddtree" + cp $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped + cp $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped - export targetgir="${lib.getDev (targetPackages.gobject-introspection-unwrapped.override argsForTarget)}" + ( + rm "$dev/bin/g-ir-compiler" + rm "$dev/bin/g-ir-scanner" + export bash="${buildPackages.bash}" + export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)} + export emulatorwrapper="$dev/bin/g-ir-scanner-qemuwrapper" + export buildlddtree="${buildPackages.pax-utils}/bin/lddtree" - substituteAll "${./wrappers/g-ir-compiler.sh}" "$dev/bin/g-ir-compiler" - substituteAll "${./wrappers/g-ir-scanner.sh}" "$dev/bin/g-ir-scanner" - substituteAll "${./wrappers/g-ir-scanner-lddwrapper.sh}" "$dev/bin/g-ir-scanner-lddwrapper" - substituteAll "${./wrappers/g-ir-scanner-qemuwrapper.sh}" "$dev/bin/g-ir-scanner-qemuwrapper" - chmod +x $dev/bin/g-ir-* - ) - '' - # when cross-compiling and using the wrapper then when a package looks up the g_ir_X - # variable with pkg-config they'll get the host version which can't be run - # override the variable to use the absolute path to g_ir_X in PATH which can be run - + '' - cat >> $dev/nix-support/setup-hook <<-'EOF' - override-pkg-config-gir-variables() { - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER="$(type -p g-ir-scanner)" - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER="$(type -p g-ir-compiler)" - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE="$(type -p g-ir-generate)" - export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER - export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER - export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE - } + export targetgir="${lib.getDev overridenTargetUnwrappedGir}" - preConfigureHooks+=(override-pkg-config-gir-variables) - EOF - ''; -}) + substituteAll "${./wrappers/g-ir-compiler.sh}" "$dev/bin/g-ir-compiler" + substituteAll "${./wrappers/g-ir-scanner.sh}" "$dev/bin/g-ir-scanner" + substituteAll "${./wrappers/g-ir-scanner-lddwrapper.sh}" "$dev/bin/g-ir-scanner-lddwrapper" + substituteAll "${./wrappers/g-ir-scanner-qemuwrapper.sh}" "$dev/bin/g-ir-scanner-qemuwrapper" + chmod +x $dev/bin/g-ir-compiler + chmod +x $dev/bin/g-ir-scanner* + ) + '' + # when cross-compiling and using the wrapper then when a package looks up the g_ir_X + # variable with pkg-config they'll get the host version which can't be run + # override the variable to use the absolute path to g_ir_X in PATH which can be run + + '' + cat >> $dev/nix-support/setup-hook <<-'EOF' + override-pkg-config-gir-variables() { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER="$(type -p g-ir-scanner)" + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER="$(type -p g-ir-compiler)" + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE="$(type -p g-ir-generate)" + export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER + export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER + export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE + } + + preConfigureHooks+=(override-pkg-config-gir-variables) + EOF + ''; + }) +else + stdenv.mkDerivation (builtins.removeAttrs overridenUnwrappedGir.drvAttrs [ "name" ] # so we can get a fresh name generated from the pname + // { + pname = "gobject-introspection-wrapped"; + passthru = overridenUnwrappedGir.passthru // { + unwrapped = overridenUnwrappedGir; + }; + phases = [ "fixupPhase" ]; # don't remove, it is valid to set phases here. + dontStrip = true; + depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ]; + postFixup = '' + ${lib.concatMapStrings (output: '' + mkdir -p ${"$" + "${output}"} + ${lib.getExe buildPackages.xorg.lndir} ${gobject-introspection-unwrapped.${output}} ${"$" + "${output}"} + '') gobject-introspection-unwrapped.outputs} + ''; + }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05d687b152e3..8d9015d76bb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19174,8 +19174,7 @@ with pkgs; gns3-gui = gns3Packages.guiStable; gns3-server = gns3Packages.serverStable; - gobject-introspection = if (!stdenv.hostPlatform.canExecute stdenv.targetPlatform) && stdenv.targetPlatform.emulatorAvailable buildPackages - then callPackage ../development/libraries/gobject-introspection/wrapper.nix { } else gobject-introspection-unwrapped; + gobject-introspection = callPackage ../development/libraries/gobject-introspection/wrapper.nix { }; gobject-introspection-unwrapped = callPackage ../development/libraries/gobject-introspection { nixStoreDir = config.nix.storeDir or builtins.storeDir; From 34e8a6debd044cdfc894bc18fa18efaa6bbd7ede Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 8 Nov 2022 23:30:05 +0200 Subject: [PATCH 072/797] i3ipc-glib: fix cross --- pkgs/applications/window-managers/i3/i3ipc-glib.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix index 572b12d986c1..a6a77600ee5f 100644 --- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix +++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix @@ -4,7 +4,6 @@ }: stdenv.mkDerivation rec { - pname = "i3ipc-glib"; version = "1.0.1"; @@ -15,10 +14,10 @@ stdenv.mkDerivation rec { sha256 = "01fzvrbnzcwx0vxw29igfpza9zwzp2s7msmzb92v01z0rz0y5m0p"; }; - nativeBuildInputs = [ autoreconfHook which pkg-config ]; - - buildInputs = [ libxcb json-glib gtk-doc xorgproto gobject-introspection ]; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook which pkg-config gtk-doc gobject-introspection ]; + buildInputs = [ libxcb json-glib xorgproto ]; preAutoreconf = '' gtkdocize From 83f0198962b4016210d20713fd437eb099b06f76 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 9 Nov 2022 06:49:39 +0200 Subject: [PATCH 073/797] keybinder3: fix cross --- .../libraries/keybinder3/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index 94f10426c715..cee48d5e9eff 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -13,14 +13,25 @@ stdenv.mkDerivation rec { sha256 = "196ibn86j54fywfwwgyh89i9wygm4vh7ls19fn20vrnm6ijlzh9r"; }; - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; + strictDeps = true; + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + gnome.gnome-common + gtk-doc + gobject-introspection + ]; buildInputs = [ - gnome.gnome-common gtk-doc gtk3 - libX11 libXext libXrender gobject-introspection + gtk3 libX11 libXext libXrender ]; preConfigure = '' - ./autogen.sh --prefix="$out" + # NOCONFIGURE fixes 'If you meant to cross compile, use `--host'.' + NOCONFIGURE=1 ./autogen.sh --prefix="$out" + substituteInPlace ./configure \ + --replace "dummy pkg-config" 'dummy ''${ac_tool_prefix}pkg-config' ''; meta = with lib; { From 62f9cc2bdcc274fb7a06c2b63a67e67334b9a76c Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 10 Nov 2022 00:06:33 +0200 Subject: [PATCH 074/797] gtksourceview{4,5}: fix cross 5 depends on opencv for which cross doesn't work so i coudlnt test it --- pkgs/development/libraries/gtksourceview/4.x.nix | 7 +++++++ pkgs/development/libraries/gtksourceview/5.x.nix | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index b7828de45585..a72229237fbb 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -70,6 +70,13 @@ stdenv.mkDerivation rec { dbus ]; + postPatch = '' + # https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/295 + # build: drop unnecessary vapigen check + substituteInPlace meson.build \ + --replace "if generate_vapi" "if false" + ''; + # Broken by PCRE 2 bump in GLib. # https://gitlab.gnome.org/GNOME/gtksourceview/-/issues/283 doCheck = false; diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 25bd8127a546..d3b1cc42a12f 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -74,6 +74,13 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; + postPatch = '' + # https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/295 + # build: drop unnecessary vapigen check + substituteInPlace meson.build \ + --replace "if generate_vapi" "if false" + ''; + doCheck = stdenv.isLinux; checkPhase = '' From 5f09efa7306838562a05d4fba883cd7f58030746 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 10 Nov 2022 00:57:44 +0200 Subject: [PATCH 075/797] libwnck: fix cross --- pkgs/development/libraries/libwnck/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index d6e647591729..2f535930ed03 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -3,6 +3,7 @@ , fetchurl , fetchpatch , meson +, mesonEmulatorHook , ninja , pkg-config , gtk-doc @@ -50,6 +51,8 @@ stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_412 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ From eeda27d0f2e07600142ba12ddb86a9c2688c26b7 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Sun, 30 Oct 2022 10:46:28 +0800 Subject: [PATCH 076/797] bpftools: fix build on ppc64le --- pkgs/os-specific/linux/bpftools/default.nix | 6 +++++- .../bpftools/include-asm-types-for-ppc64le.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/bpftools/include-asm-types-for-ppc64le.patch diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix index d3bb96afb3e7..287ad9d42264 100644 --- a/pkgs/os-specific/linux/bpftools/default.nix +++ b/pkgs/os-specific/linux/bpftools/default.nix @@ -15,7 +15,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-xDalSMcxLOb8WjRyy+rYle749ShB++fHH9jki9/isLo="; }; - patches = [ ./strip-binary-name.patch ]; + patches = [ + ./strip-binary-name.patch + # fix unknown type name '__vector128' on ppc64le + ./include-asm-types-for-ppc64le.patch + ]; nativeBuildInputs = [ python3 bison flex ]; buildInputs = (if (lib.versionAtLeast version "5.20") diff --git a/pkgs/os-specific/linux/bpftools/include-asm-types-for-ppc64le.patch b/pkgs/os-specific/linux/bpftools/include-asm-types-for-ppc64le.patch new file mode 100644 index 000000000000..47c8f8077a5a --- /dev/null +++ b/pkgs/os-specific/linux/bpftools/include-asm-types-for-ppc64le.patch @@ -0,0 +1,13 @@ +diff --git a/tools/include/uapi/linux/types.h b/tools/include/uapi/linux/types.h +index 91fa51a9c31d..bfbd9b47277f 100644 +--- a/tools/include/uapi/linux/types.h ++++ b/tools/include/uapi/linux/types.h +@@ -2,7 +2,7 @@ + #ifndef _UAPI_LINUX_TYPES_H + #define _UAPI_LINUX_TYPES_H + +-#include ++#include + + /* copied from linux:include/uapi/linux/types.h */ + #define __bitwise From 7eefaeb5e36c2899d15fe8b9a2cd0a693f61471d Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 29 Oct 2022 16:20:57 +0200 Subject: [PATCH 077/797] nextcloud25: use openssl 1.1 as a PHP extension to fix RC4 encryption --- .../from_md/release-notes/rl-2211.section.xml | 16 +++++++ .../manual/release-notes/rl-2211.section.md | 2 + nixos/modules/services/web-apps/nextcloud.nix | 47 ++++++++++++++++++- nixos/tests/nextcloud/basic.nix | 1 + nixos/tests/nextcloud/default.nix | 5 ++ pkgs/top-level/php-packages.nix | 9 ++++ 6 files changed, 79 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 25b3a686c0d9..e06a6094c1a7 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -607,6 +607,22 @@ binaries, use the p4d package instead. + + + The NextCloud NixOS module uses OpenSSL 3.x for its PHP’s + openssl extension, this breaks RC4-based server-side + encryption in NextCloud, making all your files unreadable upon + upgrade. Upon testing, we could not trigger any cases of + data loss, but we + cannot guarantee that for + every accidental OpenSSL upgrade. To restore functionality, + services.nextcloud.enableBrokenCiphersForSSE + has to be set to true. NextCloud is + planning to implement AES-256-GCM server-side encryption in + the future through + https://github.com/nextcloud/server/pull/25551. + + The coq package and versioned variants diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 583480bec020..5831dbbaba8a 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -196,6 +196,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - 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 NextCloud NixOS module uses OpenSSL 3.x for its PHP's openssl extension, this breaks RC4-based server-side encryption in NextCloud, making all your files unreadable upon upgrade. Upon testing, we could not trigger any cases of **data loss**, but we **cannot guarantee** that for every accidental OpenSSL upgrade. To restore functionality, [`services.nextcloud.enableBrokenCiphersForSSE`](#opt-services.nextcloud.enableBrokenCiphersForSSE) has to be set to `true`. NextCloud is planning to implement AES-256-GCM server-side encryption in the future through . + - 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 diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 04599884f139..2a4ca13b473f 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -13,7 +13,12 @@ let phpPackage = cfg.phpPackage.buildEnv { extensions = { enabled, all }: (with all; - enabled + # disable default openssl extension + (lib.filter (e: e.pname != "openssl") enabled) + # use OpenSSL 1.1 for RC4 NextCloud encryption if user + # has acknowledged the brokeness of the ciphers (RC4). + # TODO: remove when https://github.com/nextcloud/server/issues/32003 is fixed. + ++ (if cfg.enableBrokenCiphersForSSE then [ cfg.phpPackage.extensions.openssl-legacy ] else [ cfg.phpPackage.extensions.openssl ]) ++ optional cfg.enableImagemagick imagick # Optionally enabled depending on caching settings ++ optional cfg.caching.apcu apcu @@ -80,6 +85,36 @@ in { options.services.nextcloud = { enable = mkEnableOption (lib.mdDoc "nextcloud"); + + enableBrokenCiphersForSSE = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + This option uses OpenSSL PHP extension linked against OpenSSL 1.x rather + than latest OpenSSL (≥ 3), this is not recommended except if you need + it. + + Server-side encryption in NextCloud uses RC4 ciphers, a broken cipher + since ~2004. + + This cipher has been disabled in OpenSSL ≥ 3 and requires + a specific legacy profile to re-enable it. + + If you upgrade to a NextCloud using OpenSSL ≥ 3 and have + server-side encryption configured, you will not be able to access + your files anymore, enabling this option can restore access to your files. + + Unless you are using external storage, + it is advised to [disable server-side encryption](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html#disabling-encryption) as it is unclear + it provides any amount of security beyond encryption for external storage. + If you know more about this feature and is keen on it, + please chime in or open + an issue in nixpkgs. + + In the future, NextCloud may move to AES-256-GCM, by then, + this option will be deprecated. + ''; + }; hostName = mkOption { type = types.str; description = lib.mdDoc "FQDN for the nextcloud instance."; @@ -649,6 +684,16 @@ in { ++ (optional (versionOlder cfg.package.version "23") (upgradeWarning 22 "22.05")) ++ (optional (versionOlder cfg.package.version "24") (upgradeWarning 23 "22.05")) ++ (optional (versionOlder cfg.package.version "25") (upgradeWarning 24 "22.11")) + ++ (optional cfg.enableBrokenCiphersForSSE '' + You're using PHP's openssl extension built against OpenSSL 1.1. + This is only necessary if you're using NextCloud's server-side encryption. + Please keep in mind that it's using the broken RC4 cipher. + + In order to disable this option and remove this warning, + server-side encryption has to be disabled, see on how to achieve this. + + For more context, here is the implementing pull request: https://github.com/NixOS/nixpkgs/pull/198470 + '') ++ (optional isUnsupportedMariadb '' You seem to be using MariaDB at an unsupported version (i.e. at least 10.6)! Please note that this isn't supported officially by Nextcloud. You can either diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index eb37470a4c7b..5cf4d8ca7554 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -41,6 +41,7 @@ in { enable = true; datadir = "/var/lib/nextcloud-data"; hostName = "nextcloud"; + enableBrokenCiphersForSSE = args.enableBrokenCiphersForSSE or false; config = { # Don't inherit adminuser since "root" is supposed to be the default adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; # Don't try this at home! diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index 7dbdff988238..b55831047c62 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -8,6 +8,11 @@ with pkgs.lib; foldl (matrix: ver: matrix // { "basic${toString ver}" = import ./basic.nix { inherit system pkgs; nextcloudVersion = ver; }; + "with-legacy-openssl${toString ver}" = import ./basic.nix { + inherit system pkgs; + nextcloudVersion = ver; + enableBrokenCiphersForSSE = true; + }; "with-postgresql-and-redis${toString ver}" = import ./with-postgresql-and-redis.nix { inherit system pkgs; nextcloudVersion = ver; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0b9f4237327b..2ab2000af583 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -414,6 +414,15 @@ lib.makeScope pkgs.newScope (self: with self; { configureFlags = [ "--with-openssl" ]; doCheck = false; } + # This provides a legacy OpenSSL PHP extension + # For situations where OpenSSL 3 do not support a set of features + # without a specific openssl.cnf file + { + name = "openssl-legacy"; + buildInputs = [ openssl_1_1 ]; + configureFlags = [ "--with-openssl" ]; + doCheck = false; + } { name = "pcntl"; } { name = "pdo"; doCheck = false; } { From 394d4de8770db0c32c4a01957496d08256cdcaf5 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 7 Nov 2022 14:42:43 +0100 Subject: [PATCH 078/797] =?UTF-8?q?nextcloud25:=20enable=20by=20default=20?= =?UTF-8?q?broken=20ciphers=20for=20NixOS=20=E2=89=A4=2022.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nixos/modules/services/web-apps/nextcloud.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 2a4ca13b473f..43b00f601c49 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -88,7 +88,8 @@ in { enableBrokenCiphersForSSE = mkOption { type = types.bool; - default = false; + # Workaround can be removed at backport-time for 22.11. + default = !(versionOlder stateVersion "22.11"); description = lib.mdDoc '' This option uses OpenSSL PHP extension linked against OpenSSL 1.x rather than latest OpenSSL (≥ 3), this is not recommended except if you need From 61128cba67d881a5a741ea2a403bfb43be636fc8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Nov 2022 22:52:27 +0100 Subject: [PATCH 079/797] nixos/nextcloud: minor docs cleanup for openssl change * s/NextCloud/Nextcloud/g * `enableBrokenCiphersForSSE` should be enabled by default for any NixOS installation from before 22.11 to make sure existing installations don't run into the issue. Not the other way round. * Update release notes to reflect on that. * Improve wording of the warning a bit: explain which option to change to get rid of it. * Ensure that basic tests w/o `enableBrokenCiphersForSSE` run with OpenSSL 3. --- .../from_md/release-notes/rl-2211.section.xml | 26 +++++++------ .../manual/release-notes/rl-2211.section.md | 7 +++- nixos/modules/services/web-apps/nextcloud.nix | 37 +++++++++++-------- nixos/tests/nextcloud/basic.nix | 2 + 4 files changed, 43 insertions(+), 29 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index e06a6094c1a7..71d9ed1d2962 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -609,18 +609,20 @@ - The NextCloud NixOS module uses OpenSSL 3.x for its PHP’s - openssl extension, this breaks RC4-based server-side - encryption in NextCloud, making all your files unreadable upon - upgrade. Upon testing, we could not trigger any cases of - data loss, but we - cannot guarantee that for - every accidental OpenSSL upgrade. To restore functionality, - services.nextcloud.enableBrokenCiphersForSSE - has to be set to true. NextCloud is - planning to implement AES-256-GCM server-side encryption in - the future through - https://github.com/nextcloud/server/pull/25551. + The openssl-extension for the PHP + interpreter used by services.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 loose 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. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 5831dbbaba8a..f141813c452d 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -196,7 +196,12 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - 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 NextCloud NixOS module uses OpenSSL 3.x for its PHP's openssl extension, this breaks RC4-based server-side encryption in NextCloud, making all your files unreadable upon upgrade. Upon testing, we could not trigger any cases of **data loss**, but we **cannot guarantee** that for every accidental OpenSSL upgrade. To restore functionality, [`services.nextcloud.enableBrokenCiphersForSSE`](#opt-services.nextcloud.enableBrokenCiphersForSSE) has to be set to `true`. NextCloud is planning to implement AES-256-GCM server-side encryption in the future through . +- The `openssl`-extension for the PHP interpreter used by `services.nextcloud` is built against OpenSSL 1.1 if + [](#opt-system.stateVersion) is below `22.11`. This is to make sure that people using [server-side encryption](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html) + don't loose 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 + [](#opt-services.nextcloud.enableBrokenCiphersForSSE) to `false`. - The `coq` package and versioned variants starting at `coq_8_14` no longer include CoqIDE, which is now available through diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 43b00f601c49..6a71ac0d269c 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -15,7 +15,7 @@ let (with all; # disable default openssl extension (lib.filter (e: e.pname != "openssl") enabled) - # use OpenSSL 1.1 for RC4 NextCloud encryption if user + # use OpenSSL 1.1 for RC4 Nextcloud encryption if user # has acknowledged the brokeness of the ciphers (RC4). # TODO: remove when https://github.com/nextcloud/server/issues/32003 is fixed. ++ (if cfg.enableBrokenCiphersForSSE then [ cfg.phpPackage.extensions.openssl-legacy ] else [ cfg.phpPackage.extensions.openssl ]) @@ -88,32 +88,32 @@ in { enableBrokenCiphersForSSE = mkOption { type = types.bool; - # Workaround can be removed at backport-time for 22.11. - default = !(versionOlder stateVersion "22.11"); + default = versionOlder stateVersion "22.11"; + defaultText = literalExpression "versionOlder system.stateVersion \"22.11\""; description = lib.mdDoc '' - This option uses OpenSSL PHP extension linked against OpenSSL 1.x rather + This option uses OpenSSL PHP extension linked against OpenSSL 1.1 rather than latest OpenSSL (≥ 3), this is not recommended except if you need it. - Server-side encryption in NextCloud uses RC4 ciphers, a broken cipher + Server-side encryption in Nextcloud uses RC4 ciphers, a broken cipher since ~2004. This cipher has been disabled in OpenSSL ≥ 3 and requires a specific legacy profile to re-enable it. - If you upgrade to a NextCloud using OpenSSL ≥ 3 and have + If you upgrade to a Nextcloud using OpenSSL ≥ 3 and have server-side encryption configured, you will not be able to access - your files anymore, enabling this option can restore access to your files. + your files anymore. Enabling this option can restore access to your files. + Upon testing we didn't encounter any data corruption when turning + this on and off again, but this cannot be guaranteed for + each Nextcloud installation. Unless you are using external storage, it is advised to [disable server-side encryption](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html#disabling-encryption) as it is unclear it provides any amount of security beyond encryption for external storage. - If you know more about this feature and is keen on it, - please chime in or open - an issue in nixpkgs. - In the future, NextCloud may move to AES-256-GCM, by then, - this option will be deprecated. + In the future, Nextcloud may move to AES-256-GCM, by then, + this option will be removed. ''; }; hostName = mkOption { @@ -686,12 +686,17 @@ in { ++ (optional (versionOlder cfg.package.version "24") (upgradeWarning 23 "22.05")) ++ (optional (versionOlder cfg.package.version "25") (upgradeWarning 24 "22.11")) ++ (optional cfg.enableBrokenCiphersForSSE '' - You're using PHP's openssl extension built against OpenSSL 1.1. - This is only necessary if you're using NextCloud's server-side encryption. + You're using PHP's openssl extension built against OpenSSL 1.1 for Nextcloud. + This is only necessary if you're using Nextcloud's server-side encryption. Please keep in mind that it's using the broken RC4 cipher. - In order to disable this option and remove this warning, - server-side encryption has to be disabled, see on how to achieve this. + If you don't use that feature, you can switch to OpenSSL 3 by declaring + + services.nextcloud.enableBrokenCiphersForSSE = false; + + Otherwise you'd have to disable server-side encryption first in order + to be able to safely disable this option and get rid of that warning. + See on how to achieve this. For more context, here is the implementing pull request: https://github.com/NixOS/nixpkgs/pull/198470 '') diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index 5cf4d8ca7554..66ed9a62b8ae 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -37,6 +37,8 @@ in { "d /var/lib/nextcloud-data 0750 nextcloud nginx - -" ]; + system.stateVersion = "22.11"; + services.nextcloud = { enable = true; datadir = "/var/lib/nextcloud-data"; From c3f3baddaa0405714913f77ebcb61628a871be00 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 10 Nov 2022 12:07:41 +0000 Subject: [PATCH 080/797] Revert "llvmPackages_11: Add `$rsrc/lib` to default cflags" This reverts commit 2000ae54295e601a08ec13ea5057557a30b9a13a. This was intended as a fix for i686 cross compilation, but it has had other unforeseen consequences, such as breaking rust-bindgen. --- pkgs/development/compilers/llvm/11/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index c3abface37eb..82a78af85cac 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -43,7 +43,6 @@ let mkdir "$rsrc" ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - echo "-B $rsrc/lib" >> $out/nix-support/cc-cflags ''; mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" From 952dbf0a4aea0661bb9fc21b05a83d31c7cd77d0 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 9 Nov 2022 12:31:06 +0300 Subject: [PATCH 081/797] mesa: build more Vulkan drivers on aarch64-linux --- pkgs/development/libraries/mesa/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ecf66a7f58a0..54c1e8acf041 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -7,7 +7,8 @@ , libglvnd, libunwind , vulkan-loader, glslang , galliumDrivers ? ["auto"] -, vulkanDrivers ? ["auto"] +# upstream Mesa defaults to only enabling swrast (aka lavapipe) on aarch64 for some reason, so force building the others +, vulkanDrivers ? [ "auto" ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "broadcom" "freedreno" "panfrost" ] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] , vulkanLayers ? lib.optionals (!stdenv.isDarwin) [ "device-select" "overlay" ] # No Vulkan support on Darwin , OpenGL, Xplugin From 878a14677fcf5773401b0d084073458535377193 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Thu, 10 Nov 2022 16:53:14 +0100 Subject: [PATCH 082/797] xterm: 374 -> 375 --- pkgs/applications/terminal-emulators/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index c277e241ca30..ff0856734628 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "374"; + version = "375"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "sha256-EdTWJmcNTW17aft0Z+nsIxgX5a0iUC+RZ3aP2IrBvfU="; + sha256 = "sha256-MCxZor+B55xqcBUl13gWGiGNEjnyFWjYnivdMcAVIX8="; }; strictDeps = true; From ff8dcc56beb494f6b0c8cef3a43962f6c1bb4106 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 10 Nov 2022 19:39:23 +0100 Subject: [PATCH 083/797] newsflash: 2.1.2 -> 2.1.3 --- .../networking/feedreaders/newsflash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 34b1409a0717..e049e9c63504 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - sha256 = "sha256-Q9KCzzBM0BzdmBUs8vJ4DR0e5XAHoAxrTpMvsKnuIAQ="; + sha256 = "sha256-bor1wyClLBU2uI9az3WcLvI2SldBmnZj2xhEaZj4Vg8="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${finalAttrs.pname}-${finalAttrs.version}"; src = finalAttrs.src; - sha256 = "sha256-GxRuN5ufzSB/XOb6TWLlvgg7KBNgZ+oJpOowR9Ze9OQ="; + sha256 = "sha256-VkwPoh7A9sA27yU9PfD5KwL4gHKdX7Ip1hm53FuY5sE="; }; patches = [ From 7d5785de2bf23f9a2d1f756e8c9ce7f51c6759e3 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 10 Nov 2022 23:07:02 +0100 Subject: [PATCH 084/797] gns3-server,gns3-gui: 2.2.34 -> 2.2.35.1 --- pkgs/applications/networking/gns3/default.nix | 6 +++--- pkgs/applications/networking/gns3/gui.nix | 4 +--- pkgs/applications/networking/gns3/server.nix | 10 ++-------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 44c9477c1c43..324403808fea 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -3,7 +3,7 @@ }: let - stableVersion = "2.2.34"; + stableVersion = "2.2.35.1"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -27,8 +27,8 @@ let }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "sha256-1YsVMrUYI46lJZbPjf3jnOFDr9Hp54m8DVMz9y4dvVc="; - serverSrcHash = "sha256-h4d9s+QvqN/EFV97rPRhQiyC06wkZ9C2af9gx1Z/x/8="; + guiSrcHash = "sha256-iVvADwIp01HeZoDayvH1dilYRHRkRBTBR3Fh395JBq0="; + serverSrcHash = "sha256-41dbiSjvmsDNYr9/rRkeQVOnPSVND34xx1SNknCgHfc="; in { guiStable = mkGui { diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index be08fe4f4c76..b6db36339e3a 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -55,10 +55,8 @@ in python.pkgs.buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "sentry-sdk==" "sentry-sdk>=" \ --replace "psutil==" "psutil>=" \ - --replace "distro==" "distro>=" \ - --replace "setuptools==" "setuptools>=" + --replace "jsonschema>=4.17.0,<4.18" "jsonschema" ''; meta = with lib; { diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index a07409810c01..94fbd403e612 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -33,15 +33,8 @@ in python.pkgs.buildPythonApplication { postPatch = '' substituteInPlace requirements.txt \ - --replace "aiohttp==" "aiohttp>=" \ - --replace "aiofiles==" "aiofiles>=" \ - --replace "Jinja2==" "Jinja2>=" \ - --replace "sentry-sdk==" "sentry-sdk>=" \ - --replace "async-timeout==" "async-timeout>=" \ --replace "psutil==" "psutil>=" \ - --replace "distro==" "distro>=" \ - --replace "py-cpuinfo==" "py-cpuinfo>=" \ - --replace "setuptools==" "setuptools>=" + --replace "jsonschema>=4.17.0,<4.18" "jsonschema" ''; propagatedBuildInputs = with python.pkgs; [ @@ -50,6 +43,7 @@ in python.pkgs.buildPythonApplication { aiohttp-cors async_generator distro + importlib-resources jinja2 jsonschema multidict From e0b64413b0531f927c88cc0d9d36b1584c4b6304 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 10 Nov 2022 23:42:31 +0100 Subject: [PATCH 085/797] gns3-server,gns3-gui: clean --- pkgs/applications/networking/gns3/default.nix | 7 +------ pkgs/applications/networking/gns3/gui.nix | 14 ++------------ pkgs/applications/networking/gns3/server.nix | 14 ++------------ 3 files changed, 5 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 324403808fea..b17986daf588 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -12,18 +12,13 @@ let extraArgs = rec { mkOverride = attrname: version: sha256: self: super: { - ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: { + "${attrname}" = super."${attrname}".overridePythonAttrs (oldAttrs: { inherit version; src = oldAttrs.src.override { inherit version sha256; }; }); }; - commonOverrides = [ - (self: super: { - jsonschema = super.jsonschema_3; - }) - ]; }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index b6db36339e3a..756cbd7c8b97 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -3,25 +3,15 @@ , version , sha256Hash , mkOverride -, commonOverrides }: { lib , python3 , fetchFromGitHub , wrapQtAppsHook -, packageOverrides ? self: super: {} }: -let - defaultOverrides = commonOverrides ++ [ - ]; - - python = python3.override { - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); - }; - -in python.pkgs.buildPythonPackage rec { +python3.pkgs.buildPythonPackage rec { pname = "gns3-gui"; inherit version; @@ -36,7 +26,7 @@ in python.pkgs.buildPythonPackage rec { wrapQtAppsHook ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ distro jsonschema psutil diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 94fbd403e612..5eee199d6915 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -3,24 +3,14 @@ , version , sha256Hash , mkOverride -, commonOverrides }: { lib , python3 , fetchFromGitHub -, packageOverrides ? self: super: {} }: -let - defaultOverrides = commonOverrides ++ [ - ]; - - python = python3.override { - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); - }; - -in python.pkgs.buildPythonApplication { +python3.pkgs.buildPythonApplication { pname = "gns3-server"; inherit version; @@ -37,7 +27,7 @@ in python.pkgs.buildPythonApplication { --replace "jsonschema>=4.17.0,<4.18" "jsonschema" ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiofiles aiohttp aiohttp-cors From 1215a5fbfea687def06839cc9ceae5dd11dbee99 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 10 Nov 2022 18:55:03 +0300 Subject: [PATCH 086/797] pipewire: 0.3.59 -> 0.3.60 --- pkgs/development/libraries/pipewire/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index f2907afab018..0f98436c44f9 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -68,11 +68,10 @@ let mesonEnableFeature = b: if b then "enabled" else "disabled"; - mesonList = l: "[" + lib.concatStringsSep "," l + "]"; self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.59"; + version = "0.3.60"; outputs = [ "out" @@ -90,7 +89,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-4wDtdgkjBRlthhwbI3cSQFnbr+gxPQP5j5YnrWiQVp4="; + sha256 = "sha256-HDE2QAV2jnEJCqgiGx4TVP4ceeKAqwd4P3OYw6auNAM="; }; patches = [ @@ -107,10 +106,11 @@ let # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch - # remove when updating to 0.3.60 - (fetchpatch { # filter-chain: iterate the port correctly - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/94a64268613adac8ef6f3e6c1f04468220540d00.patch"; - sha256 = "sha256-IDTB7NgadgR3vKv97Nvd9pBfnOnMi21YsvLdD1Ew7HE="; + # Recommended backport patch to fix tdesktop with pw-pulse + # FIXME: remove in 0.3.61 + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b720da771efa950cf380101bed42d5d5ee177908.diff"; + hash = "sha256-p/BvatnbEJAMLQUUOECKAK7FppaNp9ei3FHjAw2spM8="; }) ]; From 5e41dbf243ada801adc2754f188882c859d5d9d8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 10 Nov 2022 19:32:37 +0100 Subject: [PATCH 087/797] libnftnl: 1.2.3 -> 1.2.4 --- pkgs/development/libraries/libnftnl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 4df7ddaffb25..10ef8e5395a3 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { - version = "1.2.3"; + version = "1.2.4"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - hash = "sha256-6Rbqm3n5UYVguaGHJRp8BCRCqey85/Nr55CIiGBdAlU="; + hash = "sha256-wP4jO+TN/XA+fVl37462P8vx0AUrYEThsj1HyjViR38="; }; nativeBuildInputs = [ pkg-config ]; From ae9cb7be8c3b5a3edfd90eff8734861ae89f7df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= Date: Tue, 11 Oct 2022 17:41:55 +0200 Subject: [PATCH 088/797] lispPackages_new: fixed a bunch of packages magicl, cl-cairo2, cl-ana, gsll, cl-libyaml, cl-libxml2, cl-readline --- .../development/lisp-modules-new/packages.nix | 7 +++++++ .../magicl-dont-build-fortran-twice.patch | 21 +++++++++++++++++++ pkgs/development/lisp-modules-new/ql.nix | 21 +++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 pkgs/development/lisp-modules-new/patches/magicl-dont-build-fortran-twice.patch diff --git a/pkgs/development/lisp-modules-new/packages.nix b/pkgs/development/lisp-modules-new/packages.nix index 1ad06f615b56..3dee2b19231b 100644 --- a/pkgs/development/lisp-modules-new/packages.nix +++ b/pkgs/development/lisp-modules-new/packages.nix @@ -423,6 +423,13 @@ let patches = [ ./patches/qtools-use-nix-libs.patch ]; }; + magicl = build-with-compile-into-pwd { + inherit (ql.magicl) pname version src lispLibs; + nativeBuildInputs = [ pkgs.gfortran ]; + nativeLibs = [ pkgs.openblas ]; + patches = [ ./patches/magicl-dont-build-fortran-twice.patch ]; + }; + }; in packages diff --git a/pkgs/development/lisp-modules-new/patches/magicl-dont-build-fortran-twice.patch b/pkgs/development/lisp-modules-new/patches/magicl-dont-build-fortran-twice.patch new file mode 100644 index 000000000000..f63b6949b1fd --- /dev/null +++ b/pkgs/development/lisp-modules-new/patches/magicl-dont-build-fortran-twice.patch @@ -0,0 +1,21 @@ +--- a/magicl.asd ++++ b/magicl.asd +@@ -143,6 +143,7 @@ + (shared-object (make-pathname :type #+darwin "dylib" #-darwin "so" + :name "libexpokit" + :defaults fortran-file))) ++ (unless (probe-file (nn shared-object)) + (uiop:run-program + (list "gfortran" "-fPIC" "-std=legacy" + "-c" +@@ -155,7 +156,7 @@ + (nn object-file) + #+darwin "-lblas" + #+darwin "-llapack")) +- (delete-file object-file)))) ++ (delete-file object-file))))) + + + (asdf:defsystem #:magicl/ext-expokit + +Diff finished. Mon Oct 10 22:03:54 2022 diff --git a/pkgs/development/lisp-modules-new/ql.nix b/pkgs/development/lisp-modules-new/ql.nix index 4ffce7a8d769..8e281f6b2c59 100644 --- a/pkgs/development/lisp-modules-new/ql.nix +++ b/pkgs/development/lisp-modules-new/ql.nix @@ -19,6 +19,9 @@ let cl-cffi-gtk-cairo = pkg: { nativeLibs = [ cairo ]; }; + cl-cairo2 = pkg: { + nativeLibs = [ cairo ]; + }; cl-cffi-gtk-gdk = pkg: { nativeLibs = [ gtk3 ]; }; @@ -130,6 +133,24 @@ let nativeLibs = [ libfixposix ]; systems = [ "iolib" "iolib/os" "iolib/pathnames" ]; }; + "cl-ana.hdf-cffi" = pkg: { + nativeBuildInputs = [ hdf5 ]; + nativeLibs = [ hdf5 ]; + NIX_LDFLAGS = [ "-lhdf5" ]; + }; + gsll = pkg: { + nativeBuildInputs = [ gsl ]; + nativeLibs = [ gsl ]; + }; + cl-libyaml = pkg: { + nativeLibs = [ libyaml ]; + }; + cl-libxml2 = pkg: { + nativeLibs = [ libxml2 ]; + }; + cl-readline = pkg: { + nativeLibs = [ readline ]; + }; }; qlpkgs = From 95b73dad899bad669186fe928493cdfcbd0c58ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Nov 2022 01:53:59 +0100 Subject: [PATCH 089/797] python3Packages.orjson: Disable failing tests on 32 bit Disables two tests that result in an integer overflow. --- pkgs/development/python-modules/orjson/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index d649d6ccbbac..d5815ce69866 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -52,6 +52,12 @@ buildPythonPackage rec { xxhash ]; + disabledTests = lib.optionals (stdenv.is32bit) [ + # integer overflow on 32bit + "test_numpy_array_d1_intp" + "test_numpy_array_d1_uintp" + ]; + pythonImportsCheck = [ pname ]; meta = with lib; { From 223f139e1e234865951698ab705b973ba882c1d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Nov 2022 02:29:34 +0100 Subject: [PATCH 090/797] python3Packages.jsonschema: 4.16.0 -> 4.17.0 --- pkgs/development/python-modules/jsonschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 536389fb3b10..69dba8bd472e 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.16.0"; + version = "4.17.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FlBZ8Hbv9pcbrlt0L8App7TvP5vPBMFOR3anYF3hSyM="; + sha256 = "sha256-W/zyvKFqCHreF+ArKC00r3zNdJ73YkHn+b18DLipQk0="; }; postPatch = '' From 0b25ba3d69ab89bf987a84903e46f386ad7e50db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Nov 2022 02:36:52 +0100 Subject: [PATCH 091/797] ansible-later: 2.0.22 -> 2.0.23 --- pkgs/development/python-modules/ansible-later/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index 964a00841291..b383453f7b92 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "2.0.22"; + version = "2.0.23"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RFyQvg7CF5Fa+DnOo0PoDtGPJMOx0Md8I+gshMH2Fvs="; + hash = "sha256-FQnyWC7d9h8Ya2BlaTGTrNXkHtJJLdeNL7qXP7scLFA="; }; postPatch = '' From 06a7064ec3a7170077f40bd96cc4aa7ef6ea529d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 11 Nov 2022 04:20:00 +0000 Subject: [PATCH 092/797] postgresql_11: 11.17 -> 11.18 https://www.postgresql.org/docs/release/11.18/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 2d999bdc52d5..94c17a0f1ff9 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -204,9 +204,9 @@ let in self: { postgresql_11 = self.callPackage generic { - version = "11.17"; + version = "11.18"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - hash = "sha256-bphJY64HZeYVd5lRA6fmWU2w8L0BUorBI+DeSmpMtMQ="; + hash = "sha256-0k8g78UukYrPvMoh6c6ijg4mO4RqDECPz6w7PEoPdQQ="; this = self.postgresql_11; thisAttr = "postgresql_11"; inherit self; From 0e7dc2534eacdb55ee343c4b0fb7f095721f48cc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 11 Nov 2022 04:20:00 +0000 Subject: [PATCH 093/797] postgresql_12: 12.12 -> 12.13 https://www.postgresql.org/docs/release/12.13/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 94c17a0f1ff9..3d6c5b3c3eb3 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -213,9 +213,9 @@ in self: { }; postgresql_12 = self.callPackage generic { - version = "12.12"; + version = "12.13"; psqlSchema = "12"; - hash = "sha256-NLPxxpQI4iBowMcbGCdpHxyJFTsK1XbBpE+JIKhYA5w="; + hash = "sha256-tsYjBGr0VI8RqEtAeTTWddEe0HDHk9FbBGg79fMi4C0="; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; From 4fc31c2539ef7abb4e761b6548e5164deb96aaeb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 11 Nov 2022 04:20:00 +0000 Subject: [PATCH 094/797] postgresql_13: 13.8 -> 13.9 https://www.postgresql.org/docs/release/13.9/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 3d6c5b3c3eb3..e197b8ddac2d 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -222,9 +222,9 @@ in self: { }; postgresql_13 = self.callPackage generic { - version = "13.8"; + version = "13.9"; psqlSchema = "13"; - hash = "sha256-c4dv3TpRcIc0BFjcpM4VuNKk286zNMBEFCRVGubEze0="; + hash = "sha256-7xlmwKXkn77TNwrSgkkoy2sRZGF67q4WBtooP38zpBU="; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; From 9a0ebf5d4772016da6528165b71e45944c3f41ef Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 11 Nov 2022 04:20:00 +0000 Subject: [PATCH 095/797] postgresql_14: 14.5 -> 14.6 https://www.postgresql.org/docs/release/14.6/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index e197b8ddac2d..6a7d096a43c5 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -231,9 +231,9 @@ in self: { }; postgresql_14 = self.callPackage generic { - version = "14.5"; + version = "14.6"; psqlSchema = "14"; - hash = "sha256-1PcstfuFfJqfdeyM8JGhdxJygC8hePCy5lt7b/ZPSjA="; + hash = "sha256-UIhA/BgJ05q3InTV8Tfau5/X+0+TPaQWiu67IAae3yI="; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; From b38cf2c9ae0402cb00540397df78d616f371e25f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 11 Nov 2022 04:20:00 +0000 Subject: [PATCH 096/797] postgresql_15: 15.0 -> 15.1 https://www.postgresql.org/docs/release/15.1/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 6a7d096a43c5..1da94ceebd7d 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -240,9 +240,9 @@ in self: { }; postgresql_15 = self.callPackage generic { - version = "15.0"; + version = "15.1"; psqlSchema = "15"; - hash = "sha256-cux09KfBbmhPQ+pC4hVJf81MVdAopo+3LpnmH/QNpNY="; + hash = "sha256-ZP3yPXNK+tDf5Ad9rKlqxR3NaX5ori09TKbEXLFOIa4="; this = self.postgresql_15; thisAttr = "postgresql_15"; inherit self; From 14f9d0c10bf6e00aa4af7165ef359ac2339fd624 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 10 Nov 2022 08:45:11 +0000 Subject: [PATCH 097/797] feedgnuplot: 1.58 -> 1.61 --- pkgs/tools/graphics/feedgnuplot/default.nix | 27 +++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index a205f03f079c..827481af497c 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -1,6 +1,14 @@ -{ lib, fetchFromGitHub, makeWrapper -, makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages -, stdenv, shortenPerlShebang +{ lib +, fetchFromGitHub +, makeWrapper +, makeFontsConf +, freefont_ttf +, gnuplot +, perl +, perlPackages +, stdenv +, shortenPerlShebang +, installShellFiles }: let @@ -11,18 +19,18 @@ in perlPackages.buildPerlPackage rec { pname = "feedgnuplot"; - version = "1.58"; + version = "1.61"; src = fetchFromGitHub { owner = "dkogan"; repo = "feedgnuplot"; rev = "v${version}"; - sha256 = "1qix4lwwyhqibz0a6q2rrb497rmk00v1fvmdyinj0dqmgjw155zr"; + sha256 = "sha256-r5rszxr65lSozkUNaqfBn4I4XjLtvQ6T/BG366JXLRM="; }; outputs = [ "out" ]; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; buildInputs = [ gnuplot perl ] ++ (with perlPackages; [ ListMoreUtils IPCRun StringShellQuote ]); @@ -43,10 +51,9 @@ perlPackages.buildPerlPackage rec { wrapProgram $out/bin/feedgnuplot \ --prefix "PATH" ":" "$PATH" \ --prefix "PERL5LIB" ":" "$PERL5LIB" - install -D -m 444 -t $out/share/bash-completion/completions \ - completions/bash/feedgnuplot - install -D -m 444 -t $out/share/zsh/site-functions \ - completions/zsh/_feedgnuplot + + installShellCompletion --bash --name feedgnuplot.bash completions/bash/feedgnuplot + installShellCompletion --zsh completions/zsh/_feedgnuplot ''; meta = with lib; { From 6fa503afeff8e4eb5d239463f4dee4fefb18c8ba Mon Sep 17 00:00:00 2001 From: misuzu Date: Fri, 11 Nov 2022 10:15:46 +0200 Subject: [PATCH 098/797] python3Packages.orjson: 3.8.0 -> 3.8.1 --- pkgs/development/python-modules/orjson/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index d649d6ccbbac..988ec30ce8ed 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -16,20 +16,20 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.8.0"; + version = "3.8.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; repo = pname; rev = version; - hash = "sha256-P1n0r5181Wt4tml2SKMI7pDNh2YakCp1I+cvQM6RRWg="; + hash = "sha256-3U27JuKMsMla3BKbbpO0uXesGHYaVQs8MwtQvumkksY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-8k0DetamwLqkdcg8V/D2J5ja6IJSLi50CE+ZjFa7Hdc="; + hash = "sha256-QXguyDxQHW9Fd3Nhmi5JzSxZQuk3HGPhhh/RGuOTZNY"; }; format = "pyproject"; From bea58512db5080fe6e8941c3e627ce8c64badb0b Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Mon, 17 Oct 2022 17:14:42 -0700 Subject: [PATCH 099/797] rust-bindgen: 0.59.2 -> 0.61.0 --- .../tools/rust/bindgen/unwrapped.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index 458b4a10c8d0..3a4cd640d958 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, clang, rustfmt +{ lib, fetchCrate, rustPlatform, clang, rustfmt , runtimeShell , bash }: @@ -7,18 +7,15 @@ let rustfmt-nightly = rustfmt.override { asNightly = true; }; in rustPlatform.buildRustPackage rec { pname = "rust-bindgen-unwrapped"; - version = "0.59.2"; + version = "0.61.0"; - RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update - - src = fetchFromGitHub { - owner = "rust-lang"; - repo = "rust-bindgen"; - rev = "v${version}"; - sha256 = "sha256-bJYdyf5uZgWe7fQ80/3QsRV0qyExYn6P9UET3tzwPFs="; + src = fetchCrate { + pname = "bindgen-cli"; + inherit version; + sha256 = "sha256-sKcKIAkUC2GfAZ4tJBNweXhoFzqO95iCpHgekpOyHzc="; }; - cargoSha256 = "sha256-RKZY5vf6CSFaKweuuNkeFF0ZXlSUibAkcL/YhkE0MoQ="; + cargoSha256 = "sha256-P246tw5Kznpxav0LashIkLlmQGVB+aKbFUQQdmcASPw="; buildInputs = [ clang.cc.lib ]; From 35b146ca31ea5f6cfdeee11dc7ca737fa9fbc1dd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 10 Nov 2022 12:05:24 +0100 Subject: [PATCH 100/797] nixos/nextcloud: fixup openssl compat change Upon testing the change itself I realized that it doesn't build properly because * the `pname` of a php extension is `php-`, not ``. * calling the extension `openssl-legacy` resulted in PHP trying to compile `ext/openssl-legacy` which broke since it doesn't exist: source root is php-8.1.12 setting SOURCE_DATE_EPOCH to timestamp 1666719000 of file php-8.1.12/win32/wsyslog.c patching sources cdToExtensionRootPhase /nix/store/48mnkga4kh84xyiqwzx8v7iv090i7z66-stdenv-linux/setup: line 1399: cd: ext/openssl-legacy: No such file or directory I didn't encounter that one before because I was mostly interested in having a sane behavior for everyone not using this "feature" and the documentation around this. My findings about the behavior with turning openssl1.1 on/off are still valid because I tested this on `master` with manually replacing `openssl` by `openssl_1_1` in `php-packages.nix`. To work around the issue I had to slightly modify the extension build-system for PHP: * The attribute `extensionName` is now relevant to determine the output paths (e.g. `lib/openssl.so`). This is not a behavioral change for existing extensions because then `extensionName==name`. However when specifying `extName` in `php-packages.nix` this value is overridden and it is made sure that the extension called `extName` NOT `name` (i.e. `openssl` vs `openssl-legacy`) is built and installed. The `name` still has to be kept to keep the legacy openssl available as `php.extensions.openssl-legacy`. Additionally I implemented a small VM test to check the behavior with server-side encryption: * For `stateVersion` below 22.11, OpenSSL 1.1 is used (in `basic.nix` it's checked that OpenSSL 3 is used). With that the "default" behavior of the module is checked. * It is ensured that the PHP interpreter for Nextcloud's php-fpm actually loads the correct openssl extension. * It is tested that (encrypted) files remain usable when (temporarily) installing OpenSSL3 (of course then they're not decryptable, but on a rollback that should still be possible). Finally, a few more documentation changes: * I also mentioned the issue in `nextcloud.xml` to make sure the issue is at least mentioned in the manual section about Nextcloud. Not too much detail here, but the relevant option `enableBrokenCiphersForSSE` is referenced. * I fixed a few minor wording issues to also give the full context (we're talking about Nextcloud; we're talking about the PHP extension **only**; please check if you really need this even though it's enabled by default). This is because I felt that sometimes it might be hard to understand what's going on when e.g. an eval-warning appears without telling where exactly it comes from. --- .../from_md/release-notes/rl-2211.section.xml | 3 +- .../manual/release-notes/rl-2211.section.md | 2 +- nixos/modules/services/web-apps/nextcloud.nix | 31 +++--- nixos/modules/services/web-apps/nextcloud.xml | 14 +++ nixos/tests/nextcloud/basic.nix | 8 +- nixos/tests/nextcloud/default.nix | 3 +- nixos/tests/nextcloud/openssl-sse.nix | 105 ++++++++++++++++++ pkgs/development/interpreters/php/generic.nix | 2 +- pkgs/top-level/php-packages.nix | 10 +- 9 files changed, 153 insertions(+), 25 deletions(-) create mode 100644 nixos/tests/nextcloud/openssl-sse.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 71d9ed1d2962..7f788be2b0a5 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -610,8 +610,7 @@ The openssl-extension for the PHP - interpreter used by services.nextcloud is - built against OpenSSL 1.1 if + interpreter used by Nextcloud is built against OpenSSL 1.1 if is below 22.11. This is to make sure that people using diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index f141813c452d..bc7f86bf5526 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -196,7 +196,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - 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 `services.nextcloud` is built against OpenSSL 1.1 if +- The `openssl`-extension for the PHP interpreter used by Nextcloud is built against OpenSSL 1.1 if [](#opt-system.stateVersion) is below `22.11`. This is to make sure that people using [server-side encryption](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html) don't loose access to their files. diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 6a71ac0d269c..da621573f2a2 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -14,7 +14,7 @@ let extensions = { enabled, all }: (with all; # disable default openssl extension - (lib.filter (e: e.pname != "openssl") enabled) + (lib.filter (e: e.pname != "php-openssl") enabled) # use OpenSSL 1.1 for RC4 Nextcloud encryption if user # has acknowledged the brokeness of the ciphers (RC4). # TODO: remove when https://github.com/nextcloud/server/issues/32003 is fixed. @@ -91,26 +91,29 @@ in { default = versionOlder stateVersion "22.11"; defaultText = literalExpression "versionOlder system.stateVersion \"22.11\""; description = lib.mdDoc '' - This option uses OpenSSL PHP extension linked against OpenSSL 1.1 rather - than latest OpenSSL (≥ 3), this is not recommended except if you need - it. - - Server-side encryption in Nextcloud uses RC4 ciphers, a broken cipher - since ~2004. + This option enables using the OpenSSL PHP extension linked against OpenSSL 1.1 + rather than latest OpenSSL (≥ 3), this is not recommended unless you need + it for server-side encryption (SSE). SSE uses the legacy RC4 cipher which is + considered broken for several years now. See also [RFC7465](https://datatracker.ietf.org/doc/html/rfc7465). This cipher has been disabled in OpenSSL ≥ 3 and requires a specific legacy profile to re-enable it. - If you upgrade to a Nextcloud using OpenSSL ≥ 3 and have + If you deploy Nextcloud using OpenSSL ≥ 3 for PHP and have server-side encryption configured, you will not be able to access your files anymore. Enabling this option can restore access to your files. Upon testing we didn't encounter any data corruption when turning this on and off again, but this cannot be guaranteed for each Nextcloud installation. - Unless you are using external storage, - it is advised to [disable server-side encryption](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html#disabling-encryption) as it is unclear - it provides any amount of security beyond encryption for external storage. + It is `true` by default for systems with a [](#opt-system.stateVersion) below + `22.11` to make sure that existing installations won't break on update. On newer + NixOS systems you have to explicitly enable it on your own. + + Please note that this only provides additional value when using + external storage such as S3 since it's not an end-to-end encryption. + If this is not the case, + it is advised to [disable server-side encryption](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html#disabling-encryption) and set this to `false`. In the future, Nextcloud may move to AES-256-GCM, by then, this option will be removed. @@ -690,12 +693,14 @@ in { This is only necessary if you're using Nextcloud's server-side encryption. Please keep in mind that it's using the broken RC4 cipher. - If you don't use that feature, you can switch to OpenSSL 3 by declaring + If you don't use that feature, you can switch to OpenSSL 3 and get + rid of this warning by declaring services.nextcloud.enableBrokenCiphersForSSE = false; + If you need to use server-side encryption you can ignore this waring. Otherwise you'd have to disable server-side encryption first in order - to be able to safely disable this option and get rid of that warning. + to be able to safely disable this option and get rid of this warning. See on how to achieve this. For more context, here is the implementing pull request: https://github.com/NixOS/nixpkgs/pull/198470 diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index a0b69dbd606c..ca57692fc16a 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -170,6 +170,20 @@ + + + Server-side encryption + + Nextcloud supports server-side encryption (SSE). + This is not an end-to-end encryption, but can be used to encrypt files that will be persisted + to external storage such as S3. Please note that this won't work anymore when using OpenSSL 3 + for PHP's openssl extension because this is implemented using the legacy cipher RC4. + If is above 22.05, + this is disabled by default. To turn it on again and for further information please refer to + . + + + diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index 66ed9a62b8ae..a475049e7b26 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -37,13 +37,12 @@ in { "d /var/lib/nextcloud-data 0750 nextcloud nginx - -" ]; - system.stateVersion = "22.11"; + system.stateVersion = "22.11"; # stateVersion >=21.11 to make sure that we use OpenSSL3 services.nextcloud = { enable = true; datadir = "/var/lib/nextcloud-data"; hostName = "nextcloud"; - enableBrokenCiphersForSSE = args.enableBrokenCiphersForSSE or false; config = { # Don't inherit adminuser since "root" is supposed to be the default adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; # Don't try this at home! @@ -102,6 +101,10 @@ in { # This is just to ensure the nextcloud-occ program is working nextcloud.succeed("nextcloud-occ status") nextcloud.succeed("curl -sSf http://nextcloud/login") + # Ensure that no OpenSSL 1.1 is used. + nextcloud.succeed( + "${nodes.nextcloud.services.phpfpm.pools.nextcloud.phpPackage}/bin/php -i | grep 'OpenSSL Library Version' | awk -F'=>' '{ print $2 }' | awk '{ print $2 }' | grep -v 1.1" + ) nextcloud.succeed( "${withRcloneEnv} ${copySharedFile}" ) @@ -111,5 +114,6 @@ in { "${withRcloneEnv} ${diffSharedFile}" ) assert "hi" in client.succeed("cat /mnt/dav/test-shared-file") + nextcloud.succeed("grep -vE '^HBEGIN:oc_encryption_module' /var/lib/nextcloud-data/data/root/files/test-shared-file") ''; })) args diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index b55831047c62..b8d3ba75b51a 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -8,10 +8,9 @@ with pkgs.lib; foldl (matrix: ver: matrix // { "basic${toString ver}" = import ./basic.nix { inherit system pkgs; nextcloudVersion = ver; }; - "with-legacy-openssl${toString ver}" = import ./basic.nix { + "openssl-sse${toString ver}" = import ./openssl-sse.nix { inherit system pkgs; nextcloudVersion = ver; - enableBrokenCiphersForSSE = true; }; "with-postgresql-and-redis${toString ver}" = import ./with-postgresql-and-redis.nix { inherit system pkgs; diff --git a/nixos/tests/nextcloud/openssl-sse.nix b/nixos/tests/nextcloud/openssl-sse.nix new file mode 100644 index 000000000000..7595ee2c67e3 --- /dev/null +++ b/nixos/tests/nextcloud/openssl-sse.nix @@ -0,0 +1,105 @@ +args@{ pkgs, nextcloudVersion ? 25, ... }: + +(import ../make-test-python.nix ({ pkgs, ...}: let + adminuser = "root"; + adminpass = "notproduction"; + nextcloudBase = { + networking.firewall.allowedTCPPorts = [ 80 ]; + system.stateVersion = "22.05"; # stateVersions <22.11 use openssl 1.1 by default + services.nextcloud = { + enable = true; + config.adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; + package = pkgs.${"nextcloud" + (toString nextcloudVersion)}; + }; + }; +in { + name = "nextcloud-openssl"; + meta = with pkgs.lib.maintainers; { + maintainers = [ ma27 ]; + }; + nodes.nextcloudwithopenssl1 = { + imports = [ nextcloudBase ]; + services.nextcloud.hostName = "nextcloudwithopenssl1"; + }; + nodes.nextcloudwithopenssl3 = { + imports = [ nextcloudBase ]; + services.nextcloud = { + hostName = "nextcloudwithopenssl3"; + enableBrokenCiphersForSSE = false; + }; + }; + testScript = { nodes, ... }: let + withRcloneEnv = host: pkgs.writeScript "with-rclone-env" '' + #!${pkgs.runtimeShell} + export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav + export RCLONE_CONFIG_NEXTCLOUD_URL="http://${host}/remote.php/webdav/" + export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" + export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" + export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" + "''${@}" + ''; + withRcloneEnv1 = withRcloneEnv "nextcloudwithopenssl1"; + withRcloneEnv3 = withRcloneEnv "nextcloudwithopenssl3"; + copySharedFile1 = pkgs.writeScript "copy-shared-file" '' + #!${pkgs.runtimeShell} + echo 'hi' | ${withRcloneEnv1} ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file + ''; + copySharedFile3 = pkgs.writeScript "copy-shared-file" '' + #!${pkgs.runtimeShell} + echo 'bye' | ${withRcloneEnv3} ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file2 + ''; + openssl1-node = nodes.nextcloudwithopenssl1.config.system.build.toplevel; + openssl3-node = nodes.nextcloudwithopenssl3.config.system.build.toplevel; + in '' + nextcloudwithopenssl1.start() + nextcloudwithopenssl1.wait_for_unit("multi-user.target") + nextcloudwithopenssl1.succeed("nextcloud-occ status") + nextcloudwithopenssl1.succeed("curl -sSf http://nextcloudwithopenssl1/login") + + with subtest("With OpenSSL 1 SSE can be enabled and used"): + nextcloudwithopenssl1.succeed("nextcloud-occ app:enable encryption") + nextcloudwithopenssl1.succeed("nextcloud-occ encryption:enable") + + with subtest("Upload file and ensure it's encrypted"): + nextcloudwithopenssl1.succeed("${copySharedFile1}") + nextcloudwithopenssl1.succeed("grep -E '^HBEGIN:oc_encryption_module' /var/lib/nextcloud/data/root/files/test-shared-file") + nextcloudwithopenssl1.succeed("${withRcloneEnv1} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file | grep hi") + + with subtest("Switch to OpenSSL 3"): + nextcloudwithopenssl1.succeed("${openssl3-node}/bin/switch-to-configuration test") + nextcloudwithopenssl1.wait_for_open_port(80) + nextcloudwithopenssl1.succeed("nextcloud-occ status") + + with subtest("Existing encrypted files cannot be read, but new files can be added"): + nextcloudwithopenssl1.fail("${withRcloneEnv3} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file >&2") + nextcloudwithopenssl1.succeed("nextcloud-occ encryption:disable") + nextcloudwithopenssl1.succeed("${copySharedFile3}") + nextcloudwithopenssl1.succeed("grep bye /var/lib/nextcloud/data/root/files/test-shared-file2") + nextcloudwithopenssl1.succeed("${withRcloneEnv3} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file2 | grep bye") + + with subtest("Switch back to OpenSSL 1.1 and ensure that encrypted files are readable again"): + nextcloudwithopenssl1.succeed("${openssl1-node}/bin/switch-to-configuration test") + nextcloudwithopenssl1.wait_for_open_port(80) + nextcloudwithopenssl1.succeed("nextcloud-occ status") + nextcloudwithopenssl1.succeed("nextcloud-occ encryption:enable") + nextcloudwithopenssl1.succeed("${withRcloneEnv1} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file2 | grep bye") + nextcloudwithopenssl1.succeed("${withRcloneEnv1} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file | grep hi") + nextcloudwithopenssl1.succeed("grep -E '^HBEGIN:oc_encryption_module' /var/lib/nextcloud/data/root/files/test-shared-file") + nextcloudwithopenssl1.succeed("grep bye /var/lib/nextcloud/data/root/files/test-shared-file2") + + with subtest("Ensure that everything can be decrypted"): + nextcloudwithopenssl1.succeed("echo y | nextcloud-occ encryption:decrypt-all >&2") + nextcloudwithopenssl1.succeed("${withRcloneEnv1} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file2 | grep bye") + nextcloudwithopenssl1.succeed("${withRcloneEnv1} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file | grep hi") + nextcloudwithopenssl1.succeed("grep -vE '^HBEGIN:oc_encryption_module' /var/lib/nextcloud/data/root/files/test-shared-file") + + with subtest("Switch to OpenSSL 3 ensure that all files are usable now"): + nextcloudwithopenssl1.succeed("${openssl3-node}/bin/switch-to-configuration test") + nextcloudwithopenssl1.wait_for_open_port(80) + nextcloudwithopenssl1.succeed("nextcloud-occ status") + nextcloudwithopenssl1.succeed("${withRcloneEnv3} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file2 | grep bye") + nextcloudwithopenssl1.succeed("${withRcloneEnv3} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file | grep hi") + + nextcloudwithopenssl1.shutdown() + ''; +})) args diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index d1b7c6829557..ae59bf349a9c 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -91,7 +91,7 @@ let [ ] allExtensionFunctions; - getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; + getExtName = ext: ext.extensionName; # Recursively get a list of all internal dependencies # for a list of extensions. diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 2ab2000af583..af3bb5451025 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -71,16 +71,17 @@ lib.makeScope pkgs.newScope (self: with self; { # will mark the extension as a zend extension or not. mkExtension = lib.makeOverridable ({ name - , configureFlags ? [ "--enable-${name}" ] + , configureFlags ? [ "--enable-${extName}" ] , internalDeps ? [ ] , postPhpize ? "" , buildInputs ? [ ] , zendExtension ? false , doCheck ? true + , extName ? name , ... }@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // { pname = "php-${name}"; - extensionName = name; + extensionName = extName; outputs = [ "out" "dev" ]; @@ -103,7 +104,7 @@ lib.makeScope pkgs.newScope (self: with self; { cdToExtensionRootPhase = '' # Go to extension source root. - cd "ext/${name}" + cd "ext/${extName}" ''; preConfigure = '' @@ -139,7 +140,7 @@ lib.makeScope pkgs.newScope (self: with self; { runHook preInstall mkdir -p $out/lib/php/extensions - cp modules/${name}.so $out/lib/php/extensions/${name}.so + cp modules/${extName}.so $out/lib/php/extensions/${extName}.so mkdir -p $dev/include ${rsync}/bin/rsync -r --filter="+ */" \ --filter="+ *.h" \ @@ -419,6 +420,7 @@ lib.makeScope pkgs.newScope (self: with self; { # without a specific openssl.cnf file { name = "openssl-legacy"; + extName = "openssl"; buildInputs = [ openssl_1_1 ]; configureFlags = [ "--with-openssl" ]; doCheck = false; From 9b7903ffbaf195f8bcbad80024d28f58f79f8ac3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 11 Nov 2022 18:52:35 +0100 Subject: [PATCH 101/797] haskellPackages: stackage LTS 19.31 -> LTS 19.32 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index b1c215ade1c6..a359d8ef4224 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.31 +# Stackage LTS 19.32 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -462,7 +462,7 @@ default-package-overrides: - crypto-pubkey-types ==0.4.3 - crypto-random ==0.0.9 - crypto-random-api ==0.2.0 - - cryptostore ==0.2.2.0 + - cryptostore ==0.2.3.0 - crypt-sha512 ==0 - csp ==1.4.0 - css-text ==0.1.3.0 @@ -649,7 +649,7 @@ default-package-overrides: - elerea ==2.9.0 - elf ==0.31 - eliminators ==0.8 - - elm-bridge ==0.8.0 + - elm-bridge ==0.8.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - elynx ==0.6.1.1 @@ -682,7 +682,7 @@ default-package-overrides: - error-or-utils ==0.2.0 - errors ==2.3.0 - errors-ext ==0.4.2 - - ersatz ==0.4.12 + - ersatz ==0.4.13 - esqueleto ==3.5.8.1 - essence-of-live-coding ==0.2.6 - essence-of-live-coding-gloss ==0.2.6 @@ -1611,7 +1611,7 @@ default-package-overrides: - mwc-random-monad ==0.7.3.1 - mx-state-codes ==1.0.0.0 - mysql ==0.2.1 - - mysql-simple ==0.4.8.1 + - mysql-simple ==0.4.9 - n2o ==0.11.1 - n2o-nitro ==0.11.2 - nagios-check ==0.3.2 @@ -1734,7 +1734,7 @@ default-package-overrides: - optparse-simple ==0.1.1.4 - optparse-text ==0.1.1.0 - OrderedBits ==0.0.2.0 - - ordered-containers ==0.2.2 + - ordered-containers ==0.2.3 - ormolu ==0.3.1.0 - overhang ==1.0.0 - packcheck ==0.6.0 @@ -1874,7 +1874,7 @@ default-package-overrides: - postgresql-binary ==0.12.5 - postgresql-libpq ==0.9.4.3 - postgresql-libpq-notify ==0.2.0.0 - - postgresql-migration ==0.2.1.4 + - postgresql-migration ==0.2.1.6 - postgresql-orm ==0.5.1 - postgresql-query ==3.9.0 - postgresql-schema ==0.1.14 @@ -2077,7 +2077,7 @@ default-package-overrides: - riak-protobuf ==0.25.0.0 - rio ==0.1.22.0 - rio-orphans ==0.1.2.0 - - rio-prettyprint ==0.1.1.0 + - rio-prettyprint ==0.1.2.0 - rng-utils ==0.3.1 - roc-id ==0.1.0.0 - rocksdb-haskell ==1.0.1 @@ -2252,7 +2252,7 @@ default-package-overrides: - skylighting-core ==0.12.3.1 - slack-progressbar ==0.1.0.1 - slave-thread ==1.1.0.1 - - slist ==0.2.0.1 + - slist ==0.2.1.0 - slynx ==0.6.1.1 - smallcheck ==1.2.1 - smash ==0.1.3 From 09eb71ff7c9c5948aa0b6dc047b684de33c6a0d0 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 11 Nov 2022 18:52:56 +0100 Subject: [PATCH 102/797] all-cabal-hashes: 2022-11-03T21:09:38Z -> 2022-11-11T17:48:48Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 29dfcfc10cfb..5b654ec8ad0d 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "7e2dca1338ee7f19dbb8cdbc81e9eb1716bbf64e", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7e2dca1338ee7f19dbb8cdbc81e9eb1716bbf64e.tar.gz", - "sha256": "1vrhv9w042sn2sm3niiy5640qvhiqn79zllp4vsbdpds758rj9vm", - "msg": "Update from Hackage at 2022-11-03T21:09:38Z" + "commit": "e2ccf8a8796c9192280f796ce0f5d98ec783f856", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e2ccf8a8796c9192280f796ce0f5d98ec783f856.tar.gz", + "sha256": "092g4pbxyhkw1isbib967v5aw16iqs3w5iqcicv1irr4rphsr06z", + "msg": "Update from Hackage at 2022-11-11T17:48:48Z" } From 8318b634a1b0d2f7811937155481abe5250afaa5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 11 Nov 2022 18:55:13 +0100 Subject: [PATCH 103/797] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 869 +++++++++++------- 1 file changed, 532 insertions(+), 337 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 84a307b58245..b46fbdc286d5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2069,15 +2069,17 @@ self: { }: mkDerivation { pname = "Blammo"; - version = "1.1.0.0"; - sha256 = "02j49dzwlx0p39njspz10vbj5qybb1l2l2lk4gdrbicp953czaa8"; + version = "1.1.1.0"; + sha256 = "1hqrdzj30lwwb7zis2hkfz887jh107k33mbqkj2hxvd56sc4din5"; libraryHaskellDepends = [ aeson base bytestring case-insensitive clock containers dlist envparse exceptions fast-logger http-types lens monad-logger-aeson mtl text time unliftio unliftio-core unordered-containers vector wai ]; - testHaskellDepends = [ aeson base hspec markdown-unlit mtl text ]; + testHaskellDepends = [ + aeson base bytestring hspec markdown-unlit mtl text time + ]; testToolDepends = [ markdown-unlit ]; description = "Batteries-included Structured Logging library"; license = lib.licenses.mit; @@ -7994,10 +7996,8 @@ self: { }: mkDerivation { pname = "H"; - version = "0.9.0.1"; - sha256 = "0d3isp467pq5l1c95j0q6s2isywz8xamgrm9rs16i7xczkz4vh2z"; - revision = "1"; - editedCabalFile = "07pddiap3jzcnc09v442wq30j46nmkdibilzcv69hz5imcnmhz0h"; + version = "1.0.0"; + sha256 = "1xnv8a097pidh4q9ngrsha0vm9sgsbggblizcjz449iwwsb8yg9g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -14236,6 +14236,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "MonadRandom_0_6" = callPackage + ({ mkDerivation, base, mtl, primitive, random, transformers + , transformers-compat + }: + mkDerivation { + pname = "MonadRandom"; + version = "0.6"; + sha256 = "0i6h9s2iqj71q06i9al3s2akmdjjx16h015qb81nhgjwi4q8cf69"; + libraryHaskellDepends = [ + base mtl primitive random transformers transformers-compat + ]; + description = "Random-number generation monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "MonadRandomLazy" = callPackage ({ mkDerivation, base, MonadRandom, mtl, random }: mkDerivation { @@ -15328,23 +15344,23 @@ self: { }) {}; "ONC-RPC" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cereal, containers - , filepath, haskell-src-exts, network, parsec, random, time, unix - , vector + ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal + , containers, filepath, haskell-src-exts, network, parsec, random + , time, unix, vector }: mkDerivation { pname = "ONC-RPC"; - version = "0.1"; - sha256 = "19smd0rp0jx9i59jgjk149g4czpwjx173szhp1z9dvm5j0pdwyy5"; + version = "0.2"; + sha256 = "0aqhvw6kqsd3b6wlyjhrz4ijc1b4ch57398icjfy7gr1a8g3z3c0"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ - base bytestring Cabal cereal containers filepath haskell-src-exts - parsec vector + base base16-bytestring bytestring Cabal cereal containers filepath + haskell-src-exts parsec vector ]; libraryHaskellDepends = [ - base bytestring Cabal cereal containers filepath haskell-src-exts - network parsec random time unix vector + base base16-bytestring bytestring Cabal cereal containers filepath + haskell-src-exts network parsec random time unix vector ]; executableHaskellDepends = [ base filepath ]; description = "ONC RPC (aka Sun RPC) and XDR library"; @@ -26203,6 +26219,37 @@ self: { broken = true; }) {}; + "aeson-schemas_1_4_0_0" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, criterion, deepseq + , filepath, first-class-families, hashable, hint, interpolate + , megaparsec, process, QuickCheck, raw-strings-qq, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell + , temporary, text, th-orphans, th-test-utils, unordered-containers + }: + mkDerivation { + pname = "aeson-schemas"; + version = "1.4.0.0"; + sha256 = "0nch4andx0w0l7dlw64ajz503f05zancx42178dsd5fskvd75ks2"; + libraryHaskellDepends = [ + aeson base first-class-families hashable megaparsec + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base deepseq filepath first-class-families hashable + hint interpolate megaparsec process QuickCheck raw-strings-qq tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell + temporary text th-orphans th-test-utils unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq first-class-families hashable + megaparsec template-haskell text th-test-utils unordered-containers + ]; + description = "Easily consume JSON data on-demand with type-safety"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "aeson-serialize" = callPackage ({ mkDerivation, aeson, base, cereal, hspec, HUnit }: mkDerivation { @@ -26335,7 +26382,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "aeson-typescript_0_4_1_0" = callPackage + "aeson-typescript_0_4_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, hspec, mtl, process, string-interpolate , template-haskell, temporary, text, th-abstraction, transformers @@ -26343,8 +26390,8 @@ self: { }: mkDerivation { pname = "aeson-typescript"; - version = "0.4.1.0"; - sha256 = "0zr6p0yyzm1mdhnyycd37alw3xg2jmx303mbd5a7251wffxc42n8"; + version = "0.4.2.0"; + sha256 = "00lv7mfxxnhmbxh9s1qwfnffmpy6095fh3zms68bzdkjik2hk830"; libraryHaskellDepends = [ aeson base containers mtl string-interpolate template-haskell text th-abstraction transformers unordered-containers @@ -33234,24 +33281,25 @@ self: { "appendful-persistent" = callPackage ({ mkDerivation, appendful, base, containers, genvalidity - , genvalidity-appendful, genvalidity-hspec, genvalidity-persistent - , hspec, microlens, monad-logger, mtl, path, path-io, persistent - , persistent-sqlite, persistent-template, QuickCheck, text - , validity + , genvalidity-appendful, genvalidity-persistent + , genvalidity-sydtest, microlens, monad-logger, mtl, path, path-io + , persistent, persistent-sqlite, persistent-template, QuickCheck + , sydtest, sydtest-discover, text, validity }: mkDerivation { pname = "appendful-persistent"; - version = "0.0.0.0"; - sha256 = "0h0hdjkkrz8ckhs8r8n0vm983513lahi9bd89i1hyqlycrckbphl"; + version = "0.1.0.0"; + sha256 = "0aw463j5qyjazzj7w325fn85nyz3i7rml1c5f02ps06n9rhw0w1k"; libraryHaskellDepends = [ appendful base containers microlens persistent ]; testHaskellDepends = [ appendful base containers genvalidity genvalidity-appendful - genvalidity-hspec genvalidity-persistent hspec monad-logger mtl - path path-io persistent persistent-sqlite persistent-template - QuickCheck text validity + genvalidity-persistent genvalidity-sydtest monad-logger mtl path + path-io persistent persistent-sqlite persistent-template QuickCheck + sydtest text validity ]; + testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; }) {}; @@ -38249,8 +38297,8 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.22.1"; - sha256 = "0zz8f144rsd7bpl4xfxw3wbp9s1a300c8i6vifh2yfhi798j76n4"; + version = "0.23"; + sha256 = "0kfdj9hxjvziq1y74xj9mm17zcgwywpvp9c0i6gfd5malf4qxgg0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42017,6 +42065,17 @@ self: { broken = true; }) {}; + "benri-hspec" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "benri-hspec"; + version = "0.1.0.0"; + sha256 = "0vvc7fw52c9flmdjmgrc9cca9yrl4r7yvh2l5ixc23gvvmlhdycy"; + libraryHaskellDepends = [ base hspec ]; + description = "Simplify tests where Either or Maybe types are returned from monadic code"; + license = lib.licenses.bsd3; + }) {}; + "bento" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -47810,6 +47869,28 @@ self: { broken = true; }) {}; + "borsh" = callPackage + ({ mkDerivation, base, bytestring, containers, generics-sop, memory + , optics-core, profunctors, QuickCheck, quickcheck-instances + , sop-core, tasty, tasty-quickcheck, text, vector, wide-word + }: + mkDerivation { + pname = "borsh"; + version = "0.1.0"; + sha256 = "0nyv91sn2v8m1zlp789v85dm9n21k9gb532rkzhdds5fpvqa6w3z"; + libraryHaskellDepends = [ + base bytestring containers generics-sop memory sop-core text vector + wide-word + ]; + testHaskellDepends = [ + base bytestring containers generics-sop optics-core profunctors + QuickCheck quickcheck-instances sop-core tasty tasty-quickcheck + text + ]; + description = "Implementation of BORSH serialisation"; + license = lib.licenses.bsd3; + }) {}; + "bot" = callPackage ({ mkDerivation, arrows, base, Stream }: mkDerivation { @@ -48507,8 +48588,8 @@ self: { }: mkDerivation { pname = "brick-panes"; - version = "1.0.0.1"; - sha256 = "05f5c99b44c6aajx12hx4ayxjldbj4n0fi70i95q18qxy9aacljw"; + version = "1.0.0.2"; + sha256 = "1g6q9pnc0a0fnp2qaxqxp8qdriifi6w362ky36csxl633nl6gsw0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vty ]; @@ -50502,6 +50583,8 @@ self: { pname = "byteslice"; version = "0.2.7.0"; sha256 = "1mzqlyh0mswk64irz0sr8fk0v9y9ksb1k1j3g51l9vhhnz0cavhj"; + revision = "1"; + editedCabalFile = "1g5670xillqbfpnsxppfjkvaaff4rjlk6116pc5s1pds0zsnbyy8"; libraryHaskellDepends = [ base bytestring primitive primitive-addr primitive-unlifted run-st tuples vector @@ -63474,6 +63557,23 @@ self: { license = lib.licenses.mit; }) {}; + "commonmark-wikilink" = callPackage + ({ mkDerivation, aeson, base, commonmark, commonmark-pandoc + , megaparsec, network-uri, pandoc-types, parsec, relude, uri-encode + , url-slug + }: + mkDerivation { + pname = "commonmark-wikilink"; + version = "0.1.0.0"; + sha256 = "1varv4zihai08wvgpsf9pp3qaa1wniii21qhgy39cpcz9n9s2hv2"; + libraryHaskellDepends = [ + aeson base commonmark commonmark-pandoc megaparsec network-uri + pandoc-types parsec relude uri-encode url-slug + ]; + description = "Obsidian-friendly commonmark wikilink parser"; + license = lib.licenses.mit; + }) {}; + "commsec" = callPackage ({ mkDerivation, base, bytestring, cipher-aes128, crypto-api , network @@ -68308,8 +68408,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.11"; - sha256 = "1g542m2bk0avnsnrzc0y1dqy5k91i0d9p5fd8ir39gpaa8024ih2"; + version = "3.12"; + sha256 = "0svbn9djzxqbmi62106i2692fx31vdxqjjd2y329nlq36iivvyxf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68327,8 +68427,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.11"; - sha256 = "0xz92m8rhcb1l7533lxd5sbnisld2ss0h2sm18bxdig22v4qlzh5"; + version = "3.12"; + sha256 = "0xxvdl1k09il545y263k5x37gi5z1y4plm8f4yjqh3hprv23ffhp"; libraryHaskellDepends = [ base copilot-core directory filepath language-c99 language-c99-simple mtl pretty @@ -68360,8 +68460,8 @@ self: { }: mkDerivation { pname = "copilot-core"; - version = "3.11"; - sha256 = "01h21a40v233qphm03fb9y18iwisnznpdvjvciy3kcc756rvranx"; + version = "3.12"; + sha256 = "1aw6pkxqpcwqib86yq2zvjz6jqxjc3ina0hbxsyvmgmcqs5hwybs"; libraryHaskellDepends = [ base dlist pretty ]; testHaskellDepends = [ base HUnit pretty QuickCheck test-framework test-framework-hunit @@ -68390,17 +68490,17 @@ self: { }) {}; "copilot-interpreter" = callPackage - ({ mkDerivation, base, copilot-core, pretty, QuickCheck - , test-framework, test-framework-quickcheck2 + ({ mkDerivation, base, copilot-core, copilot-prettyprinter, pretty + , QuickCheck, test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "copilot-interpreter"; - version = "3.11"; - sha256 = "1w6acc3hzjyai20l52qxhnx165i8ywra8jpc2nqvyji13fq433z6"; + version = "3.12"; + sha256 = "100nalpd7q9z26nyk06nbl4hr8p6akm8qny988zd8znp2c3z37rr"; libraryHaskellDepends = [ base copilot-core pretty ]; testHaskellDepends = [ - base copilot-core pretty QuickCheck test-framework - test-framework-quickcheck2 + base copilot-core copilot-prettyprinter pretty QuickCheck + test-framework test-framework-quickcheck2 ]; description = "Interpreter for Copilot"; license = lib.licenses.bsd3; @@ -68408,17 +68508,17 @@ self: { "copilot-language" = callPackage ({ mkDerivation, array, base, containers, copilot-core - , copilot-interpreter, copilot-theorem, data-reify, HUnit, mtl - , pretty, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 + , copilot-interpreter, copilot-prettyprinter, copilot-theorem + , data-reify, HUnit, mtl, pretty, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "copilot-language"; - version = "3.11"; - sha256 = "1j0bvlplm5pz2yf09b7n716mvkkc7n6gq25fkghmqb1ndaffz5m3"; + version = "3.12"; + sha256 = "1n2n83617wi0piw94g843zk39xvralcn7l8vdcvbx6gwqm9dn320"; libraryHaskellDepends = [ array base containers copilot-core copilot-interpreter - copilot-theorem data-reify mtl + copilot-prettyprinter copilot-theorem data-reify mtl ]; testHaskellDepends = [ base copilot-core copilot-interpreter HUnit pretty QuickCheck @@ -68433,8 +68533,8 @@ self: { ({ mkDerivation, base, containers, copilot-language, mtl, parsec }: mkDerivation { pname = "copilot-libraries"; - version = "3.11"; - sha256 = "0cvz3vq6k48yq5qjhdnzn3shgjfdyrbb480721nkmqml0v64p213"; + version = "3.12"; + sha256 = "0xxfz2r04x0cwyidlfd792v4jspv38v8w012w0dmr0ajsw15npxb"; libraryHaskellDepends = [ base containers copilot-language mtl parsec ]; @@ -68443,6 +68543,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "copilot-prettyprinter" = callPackage + ({ mkDerivation, base, copilot-core, pretty }: + mkDerivation { + pname = "copilot-prettyprinter"; + version = "3.12"; + sha256 = "1sj4fjj6kwarjxn53qrfvl0ca200ra9hnh8mrisc4jr87xhdbnh0"; + libraryHaskellDepends = [ base copilot-core pretty ]; + description = "A prettyprinter of Copilot Specifications"; + license = lib.licenses.bsd3; + }) {}; + "copilot-sbv" = callPackage ({ mkDerivation, base, containers, copilot-core, directory , filepath, pretty, sbv @@ -68462,17 +68573,18 @@ self: { "copilot-theorem" = callPackage ({ mkDerivation, base, bimap, bv-sized, containers, copilot-core - , data-default, directory, libBF, mtl, panic, parameterized-utils - , parsec, pretty, process, random, transformers, what4, xml + , copilot-prettyprinter, data-default, directory, libBF, mtl, panic + , parameterized-utils, parsec, pretty, process, random + , transformers, what4, xml }: mkDerivation { pname = "copilot-theorem"; - version = "3.11"; - sha256 = "1nrcm5vzjlqch2ff3vpjrlqjjm0j58p74md3wvpb0swr85j1calf"; + version = "3.12"; + sha256 = "1q0r8fa4jvqpkiy099f9fmrcm2qy0wrvxwkaycbqlhgx1zixxl3z"; libraryHaskellDepends = [ - base bimap bv-sized containers copilot-core data-default directory - libBF mtl panic parameterized-utils parsec pretty process random - transformers what4 xml + base bimap bv-sized containers copilot-core copilot-prettyprinter + data-default directory libBF mtl panic parameterized-utils parsec + pretty process random transformers what4 xml ]; description = "k-induction for Copilot"; license = lib.licenses.bsd3; @@ -71463,8 +71575,8 @@ self: { }: mkDerivation { pname = "cryptostore"; - version = "0.2.2.0"; - sha256 = "0n70amg7y2qwfjhj4xaqjia46fbabba9l2g19ry191m7c4zp1skx"; + version = "0.2.3.0"; + sha256 = "1w84klg3r10vapkc8s6q21ldnp3014x9nvi5ffsmzikn7g7pw1g5"; libraryHaskellDepends = [ asn1-encoding asn1-types base basement bytestring cryptonite hourglass memory pem x509 x509-validation @@ -74281,8 +74393,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "data-elevator"; - version = "0.1.0.0"; - sha256 = "1pv9z25fmqrjyh0zfbiy8wmcmhsr2r6x3hip8zgavaa7f5qb8n4y"; + version = "0.1.0.1"; + sha256 = "0j2adsqn3r23jjwl5p0kyf2z1wd2kibfqivdcchngsmf3yfr34sz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Coerce between unlifted boxed and lifted types"; @@ -77907,8 +78019,8 @@ self: { }: mkDerivation { pname = "dep-t"; - version = "0.6.2.0"; - sha256 = "1wpb5p07vvny0bhapi87iwh43nykgy6b25xmsxsp403mbnv9g9ws"; + version = "0.6.4.0"; + sha256 = "1xrazkn8pdzkjrcia9ndxiva483w9fyclcq562assnv9j3svi145"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ aeson barbies base bytestring containers doctest mtl rank2classes @@ -77955,8 +78067,8 @@ self: { }: mkDerivation { pname = "dep-t-dynamic"; - version = "0.1.0.2"; - sha256 = "0dv7ydxqgmgphcjgphrdf6jghkykvg5nnppgpgglwi2rg7yfmp7i"; + version = "0.1.1.0"; + sha256 = "1vh4igb25di61by6dhfnv2ans2ryk6j2sh8bp8rp8yawnwsidyx9"; libraryHaskellDepends = [ algebraic-graphs base dep-t hashable sop-core transformers unordered-containers @@ -79251,8 +79363,8 @@ self: { pname = "dhall"; version = "1.41.2"; sha256 = "14m5rrvkid76qnvg0l14xw1mnqclhip3gjrz20g1lp4fd5p056ka"; - revision = "2"; - editedCabalFile = "18jh1c2zinwglih5gc8av2szicyywq5q0kl2h5200sm67nxmask9"; + revision = "3"; + editedCabalFile = "1j8hhg6jxzvg1lh5lad9wp54fi0znq5syfxa7rpr6sw0v6257fi1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -79432,8 +79544,8 @@ self: { pname = "dhall-docs"; version = "1.0.10"; sha256 = "1rh6nxmjin8kvbscbhbcjsgxnlkw1r19plzpps6wkx86zfjd2ms2"; - revision = "2"; - editedCabalFile = "1zm07bnaf6j0h5x2rlyvi4fs5d42w2v5z11qxc7gysqp1k2p99m1"; + revision = "3"; + editedCabalFile = "06pjafliw9a3pzw9846yb9rmsjrwrn7jhax7s2bsdasx5agdrfg5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -80239,8 +80351,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.4"; sha256 = "043jpr7lqg708lzmv6cqys7312lfdwnf8ijcnpl4jkbvcwl87c1m"; - revision = "6"; - editedCabalFile = "1jdya89yf8r11mr0b587w7k4f5g40709048wxpijczla169f4is8"; + revision = "7"; + editedCabalFile = "0jwj06c2bqawpr57y2x8hbnjlsl1nv9k7wjxhk56w240qyspmj3p"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -83661,18 +83773,19 @@ self: { }) {}; "dnf-repo" = callPackage - ({ mkDerivation, base, directory, extra, filepath, Glob, simple-cmd - , simple-cmd-args + ({ mkDerivation, base, directory, extra, filepath, Glob + , http-directory, simple-cmd, simple-cmd-args }: mkDerivation { pname = "dnf-repo"; - version = "0.5"; - sha256 = "1adpbm76kra59jgbrx2b1lzi06lq3znwqy8wapx0p5qsf630kilw"; + version = "0.5.1"; + sha256 = "158gfmdwf77yd623782pjv4702xjnqfr5dxwl4chrbanvsdfg7si"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base directory extra filepath Glob simple-cmd simple-cmd-args + base directory extra filepath Glob http-directory simple-cmd + simple-cmd-args ]; testHaskellDepends = [ base simple-cmd ]; description = "DNF wrapper tool to control repos"; @@ -88410,8 +88523,8 @@ self: { }: mkDerivation { pname = "effectful"; - version = "2.2.0.0"; - sha256 = "0zymvpg7bbvgwpziqj3bfpxbb77d45kph0qcrdilfi9w1bbjg63r"; + version = "2.2.1.0"; + sha256 = "0p2kr9vcyhcpvyrqbvwmjjh4k2lsrrhhq6rdi087iyvd7vj33al2"; libraryHaskellDepends = [ async base bytestring directory effectful-core process stm time unliftio @@ -88433,8 +88546,8 @@ self: { }: mkDerivation { pname = "effectful-core"; - version = "2.2.0.0"; - sha256 = "0i4ybsqkamsg91vp4pkr7pxpscfk5n44far9c53cbnh49nx14jqg"; + version = "2.2.1.0"; + sha256 = "0439fk1gr2jq663zl6p0ra9hkzmjm9ad24wnbrbz1nnl5v01ay2s"; libraryHaskellDepends = [ base containers exceptions monad-control primitive transformers-base unliftio-core @@ -89473,8 +89586,8 @@ self: { }: mkDerivation { pname = "elm-bridge"; - version = "0.8.0"; - sha256 = "05xnbwxzxm80xccrd5g4f83gsvs7gmyg9a7a0xxyk10qx93j4rs3"; + version = "0.8.1"; + sha256 = "0qhxjgjmbs2gr43rzxhzr6hjygkjr7fiqka93vsfi13hpv6bw2p7"; libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ aeson base containers hspec QuickCheck text @@ -92226,33 +92339,6 @@ self: { }) {}; "ersatz" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, containers - , data-default, fail, lens, mtl, parsec, process, semigroups - , streams, temporary, transformers, unordered-containers - }: - mkDerivation { - pname = "ersatz"; - version = "0.4.12"; - sha256 = "0xdmp8yc22flb2p7bczb56k2z79kp4zs0y9x5430029whhz90bar"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array attoparsec base bytestring containers data-default lens mtl - process semigroups streams temporary transformers - unordered-containers - ]; - executableHaskellDepends = [ - array base containers fail lens mtl parsec semigroups - ]; - testHaskellDepends = [ array base ]; - description = "A monad for expressing SAT or QSAT problems using observable sharing"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "ersatz_0_4_13" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, containers , data-default, fail, lens, mtl, parsec, process, semigroups , streams, temporary, transformers, unordered-containers @@ -93190,10 +93276,8 @@ self: { }: mkDerivation { pname = "evdev"; - version = "2.1.0"; - sha256 = "1gzf9hpsi2dmcgsifq5z91ing9b5k56mm2hx9wbsa180pmq30lj3"; - revision = "1"; - editedCabalFile = "0c930gd1a9pwlr4p9r9d9nizr90g06l836rai5b83z5sa0s3p01n"; + version = "2.2.0"; + sha256 = "128i0rlxdskd63jjz887c0mjrrcm0v4xac8k2m0csglp7jap1cb7"; libraryHaskellDepends = [ base bytestring containers extra filepath-bytestring monad-loops rawfilepath time unix @@ -96500,6 +96584,27 @@ self: { broken = true; }) {}; + "faster-megaparsec" = callPackage + ({ mkDerivation, base, bytestring, cassava, containers, deepseq + , directory, megaparsec, mtl, QuickCheck, tasty-bench, temporary + , text + }: + mkDerivation { + pname = "faster-megaparsec"; + version = "0.1.2.0"; + sha256 = "0xrwh9jnbjq5i7iry0w3yz60qqi5qy46qq4fq31880rjm87qc68b"; + libraryHaskellDepends = [ base megaparsec mtl ]; + testHaskellDepends = [ + base containers megaparsec QuickCheck text + ]; + benchmarkHaskellDepends = [ + base bytestring cassava containers deepseq directory megaparsec + QuickCheck tasty-bench temporary text + ]; + description = "Speed up Megaparsec parsing when parsing succeeds"; + license = lib.licenses.gpl3Only; + }) {}; + "fastirc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-show , containers, monadLib, network-fancy @@ -100216,7 +100321,7 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; - "flat_0_5_2" = callPackage + "flat_0_6" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, filepath, ghc-prim, hashable, list-t, mono-traversable , pretty, primitive, QuickCheck, quickcheck-text, tasty @@ -100225,8 +100330,8 @@ self: { }: mkDerivation { pname = "flat"; - version = "0.5.2"; - sha256 = "189jgx5zd1m3wgn2mal93ak1p6qp9mkaz38gkfzvgv6nwgywxxix"; + version = "0.6"; + sha256 = "11mg3m760vm3b33c39h5n79lpsh9s4rjlmsmn6xxlycv2ms42cm4"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist ghc-prim hashable list-t mono-traversable pretty primitive text unordered-containers @@ -102647,7 +102752,7 @@ self: { mainProgram = "fourmolu"; }) {}; - "fourmolu_0_8_2_0" = callPackage + "fourmolu_0_9_0_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring , Cabal, containers, Diff, directory, dlist, exceptions, filepath , ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec @@ -102657,8 +102762,8 @@ self: { }: mkDerivation { pname = "fourmolu"; - version = "0.8.2.0"; - sha256 = "1wyfj3yfhp00pr0sjbkba8djjgp1pk8jabj48cps2nkgy5lqbyix"; + version = "0.9.0.0"; + sha256 = "0zq9fv5yszm7icirgwj8g4lhg21lg87fhz56sssjnfikzmkwyh1l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104422,8 +104527,8 @@ self: { pname = "ftp-client"; version = "0.5.1.4"; sha256 = "0c2xn2q24imrfgsx4zxzi24ciwkrly6n47lc5k5406j5b4znn5lf"; - revision = "2"; - editedCabalFile = "128c6lalfyjqsrycgk0773fwww3a914qd4w62vv3hx4vpmy75gq4"; + revision = "3"; + editedCabalFile = "1a7xya5c89lj4s73bd0cgr53id53xz4fnqzrizdibb6a90ml7g9r"; libraryHaskellDepends = [ attoparsec base bytestring connection containers exceptions network transformers @@ -108098,24 +108203,27 @@ self: { }) {}; "genvalidity-appendful" = callPackage - ({ mkDerivation, appendful, base, containers, criterion - , genvalidity, genvalidity-containers, genvalidity-criterion - , genvalidity-hspec, genvalidity-hspec-aeson, genvalidity-time - , genvalidity-uuid, hspec, mtl, pretty-show, QuickCheck, random - , time, uuid + ({ mkDerivation, appendful, autodocodec, autodocodec-yaml, base + , containers, criterion, genvalidity, genvalidity-containers + , genvalidity-criterion, genvalidity-sydtest + , genvalidity-sydtest-aeson, genvalidity-time, genvalidity-uuid + , mtl, pretty-show, QuickCheck, random, safe-coloured-text, sydtest + , sydtest-discover, time, uuid }: mkDerivation { pname = "genvalidity-appendful"; - version = "0.0.0.0"; - sha256 = "0sri0xdaqxpaapjspq4gipmvh7az3dilbzd4v5ihgcsjfk7kxmaj"; + version = "0.1.0.0"; + sha256 = "081a9m99mr1mvq9bysn3g0fq05f6zayb4401v6709jcw7szxfbwn"; libraryHaskellDepends = [ appendful base containers genvalidity genvalidity-containers genvalidity-time QuickCheck ]; testHaskellDepends = [ - appendful base containers genvalidity-hspec genvalidity-hspec-aeson - genvalidity-uuid hspec mtl pretty-show QuickCheck random time uuid + appendful autodocodec autodocodec-yaml base containers + genvalidity-sydtest genvalidity-sydtest-aeson genvalidity-uuid mtl + pretty-show QuickCheck random safe-coloured-text sydtest time uuid ]; + testToolDepends = [ sydtest-discover ]; benchmarkHaskellDepends = [ appendful base criterion genvalidity-criterion ]; @@ -109910,12 +110018,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-exactprint_1_6_0" = callPackage + "ghc-exactprint_1_6_1" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghc-exactprint"; - version = "1.6.0"; - sha256 = "1yj0vn42sysilikylabnncq2g005mnmpf8n7sn0a6lphpcv9gdcf"; + version = "1.6.1"; + sha256 = "1ihr3mffcm0z4plkgysiki5l225ayrxgjfjqx37ysqgp7vvnsr08"; isLibrary = true; isExecutable = true; description = "ExactPrint for GHC"; @@ -110140,7 +110248,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_2_4_20220729" = callPackage + "ghc-lib_9_2_5_20221107" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, time @@ -110148,8 +110256,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.2.4.20220729"; - sha256 = "16whiazjynzj6qw1rmadyrxkibvmyhfzxzw42cv0ya9ijzlplhpq"; + version = "9.2.5.20221107"; + sha256 = "0layv7zsjlah3dmr538g34pg7cwwiawg0xcihyjxdh2x5q5qi05s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -110162,7 +110270,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib_9_4_2_20220822" = callPackage + "ghc-lib_9_4_3_20221104" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, stm, time @@ -110170,8 +110278,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.4.2.20220822"; - sha256 = "0ri29jyrs31ai4a1w3a9jwxc6xb1hqp64gxbwb5y7mbfyi5ray30"; + version = "9.4.3.20221104"; + sha256 = "0qvlf7i5lk7d4q8kaq4b783kvrswl9q5idlw3ggqhph910bgvcwn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -110224,15 +110332,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_2_4_20220729" = callPackage + "ghc-lib-parser_9_2_5_20221107" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.2.4.20220729"; - sha256 = "0rlm6znxrhs3s9s6c7qblvl03lscydx3dridyp985i593jyan55s"; + version = "9.2.5.20221107"; + sha256 = "1xh8rm5lwbh96g4v34whkcbb1yjsyvx3rwwycj30lrglhqk7f4c4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -110245,15 +110353,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib-parser_9_4_2_20220822" = callPackage + "ghc-lib-parser_9_4_3_20221104" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.4.2.20220822"; - sha256 = "0irqp5v5vsmv4jmwizl0ag9v43bxfi14m2n977xzya27fdwzvc9y"; + version = "9.4.3.20221104"; + sha256 = "10j4vfpajr716bnipfr1rfc6r99gdfc3pjmp80lqdsfzv7xfbgj4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -118924,8 +119032,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.6.6.0"; - sha256 = "1pc89l3kirw7d8bzzbsivnf2mcfd15bk3kl1x2f7i0fdgk06apzy"; + version = "0.6.6.3"; + sha256 = "0rxkpxm7606lpiw4csixqfmd025f7rp6ivv86c6ximjlqzz1krhz"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving generic-random lens lens-aeson monad-logger mtl @@ -120232,10 +120340,8 @@ self: { }: mkDerivation { pname = "graphql-client"; - version = "1.1.1"; - sha256 = "1d00ib9c8ps8vv1qgrkjfzrjbgbsdnp1jiz7779bwm76j88vggb4"; - revision = "5"; - editedCabalFile = "0kbpsca7iybc1ra1fm04c8axmbd18czgn1rq93j0ak9979yw79gd"; + version = "1.2.0"; + sha256 = "1570gsfz3f2dlqpmmb00kr2hcjsfz9p4knfnwvjcm2lij7avcvnp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122342,24 +122448,25 @@ self: { }) {}; "h-raylib" = callPackage - ({ mkDerivation, base, c, libGL, libX11, libXcursor, libXi + ({ mkDerivation, base, c, libGL, libX11, libXcursor, libXext, libXi , libXinerama, libXrandr }: mkDerivation { pname = "h-raylib"; - version = "4.5.0.2"; - sha256 = "0yxjr2y12fj2mhis8gy3wz0115nbiznx6llxapbylcw4zx9vnb8i"; + version = "4.5.0.3"; + sha256 = "05k7z23fkjdwlq379vcd9ahqch52hkwlpmy774xafrbh2wrfli3d"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ - c libGL libX11 libXcursor libXi libXinerama libXrandr + c libGL libX11 libXcursor libXext libXi libXinerama libXrandr ]; description = "Raylib bindings for Haskell"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; - inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXi; - inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr;}; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr;}; "h-reversi" = callPackage ({ mkDerivation, base, blank-canvas, containers, hspec, QuickCheck @@ -124182,15 +124289,16 @@ self: { "hadolint" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, colourista , containers, cryptonite, data-default, deepseq, directory - , email-validate, filepath, foldl, gitrev, hspec, HsYAML, HUnit - , ilist, language-docker, megaparsec, mtl, network-uri - , optparse-applicative, parallel, parsec, prettyprinter, semver - , ShellCheck, silently, spdx, split, text, time, timerep, void + , email-validate, filepath, foldl, gitrev, hspec, hspec-discover + , HsYAML, HUnit, ilist, language-docker, megaparsec, mtl + , network-uri, optparse-applicative, parallel, parsec + , prettyprinter, semver, ShellCheck, silently, spdx, split, text + , time, timerep, void }: mkDerivation { pname = "hadolint"; - version = "2.11.0"; - sha256 = "1k5xjy064q6v306kaqkglkwzk5qwnljs7x550rxjk6012d8allcm"; + version = "2.12.0"; + sha256 = "190ighmy5bg21b67n8msli8im6xp1z4bh3cjadfpr76mikxk25vl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124209,6 +124317,7 @@ self: { HUnit language-docker megaparsec optparse-applicative ShellCheck silently split text ]; + testToolDepends = [ hspec-discover ]; description = "Dockerfile Linter JavaScript API"; license = lib.licenses.gpl3Only; mainProgram = "hadolint"; @@ -125217,7 +125326,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "hal_1_0_0" = callPackage + "hal_1_0_0_1" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, conduit, conduit-extra, containers, exceptions , hashable, hedgehog, hspec, hspec-hedgehog, http-client @@ -125226,10 +125335,8 @@ self: { }: mkDerivation { pname = "hal"; - version = "1.0.0"; - sha256 = "0mfdxjlypb1sj2kcsqks6anh80xy1azcg9lvlpkgz7dgdpjfygaq"; - revision = "2"; - editedCabalFile = "0hc2b8bdsbd1q1j7d8l64d51q3apsmsfs1blzw0fg3cjzd4v2slc"; + version = "1.0.0.1"; + sha256 = "1gdd0nbwm6hma57nw1y1gd0cc6z9zhhmim6l5miql2j6dk909mdv"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive conduit conduit-extra containers exceptions hashable http-client http-types @@ -127013,20 +127120,20 @@ self: { }) {}; "harfbuzz-pure" = callPackage - ({ mkDerivation, base, bytestring, freetype2, harfbuzz, parallel - , text, utf8-light + ({ mkDerivation, base, bytestring, derive-storable, freetype2 + , harfbuzz, parallel, text, utf8-light }: mkDerivation { pname = "harfbuzz-pure"; - version = "0.1.0.0"; - sha256 = "1djgq14d62zh2rhs10i5l6b78kmyvd3r6qghd36vhykza4lg2div"; + version = "1.0.0.0"; + sha256 = "1bydw57ab1qlicrs6cav3vk0jzqkvhnwb8c0k7ba48fmjyihi5fp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring freetype2 text utf8-light + base bytestring derive-storable freetype2 text utf8-light ]; libraryPkgconfigDepends = [ harfbuzz ]; - executableHaskellDepends = [ base bytestring parallel ]; + executableHaskellDepends = [ base bytestring parallel text ]; description = "Pure-functional Harfbuzz language bindings"; license = lib.licenses.mit; mainProgram = "shape-text"; @@ -137078,12 +137185,27 @@ self: { pname = "hex-text"; version = "0.1.0.6"; sha256 = "1a5ccvbj7asbx92f4309qfwwih8ffnfi5kkahdn6dp444xa374r7"; + revision = "2"; + editedCabalFile = "00bwakiri9vbn05zi7alwhl5rdg13ls3pydcrgc0q4v8banrp868"; libraryHaskellDepends = [ base base16-bytestring bytestring text ]; testHaskellDepends = [ base base16-bytestring bytestring text ]; description = "ByteString-Text hexidecimal conversions"; license = lib.licenses.mit; }) {}; + "hex-text_0_1_0_7" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, text }: + mkDerivation { + pname = "hex-text"; + version = "0.1.0.7"; + sha256 = "1xyyr6570dbp6mgarz8v56s9kg4pfzk1dc10nw0gg51j6xl1c2zn"; + libraryHaskellDepends = [ base base16-bytestring bytestring text ]; + testHaskellDepends = [ base base16-bytestring bytestring text ]; + description = "ByteString-Text hexidecimal conversions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hexchat" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -145396,10 +145518,8 @@ self: { }: mkDerivation { pname = "hpc-lcov"; - version = "1.0.1"; - sha256 = "01ws5y2vavgm7151dcabw3jwny1prrnzn5b04q76m5gc6a36wivl"; - revision = "4"; - editedCabalFile = "0mds8q19pqxgrmyzgzrc01zb6wf7gx5cjl8brvw7ljkyrb2n2lya"; + version = "1.1.0"; + sha256 = "009z1i0ddjx7sazybirrpw99675p1fyl84ykg4dyypa7rz81vv3z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers hpc ]; @@ -161030,25 +161150,25 @@ self: { "inline-r" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , data-default-class, deepseq, directory, exceptions, filepath - , ieee754, inline-c, mtl, pretty, primitive, process + , heredoc, ieee754, inline-c, mtl, pretty, primitive, process , quickcheck-assertions, R, reflection, setenv, silently - , singletons, strict, tasty, tasty-expected-failure, tasty-golden - , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text - , th-lift, th-orphans, transformers, unix, vector + , singletons, singletons-th, strict, tasty, tasty-expected-failure + , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell + , temporary, text, th-lift, th-orphans, transformers, unix, vector }: mkDerivation { pname = "inline-r"; - version = "0.10.5"; - sha256 = "1jaj3p4vj9g1pk4rfs1sywbq04w24g137yvl6g6mlsxyzd4mldwh"; + version = "1.0.0"; + sha256 = "0b7xsfglhb9mjac79ch07fd426bkdg22nwdg50j3jj906bi65jba"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq - exceptions inline-c mtl pretty primitive process reflection setenv - singletons template-haskell text th-lift th-orphans transformers - unix vector + exceptions heredoc inline-c mtl pretty primitive process reflection + setenv singletons singletons-th template-haskell temporary text + th-lift th-orphans transformers unix vector ]; libraryPkgconfigDepends = [ R ]; testHaskellDepends = [ - base bytestring directory filepath ieee754 mtl process + base bytestring directory filepath heredoc ieee754 mtl process quickcheck-assertions silently singletons strict tasty tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck template-haskell temporary text unix vector @@ -172967,15 +173087,15 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "language-docker_11_0_0" = callPackage + "language-docker_12_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, hspec, hspec-megaparsec, HUnit, megaparsec , prettyprinter, QuickCheck, split, text, time }: mkDerivation { pname = "language-docker"; - version = "11.0.0"; - sha256 = "1j8aib6pq7ghmsi3l2p554l8gnapi0jd3qsi8vhdn2mgvw2n1948"; + version = "12.0.0"; + sha256 = "1slrq343rcg9shmqxxy8kzk911071x31q61q75dnldnm3x27j6by"; libraryHaskellDepends = [ base bytestring containers data-default data-default-class megaparsec prettyprinter split text time @@ -174507,8 +174627,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "3.0.2"; - sha256 = "1wh0an9g3hzpmdp2jayag7dknajivl07h273ar1qplrfd1js5fd6"; + version = "3.0.3"; + sha256 = "0j5j4x94r7ha7amv0cggs7n7n9vyx1ga5kwdr8mcddc7karz18cg"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables hedis @@ -178756,8 +178876,8 @@ self: { ({ mkDerivation, array, base, constraints }: mkDerivation { pname = "linear-smc"; - version = "1.0.0"; - sha256 = "13b1gvpnpxvkswigd9cdq289m6d68vqddnq95p0i65vr2hhard8i"; + version = "1.0.1"; + sha256 = "0xgrsjqfxzz1qbphv9r0kh4agg6cjz712isk5c16zywldw5hrx9q"; libraryHaskellDepends = [ base constraints ]; testHaskellDepends = [ array base constraints ]; description = "Build SMC morphisms using linear types"; @@ -185997,8 +186117,8 @@ self: { ({ mkDerivation, base, tidal }: mkDerivation { pname = "maquinitas-tidal"; - version = "0.2.10"; - sha256 = "1p1n21hzmkk7czwnmyl4hm36jvn0m05wid3zdwiqhbxq3mw46sxa"; + version = "0.2.11"; + sha256 = "1bg0az68jzxkb54rx7zf7bbkdkp5h0aqxyy78d8caaimc5ch2mbv"; libraryHaskellDepends = [ base tidal ]; description = "library for MIDI control of hardware"; license = lib.licenses.mit; @@ -190372,8 +190492,8 @@ self: { }: mkDerivation { pname = "migrant-core"; - version = "0.1.0.2"; - sha256 = "1na0vcrmw3vy6v9qxxpprhga9ja7izwbp856pdpqiq98p4h8xmiw"; + version = "0.1.0.3"; + sha256 = "15g7w2bpzhpp0gann0s8sj5ha315jf3bwlhkapfbrbjmswph0fgf"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck text @@ -190391,8 +190511,8 @@ self: { }: mkDerivation { pname = "migrant-hdbc"; - version = "0.1.0.2"; - sha256 = "084vqb1z0ipxn07nswlcw0bbh0bfywm7hyvakb75xg8rv5kfak15"; + version = "0.1.0.3"; + sha256 = "181n17jxwii3c64crzrpxry9fbpmclpanf6sqbb3rc9vdpm7df0g"; libraryHaskellDepends = [ base HDBC migrant-core text ]; testHaskellDepends = [ base HDBC HDBC-sqlite3 HUnit migrant-core process QuickCheck random @@ -190410,8 +190530,8 @@ self: { }: mkDerivation { pname = "migrant-postgresql-simple"; - version = "0.1.0.2"; - sha256 = "1x1gsf0vp82n6dmyiamj1cvs9fww7j1ffh6d9qr075z5sj8zbhzx"; + version = "0.1.0.3"; + sha256 = "096lj9ibminyfb09ciab20q014mqhwahqh3prc530lhv5arin1ml"; libraryHaskellDepends = [ base migrant-core postgresql-simple text ]; @@ -190430,8 +190550,8 @@ self: { }: mkDerivation { pname = "migrant-sqlite-simple"; - version = "0.1.0.2"; - sha256 = "140fchiid0kjp1cdw114w497h0fsrskn9195bkjv44sdmq2l8car"; + version = "0.1.0.3"; + sha256 = "0gcji3kmdndn77kg74bxki32fwrvzafjv4svpxj31advprn6jdgx"; libraryHaskellDepends = [ base migrant-core sqlite-simple text ]; testHaskellDepends = [ base HUnit migrant-core QuickCheck sqlite-simple tasty tasty-hunit @@ -192408,8 +192528,8 @@ self: { ({ mkDerivation, base, doctest, typelits-witnesses }: mkDerivation { pname = "modular-arithmetic"; - version = "2.0.0.1"; - sha256 = "132cxgrw6lsdkpqi69v1f9jgl5icslwi5qclv4rc03hn0mcnl2sz"; + version = "2.0.0.2"; + sha256 = "1bbn3pwvpl9v7a8gkxx83w2s8mk2q9gin7yvkkr97f64rdf8lnrq"; libraryHaskellDepends = [ base typelits-witnesses ]; testHaskellDepends = [ base doctest typelits-witnesses ]; description = "A type for integers modulo some constant"; @@ -192726,8 +192846,8 @@ self: { }: mkDerivation { pname = "monad-bayes"; - version = "1.0.0"; - sha256 = "1s5niiss16a5lgw2jhda3c34r1ylcjb5k14bk0n7p7l117xpxsza"; + version = "1.1.0"; + sha256 = "0zpgmai2wh8iqdg8ds9y1928fsila80dhpidgz4hp0jkxkk988gh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195448,8 +195568,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.25.0"; - sha256 = "08vi8g73c55ky6qrgkq57h1zbpkavv0ajfd16i86s6zdaxpk3fhm"; + version = "0.26.0"; + sha256 = "1x1hg60l7zbdb7kg2gx93zxknd9f7bbdvr6r9hcy8w86h8aplilm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -195478,8 +195598,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-app"; - version = "0.25.0"; - sha256 = "09skrg2pasx3hdm13sq9ajka5yh5wsc1wc8rphc9g6pa7hpnnsxh"; + version = "0.26.0"; + sha256 = "1dq0hnm1bsy43vbrs2rm5df5j9yy55azj420jf8fs71676xni7hn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec @@ -195529,8 +195649,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.25.0"; - sha256 = "01brdkc2vqipif5942hrzli45agb7rk8wlhx2m1j9zhcxhsbhlwf"; + version = "0.26.0"; + sha256 = "0n8x888qhamlb6pkk4sa864mb3y7h261s1f83waqg0d7qdwcp5nx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers file-embed modern-uri @@ -195560,8 +195680,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen"; - version = "0.25.0"; - sha256 = "0hisqds2fn7m53hddvxw4glgwghqnx3qg0hhdc6c4zjafyfkbckf"; + version = "0.26.0"; + sha256 = "1mdhifqqj44dr9j2z4nh0m8n4836mv8cav9qn155b3nairfh3w3a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195590,8 +195710,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen-utils"; - version = "0.25.0"; - sha256 = "1xnszpmzw0jl9dshzqs5vr9kjnm9sbi0jbgpjb44s9bd4hdgyxq5"; + version = "0.26.0"; + sha256 = "0nhv20vn8v73zri9ws3rwyi9xyshp6pm7v610rrwfa43wyxlpq5g"; libraryHaskellDepends = [ base bytestring containers morpheus-graphql-core prettyprinter relude template-haskell text unordered-containers @@ -195609,8 +195729,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.25.0"; - sha256 = "07ay9vzhlxgsv9lw3b22c59r00b6f0w2c90qn14a349lkjhl1wfa"; + version = "0.26.0"; + sha256 = "0cj78h29ryalxnx4hzpl5kywqdcvjxvxqlc6axibb1cmajn4kbqm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec mtl relude @@ -195638,8 +195758,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-server"; - version = "0.25.0"; - sha256 = "02lhrvz00l2486n7nihs8ka92hxa3idzlzx10fn142kqli65bwwi"; + version = "0.26.0"; + sha256 = "1aca18d60ja6awgsvwjjbikqhvspn3wans1dvh57g37ma1p1v331"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -195664,8 +195784,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-subscriptions"; - version = "0.25.0"; - sha256 = "063gszwrjlszqg973axyig9alrix0fj7j4n2c01wdaxyjmxmzdjx"; + version = "0.26.0"; + sha256 = "1kmd37w3kp2mdhz64fwlyl9v7p10x3p6fbzw535kipic89y9pcx2"; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-app morpheus-graphql-core mtl relude text transformers unliftio-core unordered-containers @@ -195692,14 +195812,14 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql-tests_0_25_0" = callPackage + "morpheus-graphql-tests_0_26_0" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty , tasty-hunit, text, unordered-containers }: mkDerivation { pname = "morpheus-graphql-tests"; - version = "0.25.0"; - sha256 = "1gnysygk4rvcyv85f86yhcxl0rlq5hk5avanyv428fdirsjkkn5q"; + version = "0.26.0"; + sha256 = "0dyza53pp9s16y8mlpm63b9ds396lqf8wsj2qaymyy18iakcfb9m"; libraryHaskellDepends = [ aeson base bytestring directory relude tasty tasty-hunit text unordered-containers @@ -196513,8 +196633,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "mr-env"; - version = "0.1.0.4"; - sha256 = "05f89d0lxmi8w7hgdlqrgxh2abnjghcgjhzmra41p28h26adqnfm"; + version = "0.1.0.5"; + sha256 = "0hy9hqy3ijrg4l85lj6g5y48cj812y7i6nkb4q8cq2yshdchj6pi"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A simple way to read environment variables in Haskell"; @@ -199448,26 +199568,6 @@ self: { }) {}; "mysql-simple" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , bytestring, containers, hspec, mysql, old-locale, pcre-light - , text, time, vector - }: - mkDerivation { - pname = "mysql-simple"; - version = "0.4.8.1"; - sha256 = "18w6mp7s1dmvwzqdgdzywhp5li3h4kisrhgxllwi578nddwg2yx3"; - libraryHaskellDepends = [ - attoparsec base base16-bytestring blaze-builder bytestring - containers mysql old-locale pcre-light text time vector - ]; - testHaskellDepends = [ - base blaze-builder bytestring hspec mysql text time - ]; - description = "A mid-level MySQL client library"; - license = lib.licenses.bsd3; - }) {}; - - "mysql-simple_0_4_9" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , bytestring, containers, hspec, mysql, old-locale, pcre-light , text, time, vector @@ -199485,7 +199585,6 @@ self: { ]; description = "A mid-level MySQL client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mysql-simple-quasi" = callPackage @@ -206574,6 +206673,46 @@ self: { license = lib.licenses.asl20; }) {}; + "nvim-hs_2_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit + , containers, data-default, deepseq, foreign-store, hslogger, hspec + , hspec-discover, HUnit, megaparsec, messagepack, mtl, network + , optparse-applicative, path, path-io, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, resourcet, stm + , streaming-commons, template-haskell + , template-haskell-compat-v0208, text, time, time-locale-compat + , transformers, transformers-base, typed-process, unliftio + , unliftio-core, utf8-string, vector, void + }: + mkDerivation { + pname = "nvim-hs"; + version = "2.3.0.0"; + sha256 = "0jc0wzxfkah115j0y4pa4hvr4wziba4q319x5ddgb9jbc52rqh7r"; + libraryHaskellDepends = [ + base bytestring cereal cereal-conduit conduit containers + data-default deepseq foreign-store hslogger megaparsec messagepack + mtl network optparse-applicative path path-io prettyprinter + prettyprinter-ansi-terminal resourcet stm streaming-commons + template-haskell template-haskell-compat-v0208 text time + time-locale-compat transformers transformers-base typed-process + unliftio unliftio-core utf8-string vector void + ]; + testHaskellDepends = [ + base bytestring cereal cereal-conduit conduit containers + data-default foreign-store hslogger hspec hspec-discover HUnit + megaparsec messagepack mtl network optparse-applicative path + path-io prettyprinter prettyprinter-ansi-terminal QuickCheck + resourcet stm streaming-commons template-haskell + template-haskell-compat-v0208 text time time-locale-compat + transformers transformers-base typed-process unliftio unliftio-core + utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell plugin backend for neovim"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "nvim-hs-contrib" = callPackage ({ mkDerivation, base, bytestring, data-default, directory , filepath, hspec, hspec-discover, messagepack, mtl, nvim-hs @@ -207563,8 +207702,8 @@ self: { }: mkDerivation { pname = "oidc-client"; - version = "0.6.1.0"; - sha256 = "0hhjndh4q2a9694rhylrqk2a8bzy8x9i5k4is2w7709sifydip1y"; + version = "0.7.0.0"; + sha256 = "0cc1psif3s6qmina5sx49clvpg54b6sapcvq4ax3r0afsp4hdl3m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210745,17 +210884,6 @@ self: { }) {}; "ordered-containers" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "ordered-containers"; - version = "0.2.2"; - sha256 = "1j92dm36s0cfhc7s4k3dk36ibkvr6w1nhaq6q1m5vkbh1qrwfnn7"; - libraryHaskellDepends = [ base containers ]; - description = "Set- and Map-like types that remember the order elements were inserted"; - license = lib.licenses.bsd3; - }) {}; - - "ordered-containers_0_2_3" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "ordered-containers"; @@ -210764,7 +210892,6 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Set- and Map-like types that remember the order elements were inserted"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ordering-util" = callPackage @@ -212289,8 +212416,8 @@ self: { pname = "palette"; version = "0.3.0.2"; sha256 = "0820n3cj4zy9s46diln2rrs4lrxbipkhdw74p2w42gc7k1nlj54i"; - revision = "4"; - editedCabalFile = "07yjz9hsmfm5jh05i4nqc6iax61ssr97475l7pf3bbdp8bam39wl"; + revision = "5"; + editedCabalFile = "1h5vs204qkq0m9ks5sf7f300drpkinkhinvmnijq8x0mbjl8hsg4"; libraryHaskellDepends = [ array base colour containers MonadRandom ]; @@ -219169,8 +219296,8 @@ self: { pname = "phatsort"; version = "0.5.0.1"; sha256 = "14czx4s3ywfcxbw8lr60i3cdk62rcfr7m1v98mx3qm1gjinll5js"; - revision = "1"; - editedCabalFile = "06s8xg07za1d23wai8pb7gvbcri2vmbv0jks7as8d8mf82giqvz8"; + revision = "2"; + editedCabalFile = "087vq0cfrvqgqrph5kkpyrvyfc72n9jh7bip68s30w5y4v55a821"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225972,8 +226099,8 @@ self: { }: mkDerivation { pname = "postgresql-migration"; - version = "0.2.1.4"; - sha256 = "0p8rggalgijw02p7m77x443md5dg1kjvvm06v980cchsj148c80s"; + version = "0.2.1.6"; + sha256 = "0zx6pa9s8k3gq1sgn8pj9xwdlj0wlx49d1mxgmd9s2zk9flfzybf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230087,8 +230214,8 @@ self: { }: mkDerivation { pname = "project-m36"; - version = "0.9.5"; - sha256 = "01gd1hi7x515q1y2nz3zsx3481rb13f30i6xccyzm4fjn7p08mv7"; + version = "0.9.6"; + sha256 = "067z934phddvi7r4kp3b1ykfz62vak395j9wlwm36m9rn526ih8g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230125,7 +230252,7 @@ self: { modern-uri MonadRandom mtl network optparse-applicative parallel parser-combinators prettyprinter random scientific semigroups stm stm-containers temporary text time transformers - unordered-containers uuid vector websockets winery + unordered-containers uuid vector wai warp websockets winery ]; benchmarkHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring @@ -234372,19 +234499,19 @@ self: { }) {}; "quickcheck-lockstep" = callPackage - ({ mkDerivation, base, containers, directory, filepath, mtl - , QuickCheck, quickcheck-dynamic, tasty, tasty-hunit + ({ mkDerivation, base, constraints, containers, directory, filepath + , mtl, QuickCheck, quickcheck-dynamic, tasty, tasty-hunit , tasty-quickcheck, temporary }: mkDerivation { pname = "quickcheck-lockstep"; - version = "0.1.0"; - sha256 = "0i0sqd5fky5d8imlrqazmr7cpdm71mdgv7sagyx9f1bb38p4yr9g"; + version = "0.2.0"; + sha256 = "1vc0ry2qp4c99pql6mgb4csffsjs9qgwciz58g68wbrjqp7rgm2w"; libraryHaskellDepends = [ - base containers mtl QuickCheck quickcheck-dynamic + base constraints containers mtl QuickCheck quickcheck-dynamic ]; testHaskellDepends = [ - base containers directory filepath mtl QuickCheck + base constraints containers directory filepath mtl QuickCheck quickcheck-dynamic tasty tasty-hunit tasty-quickcheck temporary ]; description = "Library for lockstep-style testing with 'quickcheck-dynamic'"; @@ -244030,8 +244157,8 @@ self: { }: mkDerivation { pname = "ret"; - version = "0.1.5.1"; - sha256 = "0jac5hidynwqnfik8h2fkf45dm1cdf6ql6zxwyap14m7z3jbv48n"; + version = "0.1.5.2"; + sha256 = "1lsqjqib4nvxacsjlr4207vwwxdd86wxxjvxw4vqra6a5clj6g08"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -245323,8 +245450,8 @@ self: { }: mkDerivation { pname = "rio-prettyprint"; - version = "0.1.1.0"; - sha256 = "1h092l46pfm6k3n0vb6c67gb64kahzc97qv45rhvp0cq2y5bqykf"; + version = "0.1.2.0"; + sha256 = "0xql9rjd0b8vyfllb9h8j7nxbrnrvz9kkclzlb3wln10l9pi5v03"; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array base Cabal colour mtl path rio text @@ -255515,8 +255642,8 @@ self: { }: mkDerivation { pname = "servant-polysemy"; - version = "0.1.3"; - sha256 = "132yf6fp0hl6k3859sywkfzsca8xsaqd3a4ca4vdqqjrllk0m88i"; + version = "0.1.4"; + sha256 = "07rma3yijvp9sd0lnnx77in0h4a8mm955v65hzh5mh0j91k406n2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -257876,6 +258003,8 @@ self: { pname = "shake-cabal"; version = "0.2.2.2"; sha256 = "1z1l4mah7nmpa6ycx9f5ynr9rn24irs1w44nq1j3ck25b408g460"; + revision = "1"; + editedCabalFile = "0r2b00d0r2i73sw4h5sksdck70924k0485ayai22n3ybdj8h6xwx"; libraryHaskellDepends = [ base binary Cabal composition-prelude deepseq directory filepath hashable shake @@ -262651,22 +262780,6 @@ self: { }) {}; "slist" = callPackage - ({ mkDerivation, base, containers, doctest, Glob, hedgehog, hspec - , hspec-hedgehog - }: - mkDerivation { - pname = "slist"; - version = "0.2.0.1"; - sha256 = "1b7b869gg3bkhx8ija601gwx9521mqy5sxkizc7ss73pqj4bhv60"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ - base doctest Glob hedgehog hspec hspec-hedgehog - ]; - description = "Sized list"; - license = lib.licenses.mpl20; - }) {}; - - "slist_0_2_1_0" = callPackage ({ mkDerivation, base, containers, doctest, Glob, hedgehog, hspec , hspec-hedgehog }: @@ -262680,7 +262793,6 @@ self: { ]; description = "Sized list"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "sloane" = callPackage @@ -266130,16 +266242,15 @@ self: { "souffle-haskell" = callPackage ({ mkDerivation, array, base, bytestring, criterion, deepseq , directory, filepath, hedgehog, hspec, hspec-hedgehog, mtl - , process, profunctors, temporary, text, text-short - , type-errors-pretty, vector + , process, profunctors, temporary, text, text-short, vector }: mkDerivation { pname = "souffle-haskell"; - version = "3.5.0"; - sha256 = "1s6398wfm6wly72b7kb7l13lskc1v4iivzz9d0vbwr8jv83grjbr"; + version = "3.5.1"; + sha256 = "0vxwbs0nc7rvlcfb62nx8fa5kghwgxakg4djqmsrcq2qdvxvifbh"; libraryHaskellDepends = [ array base bytestring deepseq directory filepath mtl process - profunctors temporary text text-short type-errors-pretty vector + profunctors temporary text text-short vector ]; testHaskellDepends = [ array base directory hedgehog hspec hspec-hedgehog profunctors @@ -268101,6 +268212,27 @@ self: { broken = true; }) {inherit (pkgs) sqlite;}; + "sqlite-easy" = callPackage + ({ mkDerivation, base, bytestring, direct-sqlite, hspec + , hspec-discover, migrant-core, resource-pool, text + }: + mkDerivation { + pname = "sqlite-easy"; + version = "0.1.0.0"; + sha256 = "0i971dvfsdxpm6chxbc53flcw8gyk45nsp8pm0q2avl8p9sab05f"; + revision = "1"; + editedCabalFile = "0b3sa10mk3c2gjpsgdnylb3iqpwycfnhpscqhi68s0vfvq2ph9w8"; + libraryHaskellDepends = [ + base bytestring direct-sqlite migrant-core resource-pool text + ]; + testHaskellDepends = [ + base direct-sqlite hspec hspec-discover text + ]; + testToolDepends = [ hspec-discover ]; + description = "A primitive yet easy to use sqlite library"; + license = lib.licenses.bsd3; + }) {}; + "sqlite-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only @@ -269723,8 +269855,8 @@ self: { }: mkDerivation { pname = "stackctl"; - version = "1.1.0.1"; - sha256 = "1rhwgc6qgip3p8qvyjahpk7xbv583p35rxba2x02ig7hbx3724y7"; + version = "1.1.0.3"; + sha256 = "0vvhvyvc6dz8l0df3f14qiy5851n2mv45gvjyz1cq94f44higfjw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -275257,6 +275389,29 @@ self: { broken = true; }) {}; + "supply-chain" = callPackage + ({ mkDerivation, base, supply-chain-core }: + mkDerivation { + pname = "supply-chain"; + version = "0.0.0.0"; + sha256 = "12rdx593ivps3khxpvq0r1kc99jhzvc0qfkdxa7jdy0qn22fi3dx"; + libraryHaskellDepends = [ base supply-chain-core ]; + description = "Composable request-response pipelines"; + license = lib.licenses.asl20; + }) {}; + + "supply-chain-core" = callPackage + ({ mkDerivation, base, tasty, tasty-hedgehog, tasty-hunit }: + mkDerivation { + pname = "supply-chain-core"; + version = "0.0.0.0"; + sha256 = "17ih0pvfk0xzr30q9094gf8ry8pvnannr92hvk86z7j514nv6q9h"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hedgehog tasty-hunit ]; + description = "Composable request-response pipelines"; + license = lib.licenses.asl20; + }) {}; + "surjective" = callPackage ({ mkDerivation, base, lens, mtl, template-haskell }: mkDerivation { @@ -275464,8 +275619,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "2.3.0.0"; - sha256 = "0ybnda16klwcajhhmzpiajdl39rkk52zb41k6b0qvd21dxmv2qji"; + version = "2.5.0.1"; + sha256 = "0iwrs53n6f4l2fqybamghbk5ha1w8vspiha6cnjx49hzljsjz738"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -280327,18 +280482,19 @@ self: { }) {}; "tasty-sugar" = callPackage - ({ mkDerivation, base, directory, filemanip, filepath, hedgehog - , kvitable, logict, microlens, mtl, optparse-applicative - , pretty-show, prettyprinter, raw-strings-qq, tasty, tasty-hedgehog - , tasty-hunit, text + ({ mkDerivation, base, containers, directory, filemanip, filepath + , hedgehog, kvitable, logict, microlens, mtl, optparse-applicative + , parallel, pretty-show, prettyprinter, raw-strings-qq, tasty + , tasty-hedgehog, tasty-hunit, text }: mkDerivation { pname = "tasty-sugar"; - version = "1.3.0.2"; - sha256 = "1hh2a3bzk0x0l4wqar7qb8kj9kwjlw1j5z7jxsia7a0p25wy8w8a"; + version = "2.0.0.1"; + sha256 = "0rgq5k9vv72c5826acpfscjfszvyi5bms5wjbw7bs0izimqw7b1j"; libraryHaskellDepends = [ - base directory filemanip filepath kvitable logict microlens mtl - optparse-applicative prettyprinter tasty text + base containers directory filemanip filepath kvitable logict + microlens mtl optparse-applicative parallel prettyprinter tasty + text ]; testHaskellDepends = [ base filepath hedgehog logict pretty-show prettyprinter @@ -283382,12 +283538,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-ansi_0_2_0" = callPackage + "text-ansi_0_2_1" = callPackage ({ mkDerivation, base, text, text-builder }: mkDerivation { pname = "text-ansi"; - version = "0.2.0"; - sha256 = "15sraxbiwwx49nz4kxhh2b45q222pcxzgm85rmaskpi7pswwj0b2"; + version = "0.2.1"; + sha256 = "1s0ad0nap9z0pzwl3nm2vglkz148qv120bngwy08bqb6vbs8w90p"; libraryHaskellDepends = [ base text text-builder ]; description = "Text styling for ANSI terminals"; license = lib.licenses.bsd3; @@ -283529,12 +283685,14 @@ self: { }) {}; "text-compression" = callPackage - ({ mkDerivation, base, containers, massiv, mtl }: + ({ mkDerivation, base, bytestring, containers, massiv, mtl, text }: mkDerivation { pname = "text-compression"; - version = "0.1.0.4"; - sha256 = "15bkgmlav4aybsgh7wg261fkhqg7phsc91sp1w26f9m2wb278xby"; - libraryHaskellDepends = [ base containers massiv mtl ]; + version = "0.1.0.7"; + sha256 = "0sxzcdfx2v0870w130vkw6iyg5w0k8vvkz7fj3b50kr4wl9wypb4"; + libraryHaskellDepends = [ + base bytestring containers massiv mtl text + ]; description = "A text compression library"; license = lib.licenses.bsd3; }) {}; @@ -285244,6 +285402,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-test-utils_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-golden, tasty-hunit + , template-haskell, th-orphans, transformers + }: + mkDerivation { + pname = "th-test-utils"; + version = "1.2.0"; + sha256 = "0p5j5mgjqwvkw0rcxlfkcflyqdz972ls70lprn38yjb32v3l8ncf"; + libraryHaskellDepends = [ + base template-haskell th-orphans transformers + ]; + testHaskellDepends = [ + base bytestring tasty tasty-golden tasty-hunit template-haskell + th-orphans transformers + ]; + description = "Utility functions for testing Template Haskell code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-to-exp" = callPackage ({ mkDerivation, base, hspec, template-haskell }: mkDerivation { @@ -286209,8 +286387,8 @@ self: { }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.2.0"; - sha256 = "1bw10jahy0s9ai6ryfdx58jzjib146x7kzqkg65z71brvm0cliza"; + version = "0.1.2.1"; + sha256 = "1crs90dy9ljprxb19x3zj92579njjw6ki5jnnjj8afrharim9ppj"; libraryHaskellDepends = [ base composition-prelude megaparsec text ]; @@ -287248,14 +287426,27 @@ self: { pname = "timer-wheel"; version = "0.3.0"; sha256 = "16v663mcsj0h17x4jriq50dps3m3f8wqcsm19kl48vrs7f4mp07s"; - revision = "2"; - editedCabalFile = "0kfckbmcf9c8538i38r40agrc31mgk771hfnm54sgslnam1idiym"; + revision = "3"; + editedCabalFile = "1lgavl752g968ki042dxha8d28dm8zfs8mzm5zl8xk4p0wi1iwdv"; libraryHaskellDepends = [ atomic-primops base psqueues vector ]; testHaskellDepends = [ base ]; description = "A timer wheel"; license = lib.licenses.bsd3; }) {}; + "timer-wheel_0_4_0_1" = callPackage + ({ mkDerivation, array, atomic-primops, base, ki, psqueues }: + mkDerivation { + pname = "timer-wheel"; + version = "0.4.0.1"; + sha256 = "0h8g9mgp7hcmksvgwwx2n1p9mavdsykqlavpdms7xbh0kgsb445z"; + libraryHaskellDepends = [ array atomic-primops base ki psqueues ]; + testHaskellDepends = [ base ]; + description = "A timer wheel"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "timerep" = callPackage ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, text, time @@ -293031,8 +293222,8 @@ self: { }: mkDerivation { pname = "twitchapi"; - version = "0.0.2"; - sha256 = "0lw7lr41lnm0jz3ig3y7y23348sp7mvpnihz90nh8j5iv74j7z12"; + version = "0.0.3"; + sha256 = "1wbkix4cmkzgg5mz6d721107nra00dr00nhigq55wkzhnpf39lbz"; libraryHaskellDepends = [ aeson base bytestring hoauth2 http-client text time timerep uri-bytestring @@ -307635,8 +307826,8 @@ self: { }: mkDerivation { pname = "welford-online-mean-variance"; - version = "0.1.0.1"; - sha256 = "1zzahm5d47rx1zx70i24mj6slkddwpa6hwyplda36x9xpkpjzr51"; + version = "0.1.0.2"; + sha256 = "041z3vgbnv2q6a9w80rjws3y0lwb56z1ws2ic8pyx79dvjb0y55q"; libraryHaskellDepends = [ base cereal deepseq vector ]; testHaskellDepends = [ base cereal deepseq QuickCheck tasty tasty-discover @@ -312271,6 +312462,8 @@ self: { pname = "xmonad"; version = "0.17.1"; sha256 = "1apqwyqmc51gamfgsvlanzqqig9qvjss89ibcamhnha1gs1k4jl8"; + revision = "2"; + editedCabalFile = "1rgwrnyb7kijzl2mqm8ks2nydh37q5vkbg4400rg9n6x13w2r9b3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -312322,6 +312515,8 @@ self: { pname = "xmonad-contrib"; version = "0.17.1"; sha256 = "0lwj8xkyaw6h0rv3lz2jdqrwzz7yghfmnhpndygkb3wgyhvq6dxb"; + revision = "1"; + editedCabalFile = "0dc9nbn0kaw98rgpi1rq8np601zjhdr1y0ydg6yb82wwaqawql6z"; libraryHaskellDepends = [ base bytestring containers deepseq directory filepath mtl process random time unix utf8-string X11 X11-xft xmonad From 6e4f74f19b05a348b39f2c932cbcf814bb97d756 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 11 Nov 2022 19:31:18 +0100 Subject: [PATCH 104/797] haskellPackages.h-raylib: remove broken flag Closes #197407. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d061f89c2770..fd91f3796fe1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2355,7 +2355,6 @@ broken-packages: - hquantlib - hquery - hR - - h-raylib - hreq-core - h-reversi - hricket diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b46fbdc286d5..b1f88b5ea529 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -122461,8 +122461,6 @@ self: { ]; description = "Raylib bindings for Haskell"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; From b4622ed855b2168a6526a52eb1d94f4e98bc7078 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 11 Nov 2022 12:01:44 -0800 Subject: [PATCH 105/797] obfs4: add meta fields This commit adds these meta fields: - license - changelog - downloadPage - longDescription from openwrt https://openwrt.org/packages/pkgdata/obfs4proxy It also improves the `meta.description` field to be a bit more descriptive. --- pkgs/tools/networking/obfs4/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 03e1d0ad5af2..af64c8190ebc 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -13,9 +13,23 @@ buildGoModule rec { vendorSha256 = "0yjanv5piygffpdfysviijl7cql2k0r05bsxnlj4hbamsriz9xqy"; meta = with lib; { - description = "A pluggable transport proxy"; + description = "Circumvents censorship by transforming Tor traffic between clients and bridges"; + longDescription = '' + Obfs4proxy is a tool that attempts to circumvent censorship by + transforming the Tor traffic between the client and the bridge. + This way censors, who usually monitor traffic between the client + and the bridge, will see innocent-looking transformed traffic + instead of the actual Tor traffic. obfs4proxy implements the + obfsucation protocols obfs2, obfs3, and obfs4. It is written in + Go and is compliant with the Tor pluggable transports + specification, and its modular architecture allows it to support + multiple pluggable transports. + ''; homepage = "https://www.torproject.org/projects/obfsproxy"; maintainers = with maintainers; [ thoughtpolice ]; mainProgram = "obfs4proxy"; + changelog = "https://gitweb.torproject.org/pluggable-transports/obfs4.git/plain/ChangeLog"; + downloadPage = "https://gitweb.torproject.org/pluggable-transports/obfs4.git/"; + license = with lib.licenses; [ bsd2 bsd3 gpl3 ]; }; } From 5736688c0beec50cb031833b22fd90c20d5bde94 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Fri, 11 Nov 2022 16:09:48 -0500 Subject: [PATCH 106/797] beekeeper-studio: 3.3.8 -> 3.6.2 Update to latest official release. Brings the nice feature of connecting locally via unix domain sockets. --- pkgs/development/tools/database/beekeeper-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/beekeeper-studio/default.nix b/pkgs/development/tools/database/beekeeper-studio/default.nix index c112fc3f773f..12e5a656d1aa 100644 --- a/pkgs/development/tools/database/beekeeper-studio/default.nix +++ b/pkgs/development/tools/database/beekeeper-studio/default.nix @@ -2,13 +2,13 @@ let pname = "beekeeper-studio"; - version = "3.3.8"; + version = "3.6.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${version}/Beekeeper-Studio-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha512 = "sha512-riBKlvOzBovJhXUf7YX6SJKshxwGiQR0jyWHfJRkq9+WMspPkpXg4sJMXziARHaa6durXZtqCfzQ08HrfqA4Qg=="; + sha512 = "sha512-an4Gqx2mx/rnkLe/LUAz3qRdrqWBcrWcdCiNi8Hz1OKBp1SWN3acU8RppIM0uwlrcBkjnigbbM5DZ2o+svA23A=="; }; appimageContents = appimageTools.extractType2 { From fd94629a326306fccfc0b51ecbc38f1c1fdbfc82 Mon Sep 17 00:00:00 2001 From: Lorenz Brun Date: Thu, 10 Nov 2022 03:57:10 +0100 Subject: [PATCH 107/797] qt5/qtwayland: fix popups being placed outside the screen QT 5 did not set layout constraints on their popups. This causes some compositors like GNOME to place the popups partially outside the screen. This change backports the corresponding fix, but with an exclusion for KDE as its current version does not work well with layout constraints. --- pkgs/development/libraries/qt-5/modules/qtwayland.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index 851e4ad6966b..e4870ec48463 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -1,4 +1,4 @@ -{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }: +{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config, fetchpatch }: qtModule { pname = "qtwayland"; @@ -11,5 +11,13 @@ qtModule { # wrapped executables from `wrapQtAppsHook` (see comment in patch for further # context). Beware: shared among different Qt5 versions. ./qtwayland-app_id.patch + # Backport of https://codereview.qt-project.org/c/qt/qtwayland/+/388338 + # Pulled from Fedora as they modified it to not apply to KDE as Plasma 5.x + # doesn't behave properly with the patch applied. See the discussion at + # https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/39 for details + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/qt5-qtwayland/raw/46376bb00d4c3dd3db2e82ad7ca5301ce16ea4ab/f/0080-Client-set-constraint-adjustments-for-popups-in-xdg.patch"; + sha256 = "sha256-XP+noYCk8fUdA0ItCqMjV7lSXDlNdB7Az9q7NRpupHc="; + }) ]; } From 20b813304a2766eefb661ea9585a58f9230d864e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Nov 2022 17:33:47 +0100 Subject: [PATCH 108/797] python310Packages.dulwich: add optional-dependencies - clean-up inputs --- .../python-modules/dulwich/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index a79de8f96c01..c3bab1180cf9 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -10,11 +10,10 @@ , glibcLocales , gnupg , gpgme -, mock -, urllib3 , paramiko , pytestCheckHook , pythonOlder +, urllib3 }: buildPythonPackage rec { @@ -36,18 +35,28 @@ buildPythonPackage rec { urllib3 ]; + passthru.optional-dependencies = { + fastimport = [ + fastimport + ]; + pgp = [ + gpgme + gnupg + ]; + paramiko = [ + paramiko + ]; + }; + checkInputs = [ - fastimport gevent geventhttpclient git glibcLocales - gpgme - gnupg - mock - paramiko pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.fastimport + ++ passthru.optional-dependencies.pgp + ++ passthru.optional-dependencies.paramiko; doCheck = !stdenv.isDarwin; @@ -70,7 +79,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Simple Python implementation of the Git file formats and protocols"; + description = "Implementation of the Git file formats and protocols"; longDescription = '' Dulwich is a Python implementation of the Git file formats and protocols, which does not depend on Git itself. All functionality is available in pure Python. From 218a36d6b9b56546af4f485174782f1d5a609e6c Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 12 Nov 2022 20:03:37 +0300 Subject: [PATCH 109/797] =?UTF-8?q?slock:=201.4=20=E2=86=92=201.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/misc/screensavers/slock/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index c23b5fdc249b..09fccd11d9e9 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -4,14 +4,13 @@ # https://git.suckless.org/slock/tree/config.def.h , conf ? null }: -with lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "slock"; - version = "1.4"; + version = "1.5"; src = fetchurl { - url = "https://dl.suckless.org/tools/slock-${version}.tar.gz"; - sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"; + url = "https://dl.suckless.org/tools/slock-${finalAttrs.version}.tar.gz"; + hash = "sha256-ruHj+/aid/tiWjg4BzuXm2SD57rKTOgvVt4f8ZLbDk0="; }; buildInputs = [ xorgproto libX11 libXext libXrandr libxcrypt ]; @@ -20,13 +19,13 @@ stdenv.mkDerivation rec { postPatch = "sed -i '/chmod u+s/d' Makefile"; - preBuild = optionalString (conf != null) '' + preBuild = lib.optionalString (conf != null) '' cp ${writeText "config.def.h" conf} config.def.h ''; makeFlags = [ "CC:=$(CC)" ]; - meta = { + meta = with lib; { homepage = "https://tools.suckless.org/slock"; description = "Simple X display locker"; longDescription = '' @@ -36,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; }; -} +}) From c8f5e3e9b19942de064cd4ef4de8290ed5d17eee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Nov 2022 18:11:33 +0000 Subject: [PATCH 110/797] outline: 0.66.2 -> 0.66.3 --- pkgs/servers/web-apps/outline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 03f8a0e45b7b..19cc2ee94cfd 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.66.2"; + version = "0.66.3"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - sha256 = "sha256-jRnw6UIUA3gAgyqQg6R1GOI4O8HXKnVfTH3d3SFBa9A="; + sha256 = "sha256-2o5rRVOd+dvJOzQFGuuA0PZmmK/wnItcNu8WX9WShQ8="; }; nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ]; From 743f87f165e8d382e2363db4a78eb85e6538fc70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?= =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= Date: Sat, 12 Nov 2022 22:59:53 +0100 Subject: [PATCH 111/797] maintainers: add gdamjan --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 86cec69705fb..90d05e043244 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4939,6 +4939,13 @@ githubId = 37017396; name = "gbtb"; }; + gdamjan = { + email = "gdamjan@gmail.com"; + matrix = "@gdamjan:spodeli.org"; + github = "gdamjan"; + githubId = 81654; + name = "Damjan Georgievski"; + }; gdinh = { email = "nix@contact.dinh.ai"; github = "gdinh"; From 3f76f26bef306f4184884fe92ece36b6f9975996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EF=BD=88=EF=BD=89=EF=BD=8C=EF=BD=8A=EF=BD=95=EF=BD=93?= =?UTF-8?q?=EF=BD=94=EF=BD=89?= Date: Fri, 11 Nov 2022 22:31:24 -0800 Subject: [PATCH 112/797] sigi: 3.4.3 -> 3.5.0 --- pkgs/applications/misc/sigi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/applications/misc/sigi/default.nix index 5b5bf57870df..132b8f0ab9e4 100644 --- a/pkgs/applications/misc/sigi/default.nix +++ b/pkgs/applications/misc/sigi/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "sigi"; - version = "3.4.3"; + version = "3.5.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-CDu/tllCwmt+UO4ae1uFkR4KKCWdxM4aW1O7oY59qHE="; + sha256 = "sha256-VUf5fCVOZCn0iY51eBS/fIvlxQF+BY+k75I+NY7yqzM="; }; - cargoSha256 = "sha256-pMOaw7Ra78aRisYF9ttbpjB/cbylpzZXw8DtBqn5Tjo="; + cargoSha256 = "sha256-ivSVcpUDGK0dJDy+jY7BYQIFCXu/npV0MiNe3nlsUho="; nativeBuildInputs = [ installShellFiles ]; # In case anything goes wrong. @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Organizing CLI for people who don't love organizing."; - homepage = "https://github.com/hiljusti/sigi"; + homepage = "https://github.com/sigi-cli/sigi"; license = licenses.gpl2; maintainers = with maintainers; [ hiljusti ]; }; From d77b0bb6a5ac11afb379c981d6d484a95b385961 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Sun, 13 Nov 2022 01:01:55 +0100 Subject: [PATCH 113/797] montserrat: fix build Changes needed after fetchzip changes in #173430 --- pkgs/data/fonts/montserrat/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix index 7d91f49eb3e4..cb396080e49f 100644 --- a/pkgs/data/fonts/montserrat/default.nix +++ b/pkgs/data/fonts/montserrat/default.nix @@ -1,21 +1,25 @@ { lib, fetchFromGitHub }: -let +fetchFromGitHub rec { pname = "montserrat"; version = "7.222"; -in fetchFromGitHub { - name = "${pname}-${version}"; + owner = "JulietaUla"; repo = pname; rev = "v${version}"; sha256 = "sha256-MeNnc1e5X5f0JyaLY6fX22rytHkvL++eM2ygsdlGMv0="; postFetch = '' - tar xf $downloadedFile --strip 1 - install -Dm 444 fonts/otf/*.otf -t $out/share/fonts/otf - install -Dm 444 fonts/ttf/*.ttf -t $out/share/fonts/ttf - install -Dm 444 fonts/webfonts/*.woff -t $out/share/fonts/woff - install -Dm 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2 + mkdir -p $out/share/fonts/{otf,ttf,woff,woff2} + + mv $out/fonts/otf/*.otf $out/share/fonts/otf + mv $out/fonts/ttf/*.ttf $out/share/fonts/ttf + mv $out/fonts/webfonts/*.woff $out/share/fonts/woff + mv $out/fonts/webfonts/*.woff2 $out/share/fonts/woff2 + + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob ''; meta = with lib; { From 2f103f2b1f4a9cd20fe00e331f1177cf31086f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= Date: Sun, 13 Nov 2022 13:34:39 +0100 Subject: [PATCH 114/797] lispPackages_new: Fix patching without build-with-compile-into-pwd Add patch for cffi-libffi on Darwin --- .../lisp-modules-new/lisp-packages.nix | 28 ++++--------------- .../development/lisp-modules-new/packages.nix | 1 + .../patches/cffi-libffi-darwin-ffi-h.patch | 14 ++++++++++ 3 files changed, 21 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/lisp-modules-new/patches/cffi-libffi-darwin-ffi-h.patch diff --git a/pkgs/development/lisp-modules-new/lisp-packages.nix b/pkgs/development/lisp-modules-new/lisp-packages.nix index 513f72a985e0..913296e9fce3 100644 --- a/pkgs/development/lisp-modules-new/lisp-packages.nix +++ b/pkgs/development/lisp-modules-new/lisp-packages.nix @@ -133,10 +133,6 @@ let in stdenv.mkDerivation (rec { inherit pname version nativeLibs javaLibs lispLibs lisp systems asds; - src = if builtins.length patches > 0 - then apply-patches args - else args.src; - # When src is null, we are building a lispWithPackages and only # want to make use of the dependency environment variables # generated by build-asdf-system @@ -248,24 +244,12 @@ let dontStrip = true; dontFixup = true; - } // args)); - - # Need to do that because we always want to compile straight from - # `src` for go-to-definition to work in SLIME. - apply-patches = { patches, src, ... }: - stdenv.mkDerivation { - inherit patches src; - pname = "source"; - version = "patched"; - dontConfigure = true; - dontBuild = true; - dontStrip = true; - dontFixup = true; - installPhase = '' - mkdir -pv $out - cp -r * $out - ''; - }; + } // (args // { + src = if builtins.length (args.patches or []) > 0 + then pkgs.applyPatches { inherit (args) src patches; } + else args.src; + patches = []; + }))); # Build the set of lisp packages using `lisp` # These packages are defined manually for one reason or another: diff --git a/pkgs/development/lisp-modules-new/packages.nix b/pkgs/development/lisp-modules-new/packages.nix index 3dee2b19231b..244d2f4b5b5f 100644 --- a/pkgs/development/lisp-modules-new/packages.nix +++ b/pkgs/development/lisp-modules-new/packages.nix @@ -102,6 +102,7 @@ let url = "https://github.com/cffi/cffi/archive/3f842b92ef808900bf20dae92c2d74232c2f6d3a.tar.gz"; sha256 = "1jilvmbbfrmb23j07lwmkbffc6r35wnvas5s4zjc84i856ccclm2"; }; + patches = [ ./patches/cffi-libffi-darwin-ffi-h.patch ]; }); cl-unicode = build-with-compile-into-pwd { diff --git a/pkgs/development/lisp-modules-new/patches/cffi-libffi-darwin-ffi-h.patch b/pkgs/development/lisp-modules-new/patches/cffi-libffi-darwin-ffi-h.patch new file mode 100644 index 000000000000..15c4a4588755 --- /dev/null +++ b/pkgs/development/lisp-modules-new/patches/cffi-libffi-darwin-ffi-h.patch @@ -0,0 +1,14 @@ +--- a/libffi/libffi-types.lisp ++++ b/libffi/libffi-types.lisp +@@ -43,9 +43,6 @@ + + (pkg-config-cflags "libffi" :optional t) + +-#+darwin +-(include "ffi/ffi.h") +-#-darwin + (include "ffi.h") + + (cenum status + +Diff finished. Sun Nov 13 00:23:10 2022 \ No newline at end of file From a505704e8f6c136ab015243c2807e39e012217d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 13 Nov 2022 14:31:55 +0100 Subject: [PATCH 115/797] qtwebkit: Mark known vulnerable The browser engine is based off an old Webkit version, receives no security backports, does no releases. The WebKitGTK people have counted over 500 CVEs they fixed since 2016. Adding known vulnerable to make people aware they're using a browser engine that is not up to todays standards and could very likely be easily compromised. Projects are recomended to migrate to qtwebengine instead. https://blogs.gnome.org/mcatanzaro/2017/02/08/an-update-on-webkit-security-updates/ https://github.com/qutebrowser/qutebrowser/issues/4039#issue-338246939 https://blogs.gnome.org/mcatanzaro/2022/11/04/stop-using-qtwebkit/ --- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index bebfbdda8d8b..76f3481386f3 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -69,5 +69,8 @@ qtModule { meta = { maintainers = with lib.maintainers; [ abbradar periklis ]; + knownVulnerabilities = [ + "QtWebkit upstream is unmaintained and receives no security updates, see https://blogs.gnome.org/mcatanzaro/2022/11/04/stop-using-qtwebkit/" + ]; }; } From f9e9336207b9a67b65f859783d502f096a27bf8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= Date: Sun, 13 Nov 2022 15:04:23 +0100 Subject: [PATCH 116/797] lispPackages_new: fix for patched sources not being picked up --- pkgs/development/lisp-modules-new/lisp-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/lisp-modules-new/lisp-packages.nix b/pkgs/development/lisp-modules-new/lisp-packages.nix index 913296e9fce3..aebcfdb1878e 100644 --- a/pkgs/development/lisp-modules-new/lisp-packages.nix +++ b/pkgs/development/lisp-modules-new/lisp-packages.nix @@ -197,7 +197,7 @@ let # # NOTE: It's important to read files from `src` instead of # from pwd to get go-to-definition working with SLIME - export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:${src}// + export CL_SOURCE_REGISTRY=$CL_SOURCE_REGISTRY:$src// # Similiarily for native deps export LD_LIBRARY_PATH=${makeLibraryPath nativeLibs}:$LD_LIBRARY_PATH @@ -205,7 +205,7 @@ let # Make asdf compile from `src` to pwd and load `lispLibs` # from storeDir. Otherwise it could try to recompile lisp deps. - export ASDF_OUTPUT_TRANSLATIONS="${src}:$(pwd):${storeDir}:${storeDir}" + export ASDF_OUTPUT_TRANSLATIONS="$src:$(pwd):${storeDir}:${storeDir}" # track lisp dependencies for graph generation # TODO: Do the propagation like for lisp, native and java like this: From 145bd93a310d0a79f458f06dab3c41fac45f5441 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 13 Nov 2022 17:08:56 +0300 Subject: [PATCH 117/797] kdevelop: remove qtwebkit from inputs Isn't used anyway. --- pkgs/applications/kde/kdevelop/kdevelop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kdevelop/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix index 4e7f576398e5..1d34e01813b0 100644 --- a/pkgs/applications/kde/kdevelop/kdevelop.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, cmake, gettext, pkg-config, extra-cmake-modules -, qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase +, qtquickcontrols, qttools, kde-cli-tools, qtbase , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons @@ -24,7 +24,7 @@ mkDerivation rec { ]; propagatedBuildInputs = [ - qtquickcontrols qtwebkit boost libkomparediff2 + qtquickcontrols boost libkomparediff2 kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner From c1c816dcc3a290fc1ae27576542704789111de4a Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 13 Nov 2022 17:09:12 +0300 Subject: [PATCH 118/797] rocs: remove qtwebkit from inputs Also seems unused. --- pkgs/applications/kde/rocs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix index bb5cd80bca23..80f5f4bb6d65 100644 --- a/pkgs/applications/kde/rocs.nix +++ b/pkgs/applications/kde/rocs.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, boost, - qtbase, qtscript, qtquickcontrols, qtwebkit, qtxmlpatterns, grantlee, + qtbase, qtscript, qtquickcontrols, qtxmlpatterns, grantlee, kdoctools, karchive, kxmlgui, kcrash, kdeclarative, ktexteditor, kguiaddons }: @@ -19,7 +19,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost - qtbase qtscript qtquickcontrols qtwebkit qtxmlpatterns grantlee + qtbase qtscript qtquickcontrols qtxmlpatterns grantlee kxmlgui kcrash kdeclarative karchive ktexteditor kguiaddons ]; } From 28609af5c71fad9cb8b3351957bf71ce7f7bbbed Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 13 Nov 2022 23:37:47 +0100 Subject: [PATCH 119/797] android-tools: 33.0.3 -> 33.0.3p1 --- .../android-tools-kernel-headers-6.0.diff | 82 ------------------- pkgs/tools/misc/android-tools/default.nix | 31 ++----- 2 files changed, 9 insertions(+), 104 deletions(-) delete mode 100644 pkgs/tools/misc/android-tools/android-tools-kernel-headers-6.0.diff diff --git a/pkgs/tools/misc/android-tools/android-tools-kernel-headers-6.0.diff b/pkgs/tools/misc/android-tools/android-tools-kernel-headers-6.0.diff deleted file mode 100644 index 38c0c9f39491..000000000000 --- a/pkgs/tools/misc/android-tools/android-tools-kernel-headers-6.0.diff +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/vendor/adb/client/usb_linux.cpp b/vendor/adb/client/usb_linux.cpp -index 25a50bd..0d09c47 100644 ---- a/vendor/adb/client/usb_linux.cpp -+++ b/vendor/adb/client/usb_linux.cpp -@@ -59,8 +59,15 @@ using namespace std::literals; - #define DBGX(x...) - - struct usb_handle { -+ usb_handle() : urb_in(0), urb_out(0) { -+ this->urb_in = new usbdevfs_urb; -+ this->urb_out = new usbdevfs_urb; -+ } -+ - ~usb_handle() { - if (fd != -1) unix_close(fd); -+ delete urb_in; -+ delete urb_out; - } - - std::string path; -@@ -72,8 +79,8 @@ struct usb_handle { - unsigned zero_mask; - unsigned writeable = 1; - -- usbdevfs_urb urb_in; -- usbdevfs_urb urb_out; -+ usbdevfs_urb *urb_in; -+ usbdevfs_urb *urb_out; - - bool urb_in_busy = false; - bool urb_out_busy = false; -@@ -304,7 +311,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) { - std::unique_lock lock(h->mutex); - D("++ usb_bulk_write ++"); - -- usbdevfs_urb* urb = &h->urb_out; -+ usbdevfs_urb* urb = h->urb_out; - memset(urb, 0, sizeof(*urb)); - urb->type = USBDEVFS_URB_TYPE_BULK; - urb->endpoint = h->ep_out; -@@ -343,7 +350,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { - std::unique_lock lock(h->mutex); - D("++ usb_bulk_read ++"); - -- usbdevfs_urb* urb = &h->urb_in; -+ usbdevfs_urb* urb = h->urb_in; - memset(urb, 0, sizeof(*urb)); - urb->type = USBDEVFS_URB_TYPE_BULK; - urb->endpoint = h->ep_in; -@@ -388,7 +395,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { - } - D("[ urb @%p status = %d, actual = %d ]", out, out->status, out->actual_length); - -- if (out == &h->urb_in) { -+ if (out == h->urb_in) { - D("[ reap urb - IN complete ]"); - h->urb_in_busy = false; - if (urb->status != 0) { -@@ -397,7 +404,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { - } - return urb->actual_length; - } -- if (out == &h->urb_out) { -+ if (out == h->urb_out) { - D("[ reap urb - OUT compelete ]"); - h->urb_out_busy = false; - h->cv.notify_all(); -@@ -501,10 +508,10 @@ void usb_kick(usb_handle* h) { - ** but this ensures that a reader blocked on REAPURB - ** will get unblocked - */ -- ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_in); -- ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_out); -- h->urb_in.status = -ENODEV; -- h->urb_out.status = -ENODEV; -+ ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_in); -+ ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_out); -+ h->urb_in->status = -ENODEV; -+ h->urb_out->status = -ENODEV; - h->urb_in_busy = false; - h->urb_out_busy = false; - h->cv.notify_all(); diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index bb56d4fa9f8a..79b1cf7521db 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch -, cmake, perl, go, python3 +, cmake, pkg-config, perl, go, python3 , protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2 }: @@ -9,41 +9,28 @@ in stdenv.mkDerivation rec { pname = "android-tools"; - version = "33.0.3"; + version = "33.0.3p1"; src = fetchurl { url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; - hash = "sha256-jOF02reB1d69Ke0PllciMfd3vuGbjvPBZ+M9PqdnC8U="; + hash = "sha256-viBHzyVgUWdK9a60u/7SdpiVEvgNEZHihkyRkGH5Ydg="; }; patches = [ - ./android-tools-kernel-headers-6.0.diff + (fetchpatch { + name = "add-macos-platform.patch"; + url = "https://github.com/nmeum/android-tools/commit/a1ab35b31525966e0f0770047cd82accb36d025b.patch"; + hash = "sha256-6O3ekDf0qPdzcfINFF8Ae4XOYgnQWTBhvu9SCFSHkXY="; + }) ]; - postPatch = lib.optionalString stdenv.isDarwin '' - sed -i 's/usb_linux/usb_osx/g' vendor/CMakeLists.{adb,fastboot}.txt - sed -i 's/libselinux libsepol/ /g;s#selinux/libselinux/include##g' vendor/CMakeLists.{fastboot,mke2fs}.txt - sed -z -i 's/add_library(libselinux.*selinux\/libsepol\/include)//g' vendor/CMakeLists.fastboot.txt - sed -i 's/e2fsdroid//g' vendor/CMakeLists.txt - sed -z -i 's/add_executable(e2fsdroid.*e2fsprogs\/misc)//g' vendor/CMakeLists.mke2fs.txt - ''; - - nativeBuildInputs = [ cmake perl go ]; + nativeBuildInputs = [ cmake pkg-config perl go ]; buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; propagatedBuildInputs = [ pythonEnv ]; # Don't try to fetch any Go modules via the network: GOFLAGS = [ "-mod=vendor" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ - "-D_DARWIN_C_SOURCE" - ]; - - NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ - "-framework CoreFoundation" - "-framework IOKit" - ]; - preConfigure = '' export GOCACHE=$TMPDIR/go-cache ''; From 7620992f2214379ec083a6934169af08c6dbd9bd Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 13 Nov 2022 18:12:20 -0500 Subject: [PATCH 120/797] edk2-uefi-shell: fix build when sandboxing is disabled on x86_64-darwin --- pkgs/tools/misc/edk2-uefi-shell/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/edk2-uefi-shell/default.nix b/pkgs/tools/misc/edk2-uefi-shell/default.nix index e3d73775021f..d399c7dabc15 100644 --- a/pkgs/tools/misc/edk2-uefi-shell/default.nix +++ b/pkgs/tools/misc/edk2-uefi-shell/default.nix @@ -16,6 +16,10 @@ edk2.mkDerivation "ShellPkg/ShellPkg.dsc" (finalAttrs: { NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ "-fno-pic" "-Qunused-arguments" ]; + # Set explicitly to use Python 3 from nixpkgs. Otherwise, the build system will detect and try to + # use `/usr/bin/python3` on Darwin when sandboxing is disabled. + PYTHON_COMMAND = "${lib.getBin python3}/bin/python3"; + # We only have a .efi file in $out which shouldn't be patched or stripped dontPatchELF = true; dontStrip = true; From 176d06f5061739adf241a1d8e94266baa5200180 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Mon, 14 Nov 2022 10:23:19 +0800 Subject: [PATCH 121/797] karlender: 0.7.1 -> 0.8.0 --- pkgs/applications/office/karlender/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/karlender/default.nix b/pkgs/applications/office/karlender/default.nix index 4c3735f77d5c..6917e2ab94b1 100644 --- a/pkgs/applications/office/karlender/default.nix +++ b/pkgs/applications/office/karlender/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "karlender"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitLab { owner = "floers"; repo = pname; rev = "v${version}"; - hash = "sha256-dgxhXxtwQvaWMLCh8ac67L+R6jnJQdFzoyWKyrboPTk="; + hash = "sha256-WuTxsnYXudciTBH1RFHsIYNIHeoeZ+rI2JhYBYPUziw="; }; - cargoHash = "sha256-DsayK3wk2BVG2tqijWWQqUv5uPb/lcZXmwy8pbmd430="; + cargoHash = "sha256-eHEISCHh1jWCy3LwVuCx4LXfNLe1A4drHusyayoS+Ho="; nativeBuildInputs = [ pkg-config From 843734a265b0dfba3a1b87c4a7d644b10c4dd2e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 13 Nov 2022 21:03:24 -0600 Subject: [PATCH 122/797] dbeaver: remove no longer needed overrides and bump webkitgtk --- pkgs/applications/misc/dbeaver/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 10 +--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index ceb1b9833c92..e003787efc46 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -14,7 +14,7 @@ , libXtst , zlib , maven -, webkitgtk +, webkitgtk_4_1 , glib-networking , javaPackages }: @@ -52,7 +52,7 @@ libXtst zlib ] ++ lib.optionals stdenv.isLinux [ - webkitgtk + webkitgtk_4_1 glib-networking ]; @@ -108,7 +108,7 @@ makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk glib-networking ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_1 glib-networking ])} \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fe5c03a38c8..cafeb4a5811f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5775,15 +5775,7 @@ with pkgs; davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { - jdk = jdk11; # AlgorithmId.md5WithRSAEncryption_oid was removed in jdk15 - - # TODO: remove once maven uses JDK 11 - # error: org/eclipse/tycho/core/p2/P2ArtifactRepositoryLayout has been compiled by a more recent version of the Java Runtime (class file version 55.0), this version of the Java Runtime only recognizes class file versions up to 52.0 - maven = maven.override { - jdk = jdk11; - }; - }; + dbeaver = callPackage ../applications/misc/dbeaver { }; dbench = callPackage ../development/tools/misc/dbench { }; From 4d9f200932079e93c122cfd820b40f195a6d9c20 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 11 Nov 2022 10:37:02 +0800 Subject: [PATCH 123/797] efivar: fix cross compilation --- pkgs/tools/system/efivar/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index f08a70e2b07a..7ee12fb07583 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { url = "https://github.com/rhboot/efivar/commit/15622b7e5761f3dde3f0e42081380b2b41639a48.patch"; sha256 = "sha256-SjZXj0hA2eQu2MfBoNjFPtd2DMYadtL7ZqwjKSf2cmI="; }) + # src/Makefile: build util.c separately for makeguids + # util.c needs to be built twice when cross-compiling + (fetchpatch { + url = "https://github.com/rhboot/efivar/commit/ca48d3964d26f5e3b38d73655f19b1836b16bd2d.patch"; + hash = "sha256-DkNFIK4i7Eypyf2UeK7qHW36N2FSVRJ2rnOVLriWi5c="; + }) ]; nativeBuildInputs = [ pkg-config mandoc ]; From 20faad846339f1fc8e7d50b462d2df7f975cefb8 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 14 Nov 2022 00:42:10 -0800 Subject: [PATCH 124/797] python310Packages.pyxl3: remove unittest2 In addition, we can enable its tests by fetching the source from GitHub instead of from PyPI. --- .../python-modules/pyxl3/default.nix | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix index 8cdfe6436e35..e931400b386e 100644 --- a/pkgs/development/python-modules/pyxl3/default.nix +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -1,8 +1,7 @@ { lib , buildPythonPackage -, fetchPypi -, unittest2 -, python +, fetchFromGitHub +, pytestCheckHook , isPy27 }: @@ -11,20 +10,14 @@ buildPythonPackage rec { version = "1.4"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "ad4cc56bf4b35def33783e6d4783882702111fe8f9a781c63228e2114067c065"; + src = fetchFromGitHub { + owner = "gvanrossum"; + repo = pname; + rev = "e6588c12caee49c43faf6aa260f04d7e971f6aa8"; + hash = "sha256-8nKQgwLXPVgPxNRF4CryKJb7+llDsZHis5VctxqpIRo="; }; - checkInputs = [ unittest2 ]; - - checkPhase = '' - ${python.interpreter} tests/test_basic.py - ''; - - # tests require weird codec installation - # which is not necessary for major use of package - doCheck = false; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python 3 port of pyxl for writing structured and reusable inline HTML"; From beed76d557b8b5b6af1430a8ba7d32e2a850b867 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 14 Nov 2022 00:55:44 -0800 Subject: [PATCH 125/797] python310Packages.pychef: removing because it's archived and abandoned --- .../python-modules/pychef/default.nix | 30 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 pkgs/development/python-modules/pychef/default.nix diff --git a/pkgs/development/python-modules/pychef/default.nix b/pkgs/development/python-modules/pychef/default.nix deleted file mode 100644 index ddd7dec820db..000000000000 --- a/pkgs/development/python-modules/pychef/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, six -, requests -, mock -, unittest2 -}: - -buildPythonPackage rec { - pname = "PyChef"; - version = "0.3.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0zdz8lw545cd3a34cpib7mdwnad83gr2mrrxyj3v74h4zhwabhmg"; - }; - - propagatedBuildInputs = [ six requests mock unittest2 ]; - - # FIXME - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/coderanger/pychef"; - description = "Python implementation of a Chef API client"; - license = licenses.bsd0; - }; - -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b9d3fc1835e9..c36eb28debf2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -136,6 +136,7 @@ mapAliases ({ pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 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 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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 617356b42c4e..a0968e1feee2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7581,8 +7581,6 @@ self: super: with self; { pychart = callPackage ../development/python-modules/pychart { }; - pychef = callPackage ../development/python-modules/pychef { }; - pychm = callPackage ../development/python-modules/pychm { }; PyChromecast = callPackage ../development/python-modules/pychromecast { }; From 690fd2b8f718188aaf441416bd6806c2cea55d3f Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 14 Nov 2022 15:05:12 +0100 Subject: [PATCH 126/797] iina: 1.3.0 -> 1.3.1 https://github.com/iina/iina/releases/tag/v1.3.1 --- pkgs/applications/video/iina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/iina/default.nix b/pkgs/applications/video/iina/default.nix index bb3fd9cd5e5b..6377b953d5ef 100644 --- a/pkgs/applications/video/iina/default.nix +++ b/pkgs/applications/video/iina/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "iina"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg"; - sha256 = "sha256-tQxBaCgAXh7sDcgGbJYe/MOJ5r4aWllVQepi1I0xo5E="; + sha256 = "sha256-xkZkKiiEywUWkiFw4PbUmQsStB1iRLCNU/MY27lRjC8="; }; nativeBuildInputs = [ undmg ]; From e88c8f6c53e8b5a96ac58baf365bf9141681cd44 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 14 Nov 2022 16:28:36 +0100 Subject: [PATCH 127/797] python3.pkgs.ldap: disable failing test (#201190) --- pkgs/development/python-modules/python-ldap/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index 7b3c2bdbc0ba..f8844c5eaec7 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -45,6 +45,11 @@ buildPythonPackage rec { export SCHEMA="${openldap}/etc/schema" ''; + disabledTests = [ + # https://github.com/python-ldap/python-ldap/issues/501 + "test_tls_ext_noca" + ]; + doCheck = !stdenv.isDarwin; meta = with lib; { From a42a85fd42c474080a3163eefe480a1f2231767f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Nov 2022 16:46:43 +0000 Subject: [PATCH 128/797] twtxt: 1.2.3 -> 1.3.1 --- pkgs/applications/networking/twtxt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/applications/networking/twtxt/default.nix index 792c13aa23fa..574540862562 100644 --- a/pkgs/applications/networking/twtxt/default.nix +++ b/pkgs/applications/networking/twtxt/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "twtxt"; - version = "1.2.3"; + version = "1.3.1"; src = fetchFromGitHub { owner = "buckket"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-AdM95G2Vz3UbVPI7fs8/D78BMxscbTGrCpIyyHzSmho="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-CbFh1o2Ijinfb8X+h1GP3Tp+8D0D3/Czt/Uatd1B4cw="; }; # Relax some dependencies From baf0049a9fa90dfb94799db351d757267778f7d7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 14 Nov 2022 16:54:36 +0000 Subject: [PATCH 129/797] qemacs: use xorg.* packages directly instead of xlibsWrapper indirection Validated as no change in `out` output with `diffoscope`. --- pkgs/applications/editors/qemacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/qemacs/default.nix b/pkgs/applications/editors/qemacs/default.nix index 065dccb2b219..9fc91fbe1977 100644 --- a/pkgs/applications/editors/qemacs/default.nix +++ b/pkgs/applications/editors/qemacs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, xlibsWrapper, libXv, libpng }: +{ fetchurl, lib, stdenv, libX11, libXext, libXv, libpng }: stdenv.mkDerivation rec { pname = "qemacs"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "156z4wpj49i6j388yjird5qvrph7hz0grb4r44l4jf3q8imadyrg"; }; - buildInputs = [ xlibsWrapper libpng libXv ]; + buildInputs = [ libpng libX11 libXext libXv ]; preInstall = '' mkdir -p $out/bin $out/man From 808095530a618c70e81c9f2423273860cfbed4d0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 14 Nov 2022 20:46:21 +0100 Subject: [PATCH 130/797] glib: Fix infinite loop in GNOME Keyring This was a regression in GLib 2.74.1: https://gitlab.gnome.org/GNOME/gnome-keyring/-/issues/123 --- pkgs/development/libraries/glib/default.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 8e3d1a45dbe1..eb5a45b640d8 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,14 @@ -{ config, lib, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3 +{ config +, lib +, stdenv +, fetchurl +, fetchpatch +, gettext +, meson +, ninja +, pkg-config +, perl +, python3 , libiconv, zlib, libffi, pcre2, libelf, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45, libxslt # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) , util-linuxMinimal ? null @@ -93,6 +103,14 @@ stdenv.mkDerivation (finalAttrs: { # Disable flaky test. # https://gitlab.gnome.org/GNOME/glib/-/issues/820 ./skip-timer-test.patch + + # Fix infinite loop (e.g. in gnome-keyring) + # https://github.com/NixOS/nixpkgs/pull/197754#issuecomment-1312805358 + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3039 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/2a36bb4b7e46f9ac043561c61f9a790786a5440c.patch"; + sha256 = "b77Hxt6WiLxIGqgAj9ZubzPWrWmorcUOEe/dp01BcXA="; + }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; From b5a4c7a052782168c11c9b4f2ab888d18d2617bd Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 14 Nov 2022 21:28:24 +0000 Subject: [PATCH 131/797] lirc: use xorg.* packages directly instead of xlibsWrapper indirection Validated as no change in `out` output with `diffoscope`. --- pkgs/development/libraries/lirc/default.nix | 22 ++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 8e9561ecd49c..f6b9e1d9dbdb 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3, - alsa-lib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, pkg-config +, help2man +, python3 + +, alsa-lib +, libxslt +, systemd +, libusb-compat-0_1 +, libftdi1 +, libICE +, libSM +, libX11 +}: let pythonEnv = python3.pythonForBuild.withPackages (p: with p; [ pyyaml setuptools ]); @@ -54,7 +70,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; - buildInputs = [ alsa-lib xlibsWrapper systemd libusb-compat-0_1 libftdi1 ]; + buildInputs = [ alsa-lib systemd libusb-compat-0_1 libftdi1 libICE libSM libX11 ]; DEVINPUT_HEADER = "include/linux/input-event-codes.h"; From f352d6e27b3202bc9d773cd4763201774f7fe5fc Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Mon, 14 Nov 2022 22:41:21 +0100 Subject: [PATCH 132/797] b612: fix build Changes needed after fetchzip changes in #173430 --- pkgs/data/fonts/b612/default.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/data/fonts/b612/default.nix index bf97ff30c6d6..93698578ff3e 100644 --- a/pkgs/data/fonts/b612/default.nix +++ b/pkgs/data/fonts/b612/default.nix @@ -1,19 +1,24 @@ { lib, fetchFromGitHub }: -let - version = "1.008"; +fetchFromGitHub rec { pname = "b612"; -in fetchFromGitHub { - name = "${pname}-font-${version}"; + version = "1.008"; + owner = "polarsys"; repo = "b612"; rev = version; + postFetch = '' - tar xf $downloadedFile --strip=1 - mkdir -p $out/share/fonts/truetype/${pname} - cp fonts/ttf/*.ttf $out/share/fonts/truetype/${pname} + mkdir -p $out/share/fonts/truetype + + mv $out/fonts/ttf/*.ttf $out/share/fonts/truetype + + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob ''; - sha256 = "0r3lana1q9w3siv8czb3p9rrb5d9svp628yfbvvmnj7qvjrmfsiq"; + + hash = "sha256-aJ3XzWQauPsWwEDAHT2rD9a8RvLv1kqU3krFXprmypk="; meta = with lib; { homepage = "http://b612-font.com/"; From 79059c9505281998dbfee0b7422ca28390e8bee9 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 15 Nov 2022 00:50:02 +0100 Subject: [PATCH 133/797] cups-kyocera: fix source URL --- pkgs/misc/cups/drivers/kyocera/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix index 0a560e3188f6..cd435bc49662 100644 --- a/pkgs/misc/cups/drivers/kyocera/default.nix +++ b/pkgs/misc/cups/drivers/kyocera/default.nix @@ -22,9 +22,7 @@ stdenv.mkDerivation { dontStrip = true; src = fetchzip { - # this site does not like curl -> override useragent - curlOpts = "-A ''"; - url = "https://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip"; + url = "https://web.archive.org/web/20220709011705/https://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip"; sha256 = "0z1pbgidkibv4j21z0ys8cq1lafc6687syqa07qij2qd8zp15wiz"; }; From 11d9ef272d6cfc00ab952aa3b3f6829959fa5435 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 14 Nov 2022 23:53:07 +0000 Subject: [PATCH 134/797] glbinding: dropped unused xlibsWrapper input Validated as no change in `out` output with `diffoscope`. --- pkgs/development/libraries/glbinding/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index 1b36baa24e42..bdb72b5d542a 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }: +{ lib, stdenv, fetchFromGitHub, cmake, libGLU }: stdenv.mkDerivation rec { pname = "glbinding"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libGLU xlibsWrapper ]; + buildInputs = [ libGLU ]; meta = with lib; { homepage = "https://github.com/cginternals/glbinding/"; From c754d1b6a30f87aa6b2af08f078cbd9b06dc213e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 15 Nov 2022 09:56:01 +0800 Subject: [PATCH 135/797] julia_18: 1.8.2 -> 1.8.3 --- pkgs/development/compilers/julia/1.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/1.8.nix b/pkgs/development/compilers/julia/1.8.nix index e67a02b040ab..f8b0daa1ace7 100644 --- a/pkgs/development/compilers/julia/1.8.nix +++ b/pkgs/development/compilers/julia/1.8.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - sha256 = "sha256-5Xz8Lm2JF1Ckf3zwNVmk6PchK/VJAPJqnxL9bQCdTKk="; + hash = "sha256-UraJWp1K0v422yYe6MTIzJISuDehL5MAL6r1N6IVH1A="; }; patches = From b60de3b41641ca29bc789c8bd946145762dbbbfc Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 15 Nov 2022 10:05:17 +0800 Subject: [PATCH 136/797] julia_10, julia_15: drop infavor of latest stable versions --- pkgs/development/compilers/julia/1.0.nix | 207 ------------------ pkgs/development/compilers/julia/1.5.nix | 147 ------------- .../1.0/use-system-utf8proc-julia-1.0.patch | 29 --- .../1.5/use-system-utf8proc-julia-1.3.patch | 24 -- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 27 +-- 6 files changed, 4 insertions(+), 432 deletions(-) delete mode 100644 pkgs/development/compilers/julia/1.0.nix delete mode 100644 pkgs/development/compilers/julia/1.5.nix delete mode 100644 pkgs/development/compilers/julia/patches/1.0/use-system-utf8proc-julia-1.0.patch delete mode 100644 pkgs/development/compilers/julia/patches/1.5/use-system-utf8proc-julia-1.3.patch diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix deleted file mode 100644 index 28500815639a..000000000000 --- a/pkgs/development/compilers/julia/1.0.nix +++ /dev/null @@ -1,207 +0,0 @@ -{ lib, stdenv, fetchpatch, fetchurl, fetchzip -# build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python3 -, cmake -# libjulia dependencies -, libunwind, readline, utf8proc, zlib -# standard library dependencies -, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 -# linear algebra -, blas, lapack, arpack -# Darwin frameworks -, CoreServices, ApplicationServices -}: - - -let - majorVersion = "1"; - minorVersion = "0"; - maintenanceVersion = "4"; - src_sha256 = "1dfx68wbrrzpbh74rla7i2g3r5z6wa1pxq3ahyfm5m27vfyjbkhg"; - - libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e"; - libuvSha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs"; - - dsfmtVersion = "2.2.3"; - dsfmt = fetchurl { - url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz"; - sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; - }; - - libuv = fetchurl { - url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; - sha256 = libuvSha256; - }; - - rmathVersion = "0.1"; - rmath-julia = fetchurl { - url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; - sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; - }; - - virtualenvVersion = "15.0.0"; - virtualenv = fetchurl { - url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz"; - sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh"; - }; - - libwhichVersion = "81e9723c0273d78493dc8c8ed570f68d9ce7e89e"; - libwhich = fetchurl { - url = "https://api.github.com/repos/vtjnash/libwhich/tarball/${libwhichVersion}"; - sha256 = "1p7zg31kpmpbmh1znrk1xrbd074agx13b9q4dcw8n2zrwwdlbz3b"; - }; - - llvmVersion = "6.0.0"; - llvm = fetchurl { - url = "http://releases.llvm.org/6.0.0/llvm-${llvmVersion}.src.tar.xz"; - sha256 = "0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z"; - }; - - suitesparseVersion = "4.4.5"; - suitesparse = fetchurl { - url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${suitesparseVersion}.tar.gz"; - sha256 = "1jcbxb8jx5wlcixzf6n5dca2rcfx6mlcms1k2rl5gp67ay3bix43"; - }; - version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; -in - -stdenv.mkDerivation rec { - pname = "julia"; - inherit version; - - src = fetchzip { - url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = src_sha256; - }; - - nativeBuildInputs = [ cmake curl gfortran m4 makeWrapper patchelf perl python3 which ]; - # cmake is only used to build the bundled deps - dontUseCmakeConfigure = true; - - # We assert that compatible blas and lapack are used. - buildInputs = assert (blas.isILP64 == lapack.isILP64); [ - arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr - pcre2.dev blas lapack openlibm openspecfun readline utf8proc - zlib - ] - ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] - ; - - patches = [ - ./patches/1.0/use-system-utf8proc-julia-1.0.patch - ]; - - postPatch = '' - patchShebangs . contrib - for i in backtrace cmdlineargs; do - mv test/$i.jl{,.off} - touch test/$i.jl - done - rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl - rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl - sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl - sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl - ''; - prePatch = '' - mkdir deps/srccache - cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz" - cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz" - cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz" - cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz" - cp "${libwhich}" "./deps/srccache/libwhich-${libwhichVersion}.tar.gz" - cp "${llvm}" "./deps/srccache/llvm-${llvmVersion}.src.tar.xz" - cp "${suitesparse}" "./deps/srccache/SuiteSparse-${suitesparseVersion}.tar.gz" - ''; - - makeFlags = - let - arch = lib.head (lib.splitString "-" stdenv.system); - march = { - x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64"; - i686 = "pentium4"; - aarch64 = "armv8-a"; - }.${arch} - or (throw "unsupported architecture: ${arch}"); - # Julia requires Pentium 4 (SSE2) or better - cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch} - or (throw "unsupported architecture: ${arch}"); - in [ - "ARCH=${arch}" - "MARCH=${march}" - "JULIA_CPU_TARGET=${cpuTarget}" - "PREFIX=$(out)" - "prefix=$(out)" - "SHELL=${stdenv.shell}" - - (lib.optionalString (!stdenv.isDarwin) "USE_SYSTEM_BLAS=1") - "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" - - "USE_SYSTEM_LAPACK=1" - - "USE_SYSTEM_ARPACK=1" - "USE_SYSTEM_FFTW=1" - "USE_SYSTEM_GMP=1" - "USE_SYSTEM_LIBGIT2=1" - "USE_SYSTEM_LIBUNWIND=1" - - # We will probably never do that - #"USE_SYSTEM_LLVM=1" - "LLVM_VER=6.0.0" - - "USE_SYSTEM_MPFR=1" - "USE_SYSTEM_OPENLIBM=1" - "USE_SYSTEM_OPENSPECFUN=1" - "USE_SYSTEM_PATCHELF=1" - "USE_SYSTEM_PCRE=1" - "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" - "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" - "USE_SYSTEM_READLINE=1" - "USE_SYSTEM_UTF8PROC=1" - "USE_SYSTEM_ZLIB=1" - ]; - - LD_LIBRARY_PATH = assert (blas.isILP64 == lapack.isILP64); (lib.makeLibraryPath [ - arpack fftw fftwSinglePrec gmp libgit2 mpfr blas lapack openlibm - openspecfun pcre2 - ]); - - doCheck = !stdenv.isDarwin; - checkTarget = "testall"; - # Julia's tests require read/write access to $HOME - preCheck = '' - export HOME="$NIX_BUILD_TOP" - ''; - - preBuild = '' - sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile - sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} - ''; - - enableParallelBuilding = true; - - postInstall = '' - # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, - # as using a wrapper with LD_LIBRARY_PATH causes segmentation - # faults when program returns an error: - # $ julia -e 'throw(Error())' - find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do - if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then - ln -sv $lib $out/lib/julia/$(basename $lib) - fi - done - ''; - - passthru = { - inherit majorVersion minorVersion maintenanceVersion; - site = "share/julia/site/v${majorVersion}.${minorVersion}"; - }; - - meta = { - description = "High-level performance-oriented dynamical language for technical computing"; - homepage = "https://julialang.org/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ raskin rob garrison ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix deleted file mode 100644 index 3421af681a25..000000000000 --- a/pkgs/development/compilers/julia/1.5.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ lib, stdenv, fetchzip -# build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python3, cmake -# libjulia dependencies -, libunwind, readline, utf8proc, zlib -# standard library dependencies -, curl, fftwSinglePrec, fftw, libgit2, mpfr, openlibm, openspecfun, pcre2 -# linear algebra -, blas, lapack, arpack -# Darwin frameworks -, CoreServices, ApplicationServices -}: - -assert (!blas.isILP64) && (!lapack.isILP64); - -with lib; - -let - majorVersion = "1"; - minorVersion = "5"; - maintenanceVersion = "4"; - src_sha256 = "1ba1v7hakgj95xvhyff0zcp0574qv6vailjl48wl1f8w5k54lsw2"; - version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; -in - -stdenv.mkDerivation rec { - pname = "julia"; - inherit version; - - src = fetchzip { - url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - sha256 = src_sha256; - }; - - patches = [ - ./patches/1.5/use-system-utf8proc-julia-1.3.patch - ]; - - postPatch = '' - patchShebangs . contrib - ''; - - dontUseCmakeConfigure = true; - - buildInputs = [ - arpack fftw fftwSinglePrec libgit2 libunwind mpfr - pcre2.dev blas lapack openlibm openspecfun readline utf8proc - zlib - ] ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]; - - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python3 which cmake ]; - - makeFlags = - let - arch = head (splitString "-" stdenv.system); - march = { - x86_64 = stdenv.hostPlatform.gcc.arch or "x86-64"; - i686 = "pentium4"; - aarch64 = "armv8-a"; - }.${arch} - or (throw "unsupported architecture: ${arch}"); - # Julia requires Pentium 4 (SSE2) or better - cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch} - or (throw "unsupported architecture: ${arch}"); - # Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM - # https://github.com/JuliaLang/julia/tree/master/deps/patches - in [ - "ARCH=${arch}" - "MARCH=${march}" - "JULIA_CPU_TARGET=${cpuTarget}" - "PREFIX=$(out)" - "prefix=$(out)" - "SHELL=${stdenv.shell}" - - (lib.optionalString (!stdenv.isDarwin) "USE_SYSTEM_BLAS=1") - "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" - - "USE_SYSTEM_LAPACK=1" - - "USE_SYSTEM_ARPACK=1" - "USE_SYSTEM_FFTW=1" - "USE_SYSTEM_GMP=0" - "USE_SYSTEM_LIBGIT2=1" - "USE_SYSTEM_LIBUNWIND=1" - - "USE_SYSTEM_MPFR=1" - "USE_SYSTEM_OPENLIBM=1" - "USE_SYSTEM_OPENSPECFUN=1" - "USE_SYSTEM_PATCHELF=1" - "USE_SYSTEM_PCRE=1" - "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" - "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" - "USE_SYSTEM_READLINE=1" - "USE_SYSTEM_UTF8PROC=1" - "USE_SYSTEM_ZLIB=1" - - "USE_BINARYBUILDER=0" - ]; - - LD_LIBRARY_PATH = makeLibraryPath [ - arpack fftw fftwSinglePrec libgit2 mpfr blas openlibm - openspecfun pcre2 lapack - ]; - - preBuild = '' - sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile - sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} - ''; - - enableParallelBuilding = true; - - # Julia's tests require read/write access to $HOME - preCheck = '' - export HOME="$NIX_BUILD_TOP" - ''; - doCheck = true; - checkTarget = "test"; - - postInstall = '' - # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, - # as using a wrapper with LD_LIBRARY_PATH causes segmentation - # faults when program returns an error: - # $ julia -e 'throw(Error())' - find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do - if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then - ln -sv $lib $out/lib/julia/$(basename $lib) - fi - done - ''; - - passthru = { - inherit majorVersion minorVersion maintenanceVersion; - site = "share/julia/site/v${majorVersion}.${minorVersion}"; - }; - - meta = { - description = "High-level performance-oriented dynamical language for technical computing"; - homepage = "https://julialang.org/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ raskin rob garrison ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; - # Unfortunately, this derivation does not pass Julia's test suite. See - # https://github.com/NixOS/nixpkgs/pull/121114. - broken = true; - }; -} diff --git a/pkgs/development/compilers/julia/patches/1.0/use-system-utf8proc-julia-1.0.patch b/pkgs/development/compilers/julia/patches/1.0/use-system-utf8proc-julia-1.0.patch deleted file mode 100644 index be4391399f55..000000000000 --- a/pkgs/development/compilers/julia/patches/1.0/use-system-utf8proc-julia-1.0.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 54a66b5728ec98f44a1768f064509be4fd3f2ef6 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sat, 10 Oct 2015 13:09:48 -0500 -Subject: [PATCH 1/3] use system utf8proc - ---- - src/flisp/Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/flisp/Makefile b/src/flisp/Makefile -index bec8624..5437b5c 100644 ---- a/src/flisp/Makefile -+++ b/src/flisp/Makefile -@@ -24,9 +24,9 @@ DOBJS = $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj) - LLTDIR := ../support - LLT_release := $(BUILDDIR)/$(LLTDIR)/libsupport.a - LLT_debug := $(BUILDDIR)/$(LLTDIR)/libsupport-debug.a --LIBFILES_release := $(LLT_release) $(LIBUV) $(LIBUTF8PROC) --LIBFILES_debug := $(LLT_debug) $(LIBUV) $(LIBUTF8PROC) --LIBS := -+LIBFILES_release := $(LLT_release) $(LIBUV) -+LIBFILES_debug := $(LLT_debug) $(LIBUV) -+LIBS := $(LIBUTF8PROC) - ifneq ($(OS),WINNT) - LIBS += -lpthread - endif --- -2.5.2 - diff --git a/pkgs/development/compilers/julia/patches/1.5/use-system-utf8proc-julia-1.3.patch b/pkgs/development/compilers/julia/patches/1.5/use-system-utf8proc-julia-1.3.patch deleted file mode 100644 index 63e0ba9ab057..000000000000 --- a/pkgs/development/compilers/julia/patches/1.5/use-system-utf8proc-julia-1.3.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- - src/flisp/Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - - -diff --git a/src/flisp/Makefile b/src/flisp/Makefile -index d97075e..6bebca7 100644 ---- a/src/flisp/Makefile -+++ b/src/flisp/Makefile -@@ -32,9 +32,9 @@ OBJS := $(SRCS:%.c=$(BUILDDIR)/%.o) - DOBJS := $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj) - LLT_release := $(LLT_BUILDDIR)/libsupport.a - LLT_debug := $(LLT_BUILDDIR)/libsupport-debug.a --LIBFILES_release := $(LLT_release) $(LIBUV) $(LIBUTF8PROC) --LIBFILES_debug := $(LLT_debug) $(LIBUV) $(LIBUTF8PROC) --LIBS := -+LIBFILES_release := $(LLT_release) $(LIBUV) -+LIBFILES_debug := $(LLT_debug) $(LIBUV) -+LIBS := $(LIBUTF8PROC) - ifneq ($(OS),WINNT) - LIBS += -lpthread - endif - --- diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 58af0206152f..c43b6ad2d2ce 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -673,8 +673,10 @@ mapAliases ({ # Julia julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # Added 2020-09-15 julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # Added 2021-03-13 + julia_10 = throw "julia_10 has been deprecated in favor of the latest stable version"; # Added 2022-11-15 julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # Added 2020-09-15 julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # Added 2021-03-13 + julia_15 = throw "julia_15 has been deprecated in favor of the latest stable version"; # Added 2022-11-15 julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # Added 2021-12-02 julia_17-bin = throw "julia_17-bin has been deprecated in favor of the latest stable version"; # Added 2022-09-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2505d9bdb97..1602ce0013e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14500,31 +14500,8 @@ with pkgs; juniper = callPackage ../development/compilers/juniper { }; - julia_10 = callPackage ../development/compilers/julia/1.0.nix { - gmp = gmp6; - inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - libgit2 = libgit2.overrideAttrs (_: rec { - version = "0.27.10"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; - }; - patches = []; - meta.knownVulnerabilities = [ - "CVE-2020-12278" - "CVE-2020-12279" - ]; - }); - }; - - julia_15 = callPackage ../development/compilers/julia/1.5.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - }; - - julia-lts = julia_10; - julia-stable = julia_15; + julia-lts = julia_16-bin; + julia-stable = julia_18; julia = julia-stable; julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; From 5ccc047d3a2238623fd8a379fcd205e47e3acd2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Nov 2022 03:53:33 +0000 Subject: [PATCH 137/797] grocy: 3.3.1 -> 3.3.2 --- pkgs/servers/grocy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index 99b502c13d4f..360f5202e28a 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "grocy"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "sha256-XqjYDha9wwfITEDRZsnH/ig+9q1/SfKIwQYg1svUaXM="; + sha256 = "sha256-KF4zxrC8rlRUaBKc4iLIt6TSAHMJ+tOWptMsVcixVWs="; }; nativeBuildInputs = [ unzip ]; From c0da0ab05bc7bf823370e206dea267f6b5faa2ff Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 15 Nov 2022 08:21:46 +0100 Subject: [PATCH 138/797] wxGTK30: 3.0.5 -> 3.0.5.1 --- pkgs/development/libraries/wxwidgets/wxGTK30.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/pkgs/development/libraries/wxwidgets/wxGTK30.nix index 89b7ae1f94c4..3b848f788c10 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK30.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK30.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.0.5"; + version = "3.0.5.1"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-p69nNCg552j+nldGY0oL65uFRVu4xXCkoE10F5MwY9A="; + hash = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0="; }; nativeBuildInputs = [ pkg-config ]; From bae3d99920ba622703b7b648b570b7b3e6194c0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Nov 2022 08:55:44 +0000 Subject: [PATCH 139/797] prowlarr: 0.4.7.2016 -> 0.4.9.2083 --- pkgs/servers/prowlarr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index f7fde43b75e9..9a7a96d6920f 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -16,14 +16,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-H0OTEaUD6NVzZT0OpPONRl+wuCdrFXbiY9yHqc6/9e0="; - arm64-linux_hash = "sha256-L7jTqC5IMB2pD3d71Uc/kDsfw5LVScJ97sjkq73XgVM="; - x64-osx_hash = "sha256-tFpfgRq7Xlh8uBoNBHb6aXBDzsa48JC8ge9XGdSvZaI="; + x64-linux_hash = "sha256-nzMMVsDwE5GRtqzzBVs04bXfCEbNmRiLeaohBG01NL0="; + arm64-linux_hash = "sha256-av979aV5LYWTsFajihwV0QzYbSwg1rac+q1NCnaU8K0="; + x64-osx_hash = "sha256-9oinpaetF0mphraGjAt3yeDsE+nz+59vxQG5ZTVLWXM="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "0.4.7.2016"; + version = "0.4.9.2083"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; From 51914779e29b8f30e3bee4cf4d9db5cc32be2459 Mon Sep 17 00:00:00 2001 From: hqurve Date: Tue, 15 Nov 2022 09:40:56 -0400 Subject: [PATCH 140/797] cubiomes-viewer: 2.5.1 -> 2.6.1 https://github.com/Cubitect/cubiomes-viewer/releases/tag/2.6.0 https://github.com/Cubitect/cubiomes-viewer/releases/tag/2.6.1 --- pkgs/applications/misc/cubiomes-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 5832cf9432ae..5f7f101ad613 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "2.5.1"; + version = "2.6.1"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-Ge1dO2I4avblN+3BXY9AXFFmgX4lIwZYUf4IohH1vqc="; + sha256 = "sha256-ZXqe+696dNYTkNidEA+s5QQ7Euu7WOdl0EMLU5pKdOY="; fetchSubmodules = true; }; From f010cdcad38519f71f2468d309a67467929a1fe8 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Tue, 15 Nov 2022 14:52:23 +0100 Subject: [PATCH 141/797] asterisk: 16.26.1 -> 16.29.0, 18.12.1 -> 18.15.0, 19.4.1 -> 19.7.0, init 20.0.0 --- pkgs/servers/asterisk/default.nix | 7 +++++++ pkgs/servers/asterisk/versions.json | 16 ++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index eeefe0dcd14f..5c0a539aed5d 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -98,6 +98,11 @@ let hash = "sha256-T3q4r/4WCAZCNGnULxMnNKH9wEK7gkseV/sV8IPasHQ="; }; + pjproject_2_12_1 = fetchurl { + url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.12.1/pjproject-2.12.1.tar.bz2"; + hash = "sha256-DiNH1hB5ZheYzyUjFyk1EtlsMJlgjf+QRVKjEk+hNjc="; + }; + mp3-202 = fetchsvn { url = "http://svn.digium.com/svn/thirdparty/mp3/trunk"; rev = "202"; @@ -117,6 +122,7 @@ let inherit version sha256; externals = { "externals_cache/pjproject-2.12.tar.bz2" = pjproject_2_12; + "externals_cache/pjproject-2.12.1.tar.bz2" = pjproject_2_12_1; "addons/mp3" = mp3-202; }; }) (lib.importJSON ./versions.json); @@ -136,6 +142,7 @@ in { # 16.x LTS 2018-10-09 2022-10-09 2023-10-09 # 18.x LTS 2020-10-20 2024-10-20 2025-10-20 # 19.x Standard 2021-11-02 2022-11-02 2023-11-02 + # 20.x LTS 2022-11-02 2026-10-19 2027-10-19 asterisk-lts = versions.asterisk_18; asterisk-stable = versions.asterisk_19; asterisk = versions.asterisk_19.overrideAttrs (o: { diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json index 77023dac2c28..7e6943a6822d 100644 --- a/pkgs/servers/asterisk/versions.json +++ b/pkgs/servers/asterisk/versions.json @@ -1,14 +1,18 @@ { "asterisk_16": { - "sha256": "201c92e591fc1db2c71b264907beef594d62d660168d42b5e83f9dc593b1bce0", - "version": "16.26.1" + "sha256": "406a91290e18d25a6fc23ae6b9c56b1fb2bd70216e336c74cf9c26b908c89c3d", + "version": "16.29.0" }, "asterisk_18": { - "sha256": "acbb58e5c3cd2b9c7c4506fa80b717c3c3c550ce9722ff0177b4f11f98725563", - "version": "18.12.1" + "sha256": "a963dafeba0e7e1051a1ac56964999c111dbcdb25a47010bc1f772bf8edbed75", + "version": "18.15.0" }, "asterisk_19": { - "sha256": "6b0b985163f20fcc8f8878069b8a9ee725eef4cfbdb1c1031fe3840fb32d7abe", - "version": "19.4.1" + "sha256": "832a967c5a040b0768c0e8df1646762f7304019fcf7f2e065a8b4828fa4092b7", + "version": "19.7.0" + }, + "asterisk_20": { + "sha256": "949022c20dc6da65b456e1b1b5b42a7901bb41fc9ce20920891739e7220d72eb", + "version": "20.0.0" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b12df22622cf..743a98fe8c37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23489,7 +23489,7 @@ with pkgs; inherit (callPackages ../servers/asterisk { }) asterisk asterisk-stable asterisk-lts - asterisk_16 asterisk_18 asterisk_19; + asterisk_16 asterisk_18 asterisk_19 asterisk_20; asterisk-module-sccp = callPackage ../servers/asterisk/sccp { }; From 6092075d23bfee851f2a0be1edd76c2b35ebbc3e Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 15 Nov 2022 18:51:50 +0100 Subject: [PATCH 142/797] neovim: 0.8.0 -> 0.8.1 --- pkgs/applications/editors/neovim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index e5f1d658b5d7..0a3b5ca421d3 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "sha256-mVeVjkP8JpTi2aW59ZuzQPi5YvEySVAtxko7xxAx/es="; + sha256 = "sha256-B2ZpwhdmdvPOnxVyJDfNzUT5rTVuBhJXyMwwzCl9Fac="; }; patches = [ From f6b07f0e2f5834b1fd6432a0f4c2bc11096e53ed Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Mon, 7 Nov 2022 19:42:19 +0100 Subject: [PATCH 143/797] fetchgit: make sparseCheckout a list of strings The `sparseCheckout` argument allows the user to specify directories or patterns of files, which Git uses to filter files it should check-out. Git expects a multi-line string on stdin ("newline-delimited list", see `git-sparse-checkout(1)`), but within nixpkgs it is more consistent to use a list of strings instead. The list elements are joined to a multi-line string only before passing it to the builder script. A deprecation warning is emitted if a (multi-line) string is passed to `sparseCheckout`, but for the time being it is still accepted. --- doc/builders/fetchers.chapter.md | 8 ++++---- .../from_md/release-notes/rl-2211.section.xml | 9 +++++++++ .../doc/manual/release-notes/rl-2211.section.md | 2 ++ pkgs/build-support/fetchgit/default.nix | 14 +++++++++++--- pkgs/build-support/fetchgit/tests.nix | 16 ++++++++-------- 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index 12d8a5d887fd..43aead0ad5e4 100644 --- a/doc/builders/fetchers.chapter.md +++ b/doc/builders/fetchers.chapter.md @@ -100,10 +100,10 @@ stdenv.mkDerivation { name = "hello"; src = fetchgit { url = "https://..."; - sparseCheckout = '' - directory/to/be/included - another/directory - ''; + sparseCheckout = [ + "directory/to/be/included" + "another/directory" + ]; sha256 = "0000000000000000000000000000000000000000000000000000"; }; } diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index a2f67d2707ee..b5381ccb472e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -543,6 +543,15 @@ 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, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 3540881c4622..913b3f9aea10 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -179,6 +179,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `fetchgit` fetcher now uses [cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling) by default for sparse checkouts. [Non-cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems) 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`. diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index f516c3d5a03b..1fec0c887474 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -15,7 +15,7 @@ in { url, rev ? "HEAD", md5 ? "", sha256 ? "", hash ? "", leaveDotGit ? deepClone , fetchSubmodules ? true, deepClone ? false , branchName ? null -, sparseCheckout ? "" +, sparseCheckout ? [] , nonConeMode ? false , name ? urlToName url rev , # Shell code executed after the file has been fetched @@ -55,13 +55,16 @@ in */ assert deepClone -> leaveDotGit; -assert nonConeMode -> (sparseCheckout != ""); +assert nonConeMode -> !(sparseCheckout == "" || sparseCheckout == []); if md5 != "" then throw "fetchgit does not support md5 anymore, please use sha256" else if hash != "" && sha256 != "" then throw "Only one of sha256 or hash can be set" else +# Added 2022-11-12 +lib.warnIf (builtins.isString sparseCheckout) + "Please provide directories/patterns for sparse checkout as a list of strings. Support for passing a (multi-line) string is deprecated and will be removed in the next release." stdenvNoCC.mkDerivation { inherit name; builder = ./builder.sh; @@ -79,7 +82,12 @@ stdenvNoCC.mkDerivation { else lib.fakeSha256; - inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName sparseCheckout nonConeMode postFetch; + # git-sparse-checkout(1) says: + # > When the --stdin option is provided, the directories or patterns are read + # > from standard in as a newline-delimited list instead of from the arguments. + sparseCheckout = if builtins.isString sparseCheckout then sparseCheckout else builtins.concatStringsSep "\n" sparseCheckout; + + inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName nonConeMode postFetch; postHook = if netrcPhase == null then null else '' ${netrcPhase} diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix index 62fe3f77bbdd..a18be65327b5 100644 --- a/pkgs/build-support/fetchgit/tests.nix +++ b/pkgs/build-support/fetchgit/tests.nix @@ -12,10 +12,10 @@ name = "nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; - sparseCheckout = '' - src - tests - ''; + sparseCheckout = [ + "src" + "tests" + ]; sha256 = "sha256-g1PHGTWgAcd/+sXHo1o6AjVWCvC6HiocOfMbMh873LQ="; }; @@ -23,10 +23,10 @@ name = "nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; - sparseCheckout = '' - src - tests - ''; + sparseCheckout = [ + "src" + "tests" + ]; nonConeMode = true; sha256 = "sha256-FknO6C/PSnMPfhUqObD4vsW4PhkwdmPa9blNzcNvJQ4="; }; From c95d7d5a8c301cf59fde5ffd9296660bc72c3080 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Mon, 7 Nov 2022 19:44:08 +0100 Subject: [PATCH 144/797] treewide: make sparseCheckout a list of strings --- pkgs/applications/misc/nerd-font-patcher/default.nix | 8 ++++---- pkgs/build-support/fetchgithub/default.nix | 4 ++-- pkgs/data/fonts/noto-fonts/default.nix | 2 +- pkgs/data/icons/beauty-line-icon-theme/default.nix | 6 +++--- pkgs/data/misc/colemak-dh/default.nix | 2 +- pkgs/games/itch/default.nix | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/nerd-font-patcher/default.nix b/pkgs/applications/misc/nerd-font-patcher/default.nix index e865479f8da0..21c77316c1ab 100644 --- a/pkgs/applications/misc/nerd-font-patcher/default.nix +++ b/pkgs/applications/misc/nerd-font-patcher/default.nix @@ -9,10 +9,10 @@ python3Packages.buildPythonApplication rec { owner = "ryanoasis"; repo = "nerd-fonts"; rev = "v${version}"; - sparseCheckout = '' - font-patcher - /src/glyphs - ''; + sparseCheckout = [ + "font-patcher" + "/src/glyphs" + ]; sha256 = "sha256-boZUd1PM8puc9BTgOwCJpkfk6VMdXLsIyp+fQmW/ZqI="; }; diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index cfb6a6ca7cd8..fcde7447cbd3 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -3,7 +3,7 @@ { owner, repo, rev, name ? "source" , fetchSubmodules ? false, leaveDotGit ? null , deepClone ? false, private ? false, forceFetchGit ? false -, sparseCheckout ? "" +, sparseCheckout ? [] , githubBase ? "github.com", varPrefix ? null , meta ? { } , ... # For hash agility @@ -24,7 +24,7 @@ let }; passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "forceFetchGit" "private" "githubBase" "varPrefix" ]; varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_"; - useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || (sparseCheckout != ""); + useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || !(sparseCheckout == "" || sparseCheckout == []); # We prefer fetchzip in cases we don't need submodules as the hash # is more stable in that case. fetcher = if useFetchGit then fetchgit else fetchzip; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 019ed1f371c0..da3b0f81d431 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -71,7 +71,7 @@ let owner = "googlefonts"; repo = "noto-cjk"; inherit rev sha256; - sparseCheckout = "${typeface}/Variable/OTC"; + sparseCheckout = [ "${typeface}/Variable/OTC" ]; }; installPhase = '' diff --git a/pkgs/data/icons/beauty-line-icon-theme/default.nix b/pkgs/data/icons/beauty-line-icon-theme/default.nix index 66e5ac57dd17..dc332b0fc328 100644 --- a/pkgs/data/icons/beauty-line-icon-theme/default.nix +++ b/pkgs/data/icons/beauty-line-icon-theme/default.nix @@ -18,9 +18,9 @@ stdenvNoCC.mkDerivation rec { owner = "gvolpe"; repo = pname; rev = version; - sparseCheckout = '' - BeautyLine-V3 - ''; + sparseCheckout = [ + "BeautyLine-V3" + ]; sha256 = "sha256-IkkypAj250+OXbf19TampCnqYsSbJVIjeYlxJoyhpzk="; }; diff --git a/pkgs/data/misc/colemak-dh/default.nix b/pkgs/data/misc/colemak-dh/default.nix index f36832ff42d8..261a7741f16f 100644 --- a/pkgs/data/misc/colemak-dh/default.nix +++ b/pkgs/data/misc/colemak-dh/default.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec { repo = "mod-dh"; rev = "e846a5bd24d59ed15ba70b3a9d5363a38ca51d09"; sha256 = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks="; - sparseCheckout = "console"; + sparseCheckout = [ "console" ]; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/games/itch/default.nix b/pkgs/games/itch/default.nix index 7aed72dd531d..5776a1b43b2b 100644 --- a/pkgs/games/itch/default.nix +++ b/pkgs/games/itch/default.nix @@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation rec { repo = pname; rev = "v${version}"; hash = "sha256-DZBmf8fe0zw5uiQjNKXw8g/vU2hjNDa87z/7XuhyXog="; - inherit sparseCheckout; + sparseCheckout = [ sparseCheckout ]; } + sparseCheckout; nativeBuildInputs = [ copyDesktopItems makeWrapper ]; From b2933672e2927aaf3f4a768623bdd848c9474b78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Nov 2022 19:07:35 +0000 Subject: [PATCH 145/797] python310Packages.diff-cover: 7.0.1 -> 7.0.2 --- pkgs/development/python-modules/diff-cover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 2e62913220e9..a3ea4034e8b6 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "7.0.1"; + version = "7.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-aSWDVdr4J2BXqS5CzsUllK2M/n3VBdbw5W/kQLxEGNA="; + hash = "sha256-OENUR9rTKrt+AdHDlCU5AhpSI4ijtYXVg6biB8wTNJc="; }; propagatedBuildInputs = [ From 0551d04c28fc6fc7eb8b02d03366449b36894303 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Nov 2022 19:45:30 +0000 Subject: [PATCH 146/797] python310Packages.django-webpack-loader: 1.6.0 -> 1.7.0 --- .../python-modules/django-webpack-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index ee51b0e7c8ec..22b6440c70f3 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-opQY/0FpADW+ENLJSgZV2rCZAJxouJiDmBPWoQmxTXE="; + sha256 = "sha256-agZTglc3cbr0AHVMTTnAkTsKKaRTqUHfuRIu6+0hVy8="; }; # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) From 9fdf63a7b4cbf217a3d4843eeb1e7d90b97d54ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Nov 2022 19:48:54 +0000 Subject: [PATCH 147/797] python310Packages.django_hijack: 3.2.1 -> 3.2.4 --- pkgs/development/python-modules/django-hijack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 326db4e3232a..d68ec8f4b75e 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.2.1"; + version = "3.2.4"; # the wheel comes with pre-built assets, allowing us to avoid fighting # with npm/webpack/gettext to build them ourselves. @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "django_hijack"; dist = "py3"; python = "py3"; - sha256 = "sha256-sHI3ULJH5bH2n2AKQLHVEkBAYfM5GOC/+0qpKDFOods="; + sha256 = "sha256-tSIovIPEszq00Y0PMl/Wlx5YK5MTxLhCpNpHFZDi9rQ="; }; propagatedBuildInputs = [ django django_compat ]; From 52f1f8f11073d7b5573bf92e013c5d54205fc6ca Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Tue, 15 Nov 2022 22:12:16 +0530 Subject: [PATCH 148/797] haskellPackages/extra: init brick 1.3 for swarm 0.2.0.0 Signed-off-by: Amneesh Singh --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index fd91f3796fe1..152cfacf84f4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4968,7 +4968,6 @@ broken-packages: - swagger - swagger-petstore - swagger-test - - swarm - swearjure - swf - swift-lda diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index df8fbf82107c..ec1c7d35f7a6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -108,6 +108,7 @@ extra-packages: - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 - bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9 - brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0 + - brick == 1.3 # 2022-11-03: needed by swarm 0.2.0.0 - brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8 - cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3 - clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0 From f52a92c22678777bb8edee6dffb05047d3781cba Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Tue, 15 Nov 2022 22:12:49 +0530 Subject: [PATCH 149/797] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b1f88b5ea529..dbe697d4482e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -48516,6 +48516,33 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "brick_1_3" = callPackage + ({ mkDerivation, base, bimap, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, exceptions + , filepath, microlens, microlens-mtl, microlens-th, mtl, QuickCheck + , stm, template-haskell, text, text-zipper, unix, vector, vty + , word-wrap + }: + mkDerivation { + pname = "brick"; + version = "1.3"; + sha256 = "0lpd6685ya0va0a6n7cw70f5b1s13y8ynzac0gkxyqb1ivzj0hsb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bimap bytestring config-ini containers contravariant + data-clist deepseq directory exceptions filepath microlens + microlens-mtl microlens-th mtl stm template-haskell text + text-zipper unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector vty + ]; + description = "A declarative terminal user interface library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "brick_1_4" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, exceptions @@ -275988,9 +276015,7 @@ self: { ]; description = "2D resource gathering game with programmable robots"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "swarm"; - broken = true; }) {}; "swearjure" = callPackage From 1bb311a89e488e36250f5c362eea69dd714824ba Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Tue, 15 Nov 2022 22:16:08 +0530 Subject: [PATCH 150/797] haskellPackages.swarm: fix broken package Signed-off-by: Amneesh Singh --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0c35d60f430a..d2932d58d5be 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2648,4 +2648,12 @@ in { # Upstream jailbreak is unreleased: https://github.com/srid/heist/commit/988692ea850b3cbe966c7dc4dd26ba1d49647706 heist-emanote = doJailbreak (dontCheck super.heist-emanote); + # 2022-11-15: Needs newer witch package and brick 1.3 which in turn works with text-zipper 0.12 + # Other dependencies are resolved with doJailbreak for both swarm and brick_1_3 + swarm = doJailbreak (super.swarm.override { + witch = super.witch_1_1_2_0; + brick = doJailbreak (dontCheck (super.brick_1_3.override { + text-zipper = super.text-zipper_0_12; + })); + }); }) From a71ccfabf660ef4da7920a9ce7ffb6cdf5c02654 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Nov 2022 22:12:36 +0000 Subject: [PATCH 151/797] python310Packages.geopy: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/geopy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 3ef58b9ec470..c22f86fc43ef 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "geopy"; - version = "2.2.0"; + version = "2.3.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "sha256-zFz0T/M/CABKkChuiKsFkWj2pphZuFeE5gz0HxZYaz8="; + rev = "refs/tags/${version}"; + sha256 = "sha256-bHfjUfuiEH3AxRDTLmbm67bKOw6fBuMQDUQA2NLg800="; }; postPatch = '' From 1d8aaab8e5aa18ab81abe2a024aa7aaadee5a74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 15 Nov 2022 23:49:10 +0100 Subject: [PATCH 152/797] python310Packages.tld: remove tox, pytest-cov dependency --- pkgs/development/python-modules/tld/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 178ce54c8846..d64acf2db5f2 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -3,9 +3,7 @@ , factory_boy , faker , fetchPypi -, pytest-cov , pytestCheckHook -, tox }: buildPythonPackage rec { @@ -20,9 +18,7 @@ buildPythonPackage rec { checkInputs = [ factory_boy faker - pytest-cov pytestCheckHook - tox ]; # these tests require network access, but disabledTestPaths doesn't work. From 4237ad7b6ea6e66480de373f8f5999e8211ff332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 15 Nov 2022 23:55:34 +0100 Subject: [PATCH 153/797] python310Packages.sqlalchemy-jsonfield: cleanup checkInputs --- .../sqlalchemy-jsonfield/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix index 54962387967d..0c6b7cab676f 100644 --- a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix @@ -6,13 +6,11 @@ , setuptools , tox , sphinx -, pytest -, pytest-cov -, pytest-html +, pytestCheckHook , pytest-sugar -, coverage , pymysql -, psycopg2 }: +, psycopg2 +}: buildPythonPackage rec { pname = "sqlalchemy-jsonfield"; @@ -28,17 +26,15 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ sqlalchemy setuptools ]; - checkInputs = [ tox sphinx pytest pytest-cov pytest-html pytest-sugar coverage pymysql psycopg2 ]; - checkPhase = '' - TOX_TESTENV_PASSENV="PYTHONPATH SETUPTOOLS_SCM_PRETEND_VERSION" tox -e functional - ''; + propagatedBuildInputs = [ sqlalchemy setuptools ]; + + checkInputs = [ pytestCheckHook pytest-sugar pymysql psycopg2 ]; meta = with lib; { homepage = "https://github.com/penguinolog/sqlalchemy_jsonfield"; description = "SQLALchemy JSONField implementation for storing dicts at SQL independently from JSON type support"; license = licenses.asl20; - maintainers = [ maintainers.ivan-tkatchev ]; + maintainers = with maintainers; [ ivan-tkatchev ]; }; } From 56a016bd77470720a56ae2cb2b6fca5fa75f15c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 15 Nov 2022 23:58:44 +0100 Subject: [PATCH 154/797] python310Packages.smpplib: use pytestCheckHook, remove tox requirement --- pkgs/development/python-modules/smpplib/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix index 179ab7ce1bfc..474120bcd872 100644 --- a/pkgs/development/python-modules/smpplib/default.nix +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, python, six, tox, mock, pytest }: +{ buildPythonPackage, fetchPypi, lib, python, six, mock, pytestCheckHook }: buildPythonPackage rec { pname = "smpplib"; @@ -10,11 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six ]; - checkInputs = [ tox mock pytest ]; - - checkPhase = '' - pytest - ''; + checkInputs = [ mock pytestCheckHook ]; postInstall = '' rm -rf $out/${python.sitePackages}/tests From 0f32fa6a3435f5bbdea3f68153b448311c8a09ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 16 Nov 2022 00:01:14 +0100 Subject: [PATCH 155/797] python310Packages.serpy: cleanup, remove linters --- .../python-modules/serpy/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix index 7a1b8348a0e6..759b71915add 100644 --- a/pkgs/development/python-modules/serpy/default.nix +++ b/pkgs/development/python-modules/serpy/default.nix @@ -1,25 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, - flake8, py, pyflakes, six, tox -}: +{ lib, buildPythonPackage, fetchPypi, six }: buildPythonPackage rec { pname = "serpy"; version = "0.3.1"; - meta = { - description = "ridiculously fast object serialization"; - homepage = "https://github.com/clarkduvall/serpy"; - license = lib.licenses.mit; - }; - src = fetchPypi { inherit pname version; sha256 = "3772b2a9923fbf674000ff51abebf6ea8f0fca0a2cfcbfa0d63ff118193d1ec5"; }; - buildInputs = [ flake8 py pyflakes tox ]; propagatedBuildInputs = [ six ]; # ImportError: No module named 'tests doCheck = false; + + meta = with lib; { + description = "Ridiculously fast object serialization"; + homepage = "https://github.com/clarkduvall/serpy"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; } From 0b72f509f3848ffa8e2cb93eab8e49ce01920079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 16 Nov 2022 00:03:40 +0100 Subject: [PATCH 156/797] python310Packages.snakebite: cleanup unused checkInputs --- pkgs/development/python-modules/snakebite/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/python-modules/snakebite/default.nix b/pkgs/development/python-modules/snakebite/default.nix index b4d83e672271..3a83c47ff7d1 100644 --- a/pkgs/development/python-modules/snakebite/default.nix +++ b/pkgs/development/python-modules/snakebite/default.nix @@ -1,8 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, tox -, virtualenv , protobuf }: @@ -15,11 +13,6 @@ buildPythonPackage rec { sha256 = "085238b4944cb9c658ee62d5794de936ac3d0c337c504b2cc86424a205ae978a"; }; - checkInputs = [ - tox - virtualenv - ]; - propagatedBuildInputs = [ protobuf ]; From 22d230be61d200a9eea2f045636074874817ba99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 16 Nov 2022 00:06:49 +0100 Subject: [PATCH 157/797] python310Packages.pyrect: normalise pname, cleanup, remove tox dependency --- pkgs/development/python-modules/pyrect/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyrect/default.nix b/pkgs/development/python-modules/pyrect/default.nix index 54566658443c..1d0a0ba022fe 100644 --- a/pkgs/development/python-modules/pyrect/default.nix +++ b/pkgs/development/python-modules/pyrect/default.nix @@ -1,25 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, tox , pytestCheckHook , pygame }: + buildPythonPackage rec { - pname = "PyRect"; + pname = "pyrect"; version = "0.2.0"; src = fetchPypi { - inherit pname version; + pname = "PyRect"; + inherit version; sha256 = "sha256-9lFV9t+bkptnyv+9V8CUfFrlRJ07WA0XgHS/+0egm3g="; }; - checkInputs = [ tox pytestCheckHook pygame ]; - pythonImportsCheck = [ "pyrect" ]; + checkInputs = [ pytestCheckHook pygame ]; + preCheck = '' export LC_ALL="en_US.UTF-8" ''; + pythonImportsCheck = [ "pyrect" ]; + meta = with lib; { description = "Simple module with a Rect class for Pygame-like rectangular areas"; homepage = "https://github.com/asweigart/pyrect"; From 5446f0ebd2155f736660bdc63af1900ddf03d951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 16 Nov 2022 00:12:01 +0100 Subject: [PATCH 158/797] python310Packages.ibm-cloud-sdk-core: remove not required tox dependency --- pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 3e2d61843de2..c1e70fbf9902 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -7,7 +7,6 @@ , pythonOlder , requests , responses -, tox }: buildPythonPackage rec { @@ -31,7 +30,6 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook responses - tox ]; disabledTests = [ From 015d850d0cae79a9ccd95221211bb4963de604e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 16 Nov 2022 00:13:45 +0100 Subject: [PATCH 159/797] python310Packages.pwntools: use https homepage --- pkgs/development/python-modules/pwntools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index dad2c04b0d6f..35ad60317ad4 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = "http://pwntools.com"; + homepage = "https://pwntools.com"; description = "CTF framework and exploit development library"; license = licenses.mit; maintainers = with maintainers; [ bennofs kristoff3r pamplemousse ]; From 229291b8ddd7ebb26d934911610f4455770803d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 16 Nov 2022 00:18:57 +0100 Subject: [PATCH 160/797] python310Packages.taskw: enable tests, cleanup --- pkgs/development/python-modules/taskw/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 0d4cd9c09e94..dfdbbcf5d814 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -6,13 +6,14 @@ , six , python-dateutil , kitchen +, pytestCheckHook , pytz , pkgs }: buildPythonPackage rec { - version = "2.0.0"; pname = "taskw"; + version = "2.0.0"; src = fetchPypi { inherit pname version; @@ -25,17 +26,16 @@ buildPythonPackage rec { --replace '@@taskwarrior@@' '${pkgs.taskwarrior}' ''; - # https://github.com/ralphbean/taskw/issues/98 - doCheck = false; + buildInputs = [ pkgs.taskwarrior ]; - buildInputs = [ nose pkgs.taskwarrior tox ]; propagatedBuildInputs = [ six python-dateutil kitchen pytz ]; + checkInputs = [ pytestCheckHook ]; + meta = with lib; { homepage = "https://github.com/ralphbean/taskw"; description = "Python bindings for your taskwarrior database"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pierron ]; }; - } From 4e2df25b918aa10f18093e9c2771da6fb34bd0c5 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 15 Nov 2022 18:20:39 -0500 Subject: [PATCH 161/797] haskellPackages: update ghc-lib-parser to 9.2.5.20221107 and fourmolu to 0.9.0.0 --- .../haskell-modules/configuration-common.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d2932d58d5be..cea6fd2a8ba8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1565,10 +1565,10 @@ self: super: { (disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways … ]).overrideScope (lself: lsuper: { ormolu = doJailbreak lself.ormolu_0_5_0_1; - fourmolu = doJailbreak lself.fourmolu_0_8_2_0; + fourmolu = doJailbreak lself.fourmolu_0_9_0_0; hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; - ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729; + ghc-lib-parser = lself.ghc-lib-parser_9_2_5_20221107; # For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix, # because some packages, like ormolu, need a newer Cabal version. # ghc-paths is special because it depends on Cabal for building @@ -1589,12 +1589,12 @@ self: super: { # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; - ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729; + ghc-lib-parser = lself.ghc-lib-parser_9_2_5_20221107; }); # For -f-auto see cabal.project in haskell-language-server. ghc-lib-parser-ex_9_2_0_4 = disableCabalFlag "auto" (super.ghc-lib-parser-ex_9_2_0_4.override { - ghc-lib-parser = self.ghc-lib-parser_9_2_4_20220729; + ghc-lib-parser = self.ghc-lib-parser_9_2_5_20221107; }); # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809 @@ -2179,7 +2179,7 @@ self: super: { # 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2 stylish-haskell = (super.stylish-haskell.override { - ghc-lib-parser = self.ghc-lib-parser_9_2_4_20220729; + ghc-lib-parser = self.ghc-lib-parser_9_2_5_20221107; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; }); From 0e90efeddc70837b96241dae1bd585215ce00ec3 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Tue, 15 Nov 2022 23:58:41 +0100 Subject: [PATCH 162/797] =?UTF-8?q?python310Packages.sip:=206.7.1=20?= =?UTF-8?q?=E2=86=92=206.7.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes NixOS/nixpkgs#196432 --- pkgs/development/python-modules/sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index ab2701fefdc3..07a731b53d92 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "sip"; - version = "6.7.1"; + version = "6.7.4"; src = fetchPypi { pname = "sip"; inherit version; - sha256 = "sha256-KBcP34gPk3Am/If6qcF3sGLDU8XRaeoyQrB4AmFN3Qw="; + sha256 = "sha256-nb+KDnyNdtFkLi/dP1PmpSL3wwmA5Sd2PEV2DCUFz78="; }; propagatedBuildInputs = [ packaging ply toml ]; From 54d139174aa121e53595ea99580bc7724352cd95 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Tue, 15 Nov 2022 23:51:29 +0100 Subject: [PATCH 163/797] rustup-toolchain-install-master: fix build by using openssl 1.x Upstream package didn't have recent releases. Currently build fails with something like ``` running: "/nix/store/dq0xwmsk1g0i2ayg6pb7y87na2knzylh-gcc-wrapper-11.3.0/bin/cc" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-I" "/nix/store/f95kxwhnr2bazy7nl6wzwjiak02dlp9v-openssl-3.0.7-dev/include" "-Wall" "-Wextra" "-E" "build/expando.c" cargo:warning=build/expando.c:4:24: error: pasting "RUST_VERSION_OPENSSL_" and "(" does not give a valid preprocessing token cargo:warning= 4 | #define VERSION2(n, v) RUST_VERSION_##n##_##v cargo:warning= | ^~~~~~~~~~~~~ cargo:warning=build/expando.c:5:23: note: in expansion of macro 'VERSION2' cargo:warning= 5 | #define VERSION(n, v) VERSION2(n, v) cargo:warning= | ^~~~~~~~ cargo:warning=build/expando.c:10:1: note: in expansion of macro 'VERSION' cargo:warning= 10 | VERSION(OPENSSL, OPENSSL_VERSION_NUMBER) cargo:warning= | ^~~~~~~ exit status: 1 ``` which looks like https://github.com/sfackler/rust-openssl/issues/1030 and should be fixed in a transitive dependency by https://github.com/sfackler/rust-openssl/pull/1264 But rather than trying to bump transitive dependency let's downgrade openssl used by this package. ZHF: #199919 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f3d7a3dde6d..7affdba11ca1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15246,6 +15246,7 @@ with pkgs; }; rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; rusty-man = callPackage ../development/tools/rust/rusty-man { }; From 7baf23ef37e1fa276967bebd2df58cba8b455d94 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 16 Nov 2022 01:23:32 +0100 Subject: [PATCH 164/797] libnice: add darwin support --- pkgs/development/libraries/libnice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 42fb795d38ed..3129c9c7ab93 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { It provides a GLib-based library, libnice and a Glib-free library, libstun as well as GStreamer elements.''; homepage = "https://libnice.freedesktop.org/"; - platforms = platforms.linux; + platforms = platforms.unix; license = with licenses; [ lgpl21 mpl11 ]; }; } From 4ca7ad6790d33ac92947e28b74320124fada0671 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 16 Nov 2022 01:23:41 +0100 Subject: [PATCH 165/797] farstream: add darwin support --- pkgs/development/libraries/farstream/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 98c660dc798d..76ed20495725 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/Farstream"; description = "Audio/Video Communications Framework formely known as farsight"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl21; }; } From db69a86b5383185626592dca9d13824fbb5bad31 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 16 Nov 2022 01:23:47 +0100 Subject: [PATCH 166/797] telepathy-farstream: add darwin support --- pkgs/development/libraries/telepathy/farstream/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index 59f0a165221c..072ca801f31b 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call"; homepage = "https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl21Only; }; } From 875f1cc12534a8de9c40fe14c20cb65a0fcc9c23 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 16 Nov 2022 01:23:55 +0100 Subject: [PATCH 167/797] telepathy-qt: add darwin support --- pkgs/development/libraries/telepathy/qt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 37a71fb25363..accc02499d46 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { description = "Telepathy Qt bindings"; homepage = "https://telepathy.freedesktop.org/components/telepathy-qt/"; license = licenses.lgpl21; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 5b3eccd1086cc966ab2561135df0775ece7da9df Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 15 Nov 2022 12:42:27 +0000 Subject: [PATCH 168/797] perf-linux: clean up code - Remove support for older versions below 5.0 which are already marked as broken - Drop patches for removed versions such as 5.19 - Some minor changes --- .../perf/5.19-binutils-2.39-support.patch | 352 ------------------ .../os-specific/linux/kernel/perf/default.nix | 43 +-- 2 files changed, 15 insertions(+), 380 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/perf/5.19-binutils-2.39-support.patch diff --git a/pkgs/os-specific/linux/kernel/perf/5.19-binutils-2.39-support.patch b/pkgs/os-specific/linux/kernel/perf/5.19-binutils-2.39-support.patch deleted file mode 100644 index 5f4f2fc0b4a9..000000000000 --- a/pkgs/os-specific/linux/kernel/perf/5.19-binutils-2.39-support.patch +++ /dev/null @@ -1,352 +0,0 @@ -Fetched as: - $ wget 'https://github.com/torvalds/linux/compare/00b32625982e0c796f0abb8effcac9c05ef55bd3...600b7b26c07a070d0153daa76b3806c1e52c9e00.patch' - -Adds support for binutils-2.39 API change around init_disassemble_info(). ---- a/tools/build/Makefile.feature -+++ b/tools/build/Makefile.feature -@@ -70,6 +70,7 @@ FEATURE_TESTS_BASIC := \ - libaio \ - libzstd \ - disassembler-four-args \ -+ disassembler-init-styled \ - file-handle - - # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list ---- a/tools/build/feature/Makefile -+++ b/tools/build/feature/Makefile -@@ -18,6 +18,7 @@ FILES= \ - test-libbfd.bin \ - test-libbfd-buildid.bin \ - test-disassembler-four-args.bin \ -+ test-disassembler-init-styled.bin \ - test-reallocarray.bin \ - test-libbfd-liberty.bin \ - test-libbfd-liberty-z.bin \ -@@ -248,6 +249,9 @@ $(OUTPUT)test-libbfd-buildid.bin: - $(OUTPUT)test-disassembler-four-args.bin: - $(BUILD) -DPACKAGE='"perf"' -lbfd -lopcodes - -+$(OUTPUT)test-disassembler-init-styled.bin: -+ $(BUILD) -DPACKAGE='"perf"' -lbfd -lopcodes -+ - $(OUTPUT)test-reallocarray.bin: - $(BUILD) - ---- a/tools/build/feature/test-all.c -+++ b/tools/build/feature/test-all.c -@@ -166,6 +166,10 @@ - # include "test-disassembler-four-args.c" - #undef main - -+#define main main_test_disassembler_init_styled -+# include "test-disassembler-init-styled.c" -+#undef main -+ - #define main main_test_libzstd - # include "test-libzstd.c" - #undef main ---- /dev/null -+++ b/tools/build/feature/test-disassembler-init-styled.c -@@ -0,0 +1,13 @@ -+// SPDX-License-Identifier: GPL-2.0 -+#include -+#include -+ -+int main(void) -+{ -+ struct disassemble_info info; -+ -+ init_disassemble_info(&info, stdout, -+ NULL, NULL); -+ -+ return 0; -+} - ---- a/tools/build/Makefile.feature -+++ b/tools/build/Makefile.feature -@@ -135,8 +135,7 @@ FEATURE_DISPLAY ?= \ - get_cpuid \ - bpf \ - libaio \ -- libzstd \ -- disassembler-four-args -+ libzstd - - # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features. - # If in the future we need per-feature checks/flags for features not - ---- /dev/null -+++ b/tools/include/tools/dis-asm-compat.h -@@ -0,0 +1,55 @@ -+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */ -+#ifndef _TOOLS_DIS_ASM_COMPAT_H -+#define _TOOLS_DIS_ASM_COMPAT_H -+ -+#include -+#include -+ -+/* define types for older binutils version, to centralize ifdef'ery a bit */ -+#ifndef DISASM_INIT_STYLED -+enum disassembler_style {DISASSEMBLER_STYLE_NOT_EMPTY}; -+typedef int (*fprintf_styled_ftype) (void *, enum disassembler_style, const char*, ...); -+#endif -+ -+/* -+ * Trivial fprintf wrapper to be used as the fprintf_styled_func argument to -+ * init_disassemble_info_compat() when normal fprintf suffices. -+ */ -+static inline int fprintf_styled(void *out, -+ enum disassembler_style style, -+ const char *fmt, ...) -+{ -+ va_list args; -+ int r; -+ -+ (void)style; -+ -+ va_start(args, fmt); -+ r = vfprintf(out, fmt, args); -+ va_end(args); -+ -+ return r; -+} -+ -+/* -+ * Wrapper for init_disassemble_info() that hides version -+ * differences. Depending on binutils version and architecture either -+ * fprintf_func or fprintf_styled_func will be called. -+ */ -+static inline void init_disassemble_info_compat(struct disassemble_info *info, -+ void *stream, -+ fprintf_ftype unstyled_func, -+ fprintf_styled_ftype styled_func) -+{ -+#ifdef DISASM_INIT_STYLED -+ init_disassemble_info(info, stream, -+ unstyled_func, -+ styled_func); -+#else -+ (void)styled_func; -+ init_disassemble_info(info, stream, -+ unstyled_func); -+#endif -+} -+ -+#endif /* _TOOLS_DIS_ASM_COMPAT_H */ - ---- a/tools/perf/Makefile.config -+++ b/tools/perf/Makefile.config -@@ -298,6 +298,7 @@ FEATURE_CHECK_LDFLAGS-libpython := $(PYTHON_EMBED_LDOPTS) - FEATURE_CHECK_LDFLAGS-libaio = -lrt - - FEATURE_CHECK_LDFLAGS-disassembler-four-args = -lbfd -lopcodes -ldl -+FEATURE_CHECK_LDFLAGS-disassembler-init-styled = -lbfd -lopcodes -ldl - - CORE_CFLAGS += -fno-omit-frame-pointer - CORE_CFLAGS += -ggdb3 -@@ -924,13 +925,16 @@ ifndef NO_LIBBFD - ifeq ($(feature-libbfd-liberty), 1) - EXTLIBS += -lbfd -lopcodes -liberty - FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -ldl -+ FEATURE_CHECK_LDFLAGS-disassembler-init-styled += -liberty -ldl - else - ifeq ($(feature-libbfd-liberty-z), 1) - EXTLIBS += -lbfd -lopcodes -liberty -lz - FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -lz -ldl -+ FEATURE_CHECK_LDFLAGS-disassembler-init-styled += -liberty -lz -ldl - endif - endif - $(call feature_check,disassembler-four-args) -+ $(call feature_check,disassembler-init-styled) - endif - - ifeq ($(feature-libbfd-buildid), 1) -@@ -1044,6 +1048,10 @@ ifeq ($(feature-disassembler-four-args), 1) - CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE - endif - -+ifeq ($(feature-disassembler-init-styled), 1) -+ CFLAGS += -DDISASM_INIT_STYLED -+endif -+ - ifeq (${IS_64_BIT}, 1) - ifndef NO_PERF_READ_VDSO32 - $(call feature_check,compile-32) ---- a/tools/perf/util/annotate.c -+++ b/tools/perf/util/annotate.c -@@ -1720,6 +1720,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil - #include - #include - #include -+#include - - static int symbol__disassemble_bpf(struct symbol *sym, - struct annotate_args *args) -@@ -1762,9 +1763,9 @@ static int symbol__disassemble_bpf(struct symbol *sym, - ret = errno; - goto out; - } -- init_disassemble_info(&info, s, -- (fprintf_ftype) fprintf); -- -+ init_disassemble_info_compat(&info, s, -+ (fprintf_ftype) fprintf, -+ fprintf_styled); - info.arch = bfd_get_arch(bfdf); - info.mach = bfd_get_mach(bfdf); - - ---- a/tools/bpf/Makefile -+++ b/tools/bpf/Makefile -@@ -34,7 +34,7 @@ else - endif - - FEATURE_USER = .bpf --FEATURE_TESTS = libbfd disassembler-four-args -+FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled - FEATURE_DISPLAY = libbfd disassembler-four-args - - check_feat := 1 -@@ -56,6 +56,9 @@ endif - ifeq ($(feature-disassembler-four-args), 1) - CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE - endif -+ifeq ($(feature-disassembler-init-styled), 1) -+CFLAGS += -DDISASM_INIT_STYLED -+endif - - $(OUTPUT)%.yacc.c: $(srctree)/tools/bpf/%.y - $(QUIET_BISON)$(YACC) -o $@ -d $< ---- a/tools/bpf/bpf_jit_disasm.c -+++ b/tools/bpf/bpf_jit_disasm.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #define CMD_ACTION_SIZE_BUFFER 10 - #define CMD_ACTION_READ_ALL 3 -@@ -64,7 +65,9 @@ static void get_asm_insns(uint8_t *image, size_t len, int opcodes) - assert(bfdf); - assert(bfd_check_format(bfdf, bfd_object)); - -- init_disassemble_info(&info, stdout, (fprintf_ftype) fprintf); -+ init_disassemble_info_compat(&info, stdout, -+ (fprintf_ftype) fprintf, -+ fprintf_styled); - info.arch = bfd_get_arch(bfdf); - info.mach = bfd_get_mach(bfdf); - info.buffer = image; - ---- a/tools/bpf/Makefile -+++ b/tools/bpf/Makefile -@@ -35,7 +35,7 @@ endif - - FEATURE_USER = .bpf - FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled --FEATURE_DISPLAY = libbfd disassembler-four-args -+FEATURE_DISPLAY = libbfd - - check_feat := 1 - NON_CHECK_FEAT_TARGETS := clean bpftool_clean runqslower_clean resolve_btfids_clean - ---- a/tools/bpf/bpftool/Makefile -+++ b/tools/bpf/bpftool/Makefile -@@ -93,7 +93,7 @@ INSTALL ?= install - RM ?= rm -f - - FEATURE_USER = .bpftool --FEATURE_TESTS = libbfd disassembler-four-args zlib libcap \ -+FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled zlib libcap \ - clang-bpf-co-re - FEATURE_DISPLAY = libbfd disassembler-four-args zlib libcap \ - clang-bpf-co-re -@@ -117,6 +117,9 @@ endif - ifeq ($(feature-disassembler-four-args), 1) - CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE - endif -+ifeq ($(feature-disassembler-init-styled), 1) -+ CFLAGS += -DDISASM_INIT_STYLED -+endif - - LIBS = $(LIBBPF) -lelf -lz - LIBS_BOOTSTRAP = $(LIBBPF_BOOTSTRAP) -lelf -lz ---- a/tools/bpf/bpftool/jit_disasm.c -+++ b/tools/bpf/bpftool/jit_disasm.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #include "json_writer.h" - #include "main.h" -@@ -39,15 +40,12 @@ static void get_exec_path(char *tpath, size_t size) - } - - static int oper_count; --static int fprintf_json(void *out, const char *fmt, ...) -+static int printf_json(void *out, const char *fmt, va_list ap) - { -- va_list ap; - char *s; - int err; - -- va_start(ap, fmt); - err = vasprintf(&s, fmt, ap); -- va_end(ap); - if (err < 0) - return -1; - -@@ -73,6 +71,32 @@ static int fprintf_json(void *out, const char *fmt, ...) - return 0; - } - -+static int fprintf_json(void *out, const char *fmt, ...) -+{ -+ va_list ap; -+ int r; -+ -+ va_start(ap, fmt); -+ r = printf_json(out, fmt, ap); -+ va_end(ap); -+ -+ return r; -+} -+ -+static int fprintf_json_styled(void *out, -+ enum disassembler_style style __maybe_unused, -+ const char *fmt, ...) -+{ -+ va_list ap; -+ int r; -+ -+ va_start(ap, fmt); -+ r = printf_json(out, fmt, ap); -+ va_end(ap); -+ -+ return r; -+} -+ - void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes, - const char *arch, const char *disassembler_options, - const struct btf *btf, -@@ -99,11 +123,13 @@ void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes, - assert(bfd_check_format(bfdf, bfd_object)); - - if (json_output) -- init_disassemble_info(&info, stdout, -- (fprintf_ftype) fprintf_json); -+ init_disassemble_info_compat(&info, stdout, -+ (fprintf_ftype) fprintf_json, -+ fprintf_json_styled); - else -- init_disassemble_info(&info, stdout, -- (fprintf_ftype) fprintf); -+ init_disassemble_info_compat(&info, stdout, -+ (fprintf_ftype) fprintf, -+ fprintf_styled); - - /* Update architecture info for offload. */ - if (arch) { diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 709312ebdcdf..e4c8be02cbb0 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -4,9 +4,7 @@ , fetchurl , kernel , elfutils -, python2 , python3 -, python3Packages , perl , newt , slang @@ -61,34 +59,23 @@ stdenv.mkDerivation { inherit (kernel) src; - patches = lib.optionals (lib.versionAtLeast kernel.version "5.19" && lib.versionOlder kernel.version "5.20") [ - # binutils-2.39 support around init_disassemble_info() - # API change. - # Will be included in 5.20. - ./5.19-binutils-2.39-support.patch - ]; - postPatch = '' - patchShebangs scripts tools/perf/pmu-events/jevents.py - '' + lib.optionalString (lib.versionAtLeast kernel.version "5.8") '' - substituteInPlace tools/perf/scripts/python/flamegraph.py \ - --replace "/usr/share/d3-flame-graph/d3-flamegraph-base.html" \ - "${d3-flame-graph-templates}/share/d3-flame-graph/d3-flamegraph-base.html" - ''; + # Linux scripts + patchShebangs scripts - preConfigure = '' cd tools/perf - substituteInPlace Makefile \ - --replace /usr/include/elfutils $elfutils/include/elfutils - for x in util/build-id.c util/dso.c; do substituteInPlace $x --replace /usr/lib/debug /run/current-system/sw/lib/debug done - if [ -f bash_completion ]; then - sed -i 's,^have perf,_have perf,' bash_completion - fi + '' + lib.optionalString (lib.versionAtLeast kernel.version "5.8") '' + substituteInPlace scripts/python/flamegraph.py \ + --replace "/usr/share/d3-flame-graph/d3-flamegraph-base.html" \ + "${d3-flame-graph-templates}/share/d3-flame-graph/d3-flamegraph-base.html" + + '' + lib.optionalString (lib.versionAtLeast kernel.version "6.0") '' + patchShebangs pmu-events/jevents.py ''; makeFlags = [ "prefix=$(out)" "WERROR=0" ] ++ kernel.makeFlags; @@ -127,10 +114,9 @@ stdenv.mkDerivation { then [ libbfd libopcodes ] else [ libbfd_2_38 libopcodes_2_38 ]) ++ lib.optional withGtk gtk2 - ++ (if (lib.versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]) ++ lib.optional withZstd zstd ++ lib.optional withLibcap libcap - ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3Packages.setuptools; + ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3.pkgs.setuptools; NIX_CFLAGS_COMPILE = toString [ "-Wno-error=cpp" @@ -140,22 +126,23 @@ stdenv.mkDerivation { ]; doCheck = false; # requires "sparse" - doInstallCheck = false; # same - separateDebugInfo = true; installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; - postInstall ='' + # TODO: Add completions based on perf-completion.sh + postInstall = '' # Same as perf. Remove. rm -f $out/bin/trace ''; + separateDebugInfo = true; + preFixup = '' # Pull in 'objdump' into PATH to make annotations work. # The embeded Python interpreter will search PATH to calculate the Python path configuration(Should be fixed by upstream). # Add python.interpreter to PATH for now. wrapProgram $out/bin/perf \ - --prefix PATH : ${lib.makeBinPath ([ binutils-unwrapped ] ++ (if (lib.versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]))} + --prefix PATH : ${lib.makeBinPath [ binutils-unwrapped python3 ]} ''; meta = with lib; { From 03db455ebc6242f8d55e4938895362ea60153174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 15 Nov 2022 20:56:11 -0800 Subject: [PATCH 169/797] python310Packages.hatchling: 1.9.0 -> 1.11.1 https://github.com/pypa/hatch/blob/hatchling-v1.11.1/docs/history.md#hatchling --- pkgs/development/python-modules/hatchling/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 6006c30219e1..6d948889341d 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -20,7 +20,7 @@ let pname = "hatchling"; - version = "1.9.0"; + version = "1.11.1"; in buildPythonPackage { inherit pname version; @@ -28,7 +28,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-tXxzYvQ3uUJuS5QiiiHSrFgE+7KrywGt3iVEo1uzA80="; + hash = "sha256-n4Q2H3DPOnq5VDsMPsxkIR7SuopganHrakc8HJsI4dA="; }; # listed in backend/src/hatchling/ouroboros.py @@ -72,6 +72,7 @@ buildPythonPackage { meta = with lib; { description = "Modern, extensible Python build backend"; homepage = "https://hatch.pypa.io/latest/"; + changelog = "https://github.com/pypa/hatch/blob/hatchling-v${version}/docs/history.md#hatchling"; license = licenses.mit; maintainers = with maintainers; [ hexa ofek ]; }; From 7cf198ce2e294d316a4afdca89b9c906a0f60683 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Nov 2022 05:17:02 +0000 Subject: [PATCH 170/797] python310Packages.holidays: 0.16 -> 0.17 --- pkgs/development/python-modules/holidays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index ef86bbfc9ff9..570c61d186f5 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.16"; + version = "0.17"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HX9P1rGYApj7uzMWsNV/pvFbUxMHTNrMEqOrk788pc0="; + hash = "sha256-nxa2Dwe+KgPKqj1sqLDWau6JkLcgag0TlM4x+tK0JC4="; }; propagatedBuildInputs = [ From a7e53e534a2b8894aea20233e59579fa207dcb12 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 16 Nov 2022 15:50:07 +0900 Subject: [PATCH 171/797] haskellPackages.language-docker_11_0_0: generate for hadolint --- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index ec1c7d35f7a6..53f53d425c95 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -144,6 +144,7 @@ extra-packages: - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 + - language-docker == 11.0.0 # required by hadolint 2.12.0, 2022-11-16 - language-javascript == 0.7.0.0 # required by purescript - lsp == 1.4.0.0 # 2022-09-18: need for dhall-lsp-server 1.1.2 - lsp-types == 1.4.0.1 # 2022-09-18: need for dhall-lsp-server 1.1.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dbe697d4482e..c5b0978464b7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -173112,6 +173112,29 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "language-docker_11_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , data-default-class, hspec, hspec-megaparsec, HUnit, megaparsec + , prettyprinter, QuickCheck, split, text, time + }: + mkDerivation { + pname = "language-docker"; + version = "11.0.0"; + sha256 = "1j8aib6pq7ghmsi3l2p554l8gnapi0jd3qsi8vhdn2mgvw2n1948"; + libraryHaskellDepends = [ + base bytestring containers data-default data-default-class + megaparsec prettyprinter split text time + ]; + testHaskellDepends = [ + base bytestring containers data-default data-default-class hspec + hspec-megaparsec HUnit megaparsec prettyprinter QuickCheck split + text time + ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "language-docker_12_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, hspec, hspec-megaparsec, HUnit, megaparsec From a47061b5885080ac9a1726d9f15d3df52c618c3a Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 15 Nov 2022 23:11:19 -0800 Subject: [PATCH 172/797] python310Packages.repeated-test: init at 2.3.1 This was removed earlier this year due to lack of maintenance, but it has been updated and looks maintained again. --- .../python-modules/repeated-test/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-aliases.nix | 2 +- pkgs/top-level/python-packages.nix | 2 + 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/repeated-test/default.nix diff --git a/pkgs/development/python-modules/repeated-test/default.nix b/pkgs/development/python-modules/repeated-test/default.nix new file mode 100644 index 000000000000..0b50cde1f0b1 --- /dev/null +++ b/pkgs/development/python-modules/repeated-test/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "repeated-test"; + version = "2.3.1"; + format = "pyproject"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + pname = "repeated_test"; + inherit version; + hash = "sha256-TbVyQA7EjCSwo6qfDksbE8IU1ElkSCABEUBWy5j1KJc="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "A quick unittest-compatible framework for repeating a test function over many fixtures"; + homepage = "https://github.com/epsy/repeated_test"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b9d3fc1835e9..26f1e48f7b89 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -179,7 +179,7 @@ mapAliases ({ qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 - repeated_test = throw "repeated_test is no longer maintained"; # added 2022-01-11 + repeated_test = repeated-test; # added 2022-11-15 requests_oauthlib = requests-oauthlib; # added 2022-02-12 requests_toolbelt = requests-toolbelt; # added 2017-09-26 roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f5d9228d4da..fd86f21d55b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9646,6 +9646,8 @@ self: super: with self; { reparser = callPackage ../development/python-modules/reparser { }; + repeated-test = callPackage ../development/python-modules/repeated-test { }; + repocheck = callPackage ../development/python-modules/repocheck { }; reportengine = callPackage ../development/python-modules/reportengine { }; From aa18db152e339f3b715a06c5dc9aeb22ca43c656 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 15 Nov 2022 23:14:20 -0800 Subject: [PATCH 173/797] python310Packages.od: reenable tests By adding back repeated-test and removing unittest2. --- pkgs/development/python-modules/od/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/od/default.nix b/pkgs/development/python-modules/od/default.nix index de64e2f8fdc8..c9be270f9340 100644 --- a/pkgs/development/python-modules/od/default.nix +++ b/pkgs/development/python-modules/od/default.nix @@ -1,19 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi, unittest2 }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, repeated-test +}: buildPythonPackage rec { pname = "od"; version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk="; }; - # repeated_test no longer exists in nixpkgs - # also see: https://github.com/epsy/od/issues/1 - doCheck = false; checkInputs = [ - unittest2 + repeated-test ]; meta = with lib; { @@ -21,5 +26,4 @@ buildPythonPackage rec { homepage = "https://github.com/epsy/od"; license = licenses.mit; }; - } From c6c9ecf5e8a2012d29aeae1a422b1a4d48ece027 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 15 Nov 2022 23:18:09 -0800 Subject: [PATCH 174/797] python310Packages.clize: reenable tests --- pkgs/development/python-modules/clize/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index a78b55704aec..a848125a55dc 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -8,9 +8,9 @@ , pytestCheckHook , pythonOlder , python-dateutil -, setuptools +, repeated-test +, setuptools-scm , sigtools -, unittest2 }: buildPythonPackage rec { @@ -26,7 +26,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -42,14 +42,11 @@ buildPythonPackage rec { ]; }; - # repeated_test no longer exists in nixpkgs - # also see: https://github.com/epsy/clize/issues/74 - doCheck = false; checkInputs = [ pytestCheckHook python-dateutil pygments - unittest2 + repeated-test ]; pythonImportsCheck = [ From 2f65646b1aa3f43179d2469563c0c32a4321ffda Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 15 Nov 2022 23:38:08 -0800 Subject: [PATCH 175/797] python310Packages.sigtools: reenable tests --- .../python-modules/sigtools/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix index cf32ad5db79c..ac3417ca0c3d 100644 --- a/pkgs/development/python-modules/sigtools/default.nix +++ b/pkgs/development/python-modules/sigtools/default.nix @@ -1,13 +1,12 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , sphinx , mock -, coverage -, unittest2 +, repeated-test +, unittestCheckHook , attrs -, funcsigs -, six , setuptools-scm }: @@ -16,6 +15,8 @@ buildPythonPackage rec { version = "4.0.1"; format = "pyproject"; + disabled = pythonOlder "3.4"; + src = fetchPypi { inherit pname version; sha256 = "sha256-S44TWpzU0uoA2mcMCTNy105nK6OruH9MmNjnPepURFw="; @@ -29,12 +30,12 @@ buildPythonPackage rec { attrs ]; - patchPhase = ''sed -i s/test_suite="'"sigtools.tests"'"/test_suite="'"unittest2.collector"'"/ setup.py''; - - # repeated_test no longer exists in nixpkgs - # Also see: https://github.com/epsy/sigtools/issues/26 - doCheck = false; - checkInputs = [ sphinx mock coverage unittest2 ]; + checkInputs = [ + mock + repeated-test + sphinx + unittestCheckHook + ]; meta = with lib; { description = "Utilities for working with 3.3's inspect.Signature objects."; From 12b054c3aa4c82f4f45d568eaf4a5ccec5036ae1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 16 Nov 2022 07:50:00 +0000 Subject: [PATCH 176/797] libagar: dropped unused xlibsWrapper input Validated as no change in `out` output with `diffoscope`. --- pkgs/development/libraries/libagar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index 7aeccdf583e0..28d5e481324a 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc -, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU, libGL +, libpng, libjpeg, libXinerama, freetype, SDL, libGLU, libGL , libsndfile, portaudio, libmysqlclient, fontconfig }: @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config libtool gettext ]; buildInputs = [ - bsdbuild perl xlibsWrapper libXinerama SDL libGL libmysqlclient mandoc + bsdbuild perl libXinerama SDL libGL libmysqlclient mandoc freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile ]; From a545fb2e32761ef94d655831897113de3dc60175 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Nov 2022 08:46:21 +0000 Subject: [PATCH 177/797] python310Packages.mastodon-py: 1.5.2 -> 1.6.1 --- pkgs/development/python-modules/mastodon-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index 41a94e017941..be1c3d6532ef 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "mastodon-py"; - version = "1.5.2"; + version = "1.6.1"; src = fetchFromGitHub { owner = "halcy"; repo = "Mastodon.py"; rev = "refs/tags/${version}"; - sha256 = "sha256-C1xkdM47WS31Eh8VXHd49x2QeizZAuvAcSnHGiZPLCE="; + sha256 = "sha256-ip2TT5ISOS6HJOnTWajOR5Bajs8ba9QX1EIuPmdHLsE="; }; postPatch = '' From 3261d90404e7a0c7da604b51f88ab91050ae9c1b Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Wed, 16 Nov 2022 10:15:20 +0100 Subject: [PATCH 178/797] git-branchless: 0.5.1 -> 0.6.0 --- .../git-and-tools/git-branchless/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix index 640be8547c02..1a961b422b24 100644 --- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - sha256 = "sha256-xh+G9bKEL2ho1YrNVTLbCTxSWZtjEuEWutvYEFr2G/g="; + sha256 = "sha256-Rf7ai+s2Fp/RFA4on9YBoTjFpvzSZtAHf0rytfZf0rc="; }; - cargoSha256 = "sha256-Zz1RQ/mhdIbPiw2StGtTiORXiJ2nVLyZakt1072ha6U="; + cargoSha256 = "sha256-GVo0t2dJ6R+1UJf/NlKd5QLIQfDdFEHa+FSeW/Hk/4c="; nativeBuildInputs = [ pkg-config ]; @@ -43,8 +43,9 @@ rustPlatform.buildRustPackage rec { ''; # FIXME: these tests deadlock when run in the Nix sandbox checkFlags = [ - "--skip=test_checkout_pty" + "--skip=test_switch_pty" "--skip=test_next_ambiguous_interactive" + "--skip=test_switch_auto_switch_interactive" ]; meta = with lib; { From f1cc7dceaff9a56be2740956367789d4ff20883c Mon Sep 17 00:00:00 2001 From: Hubert Jasudowicz Date: Wed, 16 Nov 2022 10:22:54 +0100 Subject: [PATCH 179/797] ghidra-bin: 10.2.1 -> 10.2.2 --- pkgs/tools/security/ghidra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 66b3fb267214..82809d03f305 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -24,12 +24,12 @@ let in stdenv.mkDerivation rec { pname = "ghidra"; - version = "10.2.1"; - versiondate = "20221110"; + version = "10.2.2"; + versiondate = "20221115"; src = fetchzip { url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip"; - sha256 = "sha256-04EZQnSuYtcseamlNBjpm8+9wD5r1WsBseix6yr057k="; + sha256 = "sha256-0OcSdCN8vWUgTgFdgNtiI0OfHmfa/WD9IoaJUl+llqI="; }; nativeBuildInputs = [ From 520902c32b3e78fe65c79c22b7ca1bbfb35b21d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Nov 2022 10:02:32 +0000 Subject: [PATCH 180/797] libheif: 1.13.0 -> 1.14.0 --- pkgs/development/libraries/libheif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 51bd86edb719..1f9037dab75d 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "libheif"; - version = "1.13.0"; + version = "1.14.0"; outputs = [ "bin" "out" "dev" "man" ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "sha256-/w/I6dgyiAscUqVpPjw2z6LbZJ6IBTeE5lawLg0awTM="; + sha256 = "sha256-MvCiVAHM9C/rxeh6f9Bd13GECc2ladEP7Av7y3eWDcY="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 9839055cf4d3e339e574d712543cb58e3fc0548e Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 16 Nov 2022 13:26:48 +0300 Subject: [PATCH 181/797] ngtcp2: 0.10.0 -> 0.11.0 --- pkgs/development/libraries/ngtcp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index da0e535c1bc1..0611bccbf402 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zDiJlwcDTLCU+WpJ6Jz6tve4oV+XMRYOtppC2fj/HgU="; + sha256 = "sha256-u6orYF/VzXpcUdCitPawoet3KAhXlTQ2giR5eTQkrLY="; }; outputs = [ "out" "dev" "doc" ]; From de995f3058cca083e51770f212a8ac6351298feb Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Wed, 16 Nov 2022 11:32:55 +0100 Subject: [PATCH 182/797] asterisk: patch pjsip CVE-2022-31031, CVE-2022-39244, CVE-2022-39269 Also remove pjsip 2.12, which was unused --- pkgs/servers/asterisk/default.nix | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 5c0a539aed5d..447c391f43bb 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -3,12 +3,30 @@ util-linux, dmidecode, libuuid, newt, lua, speex, libopus, opusfile, libogg, srtp, wget, curl, iksemel, pkg-config, - autoconf, libtool, automake, + autoconf, libtool, automake, fetchpatch, python39, writeScript, withOpus ? true, }: let + # remove when upgrading to pjsip >1.12.1 + pjsip_patches = [ + (fetchpatch { + name = "0150-CVE-2022-31031.patch"; + url = "https://github.com/pjsip/pjproject/commit/450baca94f475345542c6953832650c390889202.patch"; + sha256 = "sha256-30kHrmB51UIw4x/J6/CD+vPKf/gBYDCcFoUpwEWkDMY="; + }) + (fetchpatch { + name = "0151-CVE-2022-39244.patch"; + url = "https://github.com/pjsip/pjproject/commit/c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae.patch"; + sha256 = "sha256-hTUMh6bYAizn6GF+sRV1vjKVxSf9pnI+eQdPOqsdJI4="; + }) + (fetchpatch { + name = "0152-CVE-2022-39269.patch"; + url = "https://github.com/pjsip/pjproject/commit/d2acb9af4e27b5ba75d658690406cec9c274c5cc.patch"; + sha256 = "sha256-bKE/MrRAqN1FqD2ubhxIOOf5MgvZluHHeVXPjbR12iQ="; + }) + ]; common = {version, sha256, externals}: stdenv.mkDerivation { inherit version; pname = "asterisk"; @@ -58,6 +76,9 @@ let cp ${asterisk-opus}/codecs/* ./codecs cp ${asterisk-opus}/formats/* ./formats ''} + ${lib.concatMapStringsSep "\n" (patch: '' + cp ${patch} ./third-party/pjproject/patches/${patch.name} + '') pjsip_patches} ./bootstrap.sh ''; @@ -69,6 +90,7 @@ let ]; preBuild = '' + cat third-party/pjproject/source/pjlib-util/src/pjlib-util/scanner.c make menuselect.makeopts ${lib.optionalString (externals ? "addons/mp3") '' substituteInPlace menuselect.makeopts --replace 'format_mp3 ' "" @@ -93,11 +115,6 @@ let }; }; - pjproject_2_12 = fetchurl { - url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.12/pjproject-2.12.tar.bz2"; - hash = "sha256-T3q4r/4WCAZCNGnULxMnNKH9wEK7gkseV/sV8IPasHQ="; - }; - pjproject_2_12_1 = fetchurl { url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.12.1/pjproject-2.12.1.tar.bz2"; hash = "sha256-DiNH1hB5ZheYzyUjFyk1EtlsMJlgjf+QRVKjEk+hNjc="; @@ -121,7 +138,6 @@ let versions = lib.mapAttrs (_: {version, sha256}: common { inherit version sha256; externals = { - "externals_cache/pjproject-2.12.tar.bz2" = pjproject_2_12; "externals_cache/pjproject-2.12.1.tar.bz2" = pjproject_2_12_1; "addons/mp3" = mp3-202; }; From 94b4a737bfebd2b2c1159ebaa2ce88bb55586007 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Wed, 16 Nov 2022 11:44:45 +0100 Subject: [PATCH 183/797] asterisk: fix comment about version --- pkgs/servers/asterisk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 447c391f43bb..36927f4f6d3a 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -9,7 +9,7 @@ }: let - # remove when upgrading to pjsip >1.12.1 + # remove when upgrading to pjsip >2.12.1 pjsip_patches = [ (fetchpatch { name = "0150-CVE-2022-31031.patch"; From d048882011b713e36bf6ac79e8f5492dfb590324 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 16 Nov 2022 12:44:45 +0100 Subject: [PATCH 184/797] gitlint: 0.17.0 -> 0.18.0 Signed-off-by: Matthias Beyer --- pkgs/tools/misc/gitlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gitlint/default.nix b/pkgs/tools/misc/gitlint/default.nix index c32171585969..626739864c71 100644 --- a/pkgs/tools/misc/gitlint/default.nix +++ b/pkgs/tools/misc/gitlint/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gitlint"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "jorisroovers"; repo = "gitlint"; rev = "v${version}"; - sha256 = "sha256-RXBMb43BBiJ23X0eKC1kqgLw8iFKJnP5iejY0AWcUrU="; + sha256 = "sha256-MmXzrooN+C9MUaAz4+IEGkGJWHbgvPMSLHgssM0wyN8="; }; # Upstream splitted the project into gitlint and gitlint-core to From ed0a8c95530c02d862aa03d3088857c6e6261e1f Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 16 Nov 2022 13:15:56 +0100 Subject: [PATCH 185/797] mautrix-whatsapp: 0.7.1 -> 0.7.2 https://github.com/mautrix/whatsapp/releases/tag/v0.7.2 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 8995feba134a..50ec60989701 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-5wZtWFB5y695S4E1Cv8nTSPUy6rPQ/j91w6kI0DAkGs="; + hash = "sha256-KeuAxrp4DYy0+K1XYF3FxindYoOHHfwtufwKnic46i8="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-v2Zf9nmAzal/nAtbQLunGJR/CUcdbwSUQ1077e7hVrQ="; + vendorSha256 = "sha256-oxRxGxYvpO1TeEBAKO1RDwqw4NUSW4XunGdVB6zXjx8="; doCheck = false; From 1372a8771a9532b41eb1982e56726c42724a19fe Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 16 Nov 2022 13:32:47 +0100 Subject: [PATCH 186/797] chroma: 2.2.0 -> 2.3.0 --- pkgs/tools/text/chroma/default.nix | 4 ++-- pkgs/tools/text/chroma/src.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index ef990a5b99d6..e005b8bd258e 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -6,7 +6,7 @@ in buildGoModule rec { pname = "chroma"; - version = "2.2.0"; + version = "2.3.0"; # To update: # nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json @@ -17,7 +17,7 @@ buildGoModule rec { inherit (srcInfo) sha256; }; - vendorSha256 = "1f5pv32vg0ci71kj5bbg24ymmm12yi6r07n8blj47qz8203l5yab"; + vendorSha256 = "01ia5y030zfapyf0fk77h6qj1k46djn9jh9fcyip5iazc87vzhr6"; modRoot = "./cmd/chroma"; diff --git a/pkgs/tools/text/chroma/src.json b/pkgs/tools/text/chroma/src.json index ed8d0b6c0e4f..173f509308cd 100644 --- a/pkgs/tools/text/chroma/src.json +++ b/pkgs/tools/text/chroma/src.json @@ -1,9 +1,9 @@ { "url": "https://github.com/alecthomas/chroma.git", - "rev": "d18e8a46f25ce0eb40f276410ab6cb3f2def9b7e", - "date": "2022-06-14T21:17:50+10:00", - "path": "/nix/store/mzph49sgiv5xfmpn6d6znlq483k4hyca-chroma", - "sha256": "0rxsi4kdf363p6ysvxvgndbvcb0a5zgm0iaxkkqllj3m8nfwmzlk", + "rev": "6138519d55582350e5dec0147cb8f5ddcb78f8cf", + "date": "2022-09-16T01:14:11-07:00", + "path": "/nix/store/bnlx3v849jw7vf8i15q2bv91p1bzprhs-chroma", + "sha256": "1h2i4hqn0h4iplhid0x6rv6l7a2zglivv6w33gg8z1cvd6acjzcl", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From e40b5729a28cc7c8652e3e26f6bbb62fc8f5f04c Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 16 Nov 2022 13:33:49 +0100 Subject: [PATCH 187/797] python3Packages.sphinx-copybutton: 0.5.0 -> 0.5.1 https://github.com/executablebooks/sphinx-copybutton/releases/tag/v0.5.1 --- pkgs/development/python-modules/sphinx-copybutton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-copybutton/default.nix b/pkgs/development/python-modules/sphinx-copybutton/default.nix index 259a7dde28b3..ba0da6319e51 100644 --- a/pkgs/development/python-modules/sphinx-copybutton/default.nix +++ b/pkgs/development/python-modules/sphinx-copybutton/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "sphinx-copybutton"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "executablebooks"; repo = "sphinx-copybutton"; rev = "v${version}"; - sha256 = "sha256-W27kCU/8NHoBtiAyA+CgNa00j6ck3CAaq1hLLGo60Ro="; + sha256 = "sha256-ptQNeklF9f0XeDbBq64ZFV15O8b4lQQLHRfblOQ3nRQ="; fetchSubmodules = true; }; From bd3976941db474c16e8b54be1d05fb866e53317a Mon Sep 17 00:00:00 2001 From: zendo Date: Wed, 16 Nov 2022 22:23:34 +0800 Subject: [PATCH 188/797] kooha: add gst-plugins-good --- pkgs/applications/video/kooha/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index 37644b10252b..ba959ec5717e 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gst_all_1.gstreamer + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-base gst_all_1.gst-plugins-ugly gtk4 From c0b9fec0d750530c30616190fd6a0648a5c126f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 16 Nov 2022 07:31:38 -0800 Subject: [PATCH 189/797] mastodon-archive: 1.3.1 -> 1.4.2 --- pkgs/tools/backup/mastodon-archive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/mastodon-archive/default.nix b/pkgs/tools/backup/mastodon-archive/default.nix index 10e500339ee0..88d05022d437 100644 --- a/pkgs/tools/backup/mastodon-archive/default.nix +++ b/pkgs/tools/backup/mastodon-archive/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "mastodon-archive"; - version = "1.3.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "kensanata"; repo = "mastodon-backup"; rev = "v${version}"; - sha256 = "1dlrkygywxwm6xbn0pnfwd3f7641wnvxdyb5qihbsf62w1w08x8r"; + hash = "sha256-b4bYQshz7mwxEfpRYV7ze4C8hz58R9cVp58wHvGFb0A="; }; propagatedBuildInputs = with python3.pkgs; [ From 4f22126b823c8137238c0329895189527be9a47d Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 16 Nov 2022 16:42:57 +0100 Subject: [PATCH 190/797] logseq: 0.8.10 -> 0.8.11 https://github.com/logseq/logseq/releases/tag/0.8.11 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 26d5c3b65a36..bb879bce1572 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.10"; + version = "0.8.11"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-n6uRMkV/+U2M0/FjQJx0LIDGgeIX6TY58j2sweSmlbc="; + sha256 = "sha256-c8gP7OJwnCEXnT2FQH1ttYRzZfbcJL86FX2JQezJI+s="; name = "${pname}-${version}.AppImage"; }; From b83b3f5a3e12336e5075050f4393a4d88408cee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 15 Nov 2022 20:52:31 -0800 Subject: [PATCH 191/797] hatch: 1.3.1 -> 1.6.3 https://github.com/pypa/hatch/blob/hatch-v1.6.3/docs/history.md#hatch --- pkgs/development/tools/hatch/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/hatch/default.nix b/pkgs/development/tools/hatch/default.nix index 777028a008f9..952a8ecb16cb 100644 --- a/pkgs/development/tools/hatch/default.nix +++ b/pkgs/development/tools/hatch/default.nix @@ -7,22 +7,25 @@ python3.pkgs.buildPythonApplication rec { pname = "hatch"; - version = "1.3.1"; + version = "1.6.3"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "hatch"; rev = "hatch-v${version}"; - sha256 = "sha256-ftT86HX5CVbiHe5yzXT2gNl8Rx+f+fmiAJRnOuDpvYI="; + hash = "sha256-3nPh6F+TmLoogz9FgaZMub7hPJIzANCY4oWk9Mq22Pc="; }; propagatedBuildInputs = with python3.pkgs; [ click hatchling httpx + hyperlink keyring + packaging pexpect + platformdirs pyperclip rich shellingham @@ -36,6 +39,7 @@ python3.pkgs.buildPythonApplication rec { git pytestCheckHook pytest-mock + pytest-xdist ]; preCheck = '' @@ -54,6 +58,7 @@ python3.pkgs.buildPythonApplication rec { "test_editable_exact" "test_editable_exact_extra_dependencies" "test_editable_exact_force_include" + "test_editable_exact_force_include_option" "test_editable_exact_force_include_build_data_precedence" "test_editable_pth" # AssertionError: assert len(extract_installed_requirements(output.splitlines())) > 0 @@ -63,6 +68,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Modern, extensible Python project manager"; homepage = "https://hatch.pypa.io/latest/"; + changelog = "https://github.com/pypa/hatch/blob/${src.rev}/docs/history.md#hatch"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; From 47f473c508a65b5bf996510cff327fb0a9eab169 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 16 Nov 2022 17:21:31 +0100 Subject: [PATCH 192/797] python3Packages.unicodedata2: 14.0.0 -> 15.0.0 --- pkgs/development/python-modules/unicodedata2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix index a14895fa7996..ea878d6e0cbc 100644 --- a/pkgs/development/python-modules/unicodedata2/default.nix +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "unicodedata2"; - version = "14.0.0"; + version = "15.0.0"; disabled = isPy27; src = fetchPypi { inherit version pname; - sha256 = "110nnvh02ssp92xbmswy39aa186jrmb7m41x4220wigl8c0dzxs1"; + sha256 = "0bcgls7m2zndpd8whgznnd5908jbsa50si2bh88wsn0agcznhv7d"; }; checkInputs = [ pytestCheckHook ]; From 10e247864ef0c4aedc3e94de9635ed516c7b9a3a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 16 Nov 2022 17:30:41 +0100 Subject: [PATCH 193/797] python3Packages.pypandoc: 1.8.1 -> 1.10 https://github.com/JessicaTegner/pypandoc/releases/tag/v1.9 https://github.com/JessicaTegner/pypandoc/releases/tag/v1.10 --- pkgs/development/python-modules/pypandoc/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index eb7287e4a1b0..2b2793e535e8 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -1,16 +1,16 @@ { lib, substituteAll, buildPythonPackage, fetchFromGitHub -, pandoc, texlive +, pandoc, pandocfilters, texlive }: buildPythonPackage rec { pname = "pypandoc"; - version = "1.8.1"; + version = "1.10"; src = fetchFromGitHub { - owner = "NicklasTegner"; + owner = "JessicaTegner"; repo = pname; rev = "v${version}"; - hash = "sha256-1vQmONQFJrjptwVVjw25Wyt59loatjScsdnSax+q/f8="; + hash = "sha256:05m585l4sipjzpkrv4yj5s7w45yxhxlym55lkhnavsshlvisinkz"; }; patches = [ @@ -24,11 +24,12 @@ buildPythonPackage rec { checkInputs = [ texlive.combined.scheme-small + pandocfilters ]; meta = with lib; { description = "Thin wrapper for pandoc"; - homepage = "https://github.com/NicklasTegner/pypandoc"; + homepage = "https://github.com/JessicaTegner/pypandoc"; license = licenses.mit; maintainers = with maintainers; [ sternenseemann bennofs ]; }; From f67a5c6354e4e4c11a9fa5da6222796b14f04eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 11 Nov 2022 20:25:59 -0800 Subject: [PATCH 194/797] python310Packages.pypck: test in asyncio auto mode --- pkgs/development/python-modules/pypck/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index c1996ae402a1..13519664b52b 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; disabledTests = lib.optionals stdenv.isDarwin [ From afff895620295d3c8f4b8a84539e56894c16ccc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 11 Nov 2022 21:50:18 -0800 Subject: [PATCH 195/797] python310Packages.dynalite-devices: test in asyncio auto mode --- pkgs/development/python-modules/dynalite-devices/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix index 456e0a6a628d..ed3f3ffb82ab 100644 --- a/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; pythonImportsCheck = [ "dynalite_devices_lib" ]; From a7d24e0cc86cfa6f603d299a0e17080217192dbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 11 Nov 2022 21:56:25 -0800 Subject: [PATCH 196/797] python310Packages.pyotgw: don't set asyncio mode --- pkgs/development/python-modules/pyotgw/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/pyotgw/default.nix b/pkgs/development/python-modules/pyotgw/default.nix index ff519920ad66..c0f24aa3dc6d 100644 --- a/pkgs/development/python-modules/pyotgw/default.nix +++ b/pkgs/development/python-modules/pyotgw/default.nix @@ -30,10 +30,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - pythonImportsCheck = [ "pyotgw" ]; From 57b644c57d99d39c5b5f8341521405011eb3e44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 08:06:18 -0800 Subject: [PATCH 197/797] python310Packages.discovery30303: test in asyncio auto mode --- pkgs/development/python-modules/discovery30303/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/discovery30303/default.nix b/pkgs/development/python-modules/discovery30303/default.nix index c9b09cbfe69c..6b69ecfc98cc 100644 --- a/pkgs/development/python-modules/discovery30303/default.nix +++ b/pkgs/development/python-modules/discovery30303/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; postPatch = '' From 55d680f1a4d1f88ab903592219c96c2862a50a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 11:29:36 -0800 Subject: [PATCH 198/797] python310Packages.pywizlight: test in asyncio auto mode --- pkgs/development/python-modules/pywizlight/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 21ddb6f6097f..2ca664b88a17 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; disabledTests = [ From ab3c922488d5d10ae89ac69985d625e2f94bdef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 11:30:36 -0800 Subject: [PATCH 199/797] python310Packages.structlog: don't set asyncio mode --- pkgs/development/python-modules/structlog/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 68d91685c9c2..a3b591db5f8e 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -39,10 +39,6 @@ buildPythonPackage rec { simplejson ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - meta = with lib; { description = "Painless structural logging"; homepage = "https://github.com/hynek/structlog"; From b909b493dcb7fc54809315032ff03604925a0b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 15:18:28 -0800 Subject: [PATCH 200/797] python310Packages.amqtt: test in asyncio auto mode --- pkgs/development/python-modules/amqtt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix index ecf326a9a21a..6f4a5007e7c6 100644 --- a/pkgs/development/python-modules/amqtt/default.nix +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; disabledTestPaths = [ From 7cd70a299ba8cbf8f03d0ae56d517b9caec51ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 15:22:16 -0800 Subject: [PATCH 201/797] python310Packages.channels: don't set asyncio mode --- pkgs/development/python-modules/channels/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 5bc2db228ae4..2d6f0d009169 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -41,10 +41,6 @@ buildPythonPackage rec { pytestCheckHook ] ++ passthru.optional-dependencies.daphne; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - pythonImportsCheck = [ "channels" ]; From 0445d4fd04db40d6759de11d20ed8472c819fd7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 15:24:48 -0800 Subject: [PATCH 202/797] python310Packages.aioftp: don't set asyncio mode --- pkgs/development/python-modules/aioftp/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index df7575de0484..37f8d9fa3353 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -33,10 +33,6 @@ buildPythonPackage rec { trustme ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - disabledTests = lib.optionals stdenv.isDarwin [ # uses 127.0.0.2, which macos doesn't like "test_pasv_connection_pasv_forced_response_address" From a369a029447794809edd1a26133f36c2e77cd5b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 15:26:34 -0800 Subject: [PATCH 203/797] python310Packages.gql: test in asyncio auto mode --- pkgs/development/python-modules/gql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index bd41fd24ee10..dae5fb3438e0 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; disabledTests = [ From 49fc445b272a169ade1acd779a8a98a6c88cd9d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 15:33:11 -0800 Subject: [PATCH 204/797] python310Packages.hypercorn: 0.13.2 -> 0.14.3 https://github.com/pgjones/hypercorn/blob/0.14.3/CHANGELOG.rst --- .../python-modules/hypercorn/default.nix | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix index 35a9f8f6bb85..940c31e31882 100644 --- a/pkgs/development/python-modules/hypercorn/default.nix +++ b/pkgs/development/python-modules/hypercorn/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchFromGitLab +, fetchFromGitHub , pythonOlder , typing-extensions , wsproto @@ -10,25 +10,27 @@ , mock , poetry-core , pytest-asyncio -, pytest-cov -, pytest-sugar , pytest-trio , pytestCheckHook }: buildPythonPackage rec { pname = "Hypercorn"; - version = "0.13.2"; + version = "0.14.3"; disabled = pythonOlder "3.7"; format = "pyproject"; - src = fetchFromGitLab { + src = fetchFromGitHub { owner = "pgjones"; repo = pname; rev = version; - sha256 = "sha256-fIjw5A6SvFUv8cU7xunVlPYphv+glypY4pzvHNifYLQ="; + hash = "sha256-ECREs8UwqTWUweUrwnUwpVotCII2v4Bz7ZCk3DSAd8I="; }; + postPatch = '' + sed -i "/^addopts/d" pyproject.toml + ''; + nativeBuildInputs = [ poetry-core ]; @@ -38,20 +40,14 @@ buildPythonPackage rec { checkInputs = [ pytest-asyncio - pytest-cov - pytest-sugar pytest-trio pytestCheckHook ] ++ lib.optionals (pythonOlder "3.8") [ mock ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - pythonImportsCheck = [ "hypercorn" ]; meta = with lib; { - homepage = "https://pgjones.gitlab.io/hypercorn/"; + homepage = "https://github.com/pgjones/hypercorn"; description = "The ASGI web server inspired by Gunicorn"; license = licenses.mit; maintainers = with maintainers; [ dgliwka ]; From 36a055120d7faad3f40554780780bfa60e8e8054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 15:42:37 -0800 Subject: [PATCH 205/797] python310Packages.jsonrpc-websocket: test in asyncio auto mode --- pkgs/development/python-modules/jsonrpc-websocket/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index 9bd8ef8a108b..9da8d8cf8ab1 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" "tests.py" ]; From 8f485cea9b3299c06c1a915f9e964dcb4bfa2f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 15:45:24 -0800 Subject: [PATCH 206/797] python310Packages.aioswitcher: don't set asyncio mode --- pkgs/development/python-modules/aioswitcher/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 4c7a382813c5..5a671bce26ce 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -44,10 +44,6 @@ buildPythonPackage rec { time-machine ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - disabledTests = [ # AssertionError: Expected <14:00> to be equal to <17:00>, but was not. "test_schedule_parser_with_a_weekly_recurring_enabled_schedule_data" From be64e576776e2a5b35fafffbaa95e39e836a72f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 15:48:39 -0800 Subject: [PATCH 207/797] python310Packages.aiosyncthing: test in asyncio auto mode --- pkgs/development/python-modules/aiosyncthing/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiosyncthing/default.nix b/pkgs/development/python-modules/aiosyncthing/default.nix index 624c86fb314b..cefdf75a2866 100644 --- a/pkgs/development/python-modules/aiosyncthing/default.nix +++ b/pkgs/development/python-modules/aiosyncthing/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; postPatch = '' From c84a93c334a64d4a3e895c66e8005b1ba87819a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 15:49:25 -0800 Subject: [PATCH 208/797] python310Packages.python-smarttub: don't set asyncio mode --- pkgs/development/python-modules/python-smarttub/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index b977bc2d0c20..dba19a2ee627 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -38,10 +38,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - postPatch = '' substituteInPlace setup.py \ --replace "pyjwt~=2.1.0" "pyjwt>=2.1.0" From ed4a26d0be02822b00fd16c05f5b299174c7d9ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 15:51:55 -0800 Subject: [PATCH 209/797] python310Packages.aiogithubapi: test in asyncio auto mode --- pkgs/development/python-modules/aiogithubapi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 248443ff2360..051913ccce56 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; pythonImportsCheck = [ From 4df6edf49b10319a30e2b10aec79299cb823cae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 15:53:59 -0800 Subject: [PATCH 210/797] python310Packages.pyspcwebgw: test in asyncio auto mode --- pkgs/development/python-modules/pyspcwebgw/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyspcwebgw/default.nix b/pkgs/development/python-modules/pyspcwebgw/default.nix index b847240869ac..7a40985457da 100644 --- a/pkgs/development/python-modules/pyspcwebgw/default.nix +++ b/pkgs/development/python-modules/pyspcwebgw/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; pythonImportsCheck = [ "pyspcwebgw" ]; From 413c979ed9805e8bd4096ca74a2c3c89e81346cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 15:56:35 -0800 Subject: [PATCH 211/797] python310Packages.pylutron-caseta: test in asyncio auto mode --- pkgs/development/python-modules/pylutron-caseta/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 114e295c66ea..a14fce498e20 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; pythonImportsCheck = [ From cf51f4aee907337eff188ce26b71719802ca78c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 15:58:07 -0800 Subject: [PATCH 212/797] python310Packages.renault-api: test in asyncio auto mode --- pkgs/development/python-modules/renault-api/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 5b2165c7583b..33e1f0124a7f 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; pythonImportsCheck = [ From 6038d8bb99152e5db11de438ebde0afc7f6e78c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 15:59:18 -0800 Subject: [PATCH 213/797] python310Packages.python-kasa: test in asyncio auto mode --- pkgs/development/python-modules/python-kasa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index d4c9524c9edd..7f55dd64b94e 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; disabledTestPaths = [ From c137194c0d1da6f25969aafd3b5737e138625fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 16:02:11 -0800 Subject: [PATCH 214/797] python310Packages.unifi-discovery: test in asyncio auto mode --- pkgs/development/python-modules/unifi-discovery/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix index 3b3bfe4ca979..387818583777 100644 --- a/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/pkgs/development/python-modules/unifi-discovery/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; postPatch = '' From 976fc437ff96445fb1a76107c00d1e043232396b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 16:03:53 -0800 Subject: [PATCH 215/797] python310Packages.zigpy-znp: don't set asyncio mode --- pkgs/development/python-modules/zigpy-znp/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 2b7fef4c8e27..083805f8e7ee 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -49,10 +49,6 @@ buildPythonPackage rec { asynctest ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - pythonImportsCheck = [ "zigpy_znp" ]; From 677e78a91114d4c61a3e6facd7b62dbf4ffb2d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 16:05:23 -0800 Subject: [PATCH 216/797] python310Packages.xbox-webapi: test in asyncio auto mode --- pkgs/development/python-modules/xbox-webapi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/xbox-webapi/default.nix b/pkgs/development/python-modules/xbox-webapi/default.nix index ccd2d3febf13..de4500378f0d 100644 --- a/pkgs/development/python-modules/xbox-webapi/default.nix +++ b/pkgs/development/python-modules/xbox-webapi/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; meta = with lib; { From 4e22c8316cc0bfc61d80214453a19efc444034ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 16:10:56 -0800 Subject: [PATCH 217/797] python310Packages.pytraccar: test in asyncio auto mode --- pkgs/development/python-modules/pytraccar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix index b50d734d01a1..c65fdf8b1080 100644 --- a/pkgs/development/python-modules/pytraccar/default.nix +++ b/pkgs/development/python-modules/pytraccar/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; postPatch = '' From 05191c24637162f73299052a138908dae26d70c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 16:12:20 -0800 Subject: [PATCH 218/797] python310Packages.pytautulli: test in asyncio auto mode --- pkgs/development/python-modules/pytautulli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix index aee51ae764f8..b21b21842269 100644 --- a/pkgs/development/python-modules/pytautulli/default.nix +++ b/pkgs/development/python-modules/pytautulli/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; pythonImportsCheck = [ From 89a6cf3f5c7ed5b5ac9ff2b8641ee34eca3aa3cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 16:14:27 -0800 Subject: [PATCH 219/797] python310Packages.subarulink: don't set asyncio mode --- pkgs/development/python-modules/subarulink/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index d788e164f80d..bf975f5e8483 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -36,10 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace "--cov=subarulink" "" From 6bc4b501dfb1d471b76e53393e0622fa19646b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 12 Nov 2022 16:20:02 -0800 Subject: [PATCH 220/797] python310Packages.respx: 0.19.2 -> 0.20.0 https://github.com/lundberg/respx/blob/0.20.0/CHANGELOG.md --- pkgs/development/python-modules/respx/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix index c144ed9adb28..4d4e4e1175d8 100644 --- a/pkgs/development/python-modules/respx/default.nix +++ b/pkgs/development/python-modules/respx/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "respx"; - version = "0.19.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "lundberg"; repo = pname; rev = version; - sha256 = "sha256-uNmSBJOQF4baq8AWzfwj0kinO19jr6Mp9Yblys/WmZs="; + sha256 = "sha256-xb5jb+l6wA1v/r2yGUB6IuUVXIaTc+3O/w5xn/+A74o="; }; propagatedBuildInputs = [ @@ -35,10 +35,6 @@ buildPythonPackage rec { trio ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - postPatch = '' sed -i "/--cov/d" setup.cfg ''; @@ -52,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for mocking HTTPX"; homepage = "https://lundberg.github.io/respx/"; + changelog = "https://github.com/lundberg/respx/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; From e1d9d522c489483c41a1bab0ccf21a112f877327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 16 Nov 2022 08:51:03 -0800 Subject: [PATCH 221/797] python310Packages.homematicip: test in asyncio auto mode --- pkgs/development/python-modules/homematicip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index e620f317b9fd..aba7e19b69e0 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" + "--asyncio-mode=auto" ]; disabledTests = [ From e0b5a890fac289536f1551bcc7ac5c1cd15dc103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 16 Nov 2022 08:53:51 -0800 Subject: [PATCH 222/797] python310Packages.matrix-nio: don't set asyncio mode --- pkgs/development/python-modules/matrix-nio/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 1aa838647ad0..45689c045168 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -79,7 +79,6 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "--asyncio-mode=legacy" "--benchmark-disable" ]; From b25eb3a000381b3837c0c86e5ad27ec6e466e4a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 16 Nov 2022 08:55:32 -0800 Subject: [PATCH 223/797] python310Packages.pylitterbot: don't set asyncio mode --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 96b7cb163669..169784039c6c 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -49,10 +49,6 @@ buildPythonPackage rec { --replace 'deepdiff = "^5.8.1"' 'deepdiff = ">=5.8.1"' ''; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - pythonImportsCheck = [ "pylitterbot" ]; From 31edf9e922b1b0aaa6d20e3f4da695d30bdddf41 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Nov 2022 17:58:48 +0100 Subject: [PATCH 224/797] python3Packages.jamo: init at 0.4.1 --- .../python-modules/jamo/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/jamo/default.nix diff --git a/pkgs/development/python-modules/jamo/default.nix b/pkgs/development/python-modules/jamo/default.nix new file mode 100644 index 000000000000..e7bebd52db44 --- /dev/null +++ b/pkgs/development/python-modules/jamo/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jamo"; + version = "0.4.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "JDongian"; + repo = "python-jamo"; + rev = "refs/tags/v${version}"; + hash = "sha256-QHI3Rqf1aQOsW49A/qnIwRnPuerbtyerf+eWIiEvyho="; + }; + + pythonImportsCheck = [ + "jamo" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/JDongian/python-jamo/releases/tag/v${version}"; + description = "Hangul syllable decomposition and synthesis using jamo"; + homepage = "https://github.com/JDongian/python-jamo"; + license = licenses.asl20; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7abe843bf111..255608823b3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4653,6 +4653,8 @@ self: super: with self; { jaeger-client = callPackage ../development/python-modules/jaeger-client { }; + jamo = callPackage ../development/python-modules/jamo { }; + janus = callPackage ../development/python-modules/janus { }; jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; From 8db07f3546873e36d70eb1d1ed2df4396620505e Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Wed, 16 Nov 2022 17:05:22 +0000 Subject: [PATCH 225/797] exploitdb: 2022-10-18 -> 2022-11-12 --- pkgs/tools/security/exploitdb/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 74ba577a6dc5..cd1b1acccad9 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -1,18 +1,18 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitLab , makeWrapper }: stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-10-18"; + version = "2022-11-12"; - src = fetchFromGitHub { - owner = "offensive-security"; + src = fetchFromGitLab { + owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qyRAwy4rGaV7fiU0gwvnf6yT4ZAAXYTtZubh+GtsJU8="; + hash = "sha256-0k9q+xwzIdmhVe5zL1qoE6QzzGV3gm6RL97c7zi3Rg8="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/offensive-security/exploitdb"; + homepage = "https://gitlab.com/exploit-database/exploitdb"; description = "Archive of public exploits and corresponding vulnerable software"; license = with licenses; [ gpl2Plus gpl3Plus mit ]; maintainers = with maintainers; [ applePrincess fab ]; From 1812d1540e5ed7eabb5252c0b442ff2b2d09752d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 13 Nov 2022 21:14:38 +0100 Subject: [PATCH 226/797] php82: init at 8.2.0rc6 --- .../from_md/release-notes/rl-2211.section.xml | 5 ++ .../manual/release-notes/rl-2211.section.md | 2 + nixos/tests/all-tests.nix | 1 + pkgs/development/interpreters/php/8.2.nix | 61 +++++++++++++++++++ .../php-packages/datadog_trace/default.nix | 3 +- .../php-packages/gnupg/default.nix | 3 +- .../development/php-packages/oci8/default.nix | 14 +++-- .../php-packages/xdebug/default.nix | 14 ++++- pkgs/top-level/all-packages.nix | 10 +++ 9 files changed, 104 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/interpreters/php/8.2.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index d5cc14a3bdfd..bc5dd182e30d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -139,6 +139,11 @@ other distributions. + + + PHP 8.2.0 RC 6 is available. + + protonup has been aliased to and replaced diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index d61cf2967553..34371d8317bc 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -57,6 +57,8 @@ In addition to numerous new and upgraded packages, this release has the followin `mod_php` usage we still enable `ZTS` (Zend Thread Safe). This has been a common practice for a long time in other distributions. +- PHP 8.2.0 RC 6 is available. + - `protonup` has been aliased to and replaced by `protonup-ng` due to upstream not maintaining it. - Perl has been updated to 5.36, and its core module `HTTP::Tiny` was patched to verify SSL/TLS certificates by default. diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c7aa9ed78ba4..8afa901cc370 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -492,6 +492,7 @@ in { php = handleTest ./php {}; php80 = handleTest ./php { php = pkgs.php80; }; php81 = handleTest ./php { php = pkgs.php81; }; + php82 = handleTest ./php { php = pkgs.php82; }; phylactery = handleTest ./web-apps/phylactery.nix {}; pict-rs = handleTest ./pict-rs.nix {}; pinnwand = handleTest ./pinnwand.nix {}; diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix new file mode 100644 index 000000000000..72816da1d4b1 --- /dev/null +++ b/pkgs/development/interpreters/php/8.2.nix @@ -0,0 +1,61 @@ +{ callPackage, lib, stdenv, fetchurl, ... }@_args: + +let + hash = "sha256-sbT8sIwle3OugXxqLZO3jKXlrOQsX1iH7WRH8G+nv8Y="; + + base = callPackage ./generic.nix (_args // { + version = "8.2.0"; + phpAttrsOverrides = attrs: attrs // { + src = fetchurl { + url = "https://downloads.php.net/~sergey/php-8.2.0RC6.tar.xz"; + inherit hash; + }; + }; + inherit hash; + }); + +in +base.withExtensions ({ all, ... }: with all; ([ + bcmath + calendar + curl + ctype + dom + exif + fileinfo + filter + ftp + gd + gettext + gmp + iconv + imap + intl + ldap + mbstring + mysqli + mysqlnd + opcache + openssl + pcntl + pdo + pdo_mysql + pdo_odbc + pdo_pgsql + pdo_sqlite + pgsql + posix + readline + session + simplexml + sockets + soap + sodium + sysvsem + sqlite3 + tokenizer + xmlreader + xmlwriter + zip + zlib +])) diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index 9b91d85fefe5..f77433a8a9ec 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, curl, fetchFromGitHub, lib, pcre2 }: +{ buildPecl, curl, fetchFromGitHub, lib, pcre2, php }: buildPecl rec { pname = "ddtrace"; @@ -14,6 +14,7 @@ buildPecl rec { buildInputs = [ curl pcre2 ]; meta = with lib; { + broken = lib.versionOlder php.version "8.1"; # Broken on PHP older than 8.1. description = "Datadog Tracing PHP Client"; homepage = "https://github.com/DataDog/dd-trace-php"; license = licenses.apsl20; diff --git a/pkgs/development/php-packages/gnupg/default.nix b/pkgs/development/php-packages/gnupg/default.nix index 1d0b65d2c562..22ce2be4473b 100644 --- a/pkgs/development/php-packages/gnupg/default.nix +++ b/pkgs/development/php-packages/gnupg/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, gpgme, file, gnupg }: +{ buildPecl, lib, gpgme, file, gnupg, php }: buildPecl { pname = "gnupg"; @@ -29,6 +29,7 @@ buildPecl { doCheck = true; meta = with lib; { + broken = lib.versionOlder php.version "8.1"; # Broken on PHP older than 8.1. description = "PHP wrapper for GpgME library that provides access to GnuPG"; license = licenses.bsd3; homepage = "https://pecl.php.net/package/gnupg"; diff --git a/pkgs/development/php-packages/oci8/default.nix b/pkgs/development/php-packages/oci8/default.nix index 2657a67d38ba..477eea5898e5 100644 --- a/pkgs/development/php-packages/oci8/default.nix +++ b/pkgs/development/php-packages/oci8/default.nix @@ -1,12 +1,18 @@ -{ buildPecl, lib, oracle-instantclient }: +{ buildPecl, lib, oracle-instantclient, php }: + let - version = "3.0.1"; - sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; + versionData = if (lib.versionOlder php.version "8.1") then { + version = "3.0.1"; + sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; + } else { + version = "3.2.1"; + sha256 = "zyF703DzRZDBhlNFFt/dknmZ7layqhgjG1/ZDN+PEsg="; + }; in buildPecl { pname = "oci8"; - inherit version sha256; + inherit (versionData) version sha256; buildInputs = [ oracle-instantclient ]; configureFlags = [ "--with-oci8=shared,instantclient,${oracle-instantclient.lib}/lib" ]; diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 80b0ec73109c..388360462dcf 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -1,10 +1,18 @@ -{ buildPecl, lib }: +{ buildPecl, lib, php }: +let + versionData = if (lib.versionOlder php.version "8.1") then { + version = "3.1.6"; + sha256 = "1lnmrb5kgq8lbhjs48j3wwhqgk44pnqb1yjq4b5r6ysv9l5wlkjm"; + } else { + version = "3.2.0RC2"; + sha256 = "dQgXDP3Ifg+D0niWxaJ4ec71Vfr8KH40jv6QbxSyY+4="; + }; +in buildPecl { pname = "xdebug"; - version = "3.1.6"; - sha256 = "1lnmrb5kgq8lbhjs48j3wwhqgk44pnqb1yjq4b5r6ysv9l5wlkjm"; + inherit (versionData) version sha256; doCheck = true; checkTarget = "test"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a70dd9e0494c..6550ce27ef52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15765,6 +15765,16 @@ with pkgs; phpExtensions = php.extensions; phpPackages = php.packages; + # Import PHP82 interpreter, extensions and packages + php82 = callPackage ../development/interpreters/php/8.2.nix { + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + pcre2 = pcre2.override { + withJitSealloc = !stdenv.isDarwin; + }; + }; + php82Extensions = recurseIntoAttrs php82.extensions; + php82Packages = recurseIntoAttrs php82.packages; + # Import PHP81 interpreter, extensions and packages php81 = callPackage ../development/interpreters/php/8.1.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; From 34b696a172047b8fbea0bb9c285cfe9d7038aea7 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 17 Nov 2022 01:22:04 +0530 Subject: [PATCH 227/797] fossil: 2.19 -> 2.20 --- pkgs/applications/version-management/fossil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index ab610624f371..ea06107ed7ca 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.19"; + version = "2.20"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"; - sha256 = "sha256-RZ9/7b4lRJqFVyfXwzutO8C/Pa6XPyxtvpp7gmEGoj4="; + sha256 = "1knff50rr8f39myxj50fprb9ya87cslmwz7zzfya56l33r7i7jh3"; }; nativeBuildInputs = [ installShellFiles tcl tcllib ]; From 05dd7ec2a3d02244d35a4d20786db121dd2a2556 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 16 Nov 2022 22:15:16 +0100 Subject: [PATCH 228/797] nvtop: add passthru.tests.version --- pkgs/tools/system/nvtop/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 053437dc3e95..41f84c2a7d6b 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -6,6 +6,8 @@ , cudatoolkit , libdrm , ncurses +, nvtop +, testers , addOpenGLRunpath , amd ? true , nvidia ? true @@ -54,6 +56,14 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + tests.version = testers.testVersion { + inherit version; + package = nvtop; + command = "nvtop --version"; + }; + }; + meta = with lib; { description = "A (h)top like task monitor for AMD, Intel and NVIDIA GPUs"; longDescription = '' From 547f2797b43e72c7440a551b76377fa2231eec63 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 16 Nov 2022 22:30:28 +0100 Subject: [PATCH 229/797] nvtop: fix build Use udev over systemd as recommended with the AppImage build. Fixes #201340 --- pkgs/tools/system/nvtop/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 41f84c2a7d6b..44ecbd39d471 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -8,16 +8,16 @@ , ncurses , nvtop , testers +, udev , addOpenGLRunpath , amd ? true , nvidia ? true -, udev }: let pname-suffix = if amd && nvidia then "" else if amd then "-amd" else "-nvidia"; nvidia-postFixup = "addOpenGLRunpath $out/bin/nvtop"; - libPath = lib.makeLibraryPath [ libdrm ncurses ]; + libPath = lib.makeLibraryPath [ libdrm ncurses udev ]; amd-postFixup = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { cmakeFlags = with lib; [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_TESTING=ON" + "-DUSE_LIBUDEV_OVER_LIBSYSTEMD=ON" ] ++ optional nvidia "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include" ++ optional nvidia "-DNVML_LIBRARIES=${cudatoolkit}/targets/x86_64-linux/lib/stubs/libnvidia-ml.so" ++ optional (!amd) "-DAMDGPU_SUPPORT=OFF" From 0e74b5347a4ca39967db77103672ffca24a7ef92 Mon Sep 17 00:00:00 2001 From: nanashi0x74 Date: Wed, 16 Nov 2022 23:27:47 +0100 Subject: [PATCH 230/797] flutter: 3.3.3 -> 3.3.8, flutter.dart: 2.18.2 -> 2.18.4 --- pkgs/development/compilers/flutter/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 676ef78e3b34..f9a801284686 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -29,12 +29,12 @@ in inherit mkFlutter; stable = flutterDrv { pname = "flutter"; - version = "3.3.3"; - dartVersion = "2.18.2"; - hash = "sha256-MTZeWQUp4/TcPzYIT6eqIKSPUPvn2Mp/thOQzNgpTXg="; + version = "3.3.8"; + dartVersion = "2.18.4"; + hash = "sha256-QH+10F6a0XYEvBetiAi45Sfy7WTdVZ1i8VOO4JuSI24="; dartHash = { - x86_64-linux = "sha256-C3+YjecXLvSmJrLwi9H7TgD9Np0AArRWx3EdBrfQpTU"; - aarch64-linux = "sha256-zyIK1i5/9P2C+sjzdArhFwpVO4P+It+/X50l+n9gekI="; + x86_64-linux = "sha256-lFw+KaxzhuAMnu6ypczINqywzpiD+8Kd+C/UHJDrO9Y="; + aarch64-linux = "sha256-snlFTY4oJ4ALGLc210USbI2Z///cx1IVYUWm7Vo5z2I="; }; patches = getPatches ./patches/flutter3; }; From 8c4bc0534b2274f3ce216aa3dafdf9dae92f2f8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 01:47:27 +0000 Subject: [PATCH 231/797] s2n-tls: 1.3.27 -> 1.3.28 --- pkgs/development/libraries/s2n-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index aa1ad43fbb55..d22f59271fec 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.27"; + version = "1.3.28"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y6YlSzLZXNL7GkP0SNXQgt16W2AohGaGjshNq9GoCtA="; + sha256 = "sha256-RkOP+et8wFb44NLqkizXB68U0NRKKvhDl4PyQWz2m6A="; }; nativeBuildInputs = [ cmake ]; From 14f30827a0b5adff297e8bfda6c42c9a25eb9b96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 03:12:17 +0000 Subject: [PATCH 232/797] sn0int: 0.24.2 -> 0.24.3 --- pkgs/tools/security/sn0int/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index 8e3a806d871c..15c0d662ce2c 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "sn0int"; - version = "0.24.2"; + version = "0.24.3"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WcCNNLNvOtYiSWVvXA8mnlXOV2T/yIXFzZky5y3tYJ4="; + sha256 = "sha256-KREYWM5WOdPzLbOlrATiCCfFwE951KEo03yWNfyG8Bw="; }; - cargoSha256 = "sha256-5pVxOkm9OLSX5Lxe3DSM0mVSMhlHfFBCiMMR37WrZbI="; + cargoSha256 = "sha256-Ul53/hDUFRb4xmILoMXXk2t465Vv+MQP4iLNn1twwnc="; nativeBuildInputs = [ pkg-config From bbbf3c45d5a8350f28f35e5234ebdecfa44d7ec1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 03:54:51 +0000 Subject: [PATCH 233/797] sumneko-lua-language-server: 3.6.2 -> 3.6.3 --- .../development/tools/sumneko-lua-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 132cd57e4808..d2baf6c0ba15 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "3.6.2"; + version = "3.6.3"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-JmoZSrKISOYyj9mIiZ4MGFuSshPHnxgIZmbP/5SordU="; + sha256 = "sha256-E9Wpdf9V6MltdFncVuDhwxtsLS8mese35HLi7kV1eXI="; fetchSubmodules = true; }; From 1f8b8cc49aed8a6b55ebb42afcbaf45d0b45cf74 Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Thu, 17 Nov 2022 13:01:19 +0800 Subject: [PATCH 234/797] pacman: add missing dependencies of pacman-key --- pkgs/tools/package-management/pacman/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index f65b18c7a95e..517abf26f908 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -6,7 +6,6 @@ , binutils , coreutils , curl -, gnupg , gpgme , installShellFiles , libarchive @@ -29,6 +28,12 @@ , lz4 , lzip +# pacman-key runtime dependencies +, gawk +, gettext +, gnugrep +, gnupg + # Tells pacman where to find ALPM hooks provided by packages. # This path is very likely to be used in an Arch-like root. , sysHookDir ? "/usr/share/libalpm/hooks/" @@ -106,7 +111,14 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/makepkg \ --prefix PATH : ${lib.makeBinPath [ binutils ]} wrapProgram $out/bin/pacman-key \ - --prefix PATH : ${lib.makeBinPath [ "${placeholder "out"}" gnupg ]} + --prefix PATH : ${lib.makeBinPath [ + "${placeholder "out"}" + coreutils + gawk + gettext + gnugrep + gnupg + ]} ''; meta = with lib; { From c981c2a4c1b4e977aa5f6313694b79bcf132531d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 05:18:51 +0000 Subject: [PATCH 235/797] wabt: 1.0.30 -> 1.0.31 --- pkgs/development/tools/wabt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index a5690c8468c8..31fc7270c231 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.30"; + version = "1.0.31"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "sha256-C8S1+wcJhfv65HY8KCSnX+F6wP1E4Vkr0iwW83OwZxk="; + sha256 = "sha256-EChOQTWGt/LUfwCxmMmYC+zHjW9hVvghhOGr4DfpNtQ="; fetchSubmodules = true; }; From 979532e81ba0c25a89976a8d8e048ba118e4f070 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 08:10:24 +0000 Subject: [PATCH 236/797] python310Packages.aiohomekit: 2.2.19 -> 2.3.0 --- pkgs/development/python-modules/aiohomekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index a72d72878760..18bbaff15da6 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.2.19"; + version = "2.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-x1Cah47EupdqLxwoJBLmN3AtC7zYqGZTP0nbLLsC3a0="; + hash = "sha256-dX3yz7b3fejLFtlk5CKBQzk+o9FpLtxyZYt5SaybBJM="; }; nativeBuildInputs = [ From bf7f28b1a9e36e2bd1a13c76984d327fdcc534ce Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 17 Nov 2022 08:15:16 +0000 Subject: [PATCH 237/797] imhex: drop unused xlibsWrapper input Validated as no change in `out` output with diffoscope. --- pkgs/applications/editors/imhex/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/imhex/default.nix b/pkgs/applications/editors/imhex/default.nix index 3a7463f89f83..b35f9aa06ca4 100644 --- a/pkgs/applications/editors/imhex/default.nix +++ b/pkgs/applications/editors/imhex/default.nix @@ -17,7 +17,6 @@ , curl , fmt_8 , nlohmann_json -, xlibsWrapper , yara }: @@ -45,7 +44,7 @@ gcc12Stdenv.mkDerivation rec { hash = "sha256-SFv5ulyjm5Yf+3Gpx+A74so2YClCJx1sx0LE5fh5eG4="; }; - nativeBuildInputs = [ cmake llvm python3 perl pkg-config xlibsWrapper ]; + nativeBuildInputs = [ cmake llvm python3 perl pkg-config ]; buildInputs = [ capstone From a4aa5b7fe7a0fd05594541e1d7813f39c74e9079 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 09:18:35 +0000 Subject: [PATCH 238/797] python310Packages.arviz: 0.13.0 -> 0.14.0 --- pkgs/development/python-modules/arviz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index eb5cbc90efa9..4dd4415127f2 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.13.0"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,8 +39,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arviz-devs"; repo = pname; - rev = "v${version}"; - hash = "sha256-DGTGUMnkEQcwGR44WhmBpTBMcRcAtVIpM4YVnnlakE8="; + rev = "refs/tags/${version}"; + hash = "sha256-YLNczcgVmcctNc620Ap9yQtQTwF1LREtL57JIWS/DKQ="; }; propagatedBuildInputs = [ From a14bb81af78688a3a455db5273400ce13fceb862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 17 Nov 2022 10:43:37 +0100 Subject: [PATCH 239/797] python3Packages.scipy: pull an upstream patch In particular, this fixes crashes in .scikit-learn tests: https://hydra.nixos.org/build/198810166 --- pkgs/development/python-modules/scipy/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index f85121a39ac3..457a9c622a12 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchPypi +, fetchpatch , python , pythonOlder , buildPythonPackage @@ -28,6 +29,13 @@ buildPythonPackage rec { sha256 = "sha256-JtKMRokA5tX9s30oEqtG2wzNIsY7qglQV4cfqjpJi8k="; }; + patches = [ + (fetchpatch { + url = "https://github.com/scipy/scipy/commit/318d8c6d16fdf000be8637e9917989729f2c8ce7.diff"; + sha256 = "sha256-Zfb9GYP0r9MDJ91hSzMN1r4eNilajPThNIvZmDzFEXo="; + }) + ]; + nativeBuildInputs = [ cython gfortran meson-python pythran pkg-config wheel ]; buildInputs = [ From 53424cfb8ab94987e2a2dc086e770b70fdf8d5e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 09:50:07 +0000 Subject: [PATCH 240/797] python310Packages.aws-lambda-builders: 1.20.0 -> 1.23.0 --- .../python-modules/aws-lambda-builders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index b5198752ad82..b7c2cf8994d4 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.20.0"; + version = "1.23.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-+XOxz3xWIYacfUizztd4mH5kvBw/dkN9WiS38dONs7Y="; + hash = "sha256-3jzUowSeO6j7DzIlOkeU3KUFFIUi7cEyvjbIL8uRGcU="; }; propagatedBuildInputs = [ From c156bdf40d2f0e64b574ade52c5611d90a0b6273 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 15 Nov 2022 20:11:57 +0100 Subject: [PATCH 241/797] firefox, thunderbird, librewolf: Enable wayland support by default Enabling Wayland support by default prevents use of XWayland on Wayland systems, while correctly falling back to X11 when Wayland is unavailable in the current session. With the current packaging many people unnecessarily rely on the `firefox` attribute, which is suggested by nixos-generate-config, which in turn makes their Firefox use XWayland, when it shouldn't, which causes bugs with GNOME on Wayland: https://discourse.nixos.org/t/firefox-all-black-when-first-launched-after-login/21143 Using the Wayland-enabled Firefox was tested on pure X11 systems by contributors on the #nix-mozilla:nixos.org room and we are confident this change will not cause severe regressions. Even better, people can now toggle `MOZ_ENABLE_WAYLAND=<0|1>` in their environment to override this decision, should they feel the need to do so. --- .../manual/from_md/release-notes/rl-2211.section.xml | 11 +++++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ .../networking/browsers/firefox/wrapper.nix | 5 ++--- pkgs/top-level/aliases.nix | 4 ++++ pkgs/top-level/all-packages.nix | 7 ------- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index d5cc14a3bdfd..419864cc90b0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1017,6 +1017,17 @@ signald -d /var/lib/signald/db \
Other Notable Changes + + + firefox, thunderbird and + librewolf come with enabled 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 diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index d61cf2967553..3ff9d65ecbec 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -320,6 +320,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). ## Other Notable Changes {#sec-release-22.11-notable-changes} +- `firefox`, `thunderbird` and `librewolf` come with enabled 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](https://github.com/sayanarijit/xplr/releases/tag/v0.19.0) for more details. - `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. diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 963028ae321a..378fe1f4039b 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -33,7 +33,6 @@ let , wmClass ? null , extraNativeMessagingHosts ? [] , pkcs11Modules ? [] - , forceWayland ? false , useGlvnd ? true , cfg ? config.${applicationName} or {} @@ -170,7 +169,7 @@ let name = applicationName; exec = "${launcherName} %U"; inherit icon; - desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; + desktopName = "${desktopName}${nameSuffix}"; startupNotify = true; startupWMClass = wmClass; terminal = false; @@ -309,7 +308,7 @@ let --set MOZ_ALLOW_DOWNGRADE 1 \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \ - ${lib.optionalString forceWayland "--set MOZ_ENABLE_WAYLAND 1"} \ + --set-default MOZ_ENABLE_WAYLAND 1 \ "''${oldWrapperArgs[@]}" ############################# # # diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 58af0206152f..850ee8477b5b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -437,7 +437,9 @@ mapAliases ({ finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25"; + firefox-esr-wayland = firefox-esr; # Added 2022-11-15 firefox-esr-wrapper = throw "'firefox-esr-wrapper' has been renamed to/replaced by 'firefox-esr'"; # Converted to throw 2022-02-22 + firefox-wayland = firefox; # Added 2022-11-15 firefoxWrapper = throw "'firefoxWrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firefox-wrapper = throw "'firefox-wrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 @@ -775,6 +777,7 @@ mapAliases ({ libressl_3_2 = throw "'libressl_3_2' has reached end-of-life "; # Added 2022-03-19 librevisa = throw "librevisa has been removed because its website and source have disappeared upstream"; # Added 2022-09-23 librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 + librewolf-wayland = librewolf; # Added 2022-11-15 libseat = seatd; # Added 2021-06-24 libspotify = throw "libspotify has been removed because Spotify stopped supporting it"; # added 2022-05-29 libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used"; # Added 2020-06-22 @@ -1462,6 +1465,7 @@ mapAliases ({ tftp_hpa = throw "'tftp_hpa' has been renamed to/replaced by 'tftp-hpa'"; # Converted to throw 2022-02-22 thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25"; thunderbird-bin-68 = thunderbird-68; + thunderbird-wayland = thunderbird; # Added 2022-11-15 timescale-prometheus = promscale; # Added 2020-09-29 timedoctor = throw "'timedoctor' has been removed from nixpkgs"; # Added 2022-10-09 timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e22c11fa37ff..5657e25b05dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28697,11 +28697,9 @@ with pkgs; firefox-esr-unwrapped = firefoxPackages.firefox-esr-102; firefox = wrapFirefox firefox-unwrapped { }; - firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; firefox-esr = firefox-esr-102; firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; - firefox-esr-wayland = wrapFirefox firefox-esr-102-unwrapped { forceWayland = true; }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { inherit (gnome) adwaita-icon-theme; @@ -28743,10 +28741,6 @@ with pkgs; libName = "librewolf"; }; - librewolf-wayland = librewolf.override { - forceWayland = true; - }; - firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { }; fmtoy = callPackage ../tools/audio/fmtoy { }; @@ -32349,7 +32343,6 @@ with pkgs; thunderbird-unwrapped = thunderbirdPackages.thunderbird; thunderbird = wrapThunderbird thunderbird-unwrapped { }; - thunderbird-wayland = wrapThunderbird thunderbird-unwrapped { forceWayland = true; }; thunderbird-bin = wrapThunderbird thunderbird-bin-unwrapped { applicationName = "thunderbird"; From 4fbb0244d282a20d1903778e2162b97d3f873fa9 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 17 Nov 2022 14:16:52 +0300 Subject: [PATCH 242/797] peertube: 4.3.0 -> 4.3.1 --- pkgs/servers/peertube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 9ddad4fad1e8..ea41f6dda50d 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -14,13 +14,13 @@ let in stdenv.mkDerivation rec { pname = "peertube"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - hash = "sha256-1QpJtonn/mWGcTv2mSeGKAHwPAqOV6VBAYFZH1/jAH8="; + hash = "sha256-r3Bi7QLzDKo3/idEY7fYIxTJPULNvAS6hy19Hko2qHE="; }; yarnOfflineCacheServer = fetchYarnDeps { From ff59315b4fae36741fc812c471097e301d5dc9ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 11:29:38 +0000 Subject: [PATCH 243/797] python310Packages.azure-mgmt-security: 2.0.0 -> 3.0.0 --- .../python-modules/azure-mgmt-security/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index 30c4fe2e7627..d309112964d5 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "3.0.0"; pname = "azure-mgmt-security"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-2sr3clHf5EvbXAx5FH3d3ab1/Y48r6Ojww3p9WX35aM="; + sha256 = "sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q="; extension = "zip"; }; From cbbb646333299bd5f2f6b91f3e47b759617452ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 11:33:12 +0000 Subject: [PATCH 244/797] python310Packages.azure-mgmt-storage: 20.1.0 -> 21.0.0 --- .../development/python-modules/azure-mgmt-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 417264a70ffa..0ba50dc3f863 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "azure-mgmt-storage"; - version = "20.1.0"; + version = "21.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-IU8/3oyR4n1T8uZUoo0VADrT9vFchDioIF8MiKSNlFE="; + hash = "sha256-brE+7s+JGVsrX0e+Bnnj8niI79e9ITLux+vLznXLE3c="; }; propagatedBuildInputs = [ From 1ddcf71d410fa6c3bb5999afe02582ccfb21b298 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 12:29:40 +0000 Subject: [PATCH 245/797] python310Packages.boxx: 0.10.7 -> 0.10.8 --- pkgs/development/python-modules/boxx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index cec5c0d638dd..43fea29cc2f5 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.10.7"; + version = "0.10.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OPbqCsTZZskZOJMcK1OJsG3Qgx4K0X217g5pNWQZDAM="; + hash = "sha256-uk4DYmbV/4zSyL2QzlAJLvgC6ieBjP/xkuyDktUEmIo="; }; propagatedBuildInputs = [ From 5e41a6eef75dcff1b9ec7be743997ec2aa624036 Mon Sep 17 00:00:00 2001 From: zendo Date: Thu, 17 Nov 2022 20:53:16 +0800 Subject: [PATCH 246/797] gitnuro: 1.1.0 -> 1.1.1 --- .../version-management/git-and-tools/gitnuro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix b/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix index 7c0dbefc5069..db79637ef9ff 100644 --- a/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gitnuro"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-${version}.jar"; - hash = "sha256-tAFFl14mmXhLr6V/vTDe9lwX7trsaTWgIqkwxD3mBUw="; + hash = "sha256-ugZBk/aQ2pjL9xY66g20MorAQ02GHIdJTv8ejadaBgY="; }; icon = fetchurl { From 56639875f76a99476928a54de1a0db256a5b7d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 17 Nov 2022 16:09:39 +0300 Subject: [PATCH 247/797] libreoffice: add Turkish language pack --- pkgs/applications/office/libreoffice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 4c3a4bd98844..a562548242b6 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -96,7 +96,7 @@ , gpgme , libwebp , abseil-cpp -, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "uk" "zh-CN" ] +, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false , mkDerivation ? null From a050a54ed2369e1d73d748013a13c4e7463cd6d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Nov 2022 18:27:14 +0100 Subject: [PATCH 248/797] python3Packages.g2pkk: init at 0.1.2 --- .../python-modules/g2pkk/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/g2pkk/default.nix diff --git a/pkgs/development/python-modules/g2pkk/default.nix b/pkgs/development/python-modules/g2pkk/default.nix new file mode 100644 index 000000000000..98e03806d2ff --- /dev/null +++ b/pkgs/development/python-modules/g2pkk/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jamo +, nltk +}: + +buildPythonPackage rec { + pname = "g2pkk"; + version = "0.1.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-YarV1Btn1x3Sm4Vw/JDSyJy3ZJMXAQHZJJJklSG0R+Q="; + }; + + propagatedBuildInputs = [ + jamo + nltk + ]; + + pythonImportsCheck = [ + "g2pkk" + ]; + + doCheck = false; + + meta = with lib; { + description = "Cross-platform g2p for Korean"; + homepage = "https://github.com/harmlessman/g2pkk"; + license = licenses.asl20; + maintainers = teams.tts.members; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 255608823b3f..11993bfa5c9f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3562,6 +3562,8 @@ self: super: with self; { fx2 = callPackage ../development/python-modules/fx2 { }; + g2pkk = callPackage ../development/python-modules/g2pkk { }; + galario = toPythonModule (pkgs.galario.override { enablePython = true; pythonPackages = self; From ad3e05e91069080931ca65d55df1a740be4dfc38 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Nov 2022 18:34:13 +0100 Subject: [PATCH 249/797] python3Packages.trainer: rename from coqui-trainer --- .../python-modules/{coqui-trainer => trainer}/default.nix | 2 +- pkgs/tools/audio/tts/default.nix | 2 +- pkgs/top-level/python-packages.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/python-modules/{coqui-trainer => trainer}/default.nix (97%) diff --git a/pkgs/development/python-modules/coqui-trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix similarity index 97% rename from pkgs/development/python-modules/coqui-trainer/default.nix rename to pkgs/development/python-modules/trainer/default.nix index 4c77506b9881..627c21ee4bf0 100644 --- a/pkgs/development/python-modules/coqui-trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -16,7 +16,7 @@ }: let - pname = "coqui-trainer"; + pname = "trainer"; version = "0.0.16"; in buildPythonPackage { diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 4e9148db9663..36f485d2b9a0 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -71,7 +71,6 @@ python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ anyascii coqpit - coqui-trainer flask fsspec gdown @@ -92,6 +91,7 @@ python.pkgs.buildPythonApplication rec { torch-bin torchaudio-bin tqdm + trainer umap-learn unidic-lite webrtcvad diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11993bfa5c9f..434d8509d39b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1580,8 +1580,6 @@ self: super: with self; { coqpit = callPackage ../development/python-modules/coqpit { }; - coqui-trainer = callPackage ../development/python-modules/coqui-trainer {}; - cepa = callPackage ../development/python-modules/cepa { }; cerberus = callPackage ../development/python-modules/cerberus { }; @@ -11250,6 +11248,8 @@ self: super: with self; { trackpy = callPackage ../development/python-modules/trackpy { }; + trainer = callPackage ../development/python-modules/trainer {}; + traitlets = callPackage ../development/python-modules/traitlets { }; traits = callPackage ../development/python-modules/traits { }; From 6f2d0143991f426d0f77ec7109df175b8974456c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 17 Nov 2022 14:27:35 +0100 Subject: [PATCH 250/797] tts: 0.8.0 -> 0.9.0 https://github.com/coqui-ai/TTS/releases/tag/v0.9.0 --- pkgs/tools/audio/tts/default.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 36f485d2b9a0..9b3bce6f44cf 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -32,14 +32,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.8.0"; - format = "setuptools"; + version = "0.9.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "sha256-A48L1JGXckSEaZra00ZOBVxcYJMvhpQqzE8nABaP0TY="; + sha256 = "sha256-p4I583Rs/4eig7cnOcJjri2ugOLAeF2nvPIvMZrN1Ss="; }; postPatch = let @@ -53,7 +53,6 @@ python.pkgs.buildPythonApplication rec { "numpy" "umap-learn" "unidic-lite" - "pyworld" ]; in '' sed -r -i \ @@ -61,7 +60,6 @@ python.pkgs.buildPythonApplication rec { ''-e 's/${package}.*[<>=]+.*/${package}/g' \'' ) relaxedConstraints)} requirements.txt - sed -i '/tensorboardX/d' requirements.txt ''; nativeBuildInputs = with python.pkgs; [ @@ -73,18 +71,20 @@ python.pkgs.buildPythonApplication rec { coqpit flask fsspec + g2pkk gdown gruut inflect + jamo jieba librosa matplotlib mecab-python3 + nltk numba pandas pypinyin pysbd - pyworld scipy soundfile tensorflow @@ -127,15 +127,17 @@ python.pkgs.buildPythonApplication rec { disabledTests = [ # Requires network acccess to download models - "test_synthesize" + "test_korean_text_to_phonemes" + "test_models_offset_0_step_3" + "test_models_offset_1_step_3" + "test_models_offset_2_step_3" "test_run_all_models" + "test_synthesize" + "test_voice_conversion" # Mismatch between phonemes "test_text_to_ids_phonemes_with_eos_bos_and_blank" # Takes too long "test_parametrized_wavernn_dataset" - - # requires network - "test_voice_conversion" ]; disabledTestPaths = [ From 5b8d77fb31e760ff5686b8326c3805066655eff0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 13:57:55 +0000 Subject: [PATCH 251/797] python310Packages.clickhouse-cityhash: 1.0.2.3 -> 1.0.2.4 --- .../python-modules/clickhouse-cityhash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clickhouse-cityhash/default.nix b/pkgs/development/python-modules/clickhouse-cityhash/default.nix index 4e632cb34038..c4444f3bc792 100644 --- a/pkgs/development/python-modules/clickhouse-cityhash/default.nix +++ b/pkgs/development/python-modules/clickhouse-cityhash/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "clickhouse-cityhash"; - version = "1.0.2.3"; + version = "1.0.2.4"; src = fetchPypi { inherit pname version; - sha256 = "0z8nl0ly2p1h6nygwxs6y40q8y424w40fkjv3jyf8vvcg4h7sdrg"; + sha256 = "sha256-ezEl19CqE8LMTnWDqWWmv7CqlqEhMUdbRCVSustV9Pg="; }; propagatedBuildInputs = [ setuptools ]; From 4536ebad69010f41df3c67c18bff3d85513faf86 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 16 Nov 2022 11:47:36 -0500 Subject: [PATCH 252/797] lib/attrsets: simplify chooseDevOutputs --- lib/attrsets.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index de88763854d6..0a4c3c8ebcf4 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -606,7 +606,7 @@ rec { getMan = getOutput "man"; /* Pick the outputs of packages to place in buildInputs */ - chooseDevOutputs = drvs: builtins.map getDev drvs; + chooseDevOutputs = builtins.map getDev; /* Make various Nix tools consider the contents of the resulting attribute set when looking for what to build, find, etc. From a5bd33250a65331bf74e98fdf62c76904434a914 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 14:49:00 +0000 Subject: [PATCH 253/797] bundletool: 1.13.0 -> 1.13.1 --- pkgs/development/tools/bundletool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix index de4deed0606a..6e683e09391a 100644 --- a/pkgs/development/tools/bundletool/default.nix +++ b/pkgs/development/tools/bundletool/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "bundletool"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-9Fks0DrUgk6N218pPvgAHrU0P9kjCOJhQx8ILzloC+I="; + sha256 = "sha256-owXj7FSR98IPuaWkUGpv4e6c4c6XIYFsxZZH0OWYcu8="; }; dontUnpack = true; From 1404f230f103e97d68afaf5ab6b08dd2ee48200e Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Thu, 17 Nov 2022 15:52:47 +0100 Subject: [PATCH 254/797] python3Packages.versioningit: 2.0.1 -> 2.1.0 https://github.com/jwodder/versioningit/blob/master/CHANGELOG.md#v210-2022-10-25 --- pkgs/development/python-modules/versioningit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index 5f058d5f1b15..f78f2fbf4e55 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "versioningit"; - version = "2.0.1"; + version = "2.1.0"; disabled = pythonOlder "3.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-gJfiYNm99nZYW9gTO/e1//rDeox2KWJVtC2Gy1EqsuM="; + hash = "sha256-c/KWXjDS6/1/+ra/JjaPIjdXBiLdKknH+8GZXenGdtY="; }; postPatch = '' From b46981848d90633054143c8ed7f68329012f612c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 17 Nov 2022 11:54:13 -0300 Subject: [PATCH 255/797] numix-icon-theme: 22.08.16 -> 22.11.17 --- pkgs/data/icons/numix-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 410439da6ca6..cb425ee00cb5 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme"; - version = "22.08.16"; + version = "22.11.17"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-EveIr5XYyQYhz0AqZQBql3j0LnD8taNdzB/6IV7Mz2k="; + sha256 = "sha256-B6Yg9NkPBpByMMV4GcEBmOlSKx1s0MClGWL2RWIJMwA="; }; nativeBuildInputs = [ From 8a4a83024212f0e91cb2564f759b419a18040fdd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 14:56:27 +0000 Subject: [PATCH 256/797] cargo-public-api: 0.22.0 -> 0.23.0 --- pkgs/development/tools/rust/cargo-public-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index d248b091bba6..64418df60c75 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.22.0"; + version = "0.23.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-OjKvp3LsNBIIkpq15BAi9LqxbLgormkiW/lMqdPefZM="; + sha256 = "sha256-yllfkhf0Xy8D6tL08QYPnz7Cj/JOvMG7E53elRx11EE="; }; - cargoSha256 = "sha256-TUXyWO1rNngv1Tli0jeaOHwaBJnh7LnXe+lNSR+7rfI="; + cargoSha256 = "sha256-UwrhgMmZ9PnIsxsWxQskaMHl03g54VeoZRo9ZPkSM28="; nativeBuildInputs = [ pkg-config ]; From 65ddb0ef06abcd733bbed124ea2594b6491abd73 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 17 Nov 2022 16:02:34 +0100 Subject: [PATCH 257/797] nixos/dbus: Remove socketActivated option removal warning It has been removed since 21.05: https://github.com/NixOS/nixpkgs/commit/f292a27f442d10de4827800d064a3a8c64d05cee --- nixos/modules/services/system/dbus.nix | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index c0de00bb914c..3cfdd74ea38e 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -1,6 +1,6 @@ # D-Bus configuration and system bus daemon. -{ config, lib, options, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -65,30 +65,12 @@ in ''; default = "disabled"; }; - - socketActivated = mkOption { - type = types.nullOr types.bool; - default = null; - visible = false; - description = lib.mdDoc '' - Removed option, do not use. - ''; - }; }; }; ###### implementation config = mkIf cfg.enable { - warnings = optional (cfg.socketActivated != null) ( - let - files = showFiles options.services.dbus.socketActivated.files; - in - "The option 'services.dbus.socketActivated' in ${files} no longer has" - + " any effect and can be safely removed: the user D-Bus session is" - + " now always socket activated." - ); - environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ]; environment.etc."dbus-1".source = configDir; From 43f34da0798ed4499598abc5a9bc4a87cb118cf1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 17 Nov 2022 16:16:18 +0100 Subject: [PATCH 258/797] nixos/dbus: Clean up - Format the expression with nixpkgs-fmt. - Remove `with` statement for clarity. - Remove useless comments. - Regroup systemd options. --- nixos/modules/services/system/dbus.nix | 51 ++++++++++++++++---------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 3cfdd74ea38e..2cd843e4d67c 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -2,8 +2,6 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.services.dbus; @@ -16,11 +14,11 @@ let serviceDirectories = cfg.packages; }; + inherit (lib) mkOption types; + in { - ###### interface - options = { services.dbus = { @@ -68,10 +66,11 @@ in }; }; - ###### implementation - - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ]; + config = lib.mkIf cfg.enable { + environment.systemPackages = [ + pkgs.dbus.daemon + pkgs.dbus + ]; environment.etc."dbus-1".source = configDir; @@ -84,7 +83,9 @@ in users.groups.messagebus.gid = config.ids.gids.messagebus; - systemd.packages = [ pkgs.dbus.daemon ]; + systemd.packages = [ + pkgs.dbus.daemon + ]; security.wrappers.dbus-daemon-launch-helper = { source = "${pkgs.dbus.daemon}/libexec/dbus-daemon-launch-helper"; @@ -103,19 +104,29 @@ in systemd.services.dbus = { # Don't restart dbus-daemon. Bad things tend to happen if we do. reloadIfChanged = true; - restartTriggers = [ configDir ]; - environment = { LD_LIBRARY_PATH = config.system.nssModules.path; }; - }; - - systemd.user = { - services.dbus = { - # Don't restart dbus-daemon. Bad things tend to happen if we do. - reloadIfChanged = true; - restartTriggers = [ configDir ]; + restartTriggers = [ + configDir + ]; + environment = { + LD_LIBRARY_PATH = config.system.nssModules.path; }; - sockets.dbus.wantedBy = [ "sockets.target" ]; }; - environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ]; + systemd.user.services.dbus = { + # Don't restart dbus-daemon. Bad things tend to happen if we do. + reloadIfChanged = true; + restartTriggers = [ + configDir + ]; + }; + + systemd.user.sockets.dbus.wantedBy = [ + "sockets.target" + ]; + + environment.pathsToLink = [ + "/etc/dbus-1" + "/share/dbus-1" + ]; }; } From 25e22619ffcca17bdad8ac69ac5cc19d092d906e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 15:35:06 +0000 Subject: [PATCH 259/797] python310Packages.compreffor: 0.5.2 -> 0.5.3 --- pkgs/development/python-modules/compreffor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/compreffor/default.nix b/pkgs/development/python-modules/compreffor/default.nix index 183645053771..0c1f376aeaf6 100644 --- a/pkgs/development/python-modules/compreffor/default.nix +++ b/pkgs/development/python-modules/compreffor/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "compreffor"; - version = "0.5.2"; + version = "0.5.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rsC0HJCl3IGqEqUqfCwRRNwzjtfGDlxcCkeOU3On22Q="; + sha256 = "sha256-fUEpbU+wqh72lt/ZJdKvMifUAwYivpmzx9QQfcb4cTo="; }; nativeBuildInputs = [ From f993f8a18659bb15bc5697b6875caf0cba8b1825 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 16 Nov 2022 12:20:38 -0500 Subject: [PATCH 260/797] lib/attrsets: add concatMapAttrs --- lib/attrsets.nix | 21 ++++++++++++++++++++- lib/default.nix | 2 +- lib/tests/misc.nix | 17 +++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 0a4c3c8ebcf4..8b5c0ef4cea6 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -3,7 +3,7 @@ let inherit (builtins) head tail length; - inherit (lib.trivial) id; + inherit (lib.trivial) flip id mergeAttrs pipe; inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName; inherit (lib.lists) foldr foldl' concatMap concatLists elemAt all partition groupBy take foldl; in @@ -77,6 +77,25 @@ rec { let errorMsg = "cannot find attribute `" + concatStringsSep "." attrPath + "'"; in attrByPath attrPath (abort errorMsg); + /* Map each attribute in the given set and merge them into a new attribute set. + + Type: + concatMapAttrs :: + (String -> a -> AttrSet) + -> AttrSet + -> AttrSet + + Example: + concatMapAttrs + (name: value: { + ${name} = value; + ${name + value} = value; + }) + { x = "a"; y = "b"; } + => { x = "a"; xa = "a"; y = "b"; yb = "b"; } + */ + concatMapAttrs = f: flip pipe [ (mapAttrs f) attrValues (foldl' mergeAttrs { }) ]; + /* Update or set specific paths of an attribute set. diff --git a/lib/default.nix b/lib/default.nix index 8bb06954518b..cc4bedc5869b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -78,7 +78,7 @@ let inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs - mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond + mapAttrs' mapAttrsToList concatMapAttrs mapAttrsRecursive mapAttrsRecursiveCond genAttrs isDerivation toDerivation optionalAttrs zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil recursiveUpdate matchAttrs overrideExisting showAttrPath getOutput getBin diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 31c938a8ffda..b73da4f1010d 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -478,6 +478,23 @@ runTests { # ATTRSETS + testConcatMapAttrs = { + expr = concatMapAttrs + (name: value: { + ${name} = value; + ${name + value} = value; + }) + { + foo = "bar"; + foobar = "baz"; + }; + expected = { + foo = "bar"; + foobar = "baz"; + foobarbaz = "baz"; + }; + }; + # code from the example testRecursiveUpdateUntil = { expr = recursiveUpdateUntil (path: l: r: path == ["foo"]) { From aeb5a692c34b283790a80614beedbc124d73138a Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Wed, 16 Nov 2022 17:56:44 +0100 Subject: [PATCH 261/797] nixos/alps: add hardening, extensible options, test --- nixos/modules/services/web-apps/alps.nix | 52 ++++++++++++++---- nixos/tests/all-tests.nix | 1 + nixos/tests/alps.nix | 68 ++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 9 deletions(-) create mode 100644 nixos/tests/alps.nix diff --git a/nixos/modules/services/web-apps/alps.nix b/nixos/modules/services/web-apps/alps.nix index b73cb82925d9..4681739af4ab 100644 --- a/nixos/modules/services/web-apps/alps.nix +++ b/nixos/modules/services/web-apps/alps.nix @@ -70,6 +70,23 @@ in { ''; }; }; + + package = mkOption { + internal = true; + type = types.package; + default = pkgs.alps; + }; + + args = mkOption { + internal = true; + type = types.listOf types.str; + default = [ + "-addr" "${cfg.bindIP}:${toString cfg.port}" + "-theme" "${cfg.theme}" + "imaps://${cfg.imaps.host}:${toString cfg.imaps.port}" + "smpts://${cfg.smtps.host}:${toString cfg.smtps.port}" + ]; + }; }; config = mkIf cfg.enable { @@ -80,16 +97,33 @@ in { after = [ "network.target" "network-online.target" ]; serviceConfig = { - ExecStart = '' - ${pkgs.alps}/bin/alps \ - -addr ${cfg.bindIP}:${toString cfg.port} \ - -theme ${cfg.theme} \ - imaps://${cfg.imaps.host}:${toString cfg.imaps.port} \ - smpts://${cfg.smtps.host}:${toString cfg.smtps.port} - ''; - StateDirectory = "alps"; - WorkingDirectory = "/var/lib/alps"; + ExecStart = "${cfg.package}/bin/alps ${escapeShellArgs cfg.args}"; DynamicUser = true; + ## This is desirable but would restrict bindIP to 127.0.0.1 + #IPAddressAllow = "localhost"; + #IPAddressDeny = "any"; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateIPC = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service @resources" "~@privileged @obsolete" ]; }; }; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index bd0fe18c4f8c..b238c4384951 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -74,6 +74,7 @@ in { agda = handleTest ./agda.nix {}; airsonic = handleTest ./airsonic.nix {}; allTerminfo = handleTest ./all-terminfo.nix {}; + alps = handleTest ./alps.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; apfs = handleTest ./apfs.nix {}; apparmor = handleTest ./apparmor.nix {}; diff --git a/nixos/tests/alps.nix b/nixos/tests/alps.nix new file mode 100644 index 000000000000..0a55e9b90cd1 --- /dev/null +++ b/nixos/tests/alps.nix @@ -0,0 +1,68 @@ +let + certs = import ./common/acme/server/snakeoil-certs.nix; + domain = certs.domain; +in +import ./make-test-python.nix { + name = "alps"; + + nodes = { + server = { + imports = [ ./common/user-account.nix ]; + security.pki.certificateFiles = [ + certs.ca.cert + ]; + networking.extraHosts = '' + 127.0.0.1 ${domain} + ''; + networking.firewall.allowedTCPPorts = [ 25 465 993 ]; + services.postfix = { + enable = true; + enableSubmission = true; + enableSubmissions = true; + tlsTrustedAuthorities = "${certs.ca.cert}"; + sslCert = "${certs.${domain}.cert}"; + sslKey = "${certs.${domain}.key}"; + }; + services.dovecot2 = { + enable = true; + enableImap = true; + sslCACert = "${certs.ca.cert}"; + sslServerCert = "${certs.${domain}.cert}"; + sslServerKey = "${certs.${domain}.key}"; + }; + }; + + client = { nodes, ... }: { + security.pki.certificateFiles = [ + certs.ca.cert + ]; + networking.extraHosts = '' + ${nodes.server.config.networking.primaryIPAddress} ${domain} + ''; + services.alps = { + enable = true; + theme = "alps"; + imaps = { + host = domain; + port = 993; + }; + smtps = { + host = domain; + port = 465; + }; + }; + }; + }; + + testScript = '' + server.start() + server.wait_for_unit("postfix.service") + server.wait_for_unit("dovecot2.service") + server.wait_for_open_port(465) + server.wait_for_open_port(993) + + client.start() + client.wait_for_unit("alps.service") + client.wait_until_succeeds("curl -fvvv -s http://127.0.0.1:1323/", timeout=60) + ''; +} From 9820effbbaed11d180c307aa10ed7b82a9948c19 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Thu, 17 Nov 2022 10:34:59 +0100 Subject: [PATCH 262/797] nixos/alps: test login and cookie --- nixos/tests/alps.nix | 44 +++++++++++++++++++++++++++++++---- pkgs/servers/alps/default.nix | 4 +++- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/nixos/tests/alps.nix b/nixos/tests/alps.nix index 0a55e9b90cd1..8d7814117df1 100644 --- a/nixos/tests/alps.nix +++ b/nixos/tests/alps.nix @@ -2,7 +2,7 @@ let certs = import ./common/acme/server/snakeoil-certs.nix; domain = certs.domain; in -import ./make-test-python.nix { +import ./make-test-python.nix ({ pkgs, ... }: { name = "alps"; nodes = { @@ -32,7 +32,7 @@ import ./make-test-python.nix { }; }; - client = { nodes, ... }: { + client = { nodes, config, ... }: { security.pki.certificateFiles = [ certs.ca.cert ]; @@ -51,6 +51,42 @@ import ./make-test-python.nix { port = 465; }; }; + environment.systemPackages = [ + (pkgs.writers.writePython3Bin "test-alps-login" { } '' + from urllib.request import build_opener, HTTPCookieProcessor, Request + from urllib.parse import urlencode, urljoin + from http.cookiejar import CookieJar + + baseurl = "http://localhost:${toString config.services.alps.port}" + username = "alice" + password = "${nodes.server.config.users.users.alice.password}" + cookiejar = CookieJar() + cookieprocessor = HTTPCookieProcessor(cookiejar) + opener = build_opener(cookieprocessor) + + data = urlencode({"username": username, "password": password}).encode() + req = Request(urljoin(baseurl, "login"), data=data, method="POST") + with opener.open(req) as ret: + # Check that the alps_session cookie is set + print(cookiejar) + assert any(cookie.name == "alps_session" for cookie in cookiejar) + + req = Request(baseurl) + with opener.open(req) as ret: + # Check that the alps_session cookie is still there... + print(cookiejar) + assert any(cookie.name == "alps_session" for cookie in cookiejar) + # ...and that we have not been redirected back to the login page + print(ret.url) + assert ret.url == urljoin(baseurl, "mailbox/INBOX") + + req = Request(urljoin(baseurl, "logout")) + with opener.open(req) as ret: + # Check that the alps_session cookie is now gone + print(cookiejar) + assert all(cookie.name != "alps_session" for cookie in cookiejar) + '') + ]; }; }; @@ -63,6 +99,6 @@ import ./make-test-python.nix { client.start() client.wait_for_unit("alps.service") - client.wait_until_succeeds("curl -fvvv -s http://127.0.0.1:1323/", timeout=60) + client.succeed("test-alps-login") ''; -} +}) diff --git a/pkgs/servers/alps/default.nix b/pkgs/servers/alps/default.nix index a2f69473fbaa..e74b308762fa 100644 --- a/pkgs/servers/alps/default.nix +++ b/pkgs/servers/alps/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromSourcehut }: +{ lib, buildGoModule, fetchFromSourcehut, nixosTests }: buildGoModule rec { pname = "alps"; @@ -31,6 +31,8 @@ buildGoModule rec { proxyVendor = true; + passthru.tests = { inherit(nixosTests) alps; }; + meta = with lib; { description = "A simple and extensible webmail."; homepage = "https://git.sr.ht/~migadu/alps"; From ee758abefeb001e2044ae59415b500cc36d2f2b1 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Thu, 17 Nov 2022 10:49:24 +0100 Subject: [PATCH 263/797] alps: 2022-06-03 -> 2022-10-18 --- pkgs/servers/alps/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/alps/default.nix b/pkgs/servers/alps/default.nix index e74b308762fa..6ce373dce268 100644 --- a/pkgs/servers/alps/default.nix +++ b/pkgs/servers/alps/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromSourcehut, nixosTests }: +{ lib, buildGoModule, fetchFromSourcehut, fetchpatch, nixosTests }: buildGoModule rec { pname = "alps"; - version = "2022-06-03"; + version = "2022-10-18"; src = fetchFromSourcehut { owner = "~migadu"; repo = "alps"; - rev = "9cb23b09975e95f6a5952e3718eaf471c3e3510f"; - hash = "sha256-BUV1/BRIXHEf2FU1rdmNgueo8KSUlMKbIpAg2lFs3hA="; + rev = "f01fbcbc48db5e65d69a0ebd9d7cb0deb378cf13"; + hash = "sha256-RSug3YSiqYLGs05Bee4NoaoCyPvUZ7IqlKWI1hmxbiA="; }; - vendorSha256 = "sha256-cpY+lYM/nAX3nUaFknrRAavxDk8UDzJkoqFjJ1/KWeg="; + vendorSha256 = "sha256-XDm6LU9D/rVQHiko7EFpocv+IktGe6tQhJYRrOJxeSs="; ldflags = [ "-s" @@ -20,6 +20,14 @@ buildGoModule rec { "-X git.sr.ht/~migadu/alps.PluginDir=${placeholder "out"}/share/alps/plugins" ]; + patches = [ + (fetchpatch { + name = "Issue-160-Alps-theme-has-a-enormous-move-to-list-sel"; + url = "https://lists.sr.ht/~migadu/alps-devel/patches/30096/mbox"; + hash = "sha256-Sz/SCkrrXZWrmJzjfPXi+UfCcbwsy6QiA7m34iiEFX0="; + }) + ]; + postPatch = '' substituteInPlace plugin.go --replace "const PluginDir" "var PluginDir" ''; From f5148df5a65b3d7f00f196c8da7d06a0c486b65d Mon Sep 17 00:00:00 2001 From: Jocelyn Thode Date: Sun, 17 Jul 2022 22:20:15 +0200 Subject: [PATCH 264/797] taxi: add tests and remove application/backends --- .../python-modules/taxi/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix index a0ccf0167cf8..28aa01e904a1 100644 --- a/pkgs/development/python-modules/taxi/default.nix +++ b/pkgs/development/python-modules/taxi/default.nix @@ -1,32 +1,38 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , appdirs , requests , click , setuptools -, backends ? [ ] +, pytestCheckHook +, freezegun }: buildPythonPackage rec { pname = "taxi"; version = "6.1.1"; - src = fetchPypi { - inherit version; - pname = "taxi"; - sha256 = "b2562ed58bd6eae7896f4f8e48dbee9845cd2d452b26dd15c26f839b4864cb02"; + src = fetchFromGitHub { + owner = "sephii"; + repo = "taxi"; + rev = version; + sha256 = "sha256-iIy3odDX3QzVG80AFp81m8AYKES4JjlDp49GGpuIHLI="; }; - # No tests in pypy package - doCheck = false; - propagatedBuildInputs = [ appdirs requests click setuptools - ] ++ backends; + ]; + + checkInputs = [ + freezegun + pytestCheckHook + ]; + + pythonImportsCheck = [ "taxi" ]; meta = with lib; { homepage = "https://github.com/sephii/taxi/"; From 4379ebe2ee783baf738ba0eaad34bba7bd95d9b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 16:24:57 +0000 Subject: [PATCH 265/797] python310Packages.datashader: 0.14.2 -> 0.14.3 --- pkgs/development/python-modules/datashader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 82f0851b1ab3..a72bc5b22bbe 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.14.2"; + version = "0.14.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-q8aOpuJD6aX9m9jPm9PY5vZGBJL6Jpf+pPHbcQVOJLg="; + hash = "sha256-zHbo03Ll40H8okBIaqrWSJby4aQAg7ukETNHerUPX28="; }; propagatedBuildInputs = [ From e19effe2ec69dfae14cdb5e160f0413cba6e2d46 Mon Sep 17 00:00:00 2001 From: Jocelyn Thode Date: Thu, 17 Nov 2022 16:38:55 +0100 Subject: [PATCH 266/797] fishPlugins.colored-man-pages: init at unstable-2022-04-30 --- .../shells/fish/plugins/colored-man-pages.nix | 20 +++++++++++++++++++ pkgs/shells/fish/plugins/default.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/shells/fish/plugins/colored-man-pages.nix diff --git a/pkgs/shells/fish/plugins/colored-man-pages.nix b/pkgs/shells/fish/plugins/colored-man-pages.nix new file mode 100644 index 000000000000..435ce6e5c410 --- /dev/null +++ b/pkgs/shells/fish/plugins/colored-man-pages.nix @@ -0,0 +1,20 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +buildFishPlugin rec { + pname = "colored-man-pages"; + version = "unstable-2022-04-30"; + + src = fetchFromGitHub { + owner = "patrickf1"; + repo = "colored_man_pages.fish"; + rev = "f885c2507128b70d6c41b043070a8f399988bc7a"; + sha256 = "0ifqdbaw09hd1ai0ykhxl8735fcsm0x2fwfzsk7my2z52ds60bwa"; + }; + + meta = with lib; { + description = "Fish shell plugin to colorize man pages"; + homepage = "https://github.com/PatrickF1/colored_man_pages.fish"; + license = licenses.mit; + maintainers = [ maintainers.jocelynthode ]; + }; +} diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index cb2d73dacc5a..4508e82d5539 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -6,6 +6,8 @@ lib.makeScope newScope (self: with self; { buildFishPlugin = callPackage ./build-fish-plugin.nix { }; + colored-man-pages = callPackage ./colored-man-pages.nix { }; + clownfish = callPackage ./clownfish.nix { }; bass = callPackage ./bass.nix { }; From b2eb74c577e695a009d07dff4d5af8afc9c6e5c5 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Thu, 17 Nov 2022 17:39:32 +0100 Subject: [PATCH 267/797] sof-firmware: 2.2 -> 2.2.2 --- .../linux/firmware/sof-firmware/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index b15f4c4949de..24ab894c9f06 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -5,23 +5,26 @@ stdenvNoCC.mkDerivation rec { pname = "sof-firmware"; - version = "2.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "thesofproject"; repo = "sof-bin"; rev = "v${version}"; - sha256 = "sha256-/gjGTDOXJ0vz/MH2hlistS3X3Euqf8T6TLnD1A2SBYo="; + sha256 = "sha256-ztewE/8Mc0bbKbxmbJ2sBn3TysuM9hoaSgqrboy77oI="; }; dontFixup = true; # binaries must not be stripped or patchelfed + # There is no proper structure in the upstream repo. + # This needs to be adapted by hand for every new release. installPhase = '' runHook preInstall - cd "v${lib.versions.majorMinor version}.x" - mkdir -p $out/lib/firmware/intel/ - cp -a sof-v${version} $out/lib/firmware/intel/sof - cp -a sof-tplg-v${version} $out/lib/firmware/intel/sof-tplg + cd "v2.2.x" + mkdir -p $out/lib/firmware/intel/sof{,-tplg} + cp -a sof-v2.2/* $out/lib/firmware/intel/sof + cp -a sof-v2.2.2/* $out/lib/firmware/intel/sof + cp -a sof-tplg-v2.2.1/* $out/lib/firmware/intel/sof-tplg runHook postInstall ''; From 8025f92e50c33ed6ab1fdfa6bbb4e8c5d1647256 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 17 Nov 2022 19:56:48 +0300 Subject: [PATCH 268/797] pipewire: backport more upstream suggested patches --- pkgs/development/libraries/pipewire/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 0f98436c44f9..6110d459ecca 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -106,12 +106,25 @@ let # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch - # Recommended backport patch to fix tdesktop with pw-pulse + # Following are backported patches as recommended by upstream. # FIXME: remove in 0.3.61 + # fix tdesktop with pw-pulse (fetchpatch { url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b720da771efa950cf380101bed42d5d5ee177908.diff"; hash = "sha256-p/BvatnbEJAMLQUUOECKAK7FppaNp9ei3FHjAw2spM8="; }) + + # fix a crash when quickly switching Bluetooth profiles + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/bf3516ba0496b644b3944b114253f23964178897.diff"; + hash = "sha256-LqasplS/azCPekslJQPTd9MZkUcRqA0ks94FtwyY3GA="; + }) + + # fix no sound in VMs (Pipewire on the guest) + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b46d8a8c921a8da6883610ad4b68da95bf59b59e.diff"; + hash = "sha256-2VHBwXbzUAGP/fG4xxoFLHSb9oXQK1BPuNv3zAV8cEg="; + }) ]; nativeBuildInputs = [ From 202fff431f9173a72a2f35a7e8de1adf0ab9da0c Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 17 Nov 2022 20:18:35 +0300 Subject: [PATCH 269/797] qt5.15: update to latest KDE patches --- .../libraries/qt-5/5.15/srcs-generated.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index 83f73c993072..4639bf53a52f 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -16,8 +16,8 @@ }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "98c727f273fc83c24550274bd2728e1aafbd213a", - "sha256": "1hwswan0yw6l4rka60ch173sd71ijx0y15gb2hnd3mhzws8gjsb5" + "rev": "51258629f2cf37fff8406bf705d79c07fc7135ca", + "sha256": "0wsjw7wc493kx6w954plmd5y8qsshbd5wqxdwj350gnv48n63g2k" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", @@ -36,8 +36,8 @@ }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "45d43c04088efb8346979f633f72bb1f23183461", - "sha256": "1ad6r1zwzzvl1i2rxkjgp8x5k4ahcf6grfq6xarbbj9qvvb08ny4" + "rev": "959b1ac3b7c699ef67ec81155e6e1e579d4e1df7", + "sha256": "0f8l214x38hdn768jjfy31pqdjgya6221k38vidnfap522qs1fcm" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", @@ -56,8 +56,8 @@ }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "1b83a9c73d6e5459ec4c2221b2bd7e5396b5e874", - "sha256": "07ry1bfim24aa530xslp8njn1bzalrmrwcx0xz2p2jilhfvvp5fc" + "rev": "adbc372b890ed90f006a6c4f3ca56bf0cba477ef", + "sha256": "05v47ba06lmhrmm9ivnfnxzv9qdhyx2bbx2lkqjfwax2czmnf81j" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", @@ -101,8 +101,8 @@ }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "9ff77702cc3649cbaf94046742d682d77cdea698", - "sha256": "0sq2j94csmd7ifd1hw4lwv7b82l59iz2258jg50d0j5hcf3acydz" + "rev": "5465566a4ad9f6f9758bed304153f0c7fec3437b", + "sha256": "03qayykxd07fwp5m1s7dwjvdcv45m3v6zia9k6ipif2bbjbi4dyd" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", @@ -166,8 +166,8 @@ }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "9c607c771acdb3d820be7f112db99213a6c6d7eb", - "sha256": "1dbilhkldvhwwd2j0g7mwz1jyw9zgzwyyx43rsmnmv9lh36pb3dc" + "rev": "4b43f2dc58e71732ebdbe1eaf4392272bc692e6d", + "sha256": "157wqyh9wv9kn8671l7dhnv3a4glmqpisqk0vdgnx19b6jdxymvj" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", From f4828b40fde0b39afc5dc9b147baa60cb2a6ca47 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 16 Nov 2022 12:54:49 -0500 Subject: [PATCH 270/797] vimPlugins.nvim-treesitter: use lib.concatMapAttrs --- .../vim/plugins/nvim-treesitter/overrides.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 97218844730f..f5e5556eaee2 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -14,18 +14,18 @@ let # ocaml-interface # tree-sitter-ocaml-interface # tree-sitter-ocaml_interface - builtGrammars = generatedGrammars // lib.listToAttrs - (lib.concatLists (lib.mapAttrsToList - (k: v: - let - replaced = lib.replaceStrings [ "_" ] [ "-" ] k; - in - map (lib.flip lib.nameValuePair v) - ([ "tree-sitter-${k}" ] ++ lib.optionals (k != replaced) [ - replaced - "tree-sitter-${replaced}" - ])) - generatedDerivations)); + builtGrammars = generatedGrammars // lib.concatMapAttrs + (k: v: + let + replaced = lib.replaceStrings [ "_" ] [ "-" ] k; + in + { + "tree-sitter-${k}" = v; + } // lib.optionalAttrs (k != replaced) { + ${replaced} = v; + "tree-sitter-${replaced}" = v; + }) + generatedDerivations; allGrammars = lib.attrValues generatedDerivations; From d1dd00b61823e8e98fe44262090b560eee45b344 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 16 Nov 2022 12:57:04 -0500 Subject: [PATCH 271/797] nixos/vaultwarden: use lib.concatMapAttrs --- nixos/modules/services/security/vaultwarden/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index 81423e57fd2c..3ef0bfb090ac 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -22,9 +22,9 @@ let # we can only check for values consistently after converting them to their corresponding environment variable name. configEnv = let - configEnv = listToAttrs (concatLists (mapAttrsToList (name: value: - if value != null then [ (nameValuePair (nameToEnvVar name) (if isBool value then boolToString value else toString value)) ] else [] - ) cfg.config)); + configEnv = concatMapAttrs (name: value: optionalAttrs (value != null) { + ${nameToEnvVar name} = if isBool value then boolToString value else toString value; + }) cfg.config; in { DATA_FOLDER = "/var/lib/bitwarden_rs"; } // optionalAttrs (!(configEnv ? WEB_VAULT_ENABLED) || configEnv.WEB_VAULT_ENABLED == "true") { WEB_VAULT_FOLDER = "${cfg.webVaultPackage}/share/vaultwarden/vault"; } // configEnv; From 0df2046fc06aba0b54bcd54305cf5dd9fafbbbd2 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 17 Nov 2022 13:34:17 -0500 Subject: [PATCH 272/797] anytype: 0.29.0 -> 0.29.1 --- pkgs/applications/misc/anytype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 98ea0802f2e4..ae4a49d7e3a4 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.29.0"; + version = "0.29.1"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-xoHYQbV8fPsHs/G1iuTaQ197dpUZkMohmYM924y8NT0="; + sha256 = "sha256-NyIAOkOX9s9dN6m/5hfMhy4tSENPCDk2w/F8z+J6qqk="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in From 5acdf854673ffac97d3a7970d4c3026ddb411f72 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 17 Nov 2022 16:54:57 +0100 Subject: [PATCH 273/797] nixos/dbus: Avoid redundant output specification - Do not use `daemon`, it has been synonymous to `out` since https://github.com/NixOS/nixpkgs/commit/783c40eb68bbbcb9cf6918255157ecab55eedb6e - Do not use explicit `out` output, it has been default since https://github.com/NixOS/nixpkgs/commit/a17216af4c82dbeb33030355664d96875558f7ac (originally introduced in https://github.com/NixOS/nixpkgs/commit/2132c86c45de67842f9b1237f3a0d1f242dce7ec) --- nixos/modules/services/system/dbus.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 2cd843e4d67c..b87e48f2945d 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -68,7 +68,6 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ - pkgs.dbus.daemon pkgs.dbus ]; @@ -84,11 +83,11 @@ in users.groups.messagebus.gid = config.ids.gids.messagebus; systemd.packages = [ - pkgs.dbus.daemon + pkgs.dbus ]; security.wrappers.dbus-daemon-launch-helper = { - source = "${pkgs.dbus.daemon}/libexec/dbus-daemon-launch-helper"; + source = "${pkgs.dbus}/libexec/dbus-daemon-launch-helper"; owner = "root"; group = "messagebus"; setuid = true; @@ -97,7 +96,7 @@ in }; services.dbus.packages = [ - pkgs.dbus.out + pkgs.dbus config.system.path ]; From 23f765df131eb2bff9cdb89c34ad4c9282e4501d Mon Sep 17 00:00:00 2001 From: arathunku Date: Thu, 17 Nov 2022 21:08:54 +0100 Subject: [PATCH 274/797] elixir-ls: 0.11.0 -> 0.12.0 --- pkgs/development/beam-modules/elixir-ls/pin.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/beam-modules/elixir-ls/pin.json b/pkgs/development/beam-modules/elixir-ls/pin.json index a87393890a15..bd206eb1d1a2 100644 --- a/pkgs/development/beam-modules/elixir-ls/pin.json +++ b/pkgs/development/beam-modules/elixir-ls/pin.json @@ -1,5 +1,5 @@ { - "version": "0.11.0", - "sha256": "sha256-z2KkhTjw8AumD1FWbTCxYB6PHZIWmUPnwBnxKbpHfRQ=", - "depsSha256": "sha256-BMi9bVnQjbcvfIi1xup3sZ7QrPtHAdHqdcGlzKw+YbE=" + "version": "0.12.0", + "sha256": "sha256-ZieKL98EUT3RbZ1UZkhrnXjg3N0RATKB69F8D7IWnJ8=", + "depsSha256": "sha256-Otm8koWrDYxodfliIe+q4U+39eStR5umEKnQQmOOGeA=" } From 85259e37d8fa8b9f1c3b3086bf125d7b79068ad3 Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 17 Nov 2022 21:16:07 +0100 Subject: [PATCH 275/797] hugo: 0.105.0 -> 0.106.0 https://github.com/gohugoio/hugo/releases/tag/v0.106.0 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 2340f6a5f4f5..49bacebdab93 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.105.0"; + version = "0.106.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qKcybKgdNkn3AhDVwl1vCYt0HoQimz8qi+O95jKaW8Q="; + sha256 = "sha256-Dyre/ou0kjEqbq8WGGM/n8+JBTMNslbnmj+5clYJUHs="; }; - vendorSha256 = "sha256-M74pfS7bmSrXhUvQ3hDokBPNLYxJslc9UGR3Bhp2BBQ="; + vendorSha256 = "sha256-dhsGGu4uNrqKv6szGqruAcI2UTbbXknKaKk5pVCQB5A="; doCheck = false; From 9efa42244cf68316a89d7554e1fa90c903644ee7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 17 Nov 2022 22:17:33 +0100 Subject: [PATCH 276/797] grafana: 9.2.4 -> 9.2.5 ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.2.5 --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index a6ae94bf74ac..33ac32993f45 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.2.4"; + version = "9.2.5"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-kiKMyfwQi7rULTH+AVA0O+dBz4AvZcHVi9mWN4kOt5Y="; + sha256 = "sha256-9vMGC40iBl21cnKCrUosHQTf7tju1Nj2v4+yoX6jHwo="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-lNnL6ggSCpxRwp3+ZsjIXvgXrwOzzrULuxsrsu47wHs="; + sha256 = "sha256-DfmU3xMVZtWBHrgCbC+tTzDrFWLB2bfJE+fXSkmPgO8="; }; - vendorSha256 = "sha256-2DO0eAKSJzavOKKHIl3beQhBhuARm7ccwwDODPByL4Y="; + vendorSha256 = "sha256-dPvXVMfTBeCEaxRH3mj0mqBWikE3tcEcQfOMFMfBD6o="; nativeBuildInputs = [ wire ]; From f423b34570a098644ce0c876e27e4a7d04985c3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 21:21:23 +0000 Subject: [PATCH 277/797] brev-cli: 0.6.176 -> 0.6.179 --- pkgs/development/misc/brev-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index a752877beea9..52efc4f1fc3f 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.176"; + version = "0.6.179"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UEWqMgcO2emV3JxR8u13YetoV4MPukUVC0gd21cZ20Y="; + sha256 = "sha256-vU4pEVH6y72Z8H3QgrgxTp0tofAOMGUnez3Q343EOXw="; }; - vendorSha256 = "sha256-1cQd/gxXFB1VagTICvxCjtqCUlPHL4NCuW6u2AeE/WM="; + vendorSha256 = "sha256-uaLoh1VhJAT5liGqL77DLhAWviy5Ci8B16LuzCWuek8="; CGO_ENABLED = 0; subPackages = [ "." ]; From e79c32d1d6e6192969a0b9c15cf2e86f6d9b8fb2 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 17 Nov 2022 21:29:42 +0000 Subject: [PATCH 278/797] odin2: unstable-2022-02-23 -> 2.3.4 --- pkgs/applications/audio/odin2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/odin2/default.nix b/pkgs/applications/audio/odin2/default.nix index f0bd5e015648..feafe9caf181 100644 --- a/pkgs/applications/audio/odin2/default.nix +++ b/pkgs/applications/audio/odin2/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "odin2"; - version = "unstable-2022-02-23"; + version = "2.3.4"; src = fetchFromGitHub { - owner = "baconpaul"; + owner = "TheWaveWarden"; repo = "odin2"; - rev = "ed02d06cfb5db8a118d291c00bd2e4cd6e262cde"; + rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-VkZ+mqCmqWQafdN0nQxJdPxbiaZ37/0jOhLvVbnGLvQ="; + sha256 = "sha256-N96Nb7G6hqfh8DyMtHbttl/fRZUkS8f2KfPSqeMAhHY="; }; nativeBuildInputs = [ From 48c69a13e87f96c5aeddedea23e7e34554460405 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 21:42:45 +0000 Subject: [PATCH 279/797] cariddi: 1.1.9 -> 1.2.1 --- pkgs/tools/security/cariddi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/cariddi/default.nix b/pkgs/tools/security/cariddi/default.nix index cbfcb598f8aa..4936b23af3cc 100644 --- a/pkgs/tools/security/cariddi/default.nix +++ b/pkgs/tools/security/cariddi/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cariddi"; - version = "1.1.9"; + version = "1.2.1"; src = fetchFromGitHub { owner = "edoardottt"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OW6AdT2sF85WrICHiYMBLRT1lUQSgNNsXvCCs4xQceE="; + sha256 = "sha256-8Z2iswjl85rsIhHMAGD3kYJanBWToWBVidglWMg7omw="; }; vendorSha256 = "sha256-mXzI3NF1afMvQ4STPpbehoarfOT35P01IotXPVYNnio="; From 29bafee188ca9ba4ea9a9482dd72bac7a2065f10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 21:58:32 +0000 Subject: [PATCH 280/797] checkip: 0.42.1 -> 0.43.0 --- pkgs/tools/networking/checkip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index 6ebfa55d7f4e..dff7dee6d445 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "checkip"; - version = "0.42.1"; + version = "0.43.0"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gsb7Ah+WYD1voWYLyCqPZq0K8/6gXHaOqJlRloKlNy8="; + sha256 = "sha256-KeHITGUf0/sSYwMmwIxh9195KZiMVLb8IXI7SxeOz6A="; }; vendorSha256 = "sha256-bFhSMjm9rqUUbCV9keeXm+yhzQMKrYKs1DbCt53J8aM="; From e5fbcfb9743881b19a841f4d89c797f82c46680e Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 17 Nov 2022 14:54:52 -0700 Subject: [PATCH 281/797] gamescope: 3.11.48 -> 3.11.49 --- pkgs/applications/window-managers/gamescope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix index 7e4003c68046..7b951fcfa55b 100644 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ b/pkgs/applications/window-managers/gamescope/default.nix @@ -26,7 +26,7 @@ }: let pname = "gamescope"; - version = "3.11.48"; + version = "3.11.49"; in stdenv.mkDerivation { inherit pname version; @@ -35,7 +35,7 @@ stdenv.mkDerivation { owner = "Plagman"; repo = "gamescope"; rev = "refs/tags/${version}"; - hash = "sha256-/a0fW0NVIrg9tuK+mg+D+IOcq3rJJxKdFwspM1ZRR9M="; + hash = "sha256-GRq/b013wFRHzFz2YCulJRtcwzX/dhJKd8dkATSLug0="; }; patches = [ ./use-pkgconfig.patch ]; From 85af835f5454ef5219de1f0903e06a41bd4ab128 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 17 Nov 2022 14:59:19 -0700 Subject: [PATCH 282/797] gamescope: Add zhaofengli as maintainer --- pkgs/applications/window-managers/gamescope/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix index 7b951fcfa55b..7fdffc27f652 100644 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ b/pkgs/applications/window-managers/gamescope/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation { description = "SteamOS session compositing window manager"; homepage = "https://github.com/Plagman/gamescope"; license = licenses.bsd2; - maintainers = with maintainers; [ nrdxp ]; + maintainers = with maintainers; [ nrdxp zhaofengli ]; platforms = platforms.linux; }; } From 4ddf92d84519d7a327ab2280649e42aa4eebdc1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 22:04:54 +0000 Subject: [PATCH 283/797] cilium-cli: 0.12.6 -> 0.12.7 --- pkgs/applications/networking/cluster/cilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 827570db179e..9399d5b7fb9b 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.12.6"; + version = "0.12.7"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w9U8+TYU9BQ2w/jSbDo6lEAlIuMOoCjO9fWhywyVbEk="; + sha256 = "sha256-libZapDj6Y/tGJEXAX3iZH2+pS64dg7IUsgTxT0Z6JA="; }; vendorSha256 = null; From b94d3579aeb1669beb937271b58cbe7da4eb33b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 17 Nov 2022 23:36:29 +0100 Subject: [PATCH 284/797] rclone: 1.60.0 -> 1.60.1 --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 02cf46a23ce2..7568f45d6811 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "rclone"; - version = "1.60.0"; + version = "1.60.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-UFA4mPzpHnyx6+tVw0QwhTlALdu8YLNAleWxXuFJczs="; + sha256 = "sha256-ss4GTXnvWMwin1jn5yzmclS7SGh7NmPvdcDFa1ygwzg="; }; vendorSha256 = "sha256-si5fzyPQUUTKkm/UVt8xfpJGK/4F6GM4HuAg1R0hzqQ="; From 524ddeb34f94a60029bb7835cbe095ffdf647e0e Mon Sep 17 00:00:00 2001 From: Gabriella Gonzalez Date: Thu, 17 Nov 2022 16:44:16 -0600 Subject: [PATCH 285/797] haskell.packages.ghc94.{or,four}molu: Disable fixity-th flag See: https://github.com/tweag/ormolu/issues/941 --- .../haskell-modules/configuration-ghc-9.4.x.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 420c80404ed2..caf964eee520 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -220,4 +220,12 @@ in { hls-retrie-plugin = null; hls-splice-plugin = null; }; + + # https://github.com/tweag/ormolu/issues/941 + ormolu = overrideCabal (drv: { + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; + }) (disableCabalFlag "fixity-th" super.ormolu); + fourmolu = overrideCabal (drv: { + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; + }) (disableCabalFlag "fixity-th" super.fourmolu); } From 34026351c019e606666991bffcf376e60fb232b2 Mon Sep 17 00:00:00 2001 From: piegames Date: Thu, 17 Nov 2022 23:54:52 +0100 Subject: [PATCH 286/797] gnomeExtensions: auto-update --- .../desktops/gnome/extensions/extensions.json | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/extensions.json b/pkgs/desktops/gnome/extensions/extensions.json index 1132047c1a14..37f376dbb280 100644 --- a/pkgs/desktops/gnome/extensions/extensions.json +++ b/pkgs/desktops/gnome/extensions/extensions.json @@ -15,7 +15,7 @@ , {"uuid": "putWindow@clemens.lab21.org", "name": "Put Windows", "pname": "put-windows", "description": "Fully customizable replacement for the old compiz put plugin. \n * Move windows to left/right side, bottom/top, center or corner \n * Move window to other screen \n * Select focused window using the keyboard \n * Application based window placement \n\n Please check github if your gnome-shell version is not supported", "link": "https://extensions.gnome.org/extension/39/put-windows/", "shell_version_map": {"38": {"version": "32", "sha256": "1n4hk2sqdbcn25lxk02vljc9xxbidragimvc4b6dj2m72625lx67", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IGN1c3RvbWl6YWJsZSByZXBsYWNlbWVudCBmb3IgdGhlIG9sZCBjb21waXogcHV0IHBsdWdpbi4gXG4gKiBNb3ZlIHdpbmRvd3MgdG8gbGVmdC9yaWdodCBzaWRlLCBib3R0b20vdG9wLCBjZW50ZXIgb3IgY29ybmVyIFxuICogTW92ZSB3aW5kb3cgdG8gb3RoZXIgc2NyZWVuIFxuICogU2VsZWN0IGZvY3VzZWQgd2luZG93IHVzaW5nIHRoZSBrZXlib2FyZCBcbiAqIEFwcGxpY2F0aW9uIGJhc2VkIHdpbmRvdyBwbGFjZW1lbnQgXG5cbiBQbGVhc2UgY2hlY2sgZ2l0aHViIGlmIHlvdXIgZ25vbWUtc2hlbGwgdmVyc2lvbiBpcyBub3Qgc3VwcG9ydGVkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHV0V2luZG93IiwKICAibmFtZSI6ICJQdXQgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcmctbGFiMjEtcHV0d2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVnZXN0aS9nbm9tZS1zaGVsbC1leHRlbnNpb25zLW5lZ2VzdGkiLAogICJ1dWlkIjogInB1dFdpbmRvd0BjbGVtZW5zLmxhYjIxLm9yZyIsCiAgInZlcnNpb24iOiAzMgp9"}}} , {"uuid": "permanent-notifications@bonzini.gnu.org", "name": "Permanent notifications", "pname": "permanent-notifications", "description": "Keep notifications on the message tray until clicked", "link": "https://extensions.gnome.org/extension/41/permanent-notifications/", "shell_version_map": {"40": {"version": "8", "sha256": "13s0h7b9216xi7p6lsnipsm0lrxzr2dc94nm87fn580m43gx24lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgbm90aWZpY2F0aW9ucyBvbiB0aGUgbWVzc2FnZSB0cmF5IHVudGlsIGNsaWNrZWQiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBlcm1hbmVudCBub3RpZmljYXRpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJib256aW5pQGdudS5vcmciCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuMi4xIiwKICAgICIzLjQiLAogICAgIjMuMy45MCIsCiAgICAiMy4zLjkxIiwKICAgICIzLjMuOTIiLAogICAgIjMuNiIsCiAgICAiMy40LjEiLAogICAgIjMuMy45MyIsCiAgICAiMy4zLjk0IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ib256aW5pL2dub21lLXNoZWxsLXBlcm1hbmVudC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJwZXJtYW5lbnQtbm90aWZpY2F0aW9uc0Bib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "13s0h7b9216xi7p6lsnipsm0lrxzr2dc94nm87fn580m43gx24lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgbm90aWZpY2F0aW9ucyBvbiB0aGUgbWVzc2FnZSB0cmF5IHVudGlsIGNsaWNrZWQiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBlcm1hbmVudCBub3RpZmljYXRpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJib256aW5pQGdudS5vcmciCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuMi4xIiwKICAgICIzLjQiLAogICAgIjMuMy45MCIsCiAgICAiMy4zLjkxIiwKICAgICIzLjMuOTIiLAogICAgIjMuNiIsCiAgICAiMy40LjEiLAogICAgIjMuMy45MyIsCiAgICAiMy4zLjk0IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ib256aW5pL2dub21lLXNoZWxsLXBlcm1hbmVudC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJwZXJtYW5lbnQtbm90aWZpY2F0aW9uc0Bib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "13s0h7b9216xi7p6lsnipsm0lrxzr2dc94nm87fn580m43gx24lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgbm90aWZpY2F0aW9ucyBvbiB0aGUgbWVzc2FnZSB0cmF5IHVudGlsIGNsaWNrZWQiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBlcm1hbmVudCBub3RpZmljYXRpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJib256aW5pQGdudS5vcmciCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuMi4xIiwKICAgICIzLjQiLAogICAgIjMuMy45MCIsCiAgICAiMy4zLjkxIiwKICAgICIzLjMuOTIiLAogICAgIjMuNiIsCiAgICAiMy40LjEiLAogICAgIjMuMy45MyIsCiAgICAiMy4zLjk0IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ib256aW5pL2dub21lLXNoZWxsLXBlcm1hbmVudC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJwZXJtYW5lbnQtbm90aWZpY2F0aW9uc0Bib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "gnome-shell-trash-extension", "name": "Trash", "pname": "trash", "description": "A Trash button for the GNOME shell panel", "link": "https://extensions.gnome.org/extension/48/trash/", "shell_version_map": {"38": {"version": "22", "sha256": "00sph5bz2q77shsqh6yf9lmb3bp6ryx6crrz0gi7s70i4byji991", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVHJhc2ggYnV0dG9uIGZvciB0aGUgR05PTUUgc2hlbGwgcGFuZWwiLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJUcmFzaCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiQXhlbCB2b24gQmVydG9sZGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iZXJ0b2xkaWEvZ25vbWUtc2hlbGwtdHJhc2gtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC10cmFzaC1leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "00sph5bz2q77shsqh6yf9lmb3bp6ryx6crrz0gi7s70i4byji991", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVHJhc2ggYnV0dG9uIGZvciB0aGUgR05PTUUgc2hlbGwgcGFuZWwiLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJUcmFzaCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiQXhlbCB2b24gQmVydG9sZGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iZXJ0b2xkaWEvZ25vbWUtc2hlbGwtdHJhc2gtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC10cmFzaC1leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "00sph5bz2q77shsqh6yf9lmb3bp6ryx6crrz0gi7s70i4byji991", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVHJhc2ggYnV0dG9uIGZvciB0aGUgR05PTUUgc2hlbGwgcGFuZWwiLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJUcmFzaCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiQXhlbCB2b24gQmVydG9sZGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iZXJ0b2xkaWEvZ25vbWUtc2hlbGwtdHJhc2gtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC10cmFzaC1leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "22", "sha256": "00sph5bz2q77shsqh6yf9lmb3bp6ryx6crrz0gi7s70i4byji991", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVHJhc2ggYnV0dG9uIGZvciB0aGUgR05PTUUgc2hlbGwgcGFuZWwiLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJUcmFzaCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiQXhlbCB2b24gQmVydG9sZGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iZXJ0b2xkaWEvZ25vbWUtc2hlbGwtdHJhc2gtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC10cmFzaC1leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} -, {"uuid": "RecentItems@bananenfisch.net", "name": "Recent Items", "pname": "recent-items", "description": "Adds an icon for recently used items at the top panel; clear list by click; left click: open file, right click: open containing folder; Settings for: number of items, number of items under \"more\" and blacklisting options are defined at the top of extension.js (see https://github.com/bananenfisch/RecentItems for more infos).", "link": "https://extensions.gnome.org/extension/72/recent-items/", "shell_version_map": {"40": {"version": "21", "sha256": "04rm692pwmm9lxl9x3igab6akxfjn6l7y7lfchwl1zc1cyj3lfrk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmFuYW5lbmZpc2NoL1JlY2VudEl0ZW1zIiwKICAidXVpZCI6ICJSZWNlbnRJdGVtc0BiYW5hbmVuZmlzY2gubmV0IiwKICAidmVyc2lvbiI6IDIxCn0="}, "41": {"version": "21", "sha256": "04rm692pwmm9lxl9x3igab6akxfjn6l7y7lfchwl1zc1cyj3lfrk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmFuYW5lbmZpc2NoL1JlY2VudEl0ZW1zIiwKICAidXVpZCI6ICJSZWNlbnRJdGVtc0BiYW5hbmVuZmlzY2gubmV0IiwKICAidmVyc2lvbiI6IDIxCn0="}, "42": {"version": "21", "sha256": "04rm692pwmm9lxl9x3igab6akxfjn6l7y7lfchwl1zc1cyj3lfrk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmFuYW5lbmZpc2NoL1JlY2VudEl0ZW1zIiwKICAidXVpZCI6ICJSZWNlbnRJdGVtc0BiYW5hbmVuZmlzY2gubmV0IiwKICAidmVyc2lvbiI6IDIxCn0="}}} +, {"uuid": "RecentItems@bananenfisch.net", "name": "Recent Items", "pname": "recent-items", "description": "Adds an icon for recently used items at the top panel; clear list by click; left click: open file, right click: open containing folder; Settings for: number of items, number of items under \"more\" and blacklisting options are defined at the top of extension.js (see https://github.com/bananenfisch/RecentItems for more infos).", "link": "https://extensions.gnome.org/extension/72/recent-items/", "shell_version_map": {"40": {"version": "22", "sha256": "17xgw3iqcznlsfqjfs99bb5s1h7wlg37xjn9rar1hqpl7dsy84nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JhbmFuZW5maXNjaC9SZWNlbnRJdGVtcyIsCiAgInV1aWQiOiAiUmVjZW50SXRlbXNAYmFuYW5lbmZpc2NoLm5ldCIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "22", "sha256": "17xgw3iqcznlsfqjfs99bb5s1h7wlg37xjn9rar1hqpl7dsy84nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JhbmFuZW5maXNjaC9SZWNlbnRJdGVtcyIsCiAgInV1aWQiOiAiUmVjZW50SXRlbXNAYmFuYW5lbmZpc2NoLm5ldCIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "22", "sha256": "17xgw3iqcznlsfqjfs99bb5s1h7wlg37xjn9rar1hqpl7dsy84nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JhbmFuZW5maXNjaC9SZWNlbnRJdGVtcyIsCiAgInV1aWQiOiAiUmVjZW50SXRlbXNAYmFuYW5lbmZpc2NoLm5ldCIsCiAgInZlcnNpb24iOiAyMgp9"}, "43": {"version": "22", "sha256": "17xgw3iqcznlsfqjfs99bb5s1h7wlg37xjn9rar1hqpl7dsy84nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JhbmFuZW5maXNjaC9SZWNlbnRJdGVtcyIsCiAgInV1aWQiOiAiUmVjZW50SXRlbXNAYmFuYW5lbmZpc2NoLm5ldCIsCiAgInZlcnNpb24iOiAyMgp9"}}} , {"uuid": "lockscreen@sri.ramkrishna.me", "name": "Lock Screen", "pname": "lock-screen", "description": "Add lock icon to the panel and lock the screen instead of using ctrl-alt-l", "link": "https://extensions.gnome.org/extension/83/lock-screen/", "shell_version_map": {"40": {"version": "14", "sha256": "1dh02rbq7pfvpjpgjq7rlx7lld2qhq602apn1g17hbxbcpdzz004", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsb2NrIGljb24gdG8gdGhlIHBhbmVsIGFuZCBsb2NrIHRoZSBzY3JlZW4gaW5zdGVhZCBvZiB1c2luZyBjdHJsLWFsdC1sIiwKICAibmFtZSI6ICJMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiNDAuMCIsCiAgICAiNDIuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NyYW1rcmlzaG5hL2dub21lMy1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsb2Nrc2NyZWVuQHNyaS5yYW1rcmlzaG5hLm1lIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "1dh02rbq7pfvpjpgjq7rlx7lld2qhq602apn1g17hbxbcpdzz004", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsb2NrIGljb24gdG8gdGhlIHBhbmVsIGFuZCBsb2NrIHRoZSBzY3JlZW4gaW5zdGVhZCBvZiB1c2luZyBjdHJsLWFsdC1sIiwKICAibmFtZSI6ICJMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiNDAuMCIsCiAgICAiNDIuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NyYW1rcmlzaG5hL2dub21lMy1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsb2Nrc2NyZWVuQHNyaS5yYW1rcmlzaG5hLm1lIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "CoverflowAltTab@palatis.blogspot.com", "name": "Coverflow Alt-Tab", "pname": "coverflow-alt-tab", "description": "Replacement of Alt-Tab, iterates through windows in a cover-flow manner.", "link": "https://extensions.gnome.org/extension/97/coverflow-alt-tab/", "shell_version_map": {"38": {"version": "44", "sha256": "18qpriqi0h6la45bl584hglnni0ka2d5q4qv61wdcan28a7kywq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNpbm5hbW9uLXZlcnNpb24iOiBbCiAgICAiMS4yIiwKICAgICIxLjQiLAogICAgIjEuNiIsCiAgICAiMS44IiwKICAgICIxLjkiLAogICAgIjIuMCIsCiAgICAiMi4xIiwKICAgICIyLjIiLAogICAgIjIuMyIsCiAgICAiMi40IiwKICAgICIyLjgiLAogICAgIjMuMCIKICBdLAogICJkZXNjcmlwdGlvbiI6ICJSZXBsYWNlbWVudCBvZiBBbHQtVGFiLCBpdGVyYXRlcyB0aHJvdWdoIHdpbmRvd3MgaW4gYSBjb3Zlci1mbG93IG1hbm5lci4iLAogICJuYW1lIjogIkNvdmVyZmxvdyBBbHQtVGFiIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG1vNjAvQ292ZXJmbG93QWx0VGFiIiwKICAidXVpZCI6ICJDb3ZlcmZsb3dBbHRUYWJAcGFsYXRpcy5ibG9nc3BvdC5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "40": {"version": "49", "sha256": "0mmz5qrlx2gjfahpyy6c050wcif3pwwfff7i8wxf7xcmj21nqlwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "41": {"version": "49", "sha256": "0mmz5qrlx2gjfahpyy6c050wcif3pwwfff7i8wxf7xcmj21nqlwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "42": {"version": "55", "sha256": "16ff2fbv8vf9cgzrxy85vis9a5bgbkn1lb21brpxsf9gs5kk4v8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDU1Cn0="}, "43": {"version": "55", "sha256": "16ff2fbv8vf9cgzrxy85vis9a5bgbkn1lb21brpxsf9gs5kk4v8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDU1Cn0="}}} , {"uuid": "netspeed@hedayaty.gmail.com", "name": "NetSpeed", "pname": "netspeed", "description": "Displays Internet Speed", "link": "https://extensions.gnome.org/extension/104/netspeed/", "shell_version_map": {"40": {"version": "34", "sha256": "04137rwnnf2mbp228wl9qjcix6i7757cqsdamabdrjwclg147vql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIEludGVybmV0IFNwZWVkIiwKICAibmFtZSI6ICJOZXRTcGVlZCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoZWRheWF0eUBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlZGF5YXR5L05ldFNwZWVkIiwKICAidXVpZCI6ICJuZXRzcGVlZEBoZWRheWF0eS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "41": {"version": "34", "sha256": "04137rwnnf2mbp228wl9qjcix6i7757cqsdamabdrjwclg147vql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIEludGVybmV0IFNwZWVkIiwKICAibmFtZSI6ICJOZXRTcGVlZCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoZWRheWF0eUBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlZGF5YXR5L05ldFNwZWVkIiwKICAidXVpZCI6ICJuZXRzcGVlZEBoZWRheWF0eS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}}} @@ -51,7 +51,7 @@ , {"uuid": "ShellTile@emasab.it", "name": "ShellTile", "pname": "shelltile", "description": "A tiling window extension for GNOME Shell. Just move a window to the edges of the screen to create a tiling, otherwise move a window over another one, holding down the Control key. Grouped windows minimize, resize, raise and change workspace together. Move or maximize a window to remove it from the group.", "link": "https://extensions.gnome.org/extension/657/shelltile/", "shell_version_map": {"38": {"version": "69", "sha256": "1kpsqaq2fcj1z3jcbvgh23c8k6bv9l6vyl05kpw0fclzsmy60mh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGlsaW5nIHdpbmRvdyBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBKdXN0IG1vdmUgYSB3aW5kb3cgdG8gdGhlIGVkZ2VzIG9mIHRoZSBzY3JlZW4gdG8gY3JlYXRlIGEgdGlsaW5nLCBvdGhlcndpc2UgbW92ZSBhIHdpbmRvdyBvdmVyIGFub3RoZXIgb25lLCBob2xkaW5nIGRvd24gdGhlIENvbnRyb2wga2V5LiBHcm91cGVkIHdpbmRvd3MgbWluaW1pemUsIHJlc2l6ZSwgcmFpc2UgYW5kIGNoYW5nZSB3b3Jrc3BhY2UgdG9nZXRoZXIuIE1vdmUgb3IgbWF4aW1pemUgYSB3aW5kb3cgdG8gcmVtb3ZlIGl0IGZyb20gdGhlIGdyb3VwLiIsCiAgImdldHRleHQtZG9tYWluIjogInNoZWxsdGlsZSIsCiAgIm5hbWUiOiAiU2hlbGxUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNoZWxsdGlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZW1hc2FiL3NoZWxsdGlsZSIsCiAgInV1aWQiOiAiU2hlbGxUaWxlQGVtYXNhYi5pdCIsCiAgInZlcnNpb24iOiA2OQp9"}}} , {"uuid": "lunarcal@ailin.nemui", "name": "Lunar Calendar 农历", "pname": "lunar-calendar", "description": "Display Chinese Lunar Calendar in panel\n\n⚠⚠⚠ dependency: typelib-1_0-LunarDate-3_0 / gir1.2-lunar-date-2.0", "link": "https://extensions.gnome.org/extension/675/lunar-calendar/", "shell_version_map": {"38": {"version": "25", "sha256": "1pj439wdsqpxim6p4d0y09v40kdjga908hagxfyvq0fzjykc51rn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "40": {"version": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}, "41": {"version": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}, "42": {"version": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}, "43": {"version": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}}} , {"uuid": "EasyScreenCast@iacopodeenosee.gmail.com", "name": "EasyScreenCast", "pname": "easyscreencast", "description": "This extension simplifies the use of the video recording function integrated in gnome shell, allows quickly to change the various settings of the desktop recording.\n\nSOURCE CODE -> https://github.com/EasyScreenCast/EasyScreenCast\n\nVIDEO -> https://youtu.be/81E9AruraKU\n\n**NOTICE**\nif an error occurs during the update is recommended to reload GNOME Shell (Alt + F2, 'r') and reload the extension's installation page.", "link": "https://extensions.gnome.org/extension/690/easyscreencast/", "shell_version_map": {"38": {"version": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "40": {"version": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "41": {"version": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "42": {"version": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "43": {"version": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}}} -, {"uuid": "scroll-workspaces@gfxmonk.net", "name": "Top Panel Workspace Scroll", "pname": "top-panel-workspace-scroll", "description": "Change workspaces by scrolling over the top panel", "link": "https://extensions.gnome.org/extension/701/top-panel-workspace-scroll/", "shell_version_map": {"40": {"version": "31", "sha256": "0zc37qnzmnc4l9j8q23bxl59xxwz31pk4wc3vamzwgz65ncjn469", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2Z4bW9uay9nbm9tZS1zaGVsbC1zY3JvbGwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAic2Nyb2xsLXdvcmtzcGFjZXNAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMzEKfQ=="}, "41": {"version": "31", "sha256": "0zc37qnzmnc4l9j8q23bxl59xxwz31pk4wc3vamzwgz65ncjn469", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2Z4bW9uay9nbm9tZS1zaGVsbC1zY3JvbGwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAic2Nyb2xsLXdvcmtzcGFjZXNAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMzEKfQ=="}, "42": {"version": "31", "sha256": "0zc37qnzmnc4l9j8q23bxl59xxwz31pk4wc3vamzwgz65ncjn469", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2Z4bW9uay9nbm9tZS1zaGVsbC1zY3JvbGwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAic2Nyb2xsLXdvcmtzcGFjZXNAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMzEKfQ=="}}} +, {"uuid": "scroll-workspaces@gfxmonk.net", "name": "Top Panel Workspace Scroll", "pname": "top-panel-workspace-scroll", "description": "Change workspaces by scrolling over the top panel", "link": "https://extensions.gnome.org/extension/701/top-panel-workspace-scroll/", "shell_version_map": {"40": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "41": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "42": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "43": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}}} , {"uuid": "all-windows@ezix.org", "name": "All Windows", "pname": "all-windows", "description": "List open windows of all workspaces", "link": "https://extensions.gnome.org/extension/704/all-windows/", "shell_version_map": {"40": {"version": "13", "sha256": "19cxrgxpim2dca6llbi8cr34hjx3pab2i4687803r96cp2hsg07l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3Qgb3BlbiB3aW5kb3dzIG9mIGFsbCB3b3Jrc3BhY2VzIiwKICAibmFtZSI6ICJBbGwgV2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlvbmVsL2FsbC13aW5kb3dzIiwKICAidXVpZCI6ICJhbGwtd2luZG93c0Bleml4Lm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "19cxrgxpim2dca6llbi8cr34hjx3pab2i4687803r96cp2hsg07l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3Qgb3BlbiB3aW5kb3dzIG9mIGFsbCB3b3Jrc3BhY2VzIiwKICAibmFtZSI6ICJBbGwgV2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlvbmVsL2FsbC13aW5kb3dzIiwKICAidXVpZCI6ICJhbGwtd2luZG93c0Bleml4Lm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "panel-osd@berend.de.schouwer.gmail.com", "name": "Panel OSD", "pname": "panel-osd", "description": "I'm sorry to say, that I am not able to work on this project anymore.\nI simply don't have the power to do it any longer.\nIf anybody wants to take it over, feel free to fork it.\nBest wishes to all the users.\n\nJens\n\nConfiguring where on the (main) screen notifications will appear, instead of just above the message tray", "link": "https://extensions.gnome.org/extension/708/panel-osd/", "shell_version_map": {"38": {"version": "39", "sha256": "12mv6fcaanv6r3zrf7717jqzq5mndy25gqh6y7hqh9cmyssakis2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkknbSBzb3JyeSB0byBzYXksIHRoYXQgSSBhbSBub3QgYWJsZSB0byB3b3JrIG9uIHRoaXMgcHJvamVjdCBhbnltb3JlLlxuSSBzaW1wbHkgZG9uJ3QgaGF2ZSB0aGUgcG93ZXIgdG8gZG8gaXQgYW55IGxvbmdlci5cbklmIGFueWJvZHkgd2FudHMgdG8gdGFrZSBpdCBvdmVyLCBmZWVsIGZyZWUgdG8gZm9yayBpdC5cbkJlc3Qgd2lzaGVzIHRvIGFsbCB0aGUgdXNlcnMuXG5cbkplbnNcblxuQ29uZmlndXJpbmcgd2hlcmUgb24gdGhlIChtYWluKSBzY3JlZW4gbm90aWZpY2F0aW9ucyB3aWxsIGFwcGVhciwgaW5zdGVhZCBvZiBqdXN0IGFib3ZlIHRoZSBtZXNzYWdlIHRyYXkiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBhbmVsIE9TRCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2plbnNsb2R5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1wYW5lbC1vc2QiLAogICJ1dWlkIjogInBhbmVsLW9zZEBiZXJlbmQuZGUuc2Nob3V3ZXIuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM5Cn0="}, "40": {"version": "40", "sha256": "16bqq0w6xrzix74xwhj2pyj22scszvspc770w1pkdhmj54mypwks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkknbSBzb3JyeSB0byBzYXksIHRoYXQgSSBhbSBub3QgYWJsZSB0byB3b3JrIG9uIHRoaXMgcHJvamVjdCBhbnltb3JlLlxuSSBzaW1wbHkgZG9uJ3QgaGF2ZSB0aGUgcG93ZXIgdG8gZG8gaXQgYW55IGxvbmdlci5cbklmIGFueWJvZHkgd2FudHMgdG8gdGFrZSBpdCBvdmVyLCBmZWVsIGZyZWUgdG8gZm9yayBpdC5cbkJlc3Qgd2lzaGVzIHRvIGFsbCB0aGUgdXNlcnMuXG5cbkplbnNcblxuQ29uZmlndXJpbmcgd2hlcmUgb24gdGhlIChtYWluKSBzY3JlZW4gbm90aWZpY2F0aW9ucyB3aWxsIGFwcGVhciwgaW5zdGVhZCBvZiBqdXN0IGFib3ZlIHRoZSBtZXNzYWdlIHRyYXkiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBhbmVsIE9TRCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qZW5zbG9keS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGFuZWwtb3NkIiwKICAidXVpZCI6ICJwYW5lbC1vc2RAYmVyZW5kLmRlLnNjaG91d2VyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MAp9"}}} , {"uuid": "pixel-saver@deadalnix.me", "name": "Pixel Saver", "pname": "pixel-saver", "description": "Pixel Saver is designed to save pixel by fusing activity bar and title bar in a natural way", "link": "https://extensions.gnome.org/extension/723/pixel-saver/", "shell_version_map": {"38": {"version": "26", "sha256": "1i284r5443cypw7jq31rrbc4f075piaq872331qnrrynv4s1k8cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIiwKICAgICI0MS4xIiwKICAgICI0MS4yIiwKICAgICI0MS4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVhZGFsbml4L3BpeGVsLXNhdmVyIiwKICAidXVpZCI6ICJwaXhlbC1zYXZlckBkZWFkYWxuaXgubWUiLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "40": {"version": "26", "sha256": "1i284r5443cypw7jq31rrbc4f075piaq872331qnrrynv4s1k8cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIiwKICAgICI0MS4xIiwKICAgICI0MS4yIiwKICAgICI0MS4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVhZGFsbml4L3BpeGVsLXNhdmVyIiwKICAidXVpZCI6ICJwaXhlbC1zYXZlckBkZWFkYWxuaXgubWUiLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "41": {"version": "26", "sha256": "1i284r5443cypw7jq31rrbc4f075piaq872331qnrrynv4s1k8cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIiwKICAgICI0MS4xIiwKICAgICI0MS4yIiwKICAgICI0MS4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVhZGFsbml4L3BpeGVsLXNhdmVyIiwKICAidXVpZCI6ICJwaXhlbC1zYXZlckBkZWFkYWxuaXgubWUiLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "42": {"version": "26", "sha256": "1i284r5443cypw7jq31rrbc4f075piaq872331qnrrynv4s1k8cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIiwKICAgICI0MS4xIiwKICAgICI0MS4yIiwKICAgICI0MS4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVhZGFsbml4L3BpeGVsLXNhdmVyIiwKICAidXVpZCI6ICJwaXhlbC1zYXZlckBkZWFkYWxuaXgubWUiLAogICJ2ZXJzaW9uIjogMjYKfQ=="}}} @@ -71,7 +71,7 @@ , {"uuid": "keyman@dpoetzsch.github.com", "name": "KeyMan", "pname": "keyman", "description": "Access passwords from the gnome keyring in a convenient way:\nSimply search for your password and copy it to clipboad by clicking it. After a certain amount of time it will be removed automatically (default is 5 seconds). As this only works if the keyrings are unlocked, this extension also provides easy access to lock/unlock keyrings.", "link": "https://extensions.gnome.org/extension/819/keyman/", "shell_version_map": {"40": {"version": "20", "sha256": "1wd76bdnzs7mxwwyvffw0fm8r8chsblz3dinpwiyc5d5kmlnyv5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBwYXNzd29yZHMgZnJvbSB0aGUgZ25vbWUga2V5cmluZyBpbiBhIGNvbnZlbmllbnQgd2F5OlxuU2ltcGx5IHNlYXJjaCBmb3IgeW91ciBwYXNzd29yZCBhbmQgY29weSBpdCB0byBjbGlwYm9hZCBieSBjbGlja2luZyBpdC4gQWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lIGl0IHdpbGwgYmUgcmVtb3ZlZCBhdXRvbWF0aWNhbGx5IChkZWZhdWx0IGlzIDUgc2Vjb25kcykuIEFzIHRoaXMgb25seSB3b3JrcyBpZiB0aGUga2V5cmluZ3MgYXJlIHVubG9ja2VkLCB0aGlzIGV4dGVuc2lvbiBhbHNvIHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRvIGxvY2svdW5sb2NrIGtleXJpbmdzLiIsCiAgIm5hbWUiOiAiS2V5TWFuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJrZXltYW5AcG9laGUuZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtleW1hbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kcG9ldHpzY2gva2V5bWFuIiwKICAidXVpZCI6ICJrZXltYW5AZHBvZXR6c2NoLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "23", "sha256": "1qvvwx0h7bakwy1a65vafy0kvlvkmy58kznzrm3zg2ng31279nfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBwYXNzd29yZHMgZnJvbSB0aGUgZ25vbWUga2V5cmluZyBpbiBhIGNvbnZlbmllbnQgd2F5OlxuU2ltcGx5IHNlYXJjaCBmb3IgeW91ciBwYXNzd29yZCBhbmQgY29weSBpdCB0byBjbGlwYm9hZCBieSBjbGlja2luZyBpdC4gQWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lIGl0IHdpbGwgYmUgcmVtb3ZlZCBhdXRvbWF0aWNhbGx5IChkZWZhdWx0IGlzIDUgc2Vjb25kcykuIEFzIHRoaXMgb25seSB3b3JrcyBpZiB0aGUga2V5cmluZ3MgYXJlIHVubG9ja2VkLCB0aGlzIGV4dGVuc2lvbiBhbHNvIHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRvIGxvY2svdW5sb2NrIGtleXJpbmdzLiIsCiAgIm5hbWUiOiAiS2V5TWFuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJrZXltYW5AcG9laGUuZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtleW1hbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rwb2V0enNjaC9rZXltYW4iLAogICJ1dWlkIjogImtleW1hbkBkcG9ldHpzY2guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "42": {"version": "23", "sha256": "1qvvwx0h7bakwy1a65vafy0kvlvkmy58kznzrm3zg2ng31279nfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBwYXNzd29yZHMgZnJvbSB0aGUgZ25vbWUga2V5cmluZyBpbiBhIGNvbnZlbmllbnQgd2F5OlxuU2ltcGx5IHNlYXJjaCBmb3IgeW91ciBwYXNzd29yZCBhbmQgY29weSBpdCB0byBjbGlwYm9hZCBieSBjbGlja2luZyBpdC4gQWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lIGl0IHdpbGwgYmUgcmVtb3ZlZCBhdXRvbWF0aWNhbGx5IChkZWZhdWx0IGlzIDUgc2Vjb25kcykuIEFzIHRoaXMgb25seSB3b3JrcyBpZiB0aGUga2V5cmluZ3MgYXJlIHVubG9ja2VkLCB0aGlzIGV4dGVuc2lvbiBhbHNvIHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRvIGxvY2svdW5sb2NrIGtleXJpbmdzLiIsCiAgIm5hbWUiOiAiS2V5TWFuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJrZXltYW5AcG9laGUuZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtleW1hbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rwb2V0enNjaC9rZXltYW4iLAogICJ1dWlkIjogImtleW1hbkBkcG9ldHpzY2guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "43": {"version": "23", "sha256": "1qvvwx0h7bakwy1a65vafy0kvlvkmy58kznzrm3zg2ng31279nfr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBwYXNzd29yZHMgZnJvbSB0aGUgZ25vbWUga2V5cmluZyBpbiBhIGNvbnZlbmllbnQgd2F5OlxuU2ltcGx5IHNlYXJjaCBmb3IgeW91ciBwYXNzd29yZCBhbmQgY29weSBpdCB0byBjbGlwYm9hZCBieSBjbGlja2luZyBpdC4gQWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lIGl0IHdpbGwgYmUgcmVtb3ZlZCBhdXRvbWF0aWNhbGx5IChkZWZhdWx0IGlzIDUgc2Vjb25kcykuIEFzIHRoaXMgb25seSB3b3JrcyBpZiB0aGUga2V5cmluZ3MgYXJlIHVubG9ja2VkLCB0aGlzIGV4dGVuc2lvbiBhbHNvIHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRvIGxvY2svdW5sb2NrIGtleXJpbmdzLiIsCiAgIm5hbWUiOiAiS2V5TWFuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJrZXltYW5AcG9laGUuZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtleW1hbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rwb2V0enNjaC9rZXltYW4iLAogICJ1dWlkIjogImtleW1hbkBkcG9ldHpzY2guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}}} , {"uuid": "time_tracker_jsnjack@gmail.com", "name": "Time Tracker", "pname": "time-tracker", "description": "Helps track time", "link": "https://extensions.gnome.org/extension/823/time-tracker/", "shell_version_map": {"40": {"version": "23", "sha256": "1q1jh3s6k6pmjssjmhzajmcr1qxdz4854fyfja0vbwcvxd6a8ff2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhlbHBzIHRyYWNrIHRpbWUiLAogICJuYW1lIjogIlRpbWUgVHJhY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aW1lLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pzbmphY2svdGltZS10cmFja2VyLyIsCiAgInV1aWQiOiAidGltZV90cmFja2VyX2pzbmphY2tAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "1q1jh3s6k6pmjssjmhzajmcr1qxdz4854fyfja0vbwcvxd6a8ff2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhlbHBzIHRyYWNrIHRpbWUiLAogICJuYW1lIjogIlRpbWUgVHJhY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aW1lLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pzbmphY2svdGltZS10cmFja2VyLyIsCiAgInV1aWQiOiAidGltZV90cmFja2VyX2pzbmphY2tAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}}} , {"uuid": "pwcalc@thilomaurer.de", "name": "Password Calculator", "pname": "password-calculator", "description": "This extension calculates strong passwords for each alias from your single secret. No need to remember dozens of passwords any longer. No need for a password manager any longer. Full freedom in choosing aliases and secret, e.g. alias: \"username@google.com#2014\", secret: \"saFe⚿in漢字\". Recent aliases are kept in a easily accessible drop-down. You may choose between HMAC_SHA1 and SHA1. The formula is as simple as \"[secret][alias]\" → SHA1 → BASE64 ", "link": "https://extensions.gnome.org/extension/825/password-calculator/", "shell_version_map": {"40": {"version": "26", "sha256": "18n86hy3a3gs3xfw6f88rag8gpvl742j8fmd6syp4wpgpqpvv7rx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNhbGN1bGF0ZXMgc3Ryb25nIHBhc3N3b3JkcyBmb3IgZWFjaCBhbGlhcyBmcm9tIHlvdXIgc2luZ2xlIHNlY3JldC4gTm8gbmVlZCB0byByZW1lbWJlciBkb3plbnMgb2YgcGFzc3dvcmRzIGFueSBsb25nZXIuIE5vIG5lZWQgZm9yIGEgcGFzc3dvcmQgbWFuYWdlciBhbnkgbG9uZ2VyLiBGdWxsIGZyZWVkb20gaW4gY2hvb3NpbmcgYWxpYXNlcyBhbmQgc2VjcmV0LCBlLmcuIGFsaWFzOiBcInVzZXJuYW1lQGdvb2dsZS5jb20jMjAxNFwiLCBzZWNyZXQ6IFwic2FGZVx1MjZiZmluXHU2ZjIyXHU1YjU3XCIuIFJlY2VudCBhbGlhc2VzIGFyZSBrZXB0IGluIGEgZWFzaWx5IGFjY2Vzc2libGUgZHJvcC1kb3duLiBZb3UgbWF5IGNob29zZSBiZXR3ZWVuIEhNQUNfU0hBMSBhbmQgU0hBMS4gVGhlIGZvcm11bGEgaXMgYXMgc2ltcGxlIGFzIFwiW3NlY3JldF1bYWxpYXNdXCIgXHUyMTkyIFNIQTEgXHUyMTkyIEJBU0U2NCAiLAogICJuYW1lIjogIlBhc3N3b3JkIENhbGN1bGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHdjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGlsb21hdXJlci9wd2NhbGMiLAogICJ1dWlkIjogInB3Y2FsY0B0aGlsb21hdXJlci5kZSIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "26", "sha256": "18n86hy3a3gs3xfw6f88rag8gpvl742j8fmd6syp4wpgpqpvv7rx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNhbGN1bGF0ZXMgc3Ryb25nIHBhc3N3b3JkcyBmb3IgZWFjaCBhbGlhcyBmcm9tIHlvdXIgc2luZ2xlIHNlY3JldC4gTm8gbmVlZCB0byByZW1lbWJlciBkb3plbnMgb2YgcGFzc3dvcmRzIGFueSBsb25nZXIuIE5vIG5lZWQgZm9yIGEgcGFzc3dvcmQgbWFuYWdlciBhbnkgbG9uZ2VyLiBGdWxsIGZyZWVkb20gaW4gY2hvb3NpbmcgYWxpYXNlcyBhbmQgc2VjcmV0LCBlLmcuIGFsaWFzOiBcInVzZXJuYW1lQGdvb2dsZS5jb20jMjAxNFwiLCBzZWNyZXQ6IFwic2FGZVx1MjZiZmluXHU2ZjIyXHU1YjU3XCIuIFJlY2VudCBhbGlhc2VzIGFyZSBrZXB0IGluIGEgZWFzaWx5IGFjY2Vzc2libGUgZHJvcC1kb3duLiBZb3UgbWF5IGNob29zZSBiZXR3ZWVuIEhNQUNfU0hBMSBhbmQgU0hBMS4gVGhlIGZvcm11bGEgaXMgYXMgc2ltcGxlIGFzIFwiW3NlY3JldF1bYWxpYXNdXCIgXHUyMTkyIFNIQTEgXHUyMTkyIEJBU0U2NCAiLAogICJuYW1lIjogIlBhc3N3b3JkIENhbGN1bGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHdjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGlsb21hdXJlci9wd2NhbGMiLAogICJ1dWlkIjogInB3Y2FsY0B0aGlsb21hdXJlci5kZSIsCiAgInZlcnNpb24iOiAyNgp9"}}} -, {"uuid": "SwitchFocusType@romano.rgtti.com", "name": "Switch Focus Type", "pname": "switch-focus-type", "description": "Toggle between focus-follow-mouse and click-to-focus mode", "link": "https://extensions.gnome.org/extension/827/switch-focus-type/", "shell_version_map": {"38": {"version": "9", "sha256": "111mpxr8r4n5x18z4zqkvp8w3r89i3wksppfs1wmc8hhxnslvyk8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JtYW5vL2dzZS1zd2l0Y2gtZm9jdXMtbW9kZSIsCiAgInV1aWQiOiAiU3dpdGNoRm9jdXNUeXBlQHJvbWFuby5yZ3R0aS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "111mpxr8r4n5x18z4zqkvp8w3r89i3wksppfs1wmc8hhxnslvyk8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JtYW5vL2dzZS1zd2l0Y2gtZm9jdXMtbW9kZSIsCiAgInV1aWQiOiAiU3dpdGNoRm9jdXNUeXBlQHJvbWFuby5yZ3R0aS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "111mpxr8r4n5x18z4zqkvp8w3r89i3wksppfs1wmc8hhxnslvyk8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JtYW5vL2dzZS1zd2l0Y2gtZm9jdXMtbW9kZSIsCiAgInV1aWQiOiAiU3dpdGNoRm9jdXNUeXBlQHJvbWFuby5yZ3R0aS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "111mpxr8r4n5x18z4zqkvp8w3r89i3wksppfs1wmc8hhxnslvyk8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JtYW5vL2dzZS1zd2l0Y2gtZm9jdXMtbW9kZSIsCiAgInV1aWQiOiAiU3dpdGNoRm9jdXNUeXBlQHJvbWFuby5yZ3R0aS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} +, {"uuid": "SwitchFocusType@romano.rgtti.com", "name": "Switch Focus Type", "pname": "switch-focus-type", "description": "Toggle between focus-follow-mouse and click-to-focus mode", "link": "https://extensions.gnome.org/extension/827/switch-focus-type/", "shell_version_map": {"38": {"version": "10", "sha256": "120x66v9xfpfn2a3nd907khh560695104ghjs84kgwjh65ah0cc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2Utc3dpdGNoLWZvY3VzLW1vZGUiLAogICJ1dWlkIjogIlN3aXRjaEZvY3VzVHlwZUByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "120x66v9xfpfn2a3nd907khh560695104ghjs84kgwjh65ah0cc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2Utc3dpdGNoLWZvY3VzLW1vZGUiLAogICJ1dWlkIjogIlN3aXRjaEZvY3VzVHlwZUByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "120x66v9xfpfn2a3nd907khh560695104ghjs84kgwjh65ah0cc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2Utc3dpdGNoLWZvY3VzLW1vZGUiLAogICJ1dWlkIjogIlN3aXRjaEZvY3VzVHlwZUByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "120x66v9xfpfn2a3nd907khh560695104ghjs84kgwjh65ah0cc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2Utc3dpdGNoLWZvY3VzLW1vZGUiLAogICJ1dWlkIjogIlN3aXRjaEZvY3VzVHlwZUByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "43": {"version": "10", "sha256": "120x66v9xfpfn2a3nd907khh560695104ghjs84kgwjh65ah0cc4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SbWFuby9nc2Utc3dpdGNoLWZvY3VzLW1vZGUiLAogICJ1dWlkIjogIlN3aXRjaEZvY3VzVHlwZUByb21hbm8ucmd0dGkuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "radio@hslbck.gmail.com", "name": "Internet Radio", "pname": "internet-radio", "description": "Listen to an Internet Radio Stream", "link": "https://extensions.gnome.org/extension/836/internet-radio/", "shell_version_map": {"38": {"version": "14", "sha256": "013wbf3npz7f438i39cd41s6whs4lgaigv4i1zais994n9ybw5y9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBhbiBJbnRlcm5ldCBSYWRpbyBTdHJlYW0iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyYWRpb0Boc2xiY2suZ21haWwuY29tIiwKICAibmFtZSI6ICJJbnRlcm5ldCBSYWRpbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzbGJjay9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmFkaW8iLAogICJ1dWlkIjogInJhZGlvQGhzbGJjay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "40": {"version": "19", "sha256": "046lh1yhaa2yp64n0ax1abzlw26avnr8z1yc3v6wral9xkz5c94h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBhbiBJbnRlcm5ldCBSYWRpbyBTdHJlYW0iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyYWRpb0Boc2xiY2suZ21haWwuY29tIiwKICAibmFtZSI6ICJJbnRlcm5ldCBSYWRpbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzbGJjay9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmFkaW8iLAogICJ1dWlkIjogInJhZGlvQGhzbGJjay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "41": {"version": "19", "sha256": "046lh1yhaa2yp64n0ax1abzlw26avnr8z1yc3v6wral9xkz5c94h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBhbiBJbnRlcm5ldCBSYWRpbyBTdHJlYW0iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyYWRpb0Boc2xiY2suZ21haWwuY29tIiwKICAibmFtZSI6ICJJbnRlcm5ldCBSYWRpbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzbGJjay9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmFkaW8iLAogICJ1dWlkIjogInJhZGlvQGhzbGJjay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "42": {"version": "19", "sha256": "046lh1yhaa2yp64n0ax1abzlw26avnr8z1yc3v6wral9xkz5c94h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBhbiBJbnRlcm5ldCBSYWRpbyBTdHJlYW0iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyYWRpb0Boc2xiY2suZ21haWwuY29tIiwKICAibmFtZSI6ICJJbnRlcm5ldCBSYWRpbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzbGJjay9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmFkaW8iLAogICJ1dWlkIjogInJhZGlvQGhzbGJjay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} , {"uuid": "freon@UshakovVasilii_Github.yahoo.com", "name": "Freon", "pname": "freon", "description": "Shows CPU temperature, disk temperature, video card temperature (NVIDIA/Catalyst/Bumblebee&NVIDIA), voltage and fan RPM (forked from xtranophilist/gnome-shell-extension-sensors)", "link": "https://extensions.gnome.org/extension/841/freon/", "shell_version_map": {"38": {"version": "43", "sha256": "06jj01flj6iyx93aqz8ipzijnrammp6xqpgqwxfh0pf2clr6nwrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1VzaGFrb3ZWYXNpbGlpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mcmVvbiIsCiAgInV1aWQiOiAiZnJlb25AVXNoYWtvdlZhc2lsaWlfR2l0aHViLnlhaG9vLmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"}, "40": {"version": "50", "sha256": "16dc5zf25kc4mga3srb69cji7girv6z314s8k3nabm9whk8jfrg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Vc2hha292VmFzaWxpaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZnJlb24iLAogICJ1dWlkIjogImZyZW9uQFVzaGFrb3ZWYXNpbGlpX0dpdGh1Yi55YWhvby5jb20iLAogICJ2ZXJzaW9uIjogNTAKfQ=="}, "41": {"version": "50", "sha256": "16dc5zf25kc4mga3srb69cji7girv6z314s8k3nabm9whk8jfrg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Vc2hha292VmFzaWxpaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZnJlb24iLAogICJ1dWlkIjogImZyZW9uQFVzaGFrb3ZWYXNpbGlpX0dpdGh1Yi55YWhvby5jb20iLAogICJ2ZXJzaW9uIjogNTAKfQ=="}, "42": {"version": "50", "sha256": "16dc5zf25kc4mga3srb69cji7girv6z314s8k3nabm9whk8jfrg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Vc2hha292VmFzaWxpaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZnJlb24iLAogICJ1dWlkIjogImZyZW9uQFVzaGFrb3ZWYXNpbGlpX0dpdGh1Yi55YWhvby5jb20iLAogICJ2ZXJzaW9uIjogNTAKfQ=="}, "43": {"version": "50", "sha256": "16dc5zf25kc4mga3srb69cji7girv6z314s8k3nabm9whk8jfrg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Vc2hha292VmFzaWxpaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZnJlb24iLAogICJ1dWlkIjogImZyZW9uQFVzaGFrb3ZWYXNpbGlpX0dpdGh1Yi55YWhvby5jb20iLAogICJ2ZXJzaW9uIjogNTAKfQ=="}}} , {"uuid": "shell-volume-mixer@derhofbauer.at", "name": "Volume Mixer", "pname": "volume-mixer", "description": "Applet allowing separate configuration of PulseAudio mixers.\n\nShell Volume Mixer is an extension for GNOME Shell allowing separate configuration of PulseAudio devices and output switches. It features a profile switcher to quickly switch between pinned profiles and devices.\n\nMiddle mouse click on a slider mutes the selected stream.\n\nPlease file bugs and feature requests on the GitHub page.", "link": "https://extensions.gnome.org/extension/858/volume-mixer/", "shell_version_map": {"38": {"version": "39", "sha256": "1cnyapjvqri5k5m4nbcmbcx97b4akwv32h7ddav2ipahqh1lqqzj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxldCBhbGxvd2luZyBzZXBhcmF0ZSBjb25maWd1cmF0aW9uIG9mIFB1bHNlQXVkaW8gbWl4ZXJzLlxuXG5TaGVsbCBWb2x1bWUgTWl4ZXIgaXMgYW4gZXh0ZW5zaW9uIGZvciBHTk9NRSBTaGVsbCBhbGxvd2luZyBzZXBhcmF0ZSBjb25maWd1cmF0aW9uIG9mIFB1bHNlQXVkaW8gZGV2aWNlcyBhbmQgb3V0cHV0IHN3aXRjaGVzLiBJdCBmZWF0dXJlcyBhIHByb2ZpbGUgc3dpdGNoZXIgdG8gcXVpY2tseSBzd2l0Y2ggYmV0d2VlbiBwaW5uZWQgcHJvZmlsZXMgYW5kIGRldmljZXMuXG5cbk1pZGRsZSBtb3VzZSBjbGljayBvbiBhIHNsaWRlciBtdXRlcyB0aGUgc2VsZWN0ZWQgc3RyZWFtLlxuXG5QbGVhc2UgZmlsZSBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZS4iLAogICJuYW1lIjogIlZvbHVtZSBNaXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZWhvL2dub21lLXNoZWxsLXZvbHVtZS1taXhlciIsCiAgInV1aWQiOiAic2hlbGwtdm9sdW1lLW1peGVyQGRlcmhvZmJhdWVyLmF0IiwKICAidmVyc2lvbiI6IDM5Cn0="}, "40": {"version": "40", "sha256": "1s4jzq1iy006k3m0r28qiayb46135y71qqv583k1sn9sppda5b4d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxldCBhbGxvd2luZyBzZXBhcmF0ZSBjb25maWd1cmF0aW9uIG9mIFB1bHNlQXVkaW8gbWl4ZXJzLlxuXG5TaGVsbCBWb2x1bWUgTWl4ZXIgaXMgYW4gZXh0ZW5zaW9uIGZvciBHTk9NRSBTaGVsbCBhbGxvd2luZyBzZXBhcmF0ZSBjb25maWd1cmF0aW9uIG9mIFB1bHNlQXVkaW8gZGV2aWNlcyBhbmQgb3V0cHV0IHN3aXRjaGVzLiBJdCBmZWF0dXJlcyBhIHByb2ZpbGUgc3dpdGNoZXIgdG8gcXVpY2tseSBzd2l0Y2ggYmV0d2VlbiBwaW5uZWQgcHJvZmlsZXMgYW5kIGRldmljZXMuXG5cbk1pZGRsZSBtb3VzZSBjbGljayBvbiBhIHNsaWRlciBtdXRlcyB0aGUgc2VsZWN0ZWQgc3RyZWFtLlxuXG5QbGVhc2UgZmlsZSBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLXNoZWxsLXZvbHVtZS1taXhlciIsCiAgIm5hbWUiOiAiVm9sdW1lIE1peGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNoZWxsLXZvbHVtZS1taXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGVoby9nbm9tZS1zaGVsbC12b2x1bWUtbWl4ZXIiLAogICJ1dWlkIjogInNoZWxsLXZvbHVtZS1taXhlckBkZXJob2ZiYXVlci5hdCIsCiAgInZlcnNpb24iOiA0MAp9"}, "41": {"version": "44", "sha256": "0pbw1w3y9clq1pmxkblsp85kw5h8znhjf223bplqhjb74g89v80z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxldCBhbGxvd2luZyBzZXBhcmF0ZSBjb25maWd1cmF0aW9uIG9mIFB1bHNlQXVkaW8gbWl4ZXJzLlxuXG5TaGVsbCBWb2x1bWUgTWl4ZXIgaXMgYW4gZXh0ZW5zaW9uIGZvciBHTk9NRSBTaGVsbCBhbGxvd2luZyBzZXBhcmF0ZSBjb25maWd1cmF0aW9uIG9mIFB1bHNlQXVkaW8gZGV2aWNlcyBhbmQgb3V0cHV0IHN3aXRjaGVzLiBJdCBmZWF0dXJlcyBhIHByb2ZpbGUgc3dpdGNoZXIgdG8gcXVpY2tseSBzd2l0Y2ggYmV0d2VlbiBwaW5uZWQgcHJvZmlsZXMgYW5kIGRldmljZXMuXG5cbk1pZGRsZSBtb3VzZSBjbGljayBvbiBhIHNsaWRlciBtdXRlcyB0aGUgc2VsZWN0ZWQgc3RyZWFtLlxuXG5QbGVhc2UgZmlsZSBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLXNoZWxsLXZvbHVtZS1taXhlciIsCiAgIm5hbWUiOiAiVm9sdW1lIE1peGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNoZWxsLXZvbHVtZS1taXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGVoby9nbm9tZS1zaGVsbC12b2x1bWUtbWl4ZXIiLAogICJ1dWlkIjogInNoZWxsLXZvbHVtZS1taXhlckBkZXJob2ZiYXVlci5hdCIsCiAgInZlcnNpb24iOiA0NAp9"}}} @@ -104,7 +104,7 @@ , {"uuid": "windowIsReady_Remover@nunofarruca@gmail.com", "name": "Window Is Ready - Notification Remover", "pname": "window-is-ready-notification-remover", "description": "Removes window is ready Notification", "link": "https://extensions.gnome.org/extension/1007/window-is-ready-notification-remover/", "shell_version_map": {"38": {"version": "19", "sha256": "13i1hdxxd2xyhm1a3vfwwy2j1xhrx625wmrxn7s5xw9rlxj55p0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbnVub2ZhcnJ1Y2EvV2luZG93SXNSZWFkeV9SZW1vdmVyIiwKICAidXVpZCI6ICJ3aW5kb3dJc1JlYWR5X1JlbW92ZXJAbnVub2ZhcnJ1Y2FAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "40": {"version": "19", "sha256": "13i1hdxxd2xyhm1a3vfwwy2j1xhrx625wmrxn7s5xw9rlxj55p0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbnVub2ZhcnJ1Y2EvV2luZG93SXNSZWFkeV9SZW1vdmVyIiwKICAidXVpZCI6ICJ3aW5kb3dJc1JlYWR5X1JlbW92ZXJAbnVub2ZhcnJ1Y2FAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "13i1hdxxd2xyhm1a3vfwwy2j1xhrx625wmrxn7s5xw9rlxj55p0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbnVub2ZhcnJ1Y2EvV2luZG93SXNSZWFkeV9SZW1vdmVyIiwKICAidXVpZCI6ICJ3aW5kb3dJc1JlYWR5X1JlbW92ZXJAbnVub2ZhcnJ1Y2FAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "19", "sha256": "13i1hdxxd2xyhm1a3vfwwy2j1xhrx625wmrxn7s5xw9rlxj55p0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbnVub2ZhcnJ1Y2EvV2luZG93SXNSZWFkeV9SZW1vdmVyIiwKICAidXVpZCI6ICJ3aW5kb3dJc1JlYWR5X1JlbW92ZXJAbnVub2ZhcnJ1Y2FAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "43": {"version": "19", "sha256": "13i1hdxxd2xyhm1a3vfwwy2j1xhrx625wmrxn7s5xw9rlxj55p0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbnVub2ZhcnJ1Y2EvV2luZG93SXNSZWFkeV9SZW1vdmVyIiwKICAidXVpZCI6ICJ3aW5kb3dJc1JlYWR5X1JlbW92ZXJAbnVub2ZhcnJ1Y2FAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} , {"uuid": "arch-update@RaphaelRochet", "name": "Arch Linux Updates Indicator", "pname": "archlinux-updates-indicator", "description": "Update indicator for Arch Linux and GNOME Shell.\n** Note : you now need to install the package pacman-contrib to use the checkupdates script. **\n Can support AUR or other distros by changing command used to check for and apply updates.\n See README about Gnome Console", "link": "https://extensions.gnome.org/extension/1010/archlinux-updates-indicator/", "shell_version_map": {"38": {"version": "39", "sha256": "1wcyjy9idj674s7pyz0210pb6kzb3jmj1fv08cm93frdl9g61dn3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMSIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "40": {"version": "51", "sha256": "1qz9q8vwdwir5v3idxz8y756aps8lhsdj0yp00lj2n5x55hgrh99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1MQp9"}, "41": {"version": "51", "sha256": "1qz9q8vwdwir5v3idxz8y756aps8lhsdj0yp00lj2n5x55hgrh99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1MQp9"}, "42": {"version": "51", "sha256": "1qz9q8vwdwir5v3idxz8y756aps8lhsdj0yp00lj2n5x55hgrh99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1MQp9"}, "43": {"version": "51", "sha256": "1qz9q8vwdwir5v3idxz8y756aps8lhsdj0yp00lj2n5x55hgrh99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lIENvbnNvbGUiLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiA1MQp9"}}} , {"uuid": "dynamic-panel-transparency@rockon999.github.io", "name": "Dynamic Panel Transparency", "pname": "dynamic-panel-transparency", "description": "Miss dynamic panel transparency in 3.32 and up? Try the original dynamic panel with much more customization! This extension will fade your top panel to nothingness when there are no maximized windows present! Never again will the panel be abruptly darkened.\n\nMay be incompatible with some extensions that make extensive changes to the panel.\n\nIf your theme isn't working correctly with this extension enable 'Remove Excessive Panel Styling' in the Background section of preferences. This particularly impacts the default *Ubuntu* theme!", "link": "https://extensions.gnome.org/extension/1011/dynamic-panel-transparency/", "shell_version_map": {"38": {"version": "34", "sha256": "10w5kvmspy4rp4jnwx0rj2crbdyi1lxv81vhi8zx490fhwgmlkvl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pc3MgZHluYW1pYyBwYW5lbCB0cmFuc3BhcmVuY3kgaW4gMy4zMiBhbmQgdXA/IFRyeSB0aGUgb3JpZ2luYWwgZHluYW1pYyBwYW5lbCB3aXRoIG11Y2ggbW9yZSBjdXN0b21pemF0aW9uISBUaGlzIGV4dGVuc2lvbiB3aWxsIGZhZGUgeW91ciB0b3AgcGFuZWwgdG8gbm90aGluZ25lc3Mgd2hlbiB0aGVyZSBhcmUgbm8gbWF4aW1pemVkIHdpbmRvd3MgcHJlc2VudCEgTmV2ZXIgYWdhaW4gd2lsbCB0aGUgcGFuZWwgYmUgYWJydXB0bHkgZGFya2VuZWQuXG5cbk1heSBiZSBpbmNvbXBhdGlibGUgd2l0aCBzb21lIGV4dGVuc2lvbnMgdGhhdCBtYWtlIGV4dGVuc2l2ZSBjaGFuZ2VzIHRvIHRoZSBwYW5lbC5cblxuSWYgeW91ciB0aGVtZSBpc24ndCB3b3JraW5nIGNvcnJlY3RseSB3aXRoIHRoaXMgZXh0ZW5zaW9uIGVuYWJsZSAnUmVtb3ZlIEV4Y2Vzc2l2ZSBQYW5lbCBTdHlsaW5nJyBpbiB0aGUgQmFja2dyb3VuZCBzZWN0aW9uIG9mIHByZWZlcmVuY2VzLiBUaGlzIHBhcnRpY3VsYXJseSBpbXBhY3RzIHRoZSBkZWZhdWx0ICpVYnVudHUqIHRoZW1lISIsCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5IiwKICAibmFtZSI6ICJEeW5hbWljIFBhbmVsIFRyYW5zcGFyZW5jeSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5keW5hbWljLXBhbmVsLXRyYW5zcGFyZW5jeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V3bHNoL2R5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5LyIsCiAgInV1aWQiOiAiZHluYW1pYy1wYW5lbC10cmFuc3BhcmVuY3lAcm9ja29uOTk5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzNAp9"}, "40": {"version": "35", "sha256": "1znc564xd7n4k2klfc0kkip6hmadqdsa50p0sq0717h407m9p0vx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pc3MgZHluYW1pYyBwYW5lbCB0cmFuc3BhcmVuY3kgaW4gMy4zMiBhbmQgdXA/IFRyeSB0aGUgb3JpZ2luYWwgZHluYW1pYyBwYW5lbCB3aXRoIG11Y2ggbW9yZSBjdXN0b21pemF0aW9uISBUaGlzIGV4dGVuc2lvbiB3aWxsIGZhZGUgeW91ciB0b3AgcGFuZWwgdG8gbm90aGluZ25lc3Mgd2hlbiB0aGVyZSBhcmUgbm8gbWF4aW1pemVkIHdpbmRvd3MgcHJlc2VudCEgTmV2ZXIgYWdhaW4gd2lsbCB0aGUgcGFuZWwgYmUgYWJydXB0bHkgZGFya2VuZWQuXG5cbk1heSBiZSBpbmNvbXBhdGlibGUgd2l0aCBzb21lIGV4dGVuc2lvbnMgdGhhdCBtYWtlIGV4dGVuc2l2ZSBjaGFuZ2VzIHRvIHRoZSBwYW5lbC5cblxuSWYgeW91ciB0aGVtZSBpc24ndCB3b3JraW5nIGNvcnJlY3RseSB3aXRoIHRoaXMgZXh0ZW5zaW9uIGVuYWJsZSAnUmVtb3ZlIEV4Y2Vzc2l2ZSBQYW5lbCBTdHlsaW5nJyBpbiB0aGUgQmFja2dyb3VuZCBzZWN0aW9uIG9mIHByZWZlcmVuY2VzLiBUaGlzIHBhcnRpY3VsYXJseSBpbXBhY3RzIHRoZSBkZWZhdWx0ICpVYnVudHUqIHRoZW1lISIsCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5IiwKICAibmFtZSI6ICJEeW5hbWljIFBhbmVsIFRyYW5zcGFyZW5jeSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5keW5hbWljLXBhbmVsLXRyYW5zcGFyZW5jeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ld2xzaC9keW5hbWljLXBhbmVsLXRyYW5zcGFyZW5jeS8iLAogICJ1dWlkIjogImR5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5QHJvY2tvbjk5OS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} -, {"uuid": "text-scaler@gnome-shell-extensions.mariospr.org", "name": "Text Scaler", "pname": "text-scaler", "description": "Simple extension to easily define arbitrary values for the text scaling factor", "link": "https://extensions.gnome.org/extension/1018/text-scaler/", "shell_version_map": {"42": {"version": "11", "sha256": "0ly0bh8mz4sbsvqwc6nf7wr9mj6l9sgk247ddd3774h6m07z08qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gZWFzaWx5IGRlZmluZSBhcmJpdHJhcnkgdmFsdWVzIGZvciB0aGUgdGV4dCBzY2FsaW5nIGZhY3RvciIsCiAgImdldHRleHQtZG9tYWluIjogInRleHQtc2NhbGVyIiwKICAibmFtZSI6ICJUZXh0IFNjYWxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJpb3Nwci90ZXh0LXNjYWxlci1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRleHQtc2NhbGVyQGdub21lLXNoZWxsLWV4dGVuc2lvbnMubWFyaW9zcHIub3JnIiwKICAidmVyc2lvbiI6IDExCn0="}}} +, {"uuid": "text-scaler@gnome-shell-extensions.mariospr.org", "name": "Text Scaler", "pname": "text-scaler", "description": "Simple extension to easily define arbitrary values for the text scaling factor", "link": "https://extensions.gnome.org/extension/1018/text-scaler/", "shell_version_map": {"42": {"version": "12", "sha256": "0jp6i0x0zw9ldfq9ngcvg1y5ahcgyaw2za9rngivp172zpvgh2xb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gZWFzaWx5IGRlZmluZSBhcmJpdHJhcnkgdmFsdWVzIGZvciB0aGUgdGV4dCBzY2FsaW5nIGZhY3RvciIsCiAgImdldHRleHQtZG9tYWluIjogInRleHQtc2NhbGVyIiwKICAibmFtZSI6ICJUZXh0IFNjYWxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyaW9zcHIvdGV4dC1zY2FsZXItZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0ZXh0LXNjYWxlckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLm1hcmlvc3ByLm9yZyIsCiAgInZlcnNpb24iOiAxMgp9"}, "43": {"version": "12", "sha256": "0jp6i0x0zw9ldfq9ngcvg1y5ahcgyaw2za9rngivp172zpvgh2xb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gZWFzaWx5IGRlZmluZSBhcmJpdHJhcnkgdmFsdWVzIGZvciB0aGUgdGV4dCBzY2FsaW5nIGZhY3RvciIsCiAgImdldHRleHQtZG9tYWluIjogInRleHQtc2NhbGVyIiwKICAibmFtZSI6ICJUZXh0IFNjYWxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyaW9zcHIvdGV4dC1zY2FsZXItZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0ZXh0LXNjYWxlckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLm1hcmlvc3ByLm9yZyIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "icinga-checker@sosulski.net", "name": "Icinga checker", "pname": "icinga-checker", "description": "Icinga/Nagios checker", "link": "https://extensions.gnome.org/extension/1029/icinga-checker/", "shell_version_map": {"38": {"version": "15", "sha256": "18fzriglzhbcwx8876s9vmlxgcmkps1aa49cqh6r3vxhbgkp3m4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaWNpbmdhLWNoZWNrZXJAc29zdWxza2kubmV0IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "40": {"version": "15", "sha256": "18fzriglzhbcwx8876s9vmlxgcmkps1aa49cqh6r3vxhbgkp3m4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaWNpbmdhLWNoZWNrZXJAc29zdWxza2kubmV0IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "18fzriglzhbcwx8876s9vmlxgcmkps1aa49cqh6r3vxhbgkp3m4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaWNpbmdhLWNoZWNrZXJAc29zdWxza2kubmV0IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "15", "sha256": "18fzriglzhbcwx8876s9vmlxgcmkps1aa49cqh6r3vxhbgkp3m4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaWNpbmdhLWNoZWNrZXJAc29zdWxza2kubmV0IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "43": {"version": "15", "sha256": "18fzriglzhbcwx8876s9vmlxgcmkps1aa49cqh6r3vxhbgkp3m4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaWNpbmdhLWNoZWNrZXJAc29zdWxza2kubmV0IiwKICAidmVyc2lvbiI6IDE1Cn0="}}} , {"uuid": "taskwhisperer-extension@infinicode.de", "name": "TaskWhisperer", "pname": "taskwhisperer", "description": "Taskwhisperer is a extension for TaskWarrior Application https://taskwarrior.org. It is to display upcoming tasks and task details as well as to create and modify them.\n", "link": "https://extensions.gnome.org/extension/1039/taskwhisperer/", "shell_version_map": {"38": {"version": "20", "sha256": "067z3j2px4rz5yspfjx2s6p5j4l1svxllclahnf3zmv1nlbhzq8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2t3aGlzcGVyZXIgaXMgYSBleHRlbnNpb24gZm9yIFRhc2tXYXJyaW9yIEFwcGxpY2F0aW9uIGh0dHBzOi8vdGFza3dhcnJpb3Iub3JnLiBJdCBpcyB0byBkaXNwbGF5IHVwY29taW5nIHRhc2tzIGFuZCB0YXNrIGRldGFpbHMgYXMgd2VsbCBhcyB0byBjcmVhdGUgYW5kIG1vZGlmeSB0aGVtLlxuIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUYXNrV2hpc3BlcmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMvdGFza3doaXNwZXJlciIsCiAgInV1aWQiOiAidGFza3doaXNwZXJlci1leHRlbnNpb25AaW5maW5pY29kZS5kZSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "24", "sha256": "1353658yr64wlh4k2nvqmrbzdsdci7zcagk6bf75qi40k923qzlh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2t3aGlzcGVyZXIgaXMgYSBleHRlbnNpb24gZm9yIFRhc2tXYXJyaW9yIEFwcGxpY2F0aW9uIGh0dHBzOi8vdGFza3dhcnJpb3Iub3JnLiBJdCBpcyB0byBkaXNwbGF5IHVwY29taW5nIHRhc2tzIGFuZCB0YXNrIGRldGFpbHMgYXMgd2VsbCBhcyB0byBjcmVhdGUgYW5kIG1vZGlmeSB0aGVtLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2t3aGlzcGVyZXIiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlRhc2tXaGlzcGVyZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFza3doaXNwZXJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL3Rhc2t3aGlzcGVyZXIiLAogICJ1dWlkIjogInRhc2t3aGlzcGVyZXItZXh0ZW5zaW9uQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "41": {"version": "24", "sha256": "1353658yr64wlh4k2nvqmrbzdsdci7zcagk6bf75qi40k923qzlh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2t3aGlzcGVyZXIgaXMgYSBleHRlbnNpb24gZm9yIFRhc2tXYXJyaW9yIEFwcGxpY2F0aW9uIGh0dHBzOi8vdGFza3dhcnJpb3Iub3JnLiBJdCBpcyB0byBkaXNwbGF5IHVwY29taW5nIHRhc2tzIGFuZCB0YXNrIGRldGFpbHMgYXMgd2VsbCBhcyB0byBjcmVhdGUgYW5kIG1vZGlmeSB0aGVtLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2t3aGlzcGVyZXIiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlRhc2tXaGlzcGVyZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFza3doaXNwZXJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL3Rhc2t3aGlzcGVyZXIiLAogICJ1dWlkIjogInRhc2t3aGlzcGVyZXItZXh0ZW5zaW9uQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "42": {"version": "24", "sha256": "1353658yr64wlh4k2nvqmrbzdsdci7zcagk6bf75qi40k923qzlh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2t3aGlzcGVyZXIgaXMgYSBleHRlbnNpb24gZm9yIFRhc2tXYXJyaW9yIEFwcGxpY2F0aW9uIGh0dHBzOi8vdGFza3dhcnJpb3Iub3JnLiBJdCBpcyB0byBkaXNwbGF5IHVwY29taW5nIHRhc2tzIGFuZCB0YXNrIGRldGFpbHMgYXMgd2VsbCBhcyB0byBjcmVhdGUgYW5kIG1vZGlmeSB0aGVtLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2t3aGlzcGVyZXIiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlRhc2tXaGlzcGVyZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFza3doaXNwZXJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL3Rhc2t3aGlzcGVyZXIiLAogICJ1dWlkIjogInRhc2t3aGlzcGVyZXItZXh0ZW5zaW9uQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "43": {"version": "24", "sha256": "1353658yr64wlh4k2nvqmrbzdsdci7zcagk6bf75qi40k923qzlh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2t3aGlzcGVyZXIgaXMgYSBleHRlbnNpb24gZm9yIFRhc2tXYXJyaW9yIEFwcGxpY2F0aW9uIGh0dHBzOi8vdGFza3dhcnJpb3Iub3JnLiBJdCBpcyB0byBkaXNwbGF5IHVwY29taW5nIHRhc2tzIGFuZCB0YXNrIGRldGFpbHMgYXMgd2VsbCBhcyB0byBjcmVhdGUgYW5kIG1vZGlmeSB0aGVtLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2t3aGlzcGVyZXIiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlRhc2tXaGlzcGVyZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFza3doaXNwZXJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL3Rhc2t3aGlzcGVyZXIiLAogICJ1dWlkIjogInRhc2t3aGlzcGVyZXItZXh0ZW5zaW9uQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogMjQKfQ=="}}} , {"uuid": "randomwallpaper@iflow.space", "name": "Random Wallpaper", "pname": "random-wallpaper", "description": "Fetch a random wallpaper from an online source and set it as a desktop background. \nThe desktop background can be updated periodically or manually.\n\nFeatures:\nMany different online sources with filters:\n - Unsplash (https://unsplash.com/)\n - Wallhaven (https://wallhaven.cc/)\n - Reddit (https://reddit.com)\n - Basically any JSON API/File (see Examples on GitHub)\nHistory of previous images\nSet lock screen image\nAutomatic renewal (Auto-Fetching)", "link": "https://extensions.gnome.org/extension/1040/random-wallpaper/", "shell_version_map": {"38": {"version": "22", "sha256": "1mnc7k1816r0q8c95y36ryzl9cni6zms5xm587wmdmy4xi92i8ic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNC41IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lmbDB3L1JhbmRvbVdhbGxwYXBlckdub21lMyIsCiAgInV1aWQiOiAicmFuZG9td2FsbHBhcGVyQGlmbG93LnNwYWNlIiwKICAidmVyc2lvbiI6IDIyCn0="}, "40": {"version": "28", "sha256": "1j6hvpfqzf2js0hq23j1vyff3pfrwxxd8r2zxcsk2s7wk1vbqjg7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNy4xIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWZsMHcvUmFuZG9tV2FsbHBhcGVyR25vbWUzIiwKICAidXVpZCI6ICJyYW5kb213YWxscGFwZXJAaWZsb3cuc3BhY2UiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "41": {"version": "28", "sha256": "1j6hvpfqzf2js0hq23j1vyff3pfrwxxd8r2zxcsk2s7wk1vbqjg7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNy4xIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWZsMHcvUmFuZG9tV2FsbHBhcGVyR25vbWUzIiwKICAidXVpZCI6ICJyYW5kb213YWxscGFwZXJAaWZsb3cuc3BhY2UiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}}} @@ -125,7 +125,7 @@ , {"uuid": "hide_clock@grantmcwilliams.com", "name": "Hide Clock", "pname": "hide-clock", "description": "Hides Clock", "link": "https://extensions.gnome.org/extension/1110/hide-clock/", "shell_version_map": {"38": {"version": "10", "sha256": "1cvwfwd7d86zwgna70p98zb09rvpvkw6ksl5bj23jgsnr9jdpvvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIENsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyYW50bWN3aWxsaWFtcy9Hbm9tZV9IaWRlX0Nsb2NrIiwKICAidXVpZCI6ICJoaWRlX2Nsb2NrQGdyYW50bWN3aWxsaWFtcy5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "1cvwfwd7d86zwgna70p98zb09rvpvkw6ksl5bj23jgsnr9jdpvvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIENsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyYW50bWN3aWxsaWFtcy9Hbm9tZV9IaWRlX0Nsb2NrIiwKICAidXVpZCI6ICJoaWRlX2Nsb2NrQGdyYW50bWN3aWxsaWFtcy5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "1cvwfwd7d86zwgna70p98zb09rvpvkw6ksl5bj23jgsnr9jdpvvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIENsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyYW50bWN3aWxsaWFtcy9Hbm9tZV9IaWRlX0Nsb2NrIiwKICAidXVpZCI6ICJoaWRlX2Nsb2NrQGdyYW50bWN3aWxsaWFtcy5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "10", "sha256": "1cvwfwd7d86zwgna70p98zb09rvpvkw6ksl5bj23jgsnr9jdpvvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIENsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyYW50bWN3aWxsaWFtcy9Hbm9tZV9IaWRlX0Nsb2NrIiwKICAidXVpZCI6ICJoaWRlX2Nsb2NrQGdyYW50bWN3aWxsaWFtcy5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "43": {"version": "10", "sha256": "1cvwfwd7d86zwgna70p98zb09rvpvkw6ksl5bj23jgsnr9jdpvvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIENsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyYW50bWN3aWxsaWFtcy9Hbm9tZV9IaWRlX0Nsb2NrIiwKICAidXVpZCI6ICJoaWRlX2Nsb2NrQGdyYW50bWN3aWxsaWFtcy5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"uuid": "gnome-shell-screenshot@ttll.de", "name": "Screenshot Tool", "pname": "screenshot-tool", "description": "Conveniently create, copy, store and upload screenshots. Please log out and log in again after updating.", "link": "https://extensions.gnome.org/extension/1112/screenshot-tool/", "shell_version_map": {"38": {"version": "56", "sha256": "1ga2ray64aq1d1vn0rsscfxjiidbiln3vx42rn9i4q2a59b00znq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY1NiIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLXNjcmVlbnNob3QvIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1zY3JlZW5zaG90QHR0bGwuZGUiLAogICJ2ZXJzaW9uIjogNTYKfQ=="}, "40": {"version": "68", "sha256": "1py94s1v5vjnf8w7as7ypprbk2504a0kkh6p6ppm9glcr2vl8w2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2OCIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLXNjcmVlbnNob3QvIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1zY3JlZW5zaG90QHR0bGwuZGUiLAogICJ2ZXJzaW9uIjogNjgKfQ=="}, "41": {"version": "68", "sha256": "1py94s1v5vjnf8w7as7ypprbk2504a0kkh6p6ppm9glcr2vl8w2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2OCIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLXNjcmVlbnNob3QvIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1zY3JlZW5zaG90QHR0bGwuZGUiLAogICJ2ZXJzaW9uIjogNjgKfQ=="}, "42": {"version": "68", "sha256": "1py94s1v5vjnf8w7as7ypprbk2504a0kkh6p6ppm9glcr2vl8w2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2OCIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLXNjcmVlbnNob3QvIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1zY3JlZW5zaG90QHR0bGwuZGUiLAogICJ2ZXJzaW9uIjogNjgKfQ=="}, "43": {"version": "69", "sha256": "1sfv67yj5c973yiizbn7hwxcz7ijyzxcni5f9ck3d02zypg4idjy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2OSIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3R0b0FsbG1lbmRpbmdlci9nbm9tZS1zaGVsbC1zY3JlZW5zaG90LyIsCiAgInV1aWQiOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdEB0dGxsLmRlIiwKICAidmVyc2lvbiI6IDY5Cn0="}}} , {"uuid": "nothing-to-say@extensions.gnome.wouter.bolsterl.ee", "name": "Nothing to say", "pname": "nothing-to-say", "description": "Unmute the microphone only when you have something to say.", "link": "https://extensions.gnome.org/extension/1113/nothing-to-say/", "shell_version_map": {"38": {"version": "8", "sha256": "12ngc4dv1ijbvihqn2rjn77bal0gdhdq4cxf1zv5lr2ckz0ishm4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "17", "sha256": "0dwqhikmwir8hyrzzy4kkicn8b1bnbc94mipih5w1qrip69j3j50", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zNi45IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "41": {"version": "17", "sha256": "0dwqhikmwir8hyrzzy4kkicn8b1bnbc94mipih5w1qrip69j3j50", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zNi45IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "42": {"version": "17", "sha256": "0dwqhikmwir8hyrzzy4kkicn8b1bnbc94mipih5w1qrip69j3j50", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zNi45IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "43": {"version": "17", "sha256": "0dwqhikmwir8hyrzzy4kkicn8b1bnbc94mipih5w1qrip69j3j50", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiMy4zNi45IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} -, {"uuid": "workspace-switch-wraparound@theychx.org", "name": "Workspace Switch Wraparound", "pname": "workspace-switch-wraparound", "description": "When switching workspaces, going down from the bottom workspace switches to the top workspace. Likewise, up from the top workspace goes to the bottom workspace.", "link": "https://extensions.gnome.org/extension/1116/workspace-switch-wraparound/", "shell_version_map": {"38": {"version": "8", "sha256": "18yncb0jamja0wnxmkk4js5qy8gabqbpp4jxvaixfz1cj4pjqyqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoZXljaHgvV29ya3NwYWNlU3dpdGNoZXJXcmFwQXJvdW5kIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoLXdyYXBhcm91bmRAdGhleWNoeC5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "18yncb0jamja0wnxmkk4js5qy8gabqbpp4jxvaixfz1cj4pjqyqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoZXljaHgvV29ya3NwYWNlU3dpdGNoZXJXcmFwQXJvdW5kIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoLXdyYXBhcm91bmRAdGhleWNoeC5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "18yncb0jamja0wnxmkk4js5qy8gabqbpp4jxvaixfz1cj4pjqyqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoZXljaHgvV29ya3NwYWNlU3dpdGNoZXJXcmFwQXJvdW5kIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoLXdyYXBhcm91bmRAdGhleWNoeC5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "18yncb0jamja0wnxmkk4js5qy8gabqbpp4jxvaixfz1cj4pjqyqr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoZXljaHgvV29ya3NwYWNlU3dpdGNoZXJXcmFwQXJvdW5kIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoLXdyYXBhcm91bmRAdGhleWNoeC5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}}} +, {"uuid": "workspace-switch-wraparound@theychx.org", "name": "Workspace Switch Wraparound", "pname": "workspace-switch-wraparound", "description": "When switching workspaces, going down from the bottom workspace switches to the top workspace. Likewise, up from the top workspace goes to the bottom workspace.", "link": "https://extensions.gnome.org/extension/1116/workspace-switch-wraparound/", "shell_version_map": {"38": {"version": "9", "sha256": "1219h03rwkks6q4zgs012p8wspmld6j71c8q1bx8vvavgqx6sam6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGV5Y2h4L1dvcmtzcGFjZVN3aXRjaGVyV3JhcEFyb3VuZCIsCiAgInV1aWQiOiAid29ya3NwYWNlLXN3aXRjaC13cmFwYXJvdW5kQHRoZXljaHgub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "9", "sha256": "1219h03rwkks6q4zgs012p8wspmld6j71c8q1bx8vvavgqx6sam6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGV5Y2h4L1dvcmtzcGFjZVN3aXRjaGVyV3JhcEFyb3VuZCIsCiAgInV1aWQiOiAid29ya3NwYWNlLXN3aXRjaC13cmFwYXJvdW5kQHRoZXljaHgub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1219h03rwkks6q4zgs012p8wspmld6j71c8q1bx8vvavgqx6sam6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGV5Y2h4L1dvcmtzcGFjZVN3aXRjaGVyV3JhcEFyb3VuZCIsCiAgInV1aWQiOiAid29ya3NwYWNlLXN3aXRjaC13cmFwYXJvdW5kQHRoZXljaHgub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "1219h03rwkks6q4zgs012p8wspmld6j71c8q1bx8vvavgqx6sam6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGV5Y2h4L1dvcmtzcGFjZVN3aXRjaGVyV3JhcEFyb3VuZCIsCiAgInV1aWQiOiAid29ya3NwYWNlLXN3aXRjaC13cmFwYXJvdW5kQHRoZXljaHgub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "1219h03rwkks6q4zgs012p8wspmld6j71c8q1bx8vvavgqx6sam6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGV5Y2h4L1dvcmtzcGFjZVN3aXRjaGVyV3JhcEFyb3VuZCIsCiAgInV1aWQiOiAid29ya3NwYWNlLXN3aXRjaC13cmFwYXJvdW5kQHRoZXljaHgub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "ibus-font-setting@ibus.github.com", "name": "ibus font setting", "pname": "ibus-font-setting", "description": "use ibus font setting of ibus setup dialog to enhance the user experience", "link": "https://extensions.gnome.org/extension/1121/ibus-font-setting/", "shell_version_map": {"38": {"version": "9", "sha256": "163byvsc3dj2w9xq498py1xjziyi98icyki1cd6wv7vxaxfmk7y6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL3B3dS5mZWRvcmFwZW9wbGUub3JnL2lidXMvaWJ1cy1mb250LXNldHRpbmciLAogICJ1dWlkIjogImlidXMtZm9udC1zZXR0aW5nQGlidXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "12", "sha256": "0vsn7rrkpys580vxg8hzkf1cj2ki7540rvpg1w90nqy7s1agm6w9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3B3dS5mZWRvcmFwZW9wbGUub3JnL2lidXMvaWJ1cy1mb250LXNldHRpbmciLAogICJ1dWlkIjogImlidXMtZm9udC1zZXR0aW5nQGlidXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0vsn7rrkpys580vxg8hzkf1cj2ki7540rvpg1w90nqy7s1agm6w9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3B3dS5mZWRvcmFwZW9wbGUub3JnL2lidXMvaWJ1cy1mb250LXNldHRpbmciLAogICJ1dWlkIjogImlidXMtZm9udC1zZXR0aW5nQGlidXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "0vsn7rrkpys580vxg8hzkf1cj2ki7540rvpg1w90nqy7s1agm6w9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3B3dS5mZWRvcmFwZW9wbGUub3JnL2lidXMvaWJ1cy1mb250LXNldHRpbmciLAogICJ1dWlkIjogImlidXMtZm9udC1zZXR0aW5nQGlidXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "github.notifications@alexandre.dufournet.gmail.com", "name": "Github Notifications", "pname": "github-notifications", "description": "Integrate Github's notifications within the gnome desktop environment\nSource code is available here: https://github.com/alexduf/gnome-github-notifications", "link": "https://extensions.gnome.org/extension/1125/github-notifications/", "shell_version_map": {"38": {"version": "17", "sha256": "0ccgbllyak1lyp14ynsg17zngfpxkc5v5asv3zwwmpk44bl984ny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnaXRodWIubm90aWZpY2F0aW9uc0BhbGV4YW5kcmUuZHVmb3VybmV0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "40": {"version": "22", "sha256": "069lbl8f9c5kcj9nwdnh7bqlffw1kgp96pi46xg3pj8hxdibhahc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnaXRodWIubm90aWZpY2F0aW9uc0BhbGV4YW5kcmUuZHVmb3VybmV0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "22", "sha256": "069lbl8f9c5kcj9nwdnh7bqlffw1kgp96pi46xg3pj8hxdibhahc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnaXRodWIubm90aWZpY2F0aW9uc0BhbGV4YW5kcmUuZHVmb3VybmV0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "22", "sha256": "069lbl8f9c5kcj9nwdnh7bqlffw1kgp96pi46xg3pj8hxdibhahc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnaXRodWIubm90aWZpY2F0aW9uc0BhbGV4YW5kcmUuZHVmb3VybmV0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}}} , {"uuid": "desk-changer@eric.gach.gmail.com", "name": "Desk Changer", "pname": "desk-changer", "description": "Simple wallpaper changer with multiple profile support. Integrates into the shell by providing it's own panel icon. The daemon is written using gjs and runs independently of the extension as a background process.", "link": "https://extensions.gnome.org/extension/1131/desk-changer/", "shell_version_map": {"38": {"version": "25", "sha256": "15ah5ipi9b0jqscw8igxxni1p12jzsv1vcm8jfdfrmq8c3dziadf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpZ0UvZGVzay1jaGFuZ2VyLyIsCiAgInV1aWQiOiAiZGVzay1jaGFuZ2VyQGVyaWMuZ2FjaC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "40": {"version": "25", "sha256": "15ah5ipi9b0jqscw8igxxni1p12jzsv1vcm8jfdfrmq8c3dziadf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpZ0UvZGVzay1jaGFuZ2VyLyIsCiAgInV1aWQiOiAiZGVzay1jaGFuZ2VyQGVyaWMuZ2FjaC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "25", "sha256": "15ah5ipi9b0jqscw8igxxni1p12jzsv1vcm8jfdfrmq8c3dziadf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpZ0UvZGVzay1jaGFuZ2VyLyIsCiAgInV1aWQiOiAiZGVzay1jaGFuZ2VyQGVyaWMuZ2FjaC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "42": {"version": "25", "sha256": "15ah5ipi9b0jqscw8igxxni1p12jzsv1vcm8jfdfrmq8c3dziadf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpZ0UvZGVzay1jaGFuZ2VyLyIsCiAgInV1aWQiOiAiZGVzay1jaGFuZ2VyQGVyaWMuZ2FjaC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "43": {"version": "25", "sha256": "15ah5ipi9b0jqscw8igxxni1p12jzsv1vcm8jfdfrmq8c3dziadf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0JpZ0UvZGVzay1jaGFuZ2VyLyIsCiAgInV1aWQiOiAiZGVzay1jaGFuZ2VyQGVyaWMuZ2FjaC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} @@ -134,7 +134,7 @@ , {"uuid": "activityAppLauncher@rastersoft.com", "name": "Activity App Launcher", "pname": "activity-app-launcher", "description": "Integrates a category-based application launcher in the activities window. IMPORTANT: it needs the 'gnome-menus' and 'libgnome-menu-3-dev'; they must be installed in the system before installing this extension.", "link": "https://extensions.gnome.org/extension/1149/activity-app-launcher/", "shell_version_map": {"38": {"version": "31", "sha256": "18jqnk4psdvdx1hydfss1870v0gnpxkmsm5yasnb0m5m484in0qv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmFzdGVyc29mdC9hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAidXVpZCI6ICJhY3Rpdml0eUFwcExhdW5jaGVyQHJhc3RlcnNvZnQuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "40": {"version": "35", "sha256": "1b1mr30kpn26hhhp871pybymk23w0s5zdn18zsp4lnvf2f618j25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "41": {"version": "35", "sha256": "1b1mr30kpn26hhhp871pybymk23w0s5zdn18zsp4lnvf2f618j25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "42": {"version": "35", "sha256": "1b1mr30kpn26hhhp871pybymk23w0s5zdn18zsp4lnvf2f618j25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "43": {"version": "35", "sha256": "1b1mr30kpn26hhhp871pybymk23w0s5zdn18zsp4lnvf2f618j25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvYWN0aXZpdHlBcHBMYXVuY2hlciIsCiAgInV1aWQiOiAiYWN0aXZpdHlBcHBMYXVuY2hlckByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}}} , {"uuid": "shutdown-timer-gnome-shell-extension", "name": "ShutdownTimer", "pname": "shutdowntimer", "description": "Allows to shutdown, restart and suspend computer after selected amount of time or in selected time.", "link": "https://extensions.gnome.org/extension/1152/shutdowntimer/", "shell_version_map": {"40": {"version": "9", "sha256": "1y69lv3mq66xxfxabngnbb104d26i05cyhmx3dqf4kyf1kd6jqvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBzaHV0ZG93biwgcmVzdGFydCBhbmQgc3VzcGVuZCBjb21wdXRlciBhZnRlciBzZWxlY3RlZCBhbW91bnQgb2YgdGltZSBvciBpbiBzZWxlY3RlZCB0aW1lLiIsCiAgImdldHRleHQtZG9tYWluIjogIkF1dG9tYXRpY1NodXRkb3duVGltZXIiLAogICJuYW1lIjogIlNodXRkb3duVGltZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXV0b21hdGljLXNodXRkb3duLXRpbWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21rcmFqbmFrL3NodXRkb3duLXRpbWVyLWdub21lLXNoZWxsLWV4dGVuc2lvbi8iLAogICJ1dWlkIjogInNodXRkb3duLXRpbWVyLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "dash-to-panel@jderose9.github.com", "name": "Dash to Panel", "pname": "dash-to-panel", "description": "An icon taskbar for the Gnome Shell. This extension moves the dash into the gnome main panel so that the application launchers and system tray are combined into a single panel, similar to that found in KDE Plasma and Windows 7+. A separate dock is no longer needed for easy access to running and favorited applications.\n\nFor a more traditional experience, you may also want to use Tweak Tool to enable Windows > Titlebar Buttons > Minimize & Maximize.\n\nFor the best support, please report any issues on Github. Dash-to-panel is developed and maintained by @jderose9 and @charlesg99.", "link": "https://extensions.gnome.org/extension/1160/dash-to-panel/", "shell_version_map": {"38": {"version": "42", "sha256": "1v9n4g9gx5kv21mb15i7b3k6svcv7jynw4zjfi2gh2pr7ii98b5z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Mgp9"}, "40": {"version": "44", "sha256": "0vdi0dznbawdavqr9j8w480av04r8m0k9czizzvk9bia33cqryi1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaG9tZS1zd2VldC1nbm9tZS9kYXNoLXRvLXBhbmVsIiwKICAidXVpZCI6ICJkYXNoLXRvLXBhbmVsQGpkZXJvc2U5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "41": {"version": "52", "sha256": "12z3hgxd8d15qz3529jzgv5slf7isa2f4krrn6c26gla5j6ryay4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "42": {"version": "52", "sha256": "12z3hgxd8d15qz3529jzgv5slf7isa2f4krrn6c26gla5j6ryay4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "43": {"version": "52", "sha256": "12z3hgxd8d15qz3529jzgv5slf7isa2f4krrn6c26gla5j6ryay4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob21lLXN3ZWV0LWdub21lL2Rhc2gtdG8tcGFuZWwiLAogICJ1dWlkIjogImRhc2gtdG8tcGFuZWxAamRlcm9zZTkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}}} -, {"uuid": "emoji-selector@maestroschan.fr", "name": "Emoji Selector", "pname": "emoji-selector", "description": "This extension provides a parametrable popup menu displaying most emojis, clicking on an emoji copies it to the clipboard. An appropriate font like 'Twitter Color Emoji' or 'JoyPixels Color' should be installed on your system for a better visual result.", "link": "https://extensions.gnome.org/extension/1162/emoji-selector/", "shell_version_map": {"38": {"version": "20", "sha256": "1i6py149m46xig5a0ry7y5v887nlzw644mw72gcr2hkfsn8b0gnd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovZW1vamktc2VsZWN0b3ItZm9yLWdub21lIiwKICAidXVpZCI6ICJlbW9qaS1zZWxlY3RvckBtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "40": {"version": "22", "sha256": "0fd29bxn1vwpsin032lgckk45bf6w9rfh852c18z42j1p7kgb5wi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovZW1vamktc2VsZWN0b3ItZm9yLWdub21lIiwKICAidXVpZCI6ICJlbW9qaS1zZWxlY3RvckBtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "0fd29bxn1vwpsin032lgckk45bf6w9rfh852c18z42j1p7kgb5wi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovZW1vamktc2VsZWN0b3ItZm9yLWdub21lIiwKICAidXVpZCI6ICJlbW9qaS1zZWxlY3RvckBtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "0fd29bxn1vwpsin032lgckk45bf6w9rfh852c18z42j1p7kgb5wi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovZW1vamktc2VsZWN0b3ItZm9yLWdub21lIiwKICAidXVpZCI6ICJlbW9qaS1zZWxlY3RvckBtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} +, {"uuid": "emoji-selector@maestroschan.fr", "name": "Emoji Selector", "pname": "emoji-selector", "description": "This extension provides a parametrable popup menu displaying most emojis, clicking on an emoji copies it to the clipboard. An appropriate font like 'Twitter Color Emoji' or 'JoyPixels Color' should be installed on your system for a better visual result.", "link": "https://extensions.gnome.org/extension/1162/emoji-selector/", "shell_version_map": {"38": {"version": "20", "sha256": "1i6py149m46xig5a0ry7y5v887nlzw644mw72gcr2hkfsn8b0gnd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovZW1vamktc2VsZWN0b3ItZm9yLWdub21lIiwKICAidXVpZCI6ICJlbW9qaS1zZWxlY3RvckBtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "40": {"version": "23", "sha256": "053l31j8ir3sba7577z5wqvcx7v53wl71g9dfpsbka29flz2m1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFvc2NoYW56L2Vtb2ppLXNlbGVjdG9yLWZvci1nbm9tZSIsCiAgInV1aWQiOiAiZW1vamktc2VsZWN0b3JAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "053l31j8ir3sba7577z5wqvcx7v53wl71g9dfpsbka29flz2m1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFvc2NoYW56L2Vtb2ppLXNlbGVjdG9yLWZvci1nbm9tZSIsCiAgInV1aWQiOiAiZW1vamktc2VsZWN0b3JAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDIzCn0="}, "42": {"version": "23", "sha256": "053l31j8ir3sba7577z5wqvcx7v53wl71g9dfpsbka29flz2m1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFvc2NoYW56L2Vtb2ppLXNlbGVjdG9yLWZvci1nbm9tZSIsCiAgInV1aWQiOiAiZW1vamktc2VsZWN0b3JAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDIzCn0="}, "43": {"version": "23", "sha256": "053l31j8ir3sba7577z5wqvcx7v53wl71g9dfpsbka29flz2m1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFvc2NoYW56L2Vtb2ppLXNlbGVjdG9yLWZvci1nbm9tZSIsCiAgInV1aWQiOiAiZW1vamktc2VsZWN0b3JAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDIzCn0="}}} , {"uuid": "gnome-kinit@bonzini.gnu.org", "name": "Kerberos login", "pname": "kerberos-login", "description": "Provide a system menu item to renew Kerberos tickets", "link": "https://extensions.gnome.org/extension/1165/kerberos-login/", "shell_version_map": {"40": {"version": "5", "sha256": "03drgiaxvnxh8sbng3f8aj54gpz73w2ls779zyz9rx3f877w6n9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyLjIiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9ib256aW5pL2dub21lLWtpbml0IiwKICAidXVpZCI6ICJnbm9tZS1raW5pdEBib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "03drgiaxvnxh8sbng3f8aj54gpz73w2ls779zyz9rx3f877w6n9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyLjIiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9ib256aW5pL2dub21lLWtpbml0IiwKICAidXVpZCI6ICJnbm9tZS1raW5pdEBib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "7", "sha256": "0ykqd0yazwrrb93gq07mbb0jcyfpmj8imbk324iq1828zsvfld8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2JvbnppbmkvZ25vbWUta2luaXQiLAogICJ1dWlkIjogImdub21lLWtpbml0QGJvbnppbmkuZ251Lm9yZyIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "10", "sha256": "0810pljxcwxyyvxfy57fwk2n9jxv39llq07fdcc2wc3rqpbzc8gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2JvbnppbmkvZ25vbWUta2luaXQiLAogICJ1dWlkIjogImdub21lLWtpbml0QGJvbnppbmkuZ251Lm9yZyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "calculator-button@amivaleo", "name": "Calculator Button", "pname": "calculator-button", "description": "A button to easily open gnome-calculator.\n Credits to extensions.gnome.org/extension/939/display-button/\n\nv10:\n1 - added support for gnome 3.38\n2 - added support for flatpak version of gnome-calculator", "link": "https://extensions.gnome.org/extension/1168/calculator-button/", "shell_version_map": {"38": {"version": "10", "sha256": "1c6b53im6xj4yaf4skvchvgipxfjs2yh3i5r75cw9avnw7imnwk6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYnV0dG9uIHRvIGVhc2lseSBvcGVuIGdub21lLWNhbGN1bGF0b3IuXG4gQ3JlZGl0cyB0byBleHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vOTM5L2Rpc3BsYXktYnV0dG9uL1xuXG52MTA6XG4xIC0gYWRkZWQgc3VwcG9ydCBmb3IgZ25vbWUgMy4zOFxuMiAtIGFkZGVkIHN1cHBvcnQgZm9yIGZsYXRwYWsgdmVyc2lvbiBvZiBnbm9tZS1jYWxjdWxhdG9yIiwKICAibmFtZSI6ICJDYWxjdWxhdG9yIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaXZhbGVvL0NhbGN1bGF0b3ItQnV0dG9uIiwKICAidXVpZCI6ICJjYWxjdWxhdG9yLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "screenshotlocations.timur@linux.com", "name": "Screenshot Locations", "pname": "screenshot-locations", "description": "Change the default GNOME screenshot directory", "link": "https://extensions.gnome.org/extension/1179/screenshot-locations/", "shell_version_map": {"38": {"version": "7", "sha256": "0ymb4m8fgxgi964fdfdqwgjw95qbcm906zgqmyqxgd4ggip3mn47", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Rsb2NhdGlvbnMuZGF0YS5ncmVzb3VyY2UiLAogICJkZXNjcmlwdGlvbiI6ICJDaGFuZ2UgdGhlIGRlZmF1bHQgR05PTUUgc2NyZWVuc2hvdCBkaXJlY3RvcnkiLAogICJuYW1lIjogIlNjcmVlbnNob3QgTG9jYXRpb25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Rsb2NhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vY29kZWJlcmcub3JnL2tpeXVpL2dub21lLXNoZWxsLXNjcmVlbnNob3Rsb2NhdGlvbnMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzY3JlZW5zaG90bG9jYXRpb25zLnRpbXVyQGxpbnV4LmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "8", "sha256": "0cxsq1zzmgn6q32wbdfw9hai62li92dwvwnzq2pdbskp9qm6v7nd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgZGVmYXVsdCBHTk9NRSBzY3JlZW5zaG90IGRpcmVjdG9yeSIsCiAgImdldHRleHQtZG9tYWluIjogInNjcmVlbnNob3Rsb2NhdGlvbnMudGltdXJAbGludXguY29tIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IExvY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW5zaG90bG9jYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9jb2RlYmVyZy5vcmcva2l5dWkvZ25vbWUtc2hlbGwtc2NyZWVuc2hvdGxvY2F0aW9ucy1leHRlbnNpb24iLAogICJ1dWlkIjogInNjcmVlbnNob3Rsb2NhdGlvbnMudGltdXJAbGludXguY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} @@ -196,7 +196,7 @@ , {"uuid": "microphone-loopback@atareao.es", "name": "Microphone Loopback", "pname": "microphone-loopback", "description": "This extension enables hear microphone on headphones or speakers", "link": "https://extensions.gnome.org/extension/1443/microphone-loopback/", "shell_version_map": {"40": {"version": "5", "sha256": "1s9sh3afa3d7vbjlna6c7yls7kglwrxy6j5hns1ql4nprkdx8nb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgaGVhciBtaWNyb3Bob25lIG9uIGhlYWRwaG9uZXMgb3Igc3BlYWtlcnMiLAogICJleHRlbnNpb24taWQiOiAibWljcm9waG9uZS1sb29wYmFja0BhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWljcm9waG9uZS1sb29wYmFja0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJtaWNyb3Bob25lLWxvb3BiYWNrIiwKICAibmFtZSI6ICJNaWNyb3Bob25lIExvb3BiYWNrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pY3JvcGhvbmUtbG9vcGJhY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL21pY3JvcGhvbmUtbG9vcGJhY2siLAogICJ1dWlkIjogIm1pY3JvcGhvbmUtbG9vcGJhY2tAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1s9sh3afa3d7vbjlna6c7yls7kglwrxy6j5hns1ql4nprkdx8nb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgaGVhciBtaWNyb3Bob25lIG9uIGhlYWRwaG9uZXMgb3Igc3BlYWtlcnMiLAogICJleHRlbnNpb24taWQiOiAibWljcm9waG9uZS1sb29wYmFja0BhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWljcm9waG9uZS1sb29wYmFja0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJtaWNyb3Bob25lLWxvb3BiYWNrIiwKICAibmFtZSI6ICJNaWNyb3Bob25lIExvb3BiYWNrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pY3JvcGhvbmUtbG9vcGJhY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL21pY3JvcGhvbmUtbG9vcGJhY2siLAogICJ1dWlkIjogIm1pY3JvcGhvbmUtbG9vcGJhY2tAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1s9sh3afa3d7vbjlna6c7yls7kglwrxy6j5hns1ql4nprkdx8nb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgaGVhciBtaWNyb3Bob25lIG9uIGhlYWRwaG9uZXMgb3Igc3BlYWtlcnMiLAogICJleHRlbnNpb24taWQiOiAibWljcm9waG9uZS1sb29wYmFja0BhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWljcm9waG9uZS1sb29wYmFja0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJtaWNyb3Bob25lLWxvb3BiYWNrIiwKICAibmFtZSI6ICJNaWNyb3Bob25lIExvb3BiYWNrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pY3JvcGhvbmUtbG9vcGJhY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL21pY3JvcGhvbmUtbG9vcGJhY2siLAogICJ1dWlkIjogIm1pY3JvcGhvbmUtbG9vcGJhY2tAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "transparent-window-moving@noobsai.github.com", "name": "Transparent Window Moving", "pname": "transparent-window-moving", "description": "Makes the window semi-transparent when moving or resizing", "link": "https://extensions.gnome.org/extension/1446/transparent-window-moving/", "shell_version_map": {"38": {"version": "6", "sha256": "0vllnrscjaqx77wb44803q6n3wk590dxacjfsw7ympbgqhikzc0p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS90cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "11", "sha256": "1dak0ckabddfq8hfl3ppdwbfxnkjhk90jwaqm875avn72zwvlsvi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "1dak0ckabddfq8hfl3ppdwbfxnkjhk90jwaqm875avn72zwvlsvi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "1dak0ckabddfq8hfl3ppdwbfxnkjhk90jwaqm875avn72zwvlsvi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "43": {"version": "11", "sha256": "1dak0ckabddfq8hfl3ppdwbfxnkjhk90jwaqm875avn72zwvlsvi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvdHJhbnNwYXJlbnQtd2luZG93LW1vdmluZyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93LW1vdmluZ0Bub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "transparent-window@pbxqdown.github.com", "name": "Transparent Window", "pname": "transparent-window", "description": "Change the opacity of windows by compiz-style shortcut Alt+scroll.\nYou can customize hotkey in Preference page if Alt key doesn't work.", "link": "https://extensions.gnome.org/extension/1454/transparent-window/", "shell_version_map": {"38": {"version": "11", "sha256": "07qn7hwpv8pzwbgw60mr87ww10mwcz8x8w3d4gq4zszgynw63nbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "07qn7hwpv8pzwbgw60mr87ww10mwcz8x8w3d4gq4zszgynw63nbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "07qn7hwpv8pzwbgw60mr87ww10mwcz8x8w3d4gq4zszgynw63nbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "07qn7hwpv8pzwbgw60mr87ww10mwcz8x8w3d4gq4zszgynw63nbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} -, {"uuid": "miniview@thesecretaryofwar.com", "name": "Miniview", "pname": "miniview", "description": "Mini preview of another window (like picture-in-picture on a TV)\n- Left-mouse drag: move preview window\n- Right-mouse drag (or ctrl + left mouse drag): resize preview window\n- Scroll wheel (or shift + click): change target window\n- Double click: raise target window\n- Shift + F12: toggle preview window (this can be changed or disabled in preferences)\n- Ctrl + scroll wheel: adjust opacity", "link": "https://extensions.gnome.org/extension/1459/miniview/", "shell_version_map": {"38": {"version": "13", "sha256": "135mg4d49cm6ba72z9174kv31y49wpvlfddh04pmbj2cy95wai46", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmkgcHJldmlldyBvZiBhbm90aGVyIHdpbmRvdyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVilcbi0gTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG4tIFJpZ2h0LW1vdXNlIGRyYWcgKG9yIGN0cmwgKyBsZWZ0IG1vdXNlIGRyYWcpOiByZXNpemUgcHJldmlldyB3aW5kb3dcbi0gU2Nyb2xsIHdoZWVsIChvciBzaGlmdCArIGNsaWNrKTogY2hhbmdlIHRhcmdldCB3aW5kb3dcbi0gRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG4tIFNoaWZ0ICsgRjEyOiB0b2dnbGUgcHJldmlldyB3aW5kb3cgKHRoaXMgY2FuIGJlIGNoYW5nZWQgb3IgZGlzYWJsZWQgaW4gcHJlZmVyZW5jZXMpXG4tIEN0cmwgKyBzY3JvbGwgd2hlZWw6IGFkanVzdCBvcGFjaXR5IiwKICAiZXh0ZW5zaW9uLWlkIjogIm1pbml2aWV3IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWluaXZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgInRoZXNlY3JldGFyeW9md2FyQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWluaXZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pYW1sZW1lYy9taW5pdmlldyIsCiAgInV1aWQiOiAibWluaXZpZXdAdGhlc2VjcmV0YXJ5b2Z3YXIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "14", "sha256": "0ylnjpwvdzxsdh68k197rk5dhv1211vcrjhc5w9k39hd2mdhw4ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmkgcHJldmlldyBvZiBhbm90aGVyIHdpbmRvdyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVilcbi0gTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG4tIFJpZ2h0LW1vdXNlIGRyYWcgKG9yIGN0cmwgKyBsZWZ0IG1vdXNlIGRyYWcpOiByZXNpemUgcHJldmlldyB3aW5kb3dcbi0gU2Nyb2xsIHdoZWVsIChvciBzaGlmdCArIGNsaWNrKTogY2hhbmdlIHRhcmdldCB3aW5kb3dcbi0gRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG4tIFNoaWZ0ICsgRjEyOiB0b2dnbGUgcHJldmlldyB3aW5kb3cgKHRoaXMgY2FuIGJlIGNoYW5nZWQgb3IgZGlzYWJsZWQgaW4gcHJlZmVyZW5jZXMpXG4tIEN0cmwgKyBzY3JvbGwgd2hlZWw6IGFkanVzdCBvcGFjaXR5IiwKICAiZXh0ZW5zaW9uLWlkIjogIm1pbml2aWV3IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWluaXZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgInRoZXNlY3JldGFyeW9md2FyQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWluaXZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pYW1sZW1lYy9taW5pdmlldyIsCiAgInV1aWQiOiAibWluaXZpZXdAdGhlc2VjcmV0YXJ5b2Z3YXIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "0ylnjpwvdzxsdh68k197rk5dhv1211vcrjhc5w9k39hd2mdhw4ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmkgcHJldmlldyBvZiBhbm90aGVyIHdpbmRvdyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVilcbi0gTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG4tIFJpZ2h0LW1vdXNlIGRyYWcgKG9yIGN0cmwgKyBsZWZ0IG1vdXNlIGRyYWcpOiByZXNpemUgcHJldmlldyB3aW5kb3dcbi0gU2Nyb2xsIHdoZWVsIChvciBzaGlmdCArIGNsaWNrKTogY2hhbmdlIHRhcmdldCB3aW5kb3dcbi0gRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG4tIFNoaWZ0ICsgRjEyOiB0b2dnbGUgcHJldmlldyB3aW5kb3cgKHRoaXMgY2FuIGJlIGNoYW5nZWQgb3IgZGlzYWJsZWQgaW4gcHJlZmVyZW5jZXMpXG4tIEN0cmwgKyBzY3JvbGwgd2hlZWw6IGFkanVzdCBvcGFjaXR5IiwKICAiZXh0ZW5zaW9uLWlkIjogIm1pbml2aWV3IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWluaXZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgInRoZXNlY3JldGFyeW9md2FyQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWluaXZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pYW1sZW1lYy9taW5pdmlldyIsCiAgInV1aWQiOiAibWluaXZpZXdAdGhlc2VjcmV0YXJ5b2Z3YXIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "0ylnjpwvdzxsdh68k197rk5dhv1211vcrjhc5w9k39hd2mdhw4ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmkgcHJldmlldyBvZiBhbm90aGVyIHdpbmRvdyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVilcbi0gTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG4tIFJpZ2h0LW1vdXNlIGRyYWcgKG9yIGN0cmwgKyBsZWZ0IG1vdXNlIGRyYWcpOiByZXNpemUgcHJldmlldyB3aW5kb3dcbi0gU2Nyb2xsIHdoZWVsIChvciBzaGlmdCArIGNsaWNrKTogY2hhbmdlIHRhcmdldCB3aW5kb3dcbi0gRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG4tIFNoaWZ0ICsgRjEyOiB0b2dnbGUgcHJldmlldyB3aW5kb3cgKHRoaXMgY2FuIGJlIGNoYW5nZWQgb3IgZGlzYWJsZWQgaW4gcHJlZmVyZW5jZXMpXG4tIEN0cmwgKyBzY3JvbGwgd2hlZWw6IGFkanVzdCBvcGFjaXR5IiwKICAiZXh0ZW5zaW9uLWlkIjogIm1pbml2aWV3IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWluaXZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgInRoZXNlY3JldGFyeW9md2FyQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWluaXZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pYW1sZW1lYy9taW5pdmlldyIsCiAgInV1aWQiOiAibWluaXZpZXdAdGhlc2VjcmV0YXJ5b2Z3YXIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} +, {"uuid": "miniview@thesecretaryofwar.com", "name": "Miniview", "pname": "miniview", "description": "Displays a mini window preview (like picture-in-picture on a TV):\n— Left-mouse drag: move preview window\n— Right-mouse drag (or ctrl + left mouse drag): resize preview window\n— Scroll wheel (or shift + click): change target window\n— Double click: raise target window\n— Shift + F12: toggle preview window (this can be changed or disabled in preferences)\n— Ctrl + scroll wheel: adjust opacity", "link": "https://extensions.gnome.org/extension/1459/miniview/", "shell_version_map": {"38": {"version": "13", "sha256": "09bkkqhah75pgx38a601pb65w44d9q8b2n24bxnvwc6bzh1rcbbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWFtbGVtZWMvbWluaXZpZXciLAogICJ1dWlkIjogIm1pbml2aWV3QHRoZXNlY3JldGFyeW9md2FyLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "15", "sha256": "04r06w0yr4agzjhizmx9grvvymnlihk5idchzicyby55zvzma48l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lhbWxlbWVjL21pbml2aWV3IiwKICAidXVpZCI6ICJtaW5pdmlld0B0aGVzZWNyZXRhcnlvZndhci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "04r06w0yr4agzjhizmx9grvvymnlihk5idchzicyby55zvzma48l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lhbWxlbWVjL21pbml2aWV3IiwKICAidXVpZCI6ICJtaW5pdmlld0B0aGVzZWNyZXRhcnlvZndhci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "42": {"version": "15", "sha256": "04r06w0yr4agzjhizmx9grvvymnlihk5idchzicyby55zvzma48l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lhbWxlbWVjL21pbml2aWV3IiwKICAidXVpZCI6ICJtaW5pdmlld0B0aGVzZWNyZXRhcnlvZndhci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "43": {"version": "15", "sha256": "04r06w0yr4agzjhizmx9grvvymnlihk5idchzicyby55zvzma48l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbWluaSB3aW5kb3cgcHJldmlldyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVik6XG5cdTIwMTQgTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG5cdTIwMTQgUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuXHUyMDE0IFNjcm9sbCB3aGVlbCAob3Igc2hpZnQgKyBjbGljayk6IGNoYW5nZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG5cdTIwMTQgU2hpZnQgKyBGMTI6IHRvZ2dsZSBwcmV2aWV3IHdpbmRvdyAodGhpcyBjYW4gYmUgY2hhbmdlZCBvciBkaXNhYmxlZCBpbiBwcmVmZXJlbmNlcylcblx1MjAxNCBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lhbWxlbWVjL21pbml2aWV3IiwKICAidXVpZCI6ICJtaW5pdmlld0B0aGVzZWNyZXRhcnlvZndhci5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} , {"uuid": "Vitals@CoreCoding.com", "name": "Vitals", "pname": "vitals", "description": "A glimpse into your computer's temperature, voltage, fan speed, memory usage, processor load, system resources, network speed and storage stats. This is a one stop shop to monitor all of your vital sensors. Uses asynchronous polling to provide a smooth user experience. Feature requests or bugs? Please use GitHub.", "link": "https://extensions.gnome.org/extension/1460/vitals/", "shell_version_map": {"38": {"version": "57", "sha256": "1q6h9pc1d31993v5knnb7c4224h6f7x1jida2xnwi0047nz5b8zn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}, "40": {"version": "57", "sha256": "1q6h9pc1d31993v5knnb7c4224h6f7x1jida2xnwi0047nz5b8zn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}, "41": {"version": "57", "sha256": "1q6h9pc1d31993v5knnb7c4224h6f7x1jida2xnwi0047nz5b8zn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}, "42": {"version": "57", "sha256": "1q6h9pc1d31993v5knnb7c4224h6f7x1jida2xnwi0047nz5b8zn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}, "43": {"version": "57", "sha256": "1q6h9pc1d31993v5knnb7c4224h6f7x1jida2xnwi0047nz5b8zn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvcmVjb2RpbmcvVml0YWxzIiwKICAidXVpZCI6ICJWaXRhbHNAQ29yZUNvZGluZy5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}}} , {"uuid": "panel-date-format@keiii.github.com", "name": "Panel Date Format", "pname": "panel-date-format", "description": "Allows to customize the date format on the panel.", "link": "https://extensions.gnome.org/extension/1462/panel-date-format/", "shell_version_map": {"40": {"version": "9", "sha256": "1g6jfb8pq1k88k5fvwavhb77nkkn8kgxy9y8f3kc26hyjwbfpn11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tFSUlJL2dub21lLXNoZWxsLXBhbmVsLWRhdGUtZm9ybWF0IiwKICAidXVpZCI6ICJwYW5lbC1kYXRlLWZvcm1hdEBrZWlpaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1g6jfb8pq1k88k5fvwavhb77nkkn8kgxy9y8f3kc26hyjwbfpn11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tFSUlJL2dub21lLXNoZWxsLXBhbmVsLWRhdGUtZm9ybWF0IiwKICAidXVpZCI6ICJwYW5lbC1kYXRlLWZvcm1hdEBrZWlpaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "1g6jfb8pq1k88k5fvwavhb77nkkn8kgxy9y8f3kc26hyjwbfpn11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tFSUlJL2dub21lLXNoZWxsLXBhbmVsLWRhdGUtZm9ybWF0IiwKICAidXVpZCI6ICJwYW5lbC1kYXRlLWZvcm1hdEBrZWlpaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "1g6jfb8pq1k88k5fvwavhb77nkkn8kgxy9y8f3kc26hyjwbfpn11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0tFSUlJL2dub21lLXNoZWxsLXBhbmVsLWRhdGUtZm9ybWF0IiwKICAidXVpZCI6ICJwYW5lbC1kYXRlLWZvcm1hdEBrZWlpaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "desktop-icons@csoriano", "name": "Desktop Icons", "pname": "desktop-icons", "description": "Add icons to the desktop", "link": "https://extensions.gnome.org/extension/1465/desktop-icons/", "shell_version_map": {"38": {"version": "19", "sha256": "01qdh1kigl3ck1mzgha1a9218lpam5b54ai72mpvr64gkaax2mcv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBpY29ucyB0byB0aGUgZGVza3RvcCIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvV29ybGQvU2hlbGxFeHRlbnNpb25zL2Rlc2t0b3AtaWNvbnMiLAogICJ1dWlkIjogImRlc2t0b3AtaWNvbnNAY3Nvcmlhbm8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} @@ -254,7 +254,7 @@ , {"uuid": "activities_icon_menu@fawtytoo", "name": "Activities Icon Menu", "pname": "activities-menu-for-apps-and-windows", "description": "This extension turns the Activities button into a popup menu with icons for selecting either Applications or Workspaces in the Overview. Selecting the same view again will hide the overview.\n\nThis is particularly useful for tablet users that find the Activities button difficult to click on, whereas a menu can be more easily invoked.", "link": "https://extensions.gnome.org/extension/2048/activities-menu-for-apps-and-windows/", "shell_version_map": {"38": {"version": "11", "sha256": "028nrx3hakj8mcr3n6nsnrzg2mfikn49m4j2pjyq67y7vikjr4af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHR1cm5zIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBpbnRvIGEgcG9wdXAgbWVudSB3aXRoIGljb25zIGZvciBzZWxlY3RpbmcgZWl0aGVyIEFwcGxpY2F0aW9ucyBvciBXb3Jrc3BhY2VzIGluIHRoZSBPdmVydmlldy4gU2VsZWN0aW5nIHRoZSBzYW1lIHZpZXcgYWdhaW4gd2lsbCBoaWRlIHRoZSBvdmVydmlldy5cblxuVGhpcyBpcyBwYXJ0aWN1bGFybHkgdXNlZnVsIGZvciB0YWJsZXQgdXNlcnMgdGhhdCBmaW5kIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBkaWZmaWN1bHQgdG8gY2xpY2sgb24sIHdoZXJlYXMgYSBtZW51IGNhbiBiZSBtb3JlIGVhc2lseSBpbnZva2VkLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29uIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYWN0aXZpdGllc19pY29uX21lbnVAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "028nrx3hakj8mcr3n6nsnrzg2mfikn49m4j2pjyq67y7vikjr4af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHR1cm5zIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBpbnRvIGEgcG9wdXAgbWVudSB3aXRoIGljb25zIGZvciBzZWxlY3RpbmcgZWl0aGVyIEFwcGxpY2F0aW9ucyBvciBXb3Jrc3BhY2VzIGluIHRoZSBPdmVydmlldy4gU2VsZWN0aW5nIHRoZSBzYW1lIHZpZXcgYWdhaW4gd2lsbCBoaWRlIHRoZSBvdmVydmlldy5cblxuVGhpcyBpcyBwYXJ0aWN1bGFybHkgdXNlZnVsIGZvciB0YWJsZXQgdXNlcnMgdGhhdCBmaW5kIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBkaWZmaWN1bHQgdG8gY2xpY2sgb24sIHdoZXJlYXMgYSBtZW51IGNhbiBiZSBtb3JlIGVhc2lseSBpbnZva2VkLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29uIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYWN0aXZpdGllc19pY29uX21lbnVAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "028nrx3hakj8mcr3n6nsnrzg2mfikn49m4j2pjyq67y7vikjr4af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHR1cm5zIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBpbnRvIGEgcG9wdXAgbWVudSB3aXRoIGljb25zIGZvciBzZWxlY3RpbmcgZWl0aGVyIEFwcGxpY2F0aW9ucyBvciBXb3Jrc3BhY2VzIGluIHRoZSBPdmVydmlldy4gU2VsZWN0aW5nIHRoZSBzYW1lIHZpZXcgYWdhaW4gd2lsbCBoaWRlIHRoZSBvdmVydmlldy5cblxuVGhpcyBpcyBwYXJ0aWN1bGFybHkgdXNlZnVsIGZvciB0YWJsZXQgdXNlcnMgdGhhdCBmaW5kIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBkaWZmaWN1bHQgdG8gY2xpY2sgb24sIHdoZXJlYXMgYSBtZW51IGNhbiBiZSBtb3JlIGVhc2lseSBpbnZva2VkLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29uIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYWN0aXZpdGllc19pY29uX21lbnVAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "028nrx3hakj8mcr3n6nsnrzg2mfikn49m4j2pjyq67y7vikjr4af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHR1cm5zIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBpbnRvIGEgcG9wdXAgbWVudSB3aXRoIGljb25zIGZvciBzZWxlY3RpbmcgZWl0aGVyIEFwcGxpY2F0aW9ucyBvciBXb3Jrc3BhY2VzIGluIHRoZSBPdmVydmlldy4gU2VsZWN0aW5nIHRoZSBzYW1lIHZpZXcgYWdhaW4gd2lsbCBoaWRlIHRoZSBvdmVydmlldy5cblxuVGhpcyBpcyBwYXJ0aWN1bGFybHkgdXNlZnVsIGZvciB0YWJsZXQgdXNlcnMgdGhhdCBmaW5kIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBkaWZmaWN1bHQgdG8gY2xpY2sgb24sIHdoZXJlYXMgYSBtZW51IGNhbiBiZSBtb3JlIGVhc2lseSBpbnZva2VkLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29uIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYWN0aXZpdGllc19pY29uX21lbnVAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "Gold_Price_Monitor@wotmshuaisi_github", "name": "Gold Price Monitor", "pname": "gold-price-monitor", "description": "simple gnome extension helps you tracking gold price in realtime", "link": "https://extensions.gnome.org/extension/2075/gold-price-monitor/", "shell_version_map": {"40": {"version": "27", "sha256": "13km181vzf13id19xrv2b1mbry6378c9vhhpzm9agplgka104xap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "41": {"version": "27", "sha256": "13km181vzf13id19xrv2b1mbry6378c9vhhpzm9agplgka104xap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "27", "sha256": "13km181vzf13id19xrv2b1mbry6378c9vhhpzm9agplgka104xap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "43": {"version": "27", "sha256": "13km181vzf13id19xrv2b1mbry6378c9vhhpzm9agplgka104xap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} , {"uuid": "ding@rastersoft.com", "name": "Desktop Icons NG (DING)", "pname": "desktop-icons-ng-ding", "description": "Adds icons to the desktop. Fork of the original Desktop Icons extension, with several enhancements .", "link": "https://extensions.gnome.org/extension/2087/desktop-icons-ng-ding/", "shell_version_map": {"38": {"version": "50", "sha256": "0f69lk9mdxmf2z9mx6wvx5l876nryjm1vjrwb70bxwxhqj5qwp5p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}, "40": {"version": "50", "sha256": "0f69lk9mdxmf2z9mx6wvx5l876nryjm1vjrwb70bxwxhqj5qwp5p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}, "41": {"version": "50", "sha256": "0f69lk9mdxmf2z9mx6wvx5l876nryjm1vjrwb70bxwxhqj5qwp5p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}, "42": {"version": "50", "sha256": "0f69lk9mdxmf2z9mx6wvx5l876nryjm1vjrwb70bxwxhqj5qwp5p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}, "43": {"version": "50", "sha256": "0f69lk9mdxmf2z9mx6wvx5l876nryjm1vjrwb70bxwxhqj5qwp5p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}}} -, {"uuid": "order-extensions@wa4557.github.com", "name": "Order Gnome Shell extensions", "pname": "order-gnome-shell-extensions", "description": "Fixes order of gnome-shell extensions\n\nhttps://github.com/andia89/order-icons", "link": "https://extensions.gnome.org/extension/2114/order-gnome-shell-extensions/", "shell_version_map": {"38": {"version": "6", "sha256": "1nc7kg43xv02ndy1c9q2a32ca558ah21kdpwqy98xp0gyxc3sppy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zXG5cbmh0dHBzOi8vZ2l0aHViLmNvbS9hbmRpYTg5L29yZGVyLWljb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICIzLjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm9yZGVyLWV4dGVuc2lvbnNAd2E0NTU3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "12", "sha256": "12v52sr6yfgxjmpva5c4navgx7h16cm4a5dq88jqwzkq0a9iilic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zXG5cbmh0dHBzOi8vZ2l0aHViLmNvbS9hbmRpYTg5L29yZGVyLWljb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm9yZGVyLWV4dGVuc2lvbnNAd2E0NTU3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "12v52sr6yfgxjmpva5c4navgx7h16cm4a5dq88jqwzkq0a9iilic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zXG5cbmh0dHBzOi8vZ2l0aHViLmNvbS9hbmRpYTg5L29yZGVyLWljb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm9yZGVyLWV4dGVuc2lvbnNAd2E0NTU3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "42": {"version": "12", "sha256": "12v52sr6yfgxjmpva5c4navgx7h16cm4a5dq88jqwzkq0a9iilic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zXG5cbmh0dHBzOi8vZ2l0aHViLmNvbS9hbmRpYTg5L29yZGVyLWljb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm9yZGVyLWV4dGVuc2lvbnNAd2E0NTU3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} +, {"uuid": "order-extensions@wa4557.github.com", "name": "Order Gnome Shell extensions", "pname": "order-gnome-shell-extensions", "description": "Fixes order of gnome-shell extensions", "link": "https://extensions.gnome.org/extension/2114/order-gnome-shell-extensions/", "shell_version_map": {"38": {"version": "6", "sha256": "0hcbjrhrg11f5p23bhss75nhc9sqlh6p1bmfq7p7m7d276ckdmkk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICIzLjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm9yZGVyLWV4dGVuc2lvbnNAd2E0NTU3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "13", "sha256": "1ld85pl6d5axmy6413x8dsb1n7g98qja0065fz6h1f924c23wqh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "1ld85pl6d5axmy6413x8dsb1n7g98qja0065fz6h1f924c23wqh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "1ld85pl6d5axmy6413x8dsb1n7g98qja0065fz6h1f924c23wqh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "13", "sha256": "1ld85pl6d5axmy6413x8dsb1n7g98qja0065fz6h1f924c23wqh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "sound-percentage@maestroschan.fr", "name": "Sound percentage", "pname": "sound-percentage", "description": "Display the current sound percentage in the system tray", "link": "https://extensions.gnome.org/extension/2120/sound-percentage/", "shell_version_map": {"38": {"version": "3", "sha256": "140a83mqwja4vkk83ajmknginh0izli65b8x7nab32sif99z7nya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkiLAogICJuYW1lIjogIlNvdW5kIHBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovc291bmQtcGVyY2VudGFnZS1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogInNvdW5kLXBlcmNlbnRhZ2VAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "140a83mqwja4vkk83ajmknginh0izli65b8x7nab32sif99z7nya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkiLAogICJuYW1lIjogIlNvdW5kIHBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovc291bmQtcGVyY2VudGFnZS1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogInNvdW5kLXBlcmNlbnRhZ2VAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "140a83mqwja4vkk83ajmknginh0izli65b8x7nab32sif99z7nya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkiLAogICJuYW1lIjogIlNvdW5kIHBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovc291bmQtcGVyY2VudGFnZS1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogInNvdW5kLXBlcmNlbnRhZ2VAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "140a83mqwja4vkk83ajmknginh0izli65b8x7nab32sif99z7nya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkiLAogICJuYW1lIjogIlNvdW5kIHBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovc291bmQtcGVyY2VudGFnZS1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogInNvdW5kLXBlcmNlbnRhZ2VAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "horizontal-workspaces@gnome-shell-extensions.gcampax.github.com", "name": "Horizontal workspaces", "pname": "horizontal-workspaces", "description": "Use a horizontal workspace layout", "link": "https://extensions.gnome.org/extension/2141/horizontal-workspaces/", "shell_version_map": {"38": {"version": "5", "sha256": "0kbqcrs96v72yk0rf8jghy1a31651fyvgpi97yp46n4wmvc41vk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBhIGhvcml6b250YWwgd29ya3NwYWNlIGxheW91dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJIb3Jpem9udGFsIHdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiaG9yaXpvbnRhbC13b3Jrc3BhY2VzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "threefingerwindowmove@do.sch.dev.gmail.com", "name": "Three Finger Window Move", "pname": "three-finger-window-move", "description": "Allows moving windows around with a three finger trackpad gesture (Wayland only)", "link": "https://extensions.gnome.org/extension/2164/three-finger-window-move/", "shell_version_map": {"38": {"version": "7", "sha256": "1m7vwr6s6w297b0x0bmnj8fs2hl73pbys6m93lnb9inh5pmgiv1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBtb3Zpbmcgd2luZG93cyBhcm91bmQgd2l0aCBhIHRocmVlIGZpbmdlciB0cmFja3BhZCBnZXN0dXJlIChXYXlsYW5kIG9ubHkpIiwKICAibmFtZSI6ICJUaHJlZSBGaW5nZXIgV2luZG93IE1vdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kby1zY2gvZ25vbWUtc2hlbGwtdG91Y2hwYWQtd2luZG93LW1vdmUiLAogICJ1dWlkIjogInRocmVlZmluZ2Vyd2luZG93bW92ZUBkby5zY2guZGV2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} @@ -282,7 +282,7 @@ , {"uuid": "eruption-profile-switcher@x3n0m0rph59.org", "name": "Eruption Profile Switcher", "pname": "eruption-profile-switcher", "description": "Runtime Profile switcher for the Eruption Realtime RGB LED Driver for Linux", "link": "https://extensions.gnome.org/extension/2621/eruption-profile-switcher/", "shell_version_map": {"38": {"version": "15", "sha256": "14zgczf2z7jv707whimggl3h31c44m1qdzncin38vdcdzhm2g7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9YM24wbTBycGg1OS9lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJlcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyQHgzbjBtMHJwaDU5Lm9yZyIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "27", "sha256": "1lcsf8611365d8pjk4s905jmj3sc8dq6y833fbv6yxbd36xvkghs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "41": {"version": "27", "sha256": "1lcsf8611365d8pjk4s905jmj3sc8dq6y833fbv6yxbd36xvkghs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "42": {"version": "27", "sha256": "1lcsf8611365d8pjk4s905jmj3sc8dq6y833fbv6yxbd36xvkghs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "43": {"version": "27", "sha256": "1lcsf8611365d8pjk4s905jmj3sc8dq6y833fbv6yxbd36xvkghs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDI3Cn0="}}} , {"uuid": "nbfcindicator@mgokcaykdev.gmail.com", "name": "Nbfc Indicator", "pname": "nbfc-indicator", "description": "Notebook Fan Control Indicator for Gnome Shell", "link": "https://extensions.gnome.org/extension/2624/nbfc-indicator/", "shell_version_map": {"40": {"version": "7", "sha256": "0hp7giwdcsk8p442q0x9214dv59ziyjswli6mccyb8v814k3p8ic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGVib29rIEZhbiBDb250cm9sIEluZGljYXRvciBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYmZjaW5kaWNhdG9yIiwKICAibmFtZSI6ICJOYmZjIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYmZjaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01Hb2tjYXlLL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtbmJmY2luZGljYXRvciIsCiAgInV1aWQiOiAibmJmY2luZGljYXRvckBtZ29rY2F5a2Rldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "user-id-in-top-panel@fthx", "name": "User id in top panel", "pname": "user-id-in-top-panel", "description": "Add ( user name :: user id @ host ) in top panel.", "link": "https://extensions.gnome.org/extension/2633/user-id-in-top-panel/", "shell_version_map": {"38": {"version": "6", "sha256": "16s1782mzb5ckshsy86ac9xj5xfk15hwzvzk4cfiimphfvkkw8x4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "1qzjh4gf6gry6xy6759bha3s3rsnfmizw32isap4j0rdsyl77j90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidXNlci1pZC1pbi10b3AtcGFuZWxAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"uuid": "hide-minimized@danigm.net", "name": "Hide minimized", "pname": "hide-minimized", "description": "Hide minimized in overview", "link": "https://extensions.gnome.org/extension/2639/hide-minimized/", "shell_version_map": {"38": {"version": "6", "sha256": "02nm3nxz3adx6zs6qblmmkwnh01bxfv2zzka2imw36s09agc5g2s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9oaWRlLW1pbmltaXplZCIsCiAgInV1aWQiOiAiaGlkZS1taW5pbWl6ZWRAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "02nm3nxz3adx6zs6qblmmkwnh01bxfv2zzka2imw36s09agc5g2s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9oaWRlLW1pbmltaXplZCIsCiAgInV1aWQiOiAiaGlkZS1taW5pbWl6ZWRAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "02nm3nxz3adx6zs6qblmmkwnh01bxfv2zzka2imw36s09agc5g2s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9oaWRlLW1pbmltaXplZCIsCiAgInV1aWQiOiAiaGlkZS1taW5pbWl6ZWRAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "02nm3nxz3adx6zs6qblmmkwnh01bxfv2zzka2imw36s09agc5g2s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9oaWRlLW1pbmltaXplZCIsCiAgInV1aWQiOiAiaGlkZS1taW5pbWl6ZWRAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}}} +, {"uuid": "hide-minimized@danigm.net", "name": "Hide minimized", "pname": "hide-minimized", "description": "Hide minimized in overview", "link": "https://extensions.gnome.org/extension/2639/hide-minimized/", "shell_version_map": {"38": {"version": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "03x65bms6ns9jz1m0kmklpjaq1lgdl9h2pmqvfczmk2vf3bmjjwv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vaGlkZS1taW5pbWl6ZWQiLAogICJ1dWlkIjogImhpZGUtbWluaW1pemVkQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "display-brightness-ddcutil@themightydeity.github.com", "name": "Brightness control using ddcutil", "pname": "brightness-control-using-ddcutil", "description": "Brightness control for all the monitors detected by ddcutil\nThis tool uses ddcutil as backend for communication with your display.\n\nUpdated 2022-Jan-05: There are multiple ways of listing the control sliders, either in top bar or in system menu, with or without value labels.\n\nRead setup instructions from: https://github.com/daitj/gnome-display-brightness-ddcutil/blob/master/README.md", "link": "https://extensions.gnome.org/extension/2645/brightness-control-using-ddcutil/", "shell_version_map": {"38": {"version": "10", "sha256": "0r8l1iipfxrsmmch0pgi9jpxk58cqn93igs1cp8sx73l1cxr5ik4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJuYW1lIjogIkJyaWdodG5lc3MgY29udHJvbCB1c2luZyBkZGN1dGlsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "30", "sha256": "14xvsd4irbhqicz8hkwny0mm9kb3230qyjypz61q1ip1i6sr8f26", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"}, "41": {"version": "30", "sha256": "14xvsd4irbhqicz8hkwny0mm9kb3230qyjypz61q1ip1i6sr8f26", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgInV1aWQiOiAiZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWxAdGhlbWlnaHR5ZGVpdHkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMAp9"}, "42": {"version": "31", "sha256": "0lzcpankfsis4z0hb6hk03k1rzcipdb5645vz4wvlkzbriqdvwmd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzEKfQ=="}, "43": {"version": "32", "sha256": "0rf7bb4mgca7g03rb7xbs001zpa3lyccvn4xvlybiisgsvzw3z7d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="}}} , {"uuid": "timezones@masquerade-circus.net", "name": "Timezones extension", "pname": "timezones-extension", "description": "Show multiple clocks in the panel. For those who need more than one additional clock.", "link": "https://extensions.gnome.org/extension/2657/timezones-extension/", "shell_version_map": {"38": {"version": "3", "sha256": "178yi4wm7h52al01a9l0q765rm6hwj0j19sg29jw4pgm0c11kywq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hc3F1ZXJhZGUtQ2lyY3VzL2dub21lLXRpbWV6b25lcy1leHRlbnNpb24iLAogICJ1dWlkIjogInRpbWV6b25lc0BtYXNxdWVyYWRlLWNpcmN1cy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "178yi4wm7h52al01a9l0q765rm6hwj0j19sg29jw4pgm0c11kywq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hc3F1ZXJhZGUtQ2lyY3VzL2dub21lLXRpbWV6b25lcy1leHRlbnNpb24iLAogICJ1dWlkIjogInRpbWV6b25lc0BtYXNxdWVyYWRlLWNpcmN1cy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "178yi4wm7h52al01a9l0q765rm6hwj0j19sg29jw4pgm0c11kywq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hc3F1ZXJhZGUtQ2lyY3VzL2dub21lLXRpbWV6b25lcy1leHRlbnNpb24iLAogICJ1dWlkIjogInRpbWV6b25lc0BtYXNxdWVyYWRlLWNpcmN1cy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "178yi4wm7h52al01a9l0q765rm6hwj0j19sg29jw4pgm0c11kywq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hc3F1ZXJhZGUtQ2lyY3VzL2dub21lLXRpbWV6b25lcy1leHRlbnNpb24iLAogICJ1dWlkIjogInRpbWV6b25lc0BtYXNxdWVyYWRlLWNpcmN1cy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "transparent-panel@fthx", "name": "Ubuntu-like Panel", "pname": "transparent-panel", "description": "Panel: transparent, straight, reduced height, non-bold fonts. Nothing more.\n\nLooks roughly like Ubuntu session's panel (Yaru). You can easily modify the transparency level through the CSS stylesheet in the extensions's folder.", "link": "https://extensions.gnome.org/extension/2660/transparent-panel/", "shell_version_map": {"40": {"version": "3", "sha256": "042cbxdvh4nxv72dd6ikm37brgb2wc1yaxsznyavjwr53awjbbzm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsOiB0cmFuc3BhcmVudCwgc3RyYWlnaHQsIHJlZHVjZWQgaGVpZ2h0LCBub24tYm9sZCBmb250cy4gTm90aGluZyBtb3JlLlxuXG5Mb29rcyByb3VnaGx5IGxpa2UgVWJ1bnR1IHNlc3Npb24ncyBwYW5lbCAoWWFydSkuIFlvdSBjYW4gZWFzaWx5IG1vZGlmeSB0aGUgdHJhbnNwYXJlbmN5IGxldmVsIHRocm91Z2ggdGhlIENTUyBzdHlsZXNoZWV0IGluIHRoZSBleHRlbnNpb25zJ3MgZm9sZGVyLiIsCiAgIm5hbWUiOiAiVWJ1bnR1LWxpa2UgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "042cbxdvh4nxv72dd6ikm37brgb2wc1yaxsznyavjwr53awjbbzm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsOiB0cmFuc3BhcmVudCwgc3RyYWlnaHQsIHJlZHVjZWQgaGVpZ2h0LCBub24tYm9sZCBmb250cy4gTm90aGluZyBtb3JlLlxuXG5Mb29rcyByb3VnaGx5IGxpa2UgVWJ1bnR1IHNlc3Npb24ncyBwYW5lbCAoWWFydSkuIFlvdSBjYW4gZWFzaWx5IG1vZGlmeSB0aGUgdHJhbnNwYXJlbmN5IGxldmVsIHRocm91Z2ggdGhlIENTUyBzdHlsZXNoZWV0IGluIHRoZSBleHRlbnNpb25zJ3MgZm9sZGVyLiIsCiAgIm5hbWUiOiAiVWJ1bnR1LWxpa2UgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "4", "sha256": "1af8hyfvrpl7slqc1sdnc82zkrqrrvw16qw47qqxfdiybyk7381z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsOiB0cmFuc3BhcmVudCwgc3RyYWlnaHQsIHJlZHVjZWQgaGVpZ2h0LCBub24tYm9sZCBmb250cy4gTm90aGluZyBtb3JlLlxuXG5Mb29rcyByb3VnaGx5IGxpa2UgVWJ1bnR1IHNlc3Npb24ncyBwYW5lbCAoWWFydSkuIFlvdSBjYW4gZWFzaWx5IG1vZGlmeSB0aGUgdHJhbnNwYXJlbmN5IGxldmVsIHRocm91Z2ggdGhlIENTUyBzdHlsZXNoZWV0IGluIHRoZSBleHRlbnNpb25zJ3MgZm9sZGVyLiIsCiAgIm5hbWUiOiAiVWJ1bnR1LWxpa2UgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogNAp9"}}} @@ -295,7 +295,7 @@ , {"uuid": "customgestures@raushankumar27.github.com", "name": "Custom 3 Finger Gestures", "pname": "custom-3-finger-gestures", "description": "3 Finger touchpad gestures into gnome-shell", "link": "https://extensions.gnome.org/extension/2781/custom-3-finger-gestures/", "shell_version_map": {"38": {"version": "7", "sha256": "1a51rlf5fjlzlm2y3cv1ncf4glqa48rkpi0z1b8hd5m1fzgdx6m9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIjMgRmluZ2VyIHRvdWNocGFkIGdlc3R1cmVzIGludG8gZ25vbWUtc2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b21nZXN0dXJlcyIsCiAgIm5hbWUiOiAiQ3VzdG9tIDMgRmluZ2VyIEdlc3R1cmVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbWdlc3R1cmVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1c2hhbmt1bWFyMjcvY3VzdG9tZ2VzdHVyZSIsCiAgInV1aWQiOiAiY3VzdG9tZ2VzdHVyZXNAcmF1c2hhbmt1bWFyMjcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "overview-improved@human.experience", "name": "Overview Improved", "pname": "overview-improved", "description": "Improved, more Unity like overview\n\n* Dash-To-Dock or Ubuntu Dock integration creates Unity-like experience showing windows of specific type\n* Windows search in overview\nConfigurable keybinding (Super+w) to trigger current window overlay\n* Clicking empty space in overview closes\n* Do not show overview when showing application on multiple monitors\n* Multi Monitors Add-On Overview integration\n\nCaveat: may clash with other extensions that modify overview experience", "link": "https://extensions.gnome.org/extension/2802/overview-improved/", "shell_version_map": {"38": {"version": "8", "sha256": "0pzk6kzhbm15rmd540gv2sc0yqbiv31lil4ra3k5k7cpnr9ipsy6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmVkLCBtb3JlIFVuaXR5IGxpa2Ugb3ZlcnZpZXdcblxuKiBEYXNoLVRvLURvY2sgb3IgVWJ1bnR1IERvY2sgaW50ZWdyYXRpb24gY3JlYXRlcyBVbml0eS1saWtlIGV4cGVyaWVuY2Ugc2hvd2luZyB3aW5kb3dzIG9mIHNwZWNpZmljIHR5cGVcbiogV2luZG93cyBzZWFyY2ggaW4gb3ZlcnZpZXdcbkNvbmZpZ3VyYWJsZSBrZXliaW5kaW5nIChTdXBlcit3KSB0byB0cmlnZ2VyIGN1cnJlbnQgd2luZG93IG92ZXJsYXlcbiogQ2xpY2tpbmcgZW1wdHkgc3BhY2UgaW4gb3ZlcnZpZXcgY2xvc2VzXG4qIERvIG5vdCBzaG93IG92ZXJ2aWV3IHdoZW4gc2hvd2luZyBhcHBsaWNhdGlvbiBvbiBtdWx0aXBsZSBtb25pdG9yc1xuKiBNdWx0aSBNb25pdG9ycyBBZGQtT24gT3ZlcnZpZXcgaW50ZWdyYXRpb25cblxuQ2F2ZWF0OiBtYXkgY2xhc2ggd2l0aCBvdGhlciBleHRlbnNpb25zIHRoYXQgbW9kaWZ5IG92ZXJ2aWV3IGV4cGVyaWVuY2UiLAogICJuYW1lIjogIk92ZXJ2aWV3IEltcHJvdmVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm92ZXJ2aWV3LWltcHJvdmVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9odW1hbi5leHBlcmllbmNlL2dub21lLXNoZWxsLW92ZXJ2aWV3LWltcHJvdmVkIiwKICAidXVpZCI6ICJvdmVydmlldy1pbXByb3ZlZEBodW1hbi5leHBlcmllbmNlIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "brightnesspanelmenuindicator@do.sch.dev.gmail.com", "name": "Brightness Panel Menu Indicator", "pname": "brightness-panel-menu-indicator", "description": "If a backlight device is available, this extension shows a brightness indicator on panel menu, that allows changing brightness through scrolling on it. Useful, when using ddcci-driver-linux on a desktop PC without native keyboard buttons to change brightness.", "link": "https://extensions.gnome.org/extension/2808/brightness-panel-menu-indicator/", "shell_version_map": {"38": {"version": "7", "sha256": "0xycwf9zks6kcwxrrn5rk1sn0km7zvzxzzp6bfag6qnibkgliwsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklmIGEgYmFja2xpZ2h0IGRldmljZSBpcyBhdmFpbGFibGUsIHRoaXMgZXh0ZW5zaW9uIHNob3dzIGEgYnJpZ2h0bmVzcyBpbmRpY2F0b3Igb24gcGFuZWwgbWVudSwgdGhhdCBhbGxvd3MgY2hhbmdpbmcgYnJpZ2h0bmVzcyB0aHJvdWdoIHNjcm9sbGluZyBvbiBpdC4gVXNlZnVsLCB3aGVuIHVzaW5nIGRkY2NpLWRyaXZlci1saW51eCBvbiBhIGRlc2t0b3AgUEMgd2l0aG91dCBuYXRpdmUga2V5Ym9hcmQgYnV0dG9ucyB0byBjaGFuZ2UgYnJpZ2h0bmVzcy4iLAogICJuYW1lIjogIkJyaWdodG5lc3MgUGFuZWwgTWVudSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG8tc2NoL2dub21lLXNoZWxsLWJyaWdodG5lc3MtcGFuZWwtbWVudS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJyaWdodG5lc3NwYW5lbG1lbnVpbmRpY2F0b3JAZG8uc2NoLmRldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "0xycwf9zks6kcwxrrn5rk1sn0km7zvzxzzp6bfag6qnibkgliwsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklmIGEgYmFja2xpZ2h0IGRldmljZSBpcyBhdmFpbGFibGUsIHRoaXMgZXh0ZW5zaW9uIHNob3dzIGEgYnJpZ2h0bmVzcyBpbmRpY2F0b3Igb24gcGFuZWwgbWVudSwgdGhhdCBhbGxvd3MgY2hhbmdpbmcgYnJpZ2h0bmVzcyB0aHJvdWdoIHNjcm9sbGluZyBvbiBpdC4gVXNlZnVsLCB3aGVuIHVzaW5nIGRkY2NpLWRyaXZlci1saW51eCBvbiBhIGRlc2t0b3AgUEMgd2l0aG91dCBuYXRpdmUga2V5Ym9hcmQgYnV0dG9ucyB0byBjaGFuZ2UgYnJpZ2h0bmVzcy4iLAogICJuYW1lIjogIkJyaWdodG5lc3MgUGFuZWwgTWVudSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG8tc2NoL2dub21lLXNoZWxsLWJyaWdodG5lc3MtcGFuZWwtbWVudS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJyaWdodG5lc3NwYW5lbG1lbnVpbmRpY2F0b3JAZG8uc2NoLmRldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0xycwf9zks6kcwxrrn5rk1sn0km7zvzxzzp6bfag6qnibkgliwsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklmIGEgYmFja2xpZ2h0IGRldmljZSBpcyBhdmFpbGFibGUsIHRoaXMgZXh0ZW5zaW9uIHNob3dzIGEgYnJpZ2h0bmVzcyBpbmRpY2F0b3Igb24gcGFuZWwgbWVudSwgdGhhdCBhbGxvd3MgY2hhbmdpbmcgYnJpZ2h0bmVzcyB0aHJvdWdoIHNjcm9sbGluZyBvbiBpdC4gVXNlZnVsLCB3aGVuIHVzaW5nIGRkY2NpLWRyaXZlci1saW51eCBvbiBhIGRlc2t0b3AgUEMgd2l0aG91dCBuYXRpdmUga2V5Ym9hcmQgYnV0dG9ucyB0byBjaGFuZ2UgYnJpZ2h0bmVzcy4iLAogICJuYW1lIjogIkJyaWdodG5lc3MgUGFuZWwgTWVudSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG8tc2NoL2dub21lLXNoZWxsLWJyaWdodG5lc3MtcGFuZWwtbWVudS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJyaWdodG5lc3NwYW5lbG1lbnVpbmRpY2F0b3JAZG8uc2NoLmRldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "0xycwf9zks6kcwxrrn5rk1sn0km7zvzxzzp6bfag6qnibkgliwsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklmIGEgYmFja2xpZ2h0IGRldmljZSBpcyBhdmFpbGFibGUsIHRoaXMgZXh0ZW5zaW9uIHNob3dzIGEgYnJpZ2h0bmVzcyBpbmRpY2F0b3Igb24gcGFuZWwgbWVudSwgdGhhdCBhbGxvd3MgY2hhbmdpbmcgYnJpZ2h0bmVzcyB0aHJvdWdoIHNjcm9sbGluZyBvbiBpdC4gVXNlZnVsLCB3aGVuIHVzaW5nIGRkY2NpLWRyaXZlci1saW51eCBvbiBhIGRlc2t0b3AgUEMgd2l0aG91dCBuYXRpdmUga2V5Ym9hcmQgYnV0dG9ucyB0byBjaGFuZ2UgYnJpZ2h0bmVzcy4iLAogICJuYW1lIjogIkJyaWdodG5lc3MgUGFuZWwgTWVudSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG8tc2NoL2dub21lLXNoZWxsLWJyaWdodG5lc3MtcGFuZWwtbWVudS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJyaWdodG5lc3NwYW5lbG1lbnVpbmRpY2F0b3JAZG8uc2NoLmRldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "0xycwf9zks6kcwxrrn5rk1sn0km7zvzxzzp6bfag6qnibkgliwsn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklmIGEgYmFja2xpZ2h0IGRldmljZSBpcyBhdmFpbGFibGUsIHRoaXMgZXh0ZW5zaW9uIHNob3dzIGEgYnJpZ2h0bmVzcyBpbmRpY2F0b3Igb24gcGFuZWwgbWVudSwgdGhhdCBhbGxvd3MgY2hhbmdpbmcgYnJpZ2h0bmVzcyB0aHJvdWdoIHNjcm9sbGluZyBvbiBpdC4gVXNlZnVsLCB3aGVuIHVzaW5nIGRkY2NpLWRyaXZlci1saW51eCBvbiBhIGRlc2t0b3AgUEMgd2l0aG91dCBuYXRpdmUga2V5Ym9hcmQgYnV0dG9ucyB0byBjaGFuZ2UgYnJpZ2h0bmVzcy4iLAogICJuYW1lIjogIkJyaWdodG5lc3MgUGFuZWwgTWVudSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG8tc2NoL2dub21lLXNoZWxsLWJyaWdodG5lc3MtcGFuZWwtbWVudS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJyaWdodG5lc3NwYW5lbG1lbnVpbmRpY2F0b3JAZG8uc2NoLmRldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"uuid": "crypto@alipirpiran.github", "name": "Crypto Price Tracker", "pname": "crypto-price-tracker", "description": "Simple extension to track price of Crypto Currencies\n\nSources: Binance, OKX, Coingecko\n\nAdd coins by symbols, for example:\n* Binance pairs: \"BTC/USDT\"\n* OKX pairs: \"LTC/USDT\"\n* Coingecko pairs: \"BTC/USD\"\nUsing api.coingecko.com, okx.com, binance.com\nComplete list of pairs: https://www.binance.com/indexSpa.html\nComplete guide: https://github.com/alipirpiran/Crypto-Price-Tracker-for-Gnome-Shell#readme\n\n** if it faced error after update:\n**Restart Gnome-shell. (ALT+F2, r, Enter)", "link": "https://extensions.gnome.org/extension/2817/crypto-price-tracker/", "shell_version_map": {"40": {"version": "33", "sha256": "0d6rgxarjvms3p2qvgq04mk46f8jkwswxspvbblamkjv7yiy2330", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcblxuU291cmNlczogQmluYW5jZSwgT0tYLCBDb2luZ2Vja29cblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuVXNpbmcgYXBpLmNvaW5nZWNrby5jb20sIG9reC5jb20sIGJpbmFuY2UuY29tXG5Db21wbGV0ZSBsaXN0IG9mIHBhaXJzOiBodHRwczovL3d3dy5iaW5hbmNlLmNvbS9pbmRleFNwYS5odG1sXG5Db21wbGV0ZSBndWlkZTogaHR0cHM6Ly9naXRodWIuY29tL2FsaXBpcnBpcmFuL0NyeXB0by1QcmljZS1UcmFja2VyLWZvci1Hbm9tZS1TaGVsbCNyZWFkbWVcblxuKiogaWYgaXQgZmFjZWQgZXJyb3IgYWZ0ZXIgdXBkYXRlOlxuKipSZXN0YXJ0IEdub21lLXNoZWxsLiAoQUxUK0YyLCByLCBFbnRlcikiLAogICJuYW1lIjogIkNyeXB0byBQcmljZSBUcmFja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNyeXB0by10cmFja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsaXBpcnBpcmFuL0NyeXB0by1QcmljZS1UcmFja2VyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiY3J5cHRvQGFsaXBpcnBpcmFuLmdpdGh1YiIsCiAgInZlcnNpb24iOiAzMwp9"}, "41": {"version": "33", "sha256": "0d6rgxarjvms3p2qvgq04mk46f8jkwswxspvbblamkjv7yiy2330", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcblxuU291cmNlczogQmluYW5jZSwgT0tYLCBDb2luZ2Vja29cblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuVXNpbmcgYXBpLmNvaW5nZWNrby5jb20sIG9reC5jb20sIGJpbmFuY2UuY29tXG5Db21wbGV0ZSBsaXN0IG9mIHBhaXJzOiBodHRwczovL3d3dy5iaW5hbmNlLmNvbS9pbmRleFNwYS5odG1sXG5Db21wbGV0ZSBndWlkZTogaHR0cHM6Ly9naXRodWIuY29tL2FsaXBpcnBpcmFuL0NyeXB0by1QcmljZS1UcmFja2VyLWZvci1Hbm9tZS1TaGVsbCNyZWFkbWVcblxuKiogaWYgaXQgZmFjZWQgZXJyb3IgYWZ0ZXIgdXBkYXRlOlxuKipSZXN0YXJ0IEdub21lLXNoZWxsLiAoQUxUK0YyLCByLCBFbnRlcikiLAogICJuYW1lIjogIkNyeXB0byBQcmljZSBUcmFja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNyeXB0by10cmFja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsaXBpcnBpcmFuL0NyeXB0by1QcmljZS1UcmFja2VyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiY3J5cHRvQGFsaXBpcnBpcmFuLmdpdGh1YiIsCiAgInZlcnNpb24iOiAzMwp9"}, "42": {"version": "33", "sha256": "0d6rgxarjvms3p2qvgq04mk46f8jkwswxspvbblamkjv7yiy2330", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcblxuU291cmNlczogQmluYW5jZSwgT0tYLCBDb2luZ2Vja29cblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuVXNpbmcgYXBpLmNvaW5nZWNrby5jb20sIG9reC5jb20sIGJpbmFuY2UuY29tXG5Db21wbGV0ZSBsaXN0IG9mIHBhaXJzOiBodHRwczovL3d3dy5iaW5hbmNlLmNvbS9pbmRleFNwYS5odG1sXG5Db21wbGV0ZSBndWlkZTogaHR0cHM6Ly9naXRodWIuY29tL2FsaXBpcnBpcmFuL0NyeXB0by1QcmljZS1UcmFja2VyLWZvci1Hbm9tZS1TaGVsbCNyZWFkbWVcblxuKiogaWYgaXQgZmFjZWQgZXJyb3IgYWZ0ZXIgdXBkYXRlOlxuKipSZXN0YXJ0IEdub21lLXNoZWxsLiAoQUxUK0YyLCByLCBFbnRlcikiLAogICJuYW1lIjogIkNyeXB0byBQcmljZSBUcmFja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNyeXB0by10cmFja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsaXBpcnBpcmFuL0NyeXB0by1QcmljZS1UcmFja2VyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiY3J5cHRvQGFsaXBpcnBpcmFuLmdpdGh1YiIsCiAgInZlcnNpb24iOiAzMwp9"}, "43": {"version": "33", "sha256": "0d6rgxarjvms3p2qvgq04mk46f8jkwswxspvbblamkjv7yiy2330", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcblxuU291cmNlczogQmluYW5jZSwgT0tYLCBDb2luZ2Vja29cblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuVXNpbmcgYXBpLmNvaW5nZWNrby5jb20sIG9reC5jb20sIGJpbmFuY2UuY29tXG5Db21wbGV0ZSBsaXN0IG9mIHBhaXJzOiBodHRwczovL3d3dy5iaW5hbmNlLmNvbS9pbmRleFNwYS5odG1sXG5Db21wbGV0ZSBndWlkZTogaHR0cHM6Ly9naXRodWIuY29tL2FsaXBpcnBpcmFuL0NyeXB0by1QcmljZS1UcmFja2VyLWZvci1Hbm9tZS1TaGVsbCNyZWFkbWVcblxuKiogaWYgaXQgZmFjZWQgZXJyb3IgYWZ0ZXIgdXBkYXRlOlxuKipSZXN0YXJ0IEdub21lLXNoZWxsLiAoQUxUK0YyLCByLCBFbnRlcikiLAogICJuYW1lIjogIkNyeXB0byBQcmljZSBUcmFja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNyeXB0by10cmFja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsaXBpcnBpcmFuL0NyeXB0by1QcmljZS1UcmFja2VyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiY3J5cHRvQGFsaXBpcnBpcmFuLmdpdGh1YiIsCiAgInZlcnNpb24iOiAzMwp9"}}} +, {"uuid": "crypto@alipirpiran.github", "name": "Crypto Price Tracker", "pname": "crypto-price-tracker", "description": "Simple extension to track price of Crypto Currencies\n\nSources: Binance, OKX, Coingecko\n\nAdd coins by symbols, for example:\n* Binance pairs: \"BTC/USDT\"\n* OKX pairs: \"LTC/USDT\"\n* Coingecko pairs: \"BTC/USD\"\n\nUsing api.coingecko.com, okx.com, binance.com\nComplete list of pairs: https://www.binance.com/indexSpa.html\nComplete guide: https://github.com/alipirpiran/Crypto-Price-Tracker-for-Gnome-Shell#readme\n\n** if it faced error after update:\n**Restart Gnome-shell. (ALT+F2, r, Enter)", "link": "https://extensions.gnome.org/extension/2817/crypto-price-tracker/", "shell_version_map": {"40": {"version": "35", "sha256": "08kyk70q4id0wj3h094mp2iw2hc35r8i97whwp4qmkaz87ldrpyi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcblxuU291cmNlczogQmluYW5jZSwgT0tYLCBDb2luZ2Vja29cblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJjcnlwdG9AYWxpcGlycGlyYW4uZ2l0aHViIiwKICAidmVyc2lvbiI6IDM1Cn0="}, "41": {"version": "35", "sha256": "08kyk70q4id0wj3h094mp2iw2hc35r8i97whwp4qmkaz87ldrpyi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcblxuU291cmNlczogQmluYW5jZSwgT0tYLCBDb2luZ2Vja29cblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJjcnlwdG9AYWxpcGlycGlyYW4uZ2l0aHViIiwKICAidmVyc2lvbiI6IDM1Cn0="}, "42": {"version": "35", "sha256": "08kyk70q4id0wj3h094mp2iw2hc35r8i97whwp4qmkaz87ldrpyi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcblxuU291cmNlczogQmluYW5jZSwgT0tYLCBDb2luZ2Vja29cblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJjcnlwdG9AYWxpcGlycGlyYW4uZ2l0aHViIiwKICAidmVyc2lvbiI6IDM1Cn0="}, "43": {"version": "35", "sha256": "08kyk70q4id0wj3h094mp2iw2hc35r8i97whwp4qmkaz87ldrpyi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcblxuU291cmNlczogQmluYW5jZSwgT0tYLCBDb2luZ2Vja29cblxuQWRkIGNvaW5zIGJ5IHN5bWJvbHMsIGZvciBleGFtcGxlOlxuKiBCaW5hbmNlIHBhaXJzOiBcIkJUQy9VU0RUXCJcbiogT0tYIHBhaXJzOiBcIkxUQy9VU0RUXCJcbiogQ29pbmdlY2tvIHBhaXJzOiBcIkJUQy9VU0RcIlxuXG5Vc2luZyBhcGkuY29pbmdlY2tvLmNvbSwgb2t4LmNvbSwgYmluYW5jZS5jb21cbkNvbXBsZXRlIGxpc3Qgb2YgcGFpcnM6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWxcbkNvbXBsZXRlIGd1aWRlOiBodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsI3JlYWRtZVxuXG4qKiBpZiBpdCBmYWNlZCBlcnJvciBhZnRlciB1cGRhdGU6XG4qKlJlc3RhcnQgR25vbWUtc2hlbGwuIChBTFQrRjIsIHIsIEVudGVyKSIsCiAgIm5hbWUiOiAiQ3J5cHRvIFByaWNlIFRyYWNrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3J5cHRvLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxpcGlycGlyYW4vQ3J5cHRvLVByaWNlLVRyYWNrZXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJjcnlwdG9AYWxpcGlycGlyYW4uZ2l0aHViIiwKICAidmVyc2lvbiI6IDM1Cn0="}}} , {"uuid": "ibus-tweaker@tuberry.github.com", "name": "IBus Tweaker", "pname": "ibus-tweaker", "description": "Tweaker of IBus for orientation, theme, font, input mode and clipboard history\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/2820/ibus-tweaker/", "shell_version_map": {"38": {"version": "28", "sha256": "1ahhcq8hpxkdvq1fp8gd8qp1cfsgqsm9swn4ph9kyrzr7j8jvc3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpYnVzLXR3ZWFrZXIiLAogICJuYW1lIjogIklCdXMgVHdlYWtlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pYnVzLXR3ZWFrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2lidXMtdHdlYWtlciIsCiAgInV1aWQiOiAiaWJ1cy10d2Vha2VyQHR1YmVycnkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}, "40": {"version": "34", "sha256": "0fs0hlxdnhssx9vcghbicg1fn3clws9q2f3nzdi4virpm8wksf3f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpYnVzLXR3ZWFrZXIiLAogICJuYW1lIjogIklCdXMgVHdlYWtlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pYnVzLXR3ZWFrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9pYnVzLXR3ZWFrZXIiLAogICJ1dWlkIjogImlidXMtdHdlYWtlckB0dWJlcnJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "41": {"version": "36", "sha256": "0f819v8n1rvvwrir7qf8fp0bvn5zk899lpc4dr8f9jk9g8w57q7d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24taWJ1cy10d2Vha2VyIiwKICAibmFtZSI6ICJJQnVzIFR3ZWFrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWJ1cy10d2Vha2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvaWJ1cy10d2Vha2VyIiwKICAidXVpZCI6ICJpYnVzLXR3ZWFrZXJAdHViZXJyeS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM2Cn0="}, "42": {"version": "38", "sha256": "0crdw1z2yan0mbc36v8vw0iinqbv4lyqzsvdyhz8zsi9q4asrlg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24taWJ1cy10d2Vha2VyIiwKICAibmFtZSI6ICJJQnVzIFR3ZWFrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWJ1cy10d2Vha2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvaWJ1cy10d2Vha2VyIiwKICAidXVpZCI6ICJpYnVzLXR3ZWFrZXJAdHViZXJyeS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM4Cn0="}, "43": {"version": "40", "sha256": "0b807s4bfxmxf6131749gi3nil42dabmz2ndwwsblcpbj0cas7mv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24taWJ1cy10d2Vha2VyIiwKICAibmFtZSI6ICJJQnVzIFR3ZWFrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWJ1cy10d2Vha2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvaWJ1cy10d2Vha2VyIiwKICAidXVpZCI6ICJpYnVzLXR3ZWFrZXJAdHViZXJyeS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQwCn0="}}} , {"uuid": "generic-monitor@gnome-shell-extensions", "name": "Generic Monitor", "pname": "generic-monitor", "description": "Display text & icon on systray using DBUS", "link": "https://extensions.gnome.org/extension/2826/generic-monitor/", "shell_version_map": {"38": {"version": "10", "sha256": "0kvniacvxv57f6jfcrlrd7ggwj4h0bfs60r59p150m6nldm9zf23", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9pbmRlZmVyby5zb3V0YWRlLmZyL3AvZ2VuZXJpY21vbml0b3IiLAogICJ1dWlkIjogImdlbmVyaWMtbW9uaXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "0kvniacvxv57f6jfcrlrd7ggwj4h0bfs60r59p150m6nldm9zf23", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9pbmRlZmVyby5zb3V0YWRlLmZyL3AvZ2VuZXJpY21vbml0b3IiLAogICJ1dWlkIjogImdlbmVyaWMtbW9uaXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "12", "sha256": "1bdn84l653p8m3r5wshz0939h6jhq2a27hcls4mhydz53vkxy6pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjMiCiAgXSwKICAidXJsIjogImh0dHA6Ly9pbmRlZmVyby5zb3V0YWRlLmZyL3AvZ2VuZXJpY21vbml0b3IiLAogICJ1dWlkIjogImdlbmVyaWMtbW9uaXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "1bdn84l653p8m3r5wshz0939h6jhq2a27hcls4mhydz53vkxy6pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjMiCiAgXSwKICAidXJsIjogImh0dHA6Ly9pbmRlZmVyby5zb3V0YWRlLmZyL3AvZ2VuZXJpY21vbml0b3IiLAogICJ1dWlkIjogImdlbmVyaWMtbW9uaXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "1bdn84l653p8m3r5wshz0939h6jhq2a27hcls4mhydz53vkxy6pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjMiCiAgXSwKICAidXJsIjogImh0dHA6Ly9pbmRlZmVyby5zb3V0YWRlLmZyL3AvZ2VuZXJpY21vbml0b3IiLAogICJ1dWlkIjogImdlbmVyaWMtbW9uaXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"uuid": "hide-keyboard-layout@sitnik.ru", "name": "Hide Keyboard Layout", "pname": "hide-keyboard-layout", "description": "Hide keyboard layout indicator in status bar", "link": "https://extensions.gnome.org/extension/2848/hide-keyboard-layout/", "shell_version_map": {"38": {"version": "5", "sha256": "12axnvpbpv1pnpbxinr9ay2pxdgd36f3fjqhx37ymvdjdhak5x4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9oaWRlLWtleWJvYXJkLWxheW91dCIsCiAgInV1aWQiOiAiaGlkZS1rZXlib2FyZC1sYXlvdXRAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "12axnvpbpv1pnpbxinr9ay2pxdgd36f3fjqhx37ymvdjdhak5x4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9oaWRlLWtleWJvYXJkLWxheW91dCIsCiAgInV1aWQiOiAiaGlkZS1rZXlib2FyZC1sYXlvdXRAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "12axnvpbpv1pnpbxinr9ay2pxdgd36f3fjqhx37ymvdjdhak5x4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9oaWRlLWtleWJvYXJkLWxheW91dCIsCiAgInV1aWQiOiAiaGlkZS1rZXlib2FyZC1sYXlvdXRAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "12axnvpbpv1pnpbxinr9ay2pxdgd36f3fjqhx37ymvdjdhak5x4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9oaWRlLWtleWJvYXJkLWxheW91dCIsCiAgInV1aWQiOiAiaGlkZS1rZXlib2FyZC1sYXlvdXRAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "43": {"version": "5", "sha256": "12axnvpbpv1pnpbxinr9ay2pxdgd36f3fjqhx37ymvdjdhak5x4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9oaWRlLWtleWJvYXJkLWxheW91dCIsCiAgInV1aWQiOiAiaGlkZS1rZXlib2FyZC1sYXlvdXRAc2l0bmlrLnJ1IiwKICAidmVyc2lvbiI6IDUKfQ=="}}} @@ -305,7 +305,7 @@ , {"uuid": "transparent_panel@fawtytoo", "name": "Transparent Top Panel", "pname": "transparent-top-panel", "description": "Totally transparent top panel in the Overview.\nAlso adds drop shadows to text and icons for those using GS 3.38.", "link": "https://extensions.gnome.org/extension/2878/transparent-top-panel/", "shell_version_map": {"38": {"version": "11", "sha256": "11628vpgmal4w46apsg6vyv7q9hxdr1z6x6yfh5344nv605904cq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvdGFsbHkgdHJhbnNwYXJlbnQgdG9wIHBhbmVsIGluIHRoZSBPdmVydmlldy5cbkFsc28gYWRkcyBkcm9wIHNoYWRvd3MgdG8gdGV4dCBhbmQgaWNvbnMgZm9yIHRob3NlIHVzaW5nIEdTIDMuMzguIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnRfcGFuZWxAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "11628vpgmal4w46apsg6vyv7q9hxdr1z6x6yfh5344nv605904cq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvdGFsbHkgdHJhbnNwYXJlbnQgdG9wIHBhbmVsIGluIHRoZSBPdmVydmlldy5cbkFsc28gYWRkcyBkcm9wIHNoYWRvd3MgdG8gdGV4dCBhbmQgaWNvbnMgZm9yIHRob3NlIHVzaW5nIEdTIDMuMzguIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnRfcGFuZWxAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "11628vpgmal4w46apsg6vyv7q9hxdr1z6x6yfh5344nv605904cq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvdGFsbHkgdHJhbnNwYXJlbnQgdG9wIHBhbmVsIGluIHRoZSBPdmVydmlldy5cbkFsc28gYWRkcyBkcm9wIHNoYWRvd3MgdG8gdGV4dCBhbmQgaWNvbnMgZm9yIHRob3NlIHVzaW5nIEdTIDMuMzguIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnRfcGFuZWxAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "11628vpgmal4w46apsg6vyv7q9hxdr1z6x6yfh5344nv605904cq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvdGFsbHkgdHJhbnNwYXJlbnQgdG9wIHBhbmVsIGluIHRoZSBPdmVydmlldy5cbkFsc28gYWRkcyBkcm9wIHNoYWRvd3MgdG8gdGV4dCBhbmQgaWNvbnMgZm9yIHRob3NlIHVzaW5nIEdTIDMuMzguIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnRfcGFuZWxAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "overview_full_bright@fawtytoo", "name": "Overview Full Bright", "pname": "overview-full-bright", "description": "Shows the Overview in full brightness and without the vignette.\n\nNOTE: This will not be developed beyond GS 3.38.", "link": "https://extensions.gnome.org/extension/2884/overview-full-bright/", "shell_version_map": {"38": {"version": "4", "sha256": "1dm5h1kl40lsly9a80ch4mfi67ppwd7dgg4idx8vrcx5iksnzxil", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBPdmVydmlldyBpbiBmdWxsIGJyaWdodG5lc3MgYW5kIHdpdGhvdXQgdGhlIHZpZ25ldHRlLlxuXG5OT1RFOiBUaGlzIHdpbGwgbm90IGJlIGRldmVsb3BlZCBiZXlvbmQgR1MgMy4zOC4iLAogICJuYW1lIjogIk92ZXJ2aWV3IEZ1bGwgQnJpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm92ZXJ2aWV3X2Z1bGxfYnJpZ2h0QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "trayIconsReloaded@selfmade.pl", "name": "Tray Icons: Reloaded", "pname": "tray-icons-reloaded", "description": "Tray Icons Reloaded is a GNOME Shell extension which bring back Tray Icons to top panel, with additional features.", "link": "https://extensions.gnome.org/extension/2890/tray-icons-reloaded/", "shell_version_map": {"38": {"version": "11", "sha256": "16dx06l7m8jjcy1xr7s3vj57csnbdmdwlmmjwxhilq10a1dapiw8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJheUljb25zUmVsb2FkZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "16", "sha256": "0ywl1v26b3qfkj58g2l7y1g2qf1fi7kkjd6403546hwyzcqkph0z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJheUljb25zUmVsb2FkZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvVHJheS1JY29ucy1SZWxvYWRlZCIsCiAgInV1aWQiOiAidHJheUljb25zUmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "22", "sha256": "0nmrjpk93afmywq0zrm7qjpkil6s6wszmr9f78q0ybnjv58jf953", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "25", "sha256": "0y3sks6idn9v2r54rb4i69gliip0c9na5q5kwl9vfc7irncgmqjr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyNQp9"}, "43": {"version": "26", "sha256": "1yx9w70ql13f0gnjbihkscyhi8mgapbl6p0hy0aqmnirhwn3fc31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyNgp9"}}} -, {"uuid": "messagingmenu@lauinger-clan.de", "name": "Messaging Menu", "pname": "messaging-menu", "description": "A Messaging Menu for the Gnome Shell. All Email and Chat Applications in one Place.", "link": "https://extensions.gnome.org/extension/2896/messaging-menu/", "shell_version_map": {"38": {"version": "4", "sha256": "1xa0hyvs2aw1z7kg5gcsgh2pjn7b13zhps98j4xpwfiv6zm0sa73", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "15", "sha256": "1zp8wrzwq1abflk075knscp3sfjihlskillbb5jzlrdmq834jq6r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "1zp8wrzwq1abflk075knscp3sfjihlskillbb5jzlrdmq834jq6r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAxNQp9"}, "42": {"version": "15", "sha256": "1zp8wrzwq1abflk075knscp3sfjihlskillbb5jzlrdmq834jq6r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAxNQp9"}, "43": {"version": "15", "sha256": "1zp8wrzwq1abflk075knscp3sfjihlskillbb5jzlrdmq834jq6r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAxNQp9"}}} +, {"uuid": "messagingmenu@lauinger-clan.de", "name": "Messaging Menu", "pname": "messaging-menu", "description": "A Messaging Menu for the Gnome Shell. All Email and Chat Applications in one Place.", "link": "https://extensions.gnome.org/extension/2896/messaging-menu/", "shell_version_map": {"38": {"version": "4", "sha256": "1xa0hyvs2aw1z7kg5gcsgh2pjn7b13zhps98j4xpwfiv6zm0sa73", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "16", "sha256": "1xb9fj4i29sjxjj978mlab32kx0p0wwwbycp84ck12acr2p8l06l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "1xb9fj4i29sjxjj978mlab32kx0p0wwwbycp84ck12acr2p8l06l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAxNgp9"}, "42": {"version": "16", "sha256": "1xb9fj4i29sjxjj978mlab32kx0p0wwwbycp84ck12acr2p8l06l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "1xb9fj4i29sjxjj978mlab32kx0p0wwwbycp84ck12acr2p8l06l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAxNgp9"}}} , {"uuid": "SettingsCenter@lauinger-clan.de", "name": "SettingsCenter", "pname": "settingscenter", "description": "Settings Center is a customizable drop-down menu for quickly launching frequently used apps in Gnome:Shell via the quicksettings. Originally created by XES.\n\nSettings shortcuts : gnome-tweak-tool, dconf-editor, gconf-editor, gnome-session-properties, gnome-shell-extension-prefs, seahorse and nvidia-settings. You can add your own\n\nOriginal source : http://svn.xesnet.fr/gnomeextensions", "link": "https://extensions.gnome.org/extension/2899/settingscenter/", "shell_version_map": {"38": {"version": "2", "sha256": "0sywdlmfgy4k5bkxmawcb7b8100g8wnpndmwvdzjq51xv5605gcs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjQiLAogICAgIjMuNiIsCiAgICAiMy41LjQiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "13", "sha256": "07jx19xfn6np66nnm5ip1jhlp4nfh05qnvnhaqhq3h7yzshr92j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImdldHRleHQtZG9tYWluIjogIlNldHRpbmdzQ2VudGVyIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "auto-mute-toggle@garotosopa.github.io", "name": "Auto-mute toggle", "pname": "auto-mute-toggle", "description": "Toggle whether to auto-mute speakers when headphones are plugged in.", "link": "https://extensions.gnome.org/extension/2905/auto-mute-toggle/", "shell_version_map": {"40": {"version": "6", "sha256": "1lyh51gvsh9ydip77vjj8rigjiah97lh8gp91jcpqblwx69fs3dk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB3aGV0aGVyIHRvIGF1dG8tbXV0ZSBzcGVha2VycyB3aGVuIGhlYWRwaG9uZXMgYXJlIHBsdWdnZWQgaW4uIiwKICAibmFtZSI6ICJBdXRvLW11dGUgdG9nZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dhcm90b3NvcGEvZ3NlLWF1dG8tbXV0ZS10b2dnbGUiLAogICJ1dWlkIjogImF1dG8tbXV0ZS10b2dnbGVAZ2Fyb3Rvc29wYS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "optimus-manager-indicator@andr3slelouch.github.com", "name": "Optimus Manager Indicator", "pname": "optimus-manager-indicator", "description": "Intel/Hybrid/NVIDIA GPU Switch Note: The GPU mode activated doesn't show up in the options, by example: When you turn on the PC you are gonna be in Intel mode so Intel option is not gonna be shown. Note: Optimus Manager Indicator is made(for the moment) for Arch based distributions with optimus-manager.", "link": "https://extensions.gnome.org/extension/2908/optimus-manager-indicator/", "shell_version_map": {"38": {"version": "5", "sha256": "1mqgnwfdbd2460ngkkq6wiswvb9bvwgm5n32j7jgvn1xhb3mqn58", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL0h5YnJpZC9OVklESUEgR1BVIFN3aXRjaCBOb3RlOiBUaGUgR1BVIG1vZGUgYWN0aXZhdGVkIGRvZXNuJ3Qgc2hvdyB1cCBpbiB0aGUgb3B0aW9ucywgYnkgZXhhbXBsZTogV2hlbiB5b3UgdHVybiBvbiB0aGUgUEMgeW91IGFyZSBnb25uYSBiZSBpbiBJbnRlbCBtb2RlIHNvIEludGVsIG9wdGlvbiBpcyBub3QgZ29ubmEgYmUgc2hvd24uIE5vdGU6IE9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IgaXMgbWFkZShmb3IgdGhlIG1vbWVudCkgZm9yIEFyY2ggYmFzZWQgZGlzdHJpYnV0aW9ucyB3aXRoIG9wdGltdXMtbWFuYWdlci4iLAogICJuYW1lIjogIk9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmRyM3NsZWxvdWNoL09wdGltdXMtTWFuYWdlci1JbmRpY2F0b3IiLAogICJ1dWlkIjogIm9wdGltdXMtbWFuYWdlci1pbmRpY2F0b3JAYW5kcjNzbGVsb3VjaC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "1mqgnwfdbd2460ngkkq6wiswvb9bvwgm5n32j7jgvn1xhb3mqn58", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL0h5YnJpZC9OVklESUEgR1BVIFN3aXRjaCBOb3RlOiBUaGUgR1BVIG1vZGUgYWN0aXZhdGVkIGRvZXNuJ3Qgc2hvdyB1cCBpbiB0aGUgb3B0aW9ucywgYnkgZXhhbXBsZTogV2hlbiB5b3UgdHVybiBvbiB0aGUgUEMgeW91IGFyZSBnb25uYSBiZSBpbiBJbnRlbCBtb2RlIHNvIEludGVsIG9wdGlvbiBpcyBub3QgZ29ubmEgYmUgc2hvd24uIE5vdGU6IE9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IgaXMgbWFkZShmb3IgdGhlIG1vbWVudCkgZm9yIEFyY2ggYmFzZWQgZGlzdHJpYnV0aW9ucyB3aXRoIG9wdGltdXMtbWFuYWdlci4iLAogICJuYW1lIjogIk9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmRyM3NsZWxvdWNoL09wdGltdXMtTWFuYWdlci1JbmRpY2F0b3IiLAogICJ1dWlkIjogIm9wdGltdXMtbWFuYWdlci1pbmRpY2F0b3JAYW5kcjNzbGVsb3VjaC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} @@ -398,7 +398,7 @@ , {"uuid": "battery-status@atareao.es", "name": "Battery Status", "pname": "battery-status", "description": "Get information about your battery status", "link": "https://extensions.gnome.org/extension/3763/battery-status/", "shell_version_map": {"40": {"version": "6", "sha256": "00zz3f00bdr95579250m7blrgavqziwh88dw45x928lq06xb052w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGJhdHRlcnkgc3RhdHVzIiwKICAiZXh0ZW5zaW9uLWlkIjogImJhdHRlcnktc3RhdHVzQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXN0YXR1c0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJiYXR0ZXJ5LXN0YXR1cy1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLmJhdHRlcnktc3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXRhcmVhby9iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYmF0dGVyeS1zdGF0dXNAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "00zz3f00bdr95579250m7blrgavqziwh88dw45x928lq06xb052w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGJhdHRlcnkgc3RhdHVzIiwKICAiZXh0ZW5zaW9uLWlkIjogImJhdHRlcnktc3RhdHVzQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXN0YXR1c0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJiYXR0ZXJ5LXN0YXR1cy1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLmJhdHRlcnktc3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXRhcmVhby9iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYmF0dGVyeS1zdGF0dXNAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "00zz3f00bdr95579250m7blrgavqziwh88dw45x928lq06xb052w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGJhdHRlcnkgc3RhdHVzIiwKICAiZXh0ZW5zaW9uLWlkIjogImJhdHRlcnktc3RhdHVzQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXN0YXR1c0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJiYXR0ZXJ5LXN0YXR1cy1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLmJhdHRlcnktc3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXRhcmVhby9iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYmF0dGVyeS1zdGF0dXNAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "distinct@sireliah.com", "name": "Distinct Windows", "pname": "distinct-windows", "description": "Visually differentiate windows with colors and symbols", "link": "https://extensions.gnome.org/extension/3769/distinct-windows/", "shell_version_map": {"38": {"version": "4", "sha256": "1iqga92l9mk3ykf8bdy9igvqfx9k78jasdmqsrrz9zcz33d7k4h7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc3VhbGx5IGRpZmZlcmVudGlhdGUgd2luZG93cyB3aXRoIGNvbG9ycyBhbmQgc3ltYm9scyIsCiAgIm5hbWUiOiAiRGlzdGluY3QgV2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NpcmVsaWFoL2Rpc3RpbmN0LXdpbmRvd3MiLAogICJ1dWlkIjogImRpc3RpbmN0QHNpcmVsaWFoLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "miniCal2@breiq", "name": "Minimalist Calendar 2", "pname": "minimalist-calendar-2", "description": "Remove event list and clock/calendar app buttons from the calendar window.", "link": "https://extensions.gnome.org/extension/3775/minimalist-calendar-2/", "shell_version_map": {"38": {"version": "1", "sha256": "1nh10ik3zk3r4jr31mr8nw8nnamgj3mk1f3im06657wv18x9wvam", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBldmVudCBsaXN0IGFuZCBjbG9jay9jYWxlbmRhciBhcHAgYnV0dG9ucyBmcm9tIHRoZSBjYWxlbmRhciB3aW5kb3cuIiwKICAibmFtZSI6ICJNaW5pbWFsaXN0IENhbGVuZGFyIDIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibWluaUNhbDJAYnJlaXEiLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "ddterm@amezin.github.com", "name": "ddterm", "pname": "ddterm", "description": "Another drop down terminal extension for GNOME Shell. With tabs. Works on Wayland natively", "link": "https://extensions.gnome.org/extension/3780/ddterm/", "shell_version_map": {"38": {"version": "40", "sha256": "1fa8fr4gwjsvr46h991fx245vgzz3kba73k3l6l2ix3sgfiggfkr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQwCn0="}, "40": {"version": "40", "sha256": "1fa8fr4gwjsvr46h991fx245vgzz3kba73k3l6l2ix3sgfiggfkr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQwCn0="}, "41": {"version": "40", "sha256": "1fa8fr4gwjsvr46h991fx245vgzz3kba73k3l6l2ix3sgfiggfkr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQwCn0="}, "42": {"version": "40", "sha256": "1fa8fr4gwjsvr46h991fx245vgzz3kba73k3l6l2ix3sgfiggfkr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQwCn0="}, "43": {"version": "40", "sha256": "1fa8fr4gwjsvr46h991fx245vgzz3kba73k3l6l2ix3sgfiggfkr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQwCn0="}}} +, {"uuid": "ddterm@amezin.github.com", "name": "ddterm", "pname": "ddterm", "description": "Another drop down terminal extension for GNOME Shell. With tabs. Works on Wayland natively", "link": "https://extensions.gnome.org/extension/3780/ddterm/", "shell_version_map": {"38": {"version": "41", "sha256": "0cff42krfad74yscn0l36p1sgskdg86wqdr5a3hrwy2777i4ds5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQxCn0="}, "40": {"version": "41", "sha256": "0cff42krfad74yscn0l36p1sgskdg86wqdr5a3hrwy2777i4ds5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQxCn0="}, "41": {"version": "41", "sha256": "0cff42krfad74yscn0l36p1sgskdg86wqdr5a3hrwy2777i4ds5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQxCn0="}, "42": {"version": "41", "sha256": "0cff42krfad74yscn0l36p1sgskdg86wqdr5a3hrwy2777i4ds5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQxCn0="}, "43": {"version": "41", "sha256": "0cff42krfad74yscn0l36p1sgskdg86wqdr5a3hrwy2777i4ds5f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZHRlcm0vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkdGVybSIsCiAgInV1aWQiOiAiZGR0ZXJtQGFtZXppbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQxCn0="}}} , {"uuid": "favorites-only-dash@nahuelwexd.github.io", "name": "Favorites-only Dash", "pname": "favorites-only-dash", "description": "Show only favorite apps on Dash", "link": "https://extensions.gnome.org/extension/3789/favorites-only-dash/", "shell_version_map": {"38": {"version": "1", "sha256": "110h019563j33gksaq5fs0z71sz1mslq1sbsmhk9mj3qggd9vs65", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgb25seSBmYXZvcml0ZSBhcHBzIG9uIERhc2giLAogICJuYW1lIjogIkZhdm9yaXRlcy1vbmx5IERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZmF2b3JpdGVzLW9ubHktZGFzaEBuYWh1ZWx3ZXhkLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "notification-timeout@chlumskyvaclav.gmail.com", "name": "Notification Timeout", "pname": "notification-timeout", "description": "This extension allows configuring the same timeout for all notifications. It also allows ignoring the idle state.", "link": "https://extensions.gnome.org/extension/3795/notification-timeout/", "shell_version_map": {"38": {"version": "6", "sha256": "0fgz8zcs913i13jar3bvwp41zvc9gmgmwg3xiw71jlhbjl128f07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vbm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi10aW1lb3V0QGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "0fgz8zcs913i13jar3bvwp41zvc9gmgmwg3xiw71jlhbjl128f07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vbm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi10aW1lb3V0QGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0fgz8zcs913i13jar3bvwp41zvc9gmgmwg3xiw71jlhbjl128f07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vbm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi10aW1lb3V0QGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "0fgz8zcs913i13jar3bvwp41zvc9gmgmwg3xiw71jlhbjl128f07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vbm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi10aW1lb3V0QGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "0fgz8zcs913i13jar3bvwp41zvc9gmgmwg3xiw71jlhbjl128f07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vbm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi10aW1lb3V0QGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "podman-as-docker@alberto.yomerengues.xyz", "name": "Podman and Docker", "pname": "podman-as-docker", "description": "podman extension as docker\nIn order to get it work on podman, you just need to create an alias\nSimply put: alias docker=podman\nand install podman-docker", "link": "https://extensions.gnome.org/extension/3799/podman-as-docker/", "shell_version_map": {"38": {"version": "1", "sha256": "18bkd6z5hm6zidh7xv8v3jvj36lmxzx4dar7nwa7nq3p51km6crz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInBvZG1hbiBleHRlbnNpb24gYXMgZG9ja2VyXG5JbiBvcmRlciB0byBnZXQgaXQgd29yayBvbiBwb2RtYW4sIHlvdSBqdXN0IG5lZWQgdG8gY3JlYXRlIGFuIGFsaWFzXG5TaW1wbHkgcHV0OiBhbGlhcyBkb2NrZXI9cG9kbWFuXG5hbmQgaW5zdGFsbCBwb2RtYW4tZG9ja2VyIiwKICAibmFtZSI6ICJQb2RtYW4gYW5kIERvY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJwb2RtYW4tYXMtZG9ja2VyQGFsYmVydG8ueW9tZXJlbmd1ZXMueHl6IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} @@ -417,7 +417,7 @@ , {"uuid": "sticky-terminal@fthx", "name": "Sticky Terminal", "pname": "sticky-terminal", "description": "Toggle a sticky GNOME terminal window. Your terminal window will always be in foreground while you use another app.\n\nA button in panel allows to toggle the visibility of the terminal. Window is resizeable.\n\nYou can easily change it to default another terminal app or another app. Some other settings. See comments in extension.js file.", "link": "https://extensions.gnome.org/extension/3915/sticky-terminal/", "shell_version_map": {"38": {"version": "2", "sha256": "0j65ihfhama6scp2b8qbqr1h4gamy4v0w1ygxrfglhvl3jhjm5zz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBhIHN0aWNreSBHTk9NRSB0ZXJtaW5hbCB3aW5kb3cuIFlvdXIgdGVybWluYWwgd2luZG93IHdpbGwgYWx3YXlzIGJlIGluIGZvcmVncm91bmQgd2hpbGUgeW91IHVzZSBhbm90aGVyIGFwcC5cblxuQSBidXR0b24gaW4gcGFuZWwgYWxsb3dzIHRvIHRvZ2dsZSB0aGUgdmlzaWJpbGl0eSBvZiB0aGUgdGVybWluYWwuIFdpbmRvdyBpcyByZXNpemVhYmxlLlxuXG5Zb3UgY2FuIGVhc2lseSBjaGFuZ2UgaXQgdG8gZGVmYXVsdCBhbm90aGVyIHRlcm1pbmFsIGFwcCBvciBhbm90aGVyIGFwcC4gU29tZSBvdGhlciBzZXR0aW5ncy4gU2VlIGNvbW1lbnRzIGluIGV4dGVuc2lvbi5qcyBmaWxlLiIsCiAgIm5hbWUiOiAiU3RpY2t5IFRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zdGlja3ktdGVybWluYWwiLAogICJ1dWlkIjogInN0aWNreS10ZXJtaW5hbEBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "sticky-r-terminal@fthx", "name": "Sticky R Terminal", "pname": "sticky-r-terminal", "description": "Toggle a sticky R terminal window. Your R window will always be in foreground while you use another app.\n\nYou can easily change it to default another terminal app or another app. Some other settings. See comments in extension.js file. Same extension only running a terminal: https://extensions.gnome.org/extension/3915/sticky-terminal . You can use it with R if this extension does not work for your R installation setup.\n\nKeywords: stat, stats, statistics, statistical, r-cran.", "link": "https://extensions.gnome.org/extension/3916/sticky-r-terminal/", "shell_version_map": {"38": {"version": "1", "sha256": "17x84g6fb785jmcl5jz41nw4rgzaad48mc5zllh5b3a485731f0s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBhIHN0aWNreSBSIHRlcm1pbmFsIHdpbmRvdy4gWW91ciBSIHdpbmRvdyB3aWxsIGFsd2F5cyBiZSBpbiBmb3JlZ3JvdW5kIHdoaWxlIHlvdSB1c2UgYW5vdGhlciBhcHAuXG5cbllvdSBjYW4gZWFzaWx5IGNoYW5nZSBpdCB0byBkZWZhdWx0IGFub3RoZXIgdGVybWluYWwgYXBwIG9yIGFub3RoZXIgYXBwLiBTb21lIG90aGVyIHNldHRpbmdzLiBTZWUgY29tbWVudHMgaW4gZXh0ZW5zaW9uLmpzIGZpbGUuIFNhbWUgZXh0ZW5zaW9uIG9ubHkgcnVubmluZyBhIHRlcm1pbmFsOiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zOTE1L3N0aWNreS10ZXJtaW5hbCAuIFlvdSBjYW4gdXNlIGl0IHdpdGggUiBpZiB0aGlzIGV4dGVuc2lvbiBkb2VzIG5vdCB3b3JrIGZvciB5b3VyIFIgaW5zdGFsbGF0aW9uIHNldHVwLlxuXG5LZXl3b3Jkczogc3RhdCwgc3RhdHMsIHN0YXRpc3RpY3MsIHN0YXRpc3RpY2FsLCByLWNyYW4uIiwKICAibmFtZSI6ICJTdGlja3kgUiBUZXJtaW5hbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvc3RpY2t5LXItdGVybWluYWwiLAogICJ1dWlkIjogInN0aWNreS1yLXRlcm1pbmFsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "onedrive@diegobazzanella.com", "name": "One Drive", "pname": "one-drive", "description": "One Drive extension", "link": "https://extensions.gnome.org/extension/3919/one-drive/", "shell_version_map": {"38": {"version": "4", "sha256": "0h37rr9hw6azrlf465ngl7w7miii9bm4sh33wkr0x8q51rz62ydd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24iLAogICJuYW1lIjogIk9uZSBEcml2ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RiYXp6YS9vbmVEcml2ZSIsCiAgInV1aWQiOiAib25lZHJpdmVAZGllZ29iYXp6YW5lbGxhLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "snowy@exposedcat", "name": "Snowy", "pname": "snowy", "description": "Adds snow to your system\nP.S. Looking for help with UI. Please submit an issue on GitHub if you want to help", "link": "https://extensions.gnome.org/extension/3921/snowy/", "shell_version_map": {"40": {"version": "12", "sha256": "1zq04rr1s6xghiv3ck4w2cb3x98iq16xy6ndqb03dv8f030l9kdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc25vdyB0byB5b3VyIHN5c3RlbVxuUC5TLiBMb29raW5nIGZvciBoZWxwIHdpdGggVUkuIFBsZWFzZSBzdWJtaXQgYW4gaXNzdWUgb24gR2l0SHViIGlmIHlvdSB3YW50IHRvIGhlbHAiLAogICJuYW1lIjogIlNub3d5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FeHBvc2VkQ2F0L3Nub3d5IiwKICAidXVpZCI6ICJzbm93eUBleHBvc2VkY2F0IiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "1zq04rr1s6xghiv3ck4w2cb3x98iq16xy6ndqb03dv8f030l9kdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc25vdyB0byB5b3VyIHN5c3RlbVxuUC5TLiBMb29raW5nIGZvciBoZWxwIHdpdGggVUkuIFBsZWFzZSBzdWJtaXQgYW4gaXNzdWUgb24gR2l0SHViIGlmIHlvdSB3YW50IHRvIGhlbHAiLAogICJuYW1lIjogIlNub3d5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FeHBvc2VkQ2F0L3Nub3d5IiwKICAidXVpZCI6ICJzbm93eUBleHBvc2VkY2F0IiwKICAidmVyc2lvbiI6IDEyCn0="}}} +, {"uuid": "snowy@exposedcat", "name": "Snowy", "pname": "snowy", "description": "Make you festive mood with falling snow on your GNOME DE system", "link": "https://extensions.gnome.org/extension/3921/snowy/", "shell_version_map": {"40": {"version": "14", "sha256": "015q21hnllkpj3566rr8086qi9kcig5n5wgg91j3s4j62sszwa2h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "015q21hnllkpj3566rr8086qi9kcig5n5wgg91j3s4j62sszwa2h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNAp9"}, "42": {"version": "14", "sha256": "015q21hnllkpj3566rr8086qi9kcig5n5wgg91j3s4j62sszwa2h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNAp9"}, "43": {"version": "14", "sha256": "015q21hnllkpj3566rr8086qi9kcig5n5wgg91j3s4j62sszwa2h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRXhwb3NlZENhdC9zbm93eSIsCiAgInV1aWQiOiAic25vd3lAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiAxNAp9"}}} , {"uuid": "focus@scaryrawr.github.io", "name": "Focus", "pname": "focus", "description": "Transparent inactive windows", "link": "https://extensions.gnome.org/extension/3924/focus/", "shell_version_map": {"38": {"version": "10", "sha256": "0y5myj24bkci6y944dnl9p52jz87fiqjxq5x3xcm8s4lc7zgzkfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NjYXJ5cmF3ci9nbm9tZS1mb2N1cyIsCiAgInV1aWQiOiAiZm9jdXNAc2NhcnlyYXdyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "0y5myj24bkci6y944dnl9p52jz87fiqjxq5x3xcm8s4lc7zgzkfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NjYXJ5cmF3ci9nbm9tZS1mb2N1cyIsCiAgInV1aWQiOiAiZm9jdXNAc2NhcnlyYXdyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0y5myj24bkci6y944dnl9p52jz87fiqjxq5x3xcm8s4lc7zgzkfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NjYXJ5cmF3ci9nbm9tZS1mb2N1cyIsCiAgInV1aWQiOiAiZm9jdXNAc2NhcnlyYXdyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "0y5myj24bkci6y944dnl9p52jz87fiqjxq5x3xcm8s4lc7zgzkfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NjYXJ5cmF3ci9nbm9tZS1mb2N1cyIsCiAgInV1aWQiOiAiZm9jdXNAc2NhcnlyYXdyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "0y5myj24bkci6y944dnl9p52jz87fiqjxq5x3xcm8s4lc7zgzkfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NjYXJ5cmF3ci9nbm9tZS1mb2N1cyIsCiAgInV1aWQiOiAiZm9jdXNAc2NhcnlyYXdyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "autoselectheadset@josephlbarnett.github.com", "name": "Auto select headset", "pname": "auto-select-headset", "description": "Auto selects headsets when possible instead of showing a dialog", "link": "https://extensions.gnome.org/extension/3928/auto-select-headset/", "shell_version_map": {"38": {"version": "6", "sha256": "1p4fyaxdhnyfzz1ba6zvpjv2ik5mvrc55cv2ii0ghr6ia0xi5yda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb3NlcGhsYmFybmV0dC9hdXRvc2VsZWN0aGVhZHNldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImF1dG9zZWxlY3RoZWFkc2V0QGpvc2VwaGxiYXJuZXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1p4fyaxdhnyfzz1ba6zvpjv2ik5mvrc55cv2ii0ghr6ia0xi5yda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb3NlcGhsYmFybmV0dC9hdXRvc2VsZWN0aGVhZHNldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImF1dG9zZWxlY3RoZWFkc2V0QGpvc2VwaGxiYXJuZXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "1p4fyaxdhnyfzz1ba6zvpjv2ik5mvrc55cv2ii0ghr6ia0xi5yda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb3NlcGhsYmFybmV0dC9hdXRvc2VsZWN0aGVhZHNldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImF1dG9zZWxlY3RoZWFkc2V0QGpvc2VwaGxiYXJuZXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "1p4fyaxdhnyfzz1ba6zvpjv2ik5mvrc55cv2ii0ghr6ia0xi5yda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb3NlcGhsYmFybmV0dC9hdXRvc2VsZWN0aGVhZHNldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImF1dG9zZWxlY3RoZWFkc2V0QGpvc2VwaGxiYXJuZXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "1p4fyaxdhnyfzz1ba6zvpjv2ik5mvrc55cv2ii0ghr6ia0xi5yda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb3NlcGhsYmFybmV0dC9hdXRvc2VsZWN0aGVhZHNldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImF1dG9zZWxlY3RoZWFkc2V0QGpvc2VwaGxiYXJuZXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "toggle-night-light@cansozbir.github.io", "name": "Toggle Night Light", "pname": "toggle-night-light", "description": "This extension lets you toggle night-light from the top-bar by clicking it.", "link": "https://extensions.gnome.org/extension/3933/toggle-night-light/", "shell_version_map": {"38": {"version": "7", "sha256": "13s25az5g1n500jih7n1n7mprm70c2mg4r9cfdrxvivvmy080s5b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IHRvZ2dsZSBuaWdodC1saWdodCBmcm9tIHRoZSB0b3AtYmFyIGJ5IGNsaWNraW5nIGl0LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fuc296YmlyL2dub21lLXNoZWxsLXRvZ2dsZS1uaWdodC1saWdodC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZ2dsZS1uaWdodC1saWdodEBjYW5zb3piaXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "13s25az5g1n500jih7n1n7mprm70c2mg4r9cfdrxvivvmy080s5b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IHRvZ2dsZSBuaWdodC1saWdodCBmcm9tIHRoZSB0b3AtYmFyIGJ5IGNsaWNraW5nIGl0LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fuc296YmlyL2dub21lLXNoZWxsLXRvZ2dsZS1uaWdodC1saWdodC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZ2dsZS1uaWdodC1saWdodEBjYW5zb3piaXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "13s25az5g1n500jih7n1n7mprm70c2mg4r9cfdrxvivvmy080s5b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IHRvZ2dsZSBuaWdodC1saWdodCBmcm9tIHRoZSB0b3AtYmFyIGJ5IGNsaWNraW5nIGl0LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fuc296YmlyL2dub21lLXNoZWxsLXRvZ2dsZS1uaWdodC1saWdodC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZ2dsZS1uaWdodC1saWdodEBjYW5zb3piaXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "13s25az5g1n500jih7n1n7mprm70c2mg4r9cfdrxvivvmy080s5b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IHRvZ2dsZSBuaWdodC1saWdodCBmcm9tIHRoZSB0b3AtYmFyIGJ5IGNsaWNraW5nIGl0LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2Fuc296YmlyL2dub21lLXNoZWxsLXRvZ2dsZS1uaWdodC1saWdodC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZ2dsZS1uaWdodC1saWdodEBjYW5zb3piaXIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} @@ -613,9 +613,9 @@ , {"uuid": "username-hotname@it-und-entwicklung-fg.de", "name": "Username and Hostname to panel", "pname": "username-and-hostname-to-panel", "description": "Adds your avatar icon, user displayname und username to the menu panel. Also it adds the hostname to the left of the panel.", "link": "https://extensions.gnome.org/extension/4583/username-and-hostname-to-panel/", "shell_version_map": {"38": {"version": "5", "sha256": "1g9jsfwxxz2as2nwkqdzr0km24ykkzhdfmya9mqxvr68fsanw27n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9pdC11bmQtZW50d2lja2x1bmctZmcvVXNlcm5hbWUtYW5kLUhvc3RuYW1lLyIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1g9jsfwxxz2as2nwkqdzr0km24ykkzhdfmya9mqxvr68fsanw27n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9pdC11bmQtZW50d2lja2x1bmctZmcvVXNlcm5hbWUtYW5kLUhvc3RuYW1lLyIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1g9jsfwxxz2as2nwkqdzr0km24ykkzhdfmya9mqxvr68fsanw27n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9pdC11bmQtZW50d2lja2x1bmctZmcvVXNlcm5hbWUtYW5kLUhvc3RuYW1lLyIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "1g9jsfwxxz2as2nwkqdzr0km24ykkzhdfmya9mqxvr68fsanw27n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9pdC11bmQtZW50d2lja2x1bmctZmcvVXNlcm5hbWUtYW5kLUhvc3RuYW1lLyIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "InternetSpeedMonitor@Rishu", "name": "Internet Speed Monitor", "pname": "internet-speed-monitor", "description": "Extension to Monitor Internet Speed and Daily Data Usage minimally.\n It is a fork of InternetSpeedMeter", "link": "https://extensions.gnome.org/extension/4585/internet-speed-monitor/", "shell_version_map": {"38": {"version": "6", "sha256": "1addh1pdb49zijqsjv10xrqs7rp6k8x26h91vkry6pvzdc9arqln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cbiBJdCBpcyBhIGZvcmsgb2YgSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9JbnRlcm5ldFNwZWVkTW9uaXRvciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1vbml0b3JAUmlzaHUiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1addh1pdb49zijqsjv10xrqs7rp6k8x26h91vkry6pvzdc9arqln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cbiBJdCBpcyBhIGZvcmsgb2YgSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9JbnRlcm5ldFNwZWVkTW9uaXRvciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1vbml0b3JAUmlzaHUiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "1addh1pdb49zijqsjv10xrqs7rp6k8x26h91vkry6pvzdc9arqln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cbiBJdCBpcyBhIGZvcmsgb2YgSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9JbnRlcm5ldFNwZWVkTW9uaXRvciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1vbml0b3JAUmlzaHUiLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "7", "sha256": "12szbvm51zq13z9mqfvwsrwbjhqf59f9cwnmpa204c7yxnfcxqp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cbiBJdCBpcyBhIGZvcmsgb2YgSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yaXNodWluZmluaXR5L0ludGVybmV0U3BlZWRNb25pdG9yIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTW9uaXRvckBSaXNodSIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "7", "sha256": "12szbvm51zq13z9mqfvwsrwbjhqf59f9cwnmpa204c7yxnfcxqp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cbiBJdCBpcyBhIGZvcmsgb2YgSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yaXNodWluZmluaXR5L0ludGVybmV0U3BlZWRNb25pdG9yIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTW9uaXRvckBSaXNodSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "simulate-switching-workspaces-on-active-monitor@micheledaros.com", "name": "Switch workspaces on active monitor", "pname": "switch-workspaces-on-active-monitor", "description": "Simulates switching the workspace on the active monitor only. Ctrl+Alt+q switches to the previous workspace, Ctrl+Alt+a switches to the next", "link": "https://extensions.gnome.org/extension/4586/switch-workspaces-on-active-monitor/", "shell_version_map": {"38": {"version": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "16lv8hysyc0yla5w6i5l94nc9h425bgf9z3cj9xqfsfzc0icalga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hlbGVkYXJvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3IiLAogICJ1dWlkIjogInNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yQG1pY2hlbGVkYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} -, {"uuid": "newworkspaceshortcut@barnix.io", "name": "New Workspace Shortcut", "pname": "new-workspace-shortcut", "description": "This extension will enable the following:\n\nMove-window-to-new-workspace Shortcut: \n - Use a shortcut to move the in-focus window to a *new* workspace on the right of your current workspace: `Ctl + Super + Shift + Right`\n - Or to the left / *backward*: `Ctl + Super + Shift + Left`\n\n\nNew-empty-workspace Shortcut:\n - Use a shortcut to create an *empty* workspace on the right: `Ctl + Super + Alt + Right`\n - Or to the left / *backward*: `Ctl + Super + Alt + Left`\n\n\nReorder-workspace Shortcut:\n - Use a shortcut to move an entire workspace left or right of the current workspace: `Ctl + Super + Left` or `Ctl + Super + Right`\n\nFor more info, see the github page", "link": "https://extensions.gnome.org/extension/4597/new-workspace-shortcut/", "shell_version_map": {"41": {"version": "8", "sha256": "1dpvinjrgw5xspa614dkpr8v2ivzqvqsv3w652xwyhnwjsh9hxfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6IFxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhICpuZXcqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQgb2YgeW91ciBjdXJyZW50IHdvcmtzcGFjZTogYEN0bCArIFN1cGVyICsgU2hpZnQgKyBSaWdodGBcbiAgLSBPciB0byB0aGUgbGVmdCAvICpiYWNrd2FyZCo6IGBDdGwgKyBTdXBlciArIFNoaWZ0ICsgTGVmdGBcblxuXG5OZXctZW1wdHktd29ya3NwYWNlIFNob3J0Y3V0OlxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIGNyZWF0ZSBhbiAqZW1wdHkqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQ6IGBDdGwgKyBTdXBlciArIEFsdCArIFJpZ2h0YFxuICAtIE9yIHRvIHRoZSBsZWZ0IC8gKmJhY2t3YXJkKjogYEN0bCArIFN1cGVyICsgQWx0ICsgTGVmdGBcblxuXG5SZW9yZGVyLXdvcmtzcGFjZSBTaG9ydGN1dDpcbiAgLSBVc2UgYSBzaG9ydGN1dCB0byBtb3ZlIGFuIGVudGlyZSB3b3Jrc3BhY2UgbGVmdCBvciByaWdodCBvZiB0aGUgY3VycmVudCB3b3Jrc3BhY2U6IGBDdGwgKyBTdXBlciArIExlZnRgIG9yIGBDdGwgKyBTdXBlciArIFJpZ2h0YFxuXG5Gb3IgbW9yZSBpbmZvLCBzZWUgdGhlIGdpdGh1YiBwYWdlIiwKICAibmFtZSI6ICJOZXcgV29ya3NwYWNlIFNob3J0Y3V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ld3dvcmtzcGFjZXNob3J0Y3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXJuc2NvdHQvbmV3d29ya3NwYWNlc2hvcnRjdXQtYmFybml4LmlvIiwKICAidXVpZCI6ICJuZXd3b3Jrc3BhY2VzaG9ydGN1dEBiYXJuaXguaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "1dpvinjrgw5xspa614dkpr8v2ivzqvqsv3w652xwyhnwjsh9hxfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6IFxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhICpuZXcqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQgb2YgeW91ciBjdXJyZW50IHdvcmtzcGFjZTogYEN0bCArIFN1cGVyICsgU2hpZnQgKyBSaWdodGBcbiAgLSBPciB0byB0aGUgbGVmdCAvICpiYWNrd2FyZCo6IGBDdGwgKyBTdXBlciArIFNoaWZ0ICsgTGVmdGBcblxuXG5OZXctZW1wdHktd29ya3NwYWNlIFNob3J0Y3V0OlxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIGNyZWF0ZSBhbiAqZW1wdHkqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQ6IGBDdGwgKyBTdXBlciArIEFsdCArIFJpZ2h0YFxuICAtIE9yIHRvIHRoZSBsZWZ0IC8gKmJhY2t3YXJkKjogYEN0bCArIFN1cGVyICsgQWx0ICsgTGVmdGBcblxuXG5SZW9yZGVyLXdvcmtzcGFjZSBTaG9ydGN1dDpcbiAgLSBVc2UgYSBzaG9ydGN1dCB0byBtb3ZlIGFuIGVudGlyZSB3b3Jrc3BhY2UgbGVmdCBvciByaWdodCBvZiB0aGUgY3VycmVudCB3b3Jrc3BhY2U6IGBDdGwgKyBTdXBlciArIExlZnRgIG9yIGBDdGwgKyBTdXBlciArIFJpZ2h0YFxuXG5Gb3IgbW9yZSBpbmZvLCBzZWUgdGhlIGdpdGh1YiBwYWdlIiwKICAibmFtZSI6ICJOZXcgV29ya3NwYWNlIFNob3J0Y3V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ld3dvcmtzcGFjZXNob3J0Y3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXJuc2NvdHQvbmV3d29ya3NwYWNlc2hvcnRjdXQtYmFybml4LmlvIiwKICAidXVpZCI6ICJuZXd3b3Jrc3BhY2VzaG9ydGN1dEBiYXJuaXguaW8iLAogICJ2ZXJzaW9uIjogOAp9"}}} +, {"uuid": "newworkspaceshortcut@barnix.io", "name": "New Workspace Shortcut", "pname": "new-workspace-shortcut", "description": "This extension will enable the following:\n\nMove-window-to-new-workspace Shortcut: \n - Use a shortcut to move the in-focus window to a *new* workspace on the right/left of your current workspace\n\nNew-empty-workspace Shortcut:\n - Use a shortcut to create an *empty* workspace\n\nReorder-workspace Shortcut:\n - Use a shortcut to move an entire workspace left or right of the current workspace", "link": "https://extensions.gnome.org/extension/4597/new-workspace-shortcut/", "shell_version_map": {"41": {"version": "9", "sha256": "0lhfwz45qb6dhfwg6f1hlhixibypzx9w6q1x8xh5pv04y2zb6h2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6IFxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhICpuZXcqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQvbGVmdCBvZiB5b3VyIGN1cnJlbnQgd29ya3NwYWNlXG5cbk5ldy1lbXB0eS13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gIC0gVXNlIGEgc2hvcnRjdXQgdG8gY3JlYXRlIGFuICplbXB0eSogd29ya3NwYWNlXG5cblJlb3JkZXItd29ya3NwYWNlIFNob3J0Y3V0OlxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZSIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "0lhfwz45qb6dhfwg6f1hlhixibypzx9w6q1x8xh5pv04y2zb6h2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6IFxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhICpuZXcqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQvbGVmdCBvZiB5b3VyIGN1cnJlbnQgd29ya3NwYWNlXG5cbk5ldy1lbXB0eS13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gIC0gVXNlIGEgc2hvcnRjdXQgdG8gY3JlYXRlIGFuICplbXB0eSogd29ya3NwYWNlXG5cblJlb3JkZXItd29ya3NwYWNlIFNob3J0Y3V0OlxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZSIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "0lhfwz45qb6dhfwg6f1hlhixibypzx9w6q1x8xh5pv04y2zb6h2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6IFxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhICpuZXcqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQvbGVmdCBvZiB5b3VyIGN1cnJlbnQgd29ya3NwYWNlXG5cbk5ldy1lbXB0eS13b3Jrc3BhY2UgU2hvcnRjdXQ6XG4gIC0gVXNlIGEgc2hvcnRjdXQgdG8gY3JlYXRlIGFuICplbXB0eSogd29ya3NwYWNlXG5cblJlb3JkZXItd29ya3NwYWNlIFNob3J0Y3V0OlxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZSIsCiAgIm5hbWUiOiAiTmV3IFdvcmtzcGFjZSBTaG9ydGN1dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXd3b3Jrc3BhY2VzaG9ydGN1dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "p.stonham@switcheroo.org", "name": "Switcheroo", "pname": "switcheroo", "description": "Switch to the first window with the title x\n\nA very small extension to allow you to switch windows via gdbus. This is particularly useful if you are using wayland as utilities such as wmctrl won't work.\n\nSince Gnome 41 removed org.gnome.Shell.Eval for security reasons, if you ever used a command such as:\n\ngdbus call --session --dest org.gnome.Shell --object-path /org/gnome/Shell --method org.gnome.Shell.Eval\"var mw = global.get_window_actors().map(w=>w.meta_window).find(mw=>mw.get_title().includes('Firefox'));mw && mw.activate(0)\"\n\nthis can now be replaced with:\n\ngdbus call --session --dest org.gnome.Shell --object-path /org/switcheroo/Switcheroo --method org.switcheroo.Switcheroo.Set Firefox\n\nThis can then be assigned to a shortcut key in Gnome settings or called programmatically.", "link": "https://extensions.gnome.org/extension/4600/switcheroo/", "shell_version_map": {"41": {"version": "3", "sha256": "0pfjhx8pm26zpizazd2pbpfqsr8vwc6znrm1cbf4ydcyvfxsnwwh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB0byB0aGUgZmlyc3Qgd2luZG93IHdpdGggdGhlIHRpdGxlIHhcblxuQSB2ZXJ5IHNtYWxsIGV4dGVuc2lvbiB0byBhbGxvdyB5b3UgdG8gc3dpdGNoIHdpbmRvd3MgdmlhIGdkYnVzLiBUaGlzIGlzIHBhcnRpY3VsYXJseSB1c2VmdWwgaWYgeW91IGFyZSB1c2luZyB3YXlsYW5kIGFzIHV0aWxpdGllcyBzdWNoIGFzIHdtY3RybCB3b24ndCB3b3JrLlxuXG5TaW5jZSBHbm9tZSA0MSByZW1vdmVkIG9yZy5nbm9tZS5TaGVsbC5FdmFsIGZvciBzZWN1cml0eSByZWFzb25zLCBpZiB5b3UgZXZlciB1c2VkIGEgY29tbWFuZCBzdWNoIGFzOlxuXG5nZGJ1cyBjYWxsIC0tc2Vzc2lvbiAtLWRlc3Qgb3JnLmdub21lLlNoZWxsIC0tb2JqZWN0LXBhdGggL29yZy9nbm9tZS9TaGVsbCAtLW1ldGhvZCBvcmcuZ25vbWUuU2hlbGwuRXZhbFwidmFyIG13ID0gZ2xvYmFsLmdldF93aW5kb3dfYWN0b3JzKCkubWFwKHc9Jmd0O3cubWV0YV93aW5kb3cpLmZpbmQobXc9Jmd0O213LmdldF90aXRsZSgpLmluY2x1ZGVzKCdGaXJlZm94JykpO213ICZhbXA7JmFtcDsgbXcuYWN0aXZhdGUoMClcIlxuXG50aGlzIGNhbiBub3cgYmUgcmVwbGFjZWQgd2l0aDpcblxuZ2RidXMgY2FsbCAtLXNlc3Npb24gLS1kZXN0IG9yZy5nbm9tZS5TaGVsbCAtLW9iamVjdC1wYXRoIC9vcmcvc3dpdGNoZXJvby9Td2l0Y2hlcm9vIC0tbWV0aG9kIG9yZy5zd2l0Y2hlcm9vLlN3aXRjaGVyb28uU2V0IEZpcmVmb3hcblxuVGhpcyBjYW4gdGhlbiBiZSBhc3NpZ25lZCB0byBhIHNob3J0Y3V0IGtleSBpbiBHbm9tZSBzZXR0aW5ncyBvciBjYWxsZWQgcHJvZ3JhbW1hdGljYWxseS4iLAogICJuYW1lIjogIlN3aXRjaGVyb28iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInAuc3RvbmhhbUBzd2l0Y2hlcm9vLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "sane-airplane-mode@kippi", "name": "Sane Airplane Mode", "pname": "sane-airplane-mode", "description": "Make airplane mode sane again! This extension gives you better control over the airplane mode. Or at least it is my attempt to make a utterly broken airplane mode implementation somewhat sane to handle.\n\nHint: With this extension you can also turn off the annoying \"Bluetooth gets turned on when I disable airplane mode\" behavior. \n\nTo everyone who is experiencing issues with this extension: Please report errors on GitHub!", "link": "https://extensions.gnome.org/extension/4604/sane-airplane-mode/", "shell_version_map": {"40": {"version": "8", "sha256": "0fkk9g35yfybqdg5mvv76b8hn8xdyxav92mk2cqn6gh1l5z0zgc7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gT3IgYXQgbGVhc3QgaXQgaXMgbXkgYXR0ZW1wdCB0byBtYWtlIGEgdXR0ZXJseSBicm9rZW4gYWlycGxhbmUgbW9kZSBpbXBsZW1lbnRhdGlvbiBzb21ld2hhdCBzYW5lIHRvIGhhbmRsZS5cblxuSGludDogV2l0aCB0aGlzIGV4dGVuc2lvbiB5b3UgY2FuIGFsc28gdHVybiBvZmYgdGhlIGFubm95aW5nIFwiQmx1ZXRvb3RoIGdldHMgdHVybmVkIG9uIHdoZW4gSSBkaXNhYmxlIGFpcnBsYW5lIG1vZGVcIiBiZWhhdmlvci4gXG5cblRvIGV2ZXJ5b25lIHdobyBpcyBleHBlcmllbmNpbmcgaXNzdWVzIHdpdGggdGhpcyBleHRlbnNpb246IFBsZWFzZSByZXBvcnQgZXJyb3JzIG9uIEdpdEh1YiEiLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hLaXBwaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2FuZS1haXJwbGFuZS1tb2RlIiwKICAidXVpZCI6ICJzYW5lLWFpcnBsYW5lLW1vZGVAa2lwcGkiLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "0fkk9g35yfybqdg5mvv76b8hn8xdyxav92mk2cqn6gh1l5z0zgc7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gT3IgYXQgbGVhc3QgaXQgaXMgbXkgYXR0ZW1wdCB0byBtYWtlIGEgdXR0ZXJseSBicm9rZW4gYWlycGxhbmUgbW9kZSBpbXBsZW1lbnRhdGlvbiBzb21ld2hhdCBzYW5lIHRvIGhhbmRsZS5cblxuSGludDogV2l0aCB0aGlzIGV4dGVuc2lvbiB5b3UgY2FuIGFsc28gdHVybiBvZmYgdGhlIGFubm95aW5nIFwiQmx1ZXRvb3RoIGdldHMgdHVybmVkIG9uIHdoZW4gSSBkaXNhYmxlIGFpcnBsYW5lIG1vZGVcIiBiZWhhdmlvci4gXG5cblRvIGV2ZXJ5b25lIHdobyBpcyBleHBlcmllbmNpbmcgaXNzdWVzIHdpdGggdGhpcyBleHRlbnNpb246IFBsZWFzZSByZXBvcnQgZXJyb3JzIG9uIEdpdEh1YiEiLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hLaXBwaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2FuZS1haXJwbGFuZS1tb2RlIiwKICAidXVpZCI6ICJzYW5lLWFpcnBsYW5lLW1vZGVAa2lwcGkiLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "0fkk9g35yfybqdg5mvv76b8hn8xdyxav92mk2cqn6gh1l5z0zgc7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gT3IgYXQgbGVhc3QgaXQgaXMgbXkgYXR0ZW1wdCB0byBtYWtlIGEgdXR0ZXJseSBicm9rZW4gYWlycGxhbmUgbW9kZSBpbXBsZW1lbnRhdGlvbiBzb21ld2hhdCBzYW5lIHRvIGhhbmRsZS5cblxuSGludDogV2l0aCB0aGlzIGV4dGVuc2lvbiB5b3UgY2FuIGFsc28gdHVybiBvZmYgdGhlIGFubm95aW5nIFwiQmx1ZXRvb3RoIGdldHMgdHVybmVkIG9uIHdoZW4gSSBkaXNhYmxlIGFpcnBsYW5lIG1vZGVcIiBiZWhhdmlvci4gXG5cblRvIGV2ZXJ5b25lIHdobyBpcyBleHBlcmllbmNpbmcgaXNzdWVzIHdpdGggdGhpcyBleHRlbnNpb246IFBsZWFzZSByZXBvcnQgZXJyb3JzIG9uIEdpdEh1YiEiLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hLaXBwaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2FuZS1haXJwbGFuZS1tb2RlIiwKICAidXVpZCI6ICJzYW5lLWFpcnBsYW5lLW1vZGVAa2lwcGkiLAogICJ2ZXJzaW9uIjogOAp9"}}} +, {"uuid": "sane-airplane-mode@kippi", "name": "Sane Airplane Mode", "pname": "sane-airplane-mode", "description": "Make airplane mode sane again! This extension gives you better control over the airplane mode. \nHint: With this extension you can also turn off the annoying \"Bluetooth gets turned on when I disable airplane mode\" behaviour.", "link": "https://extensions.gnome.org/extension/4604/sane-airplane-mode/", "shell_version_map": {"40": {"version": "9", "sha256": "14p3wrx43a9lgq7g7bdmkj4i9jb6kpc1x8kl9q6197xdgyzpvll3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "14p3wrx43a9lgq7g7bdmkj4i9jb6kpc1x8kl9q6197xdgyzpvll3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "14p3wrx43a9lgq7g7bdmkj4i9jb6kpc1x8kl9q6197xdgyzpvll3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "14p3wrx43a9lgq7g7bdmkj4i9jb6kpc1x8kl9q6197xdgyzpvll3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94S2lwcGkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNhbmUtYWlycGxhbmUtbW9kZSIsCiAgInV1aWQiOiAic2FuZS1haXJwbGFuZS1tb2RlQGtpcHBpIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "undecorate@tabdeveloper.com", "name": "Undecorate Window for Wayland", "pname": "undecorate-window-for-wayland", "description": "Adds undecorate option to window menu to toggle window decoration.", "link": "https://extensions.gnome.org/extension/4606/undecorate-window-for-wayland/", "shell_version_map": {"40": {"version": "3", "sha256": "1ikbxwqdc204w6vjn1slbrmqvxmkcbyzgqg35jacv8r1z66n6nwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdW5kZWNvcmF0ZSBvcHRpb24gdG8gd2luZG93IG1lbnUgdG8gdG9nZ2xlIHdpbmRvdyBkZWNvcmF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAibmFtZSI6ICJVbmRlY29yYXRlIFdpbmRvdyBmb3IgV2F5bGFuZCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iLAogICAgInRpbUB0YWJkZXZlbG9wZXIuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmRlY29yYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJyYW55ZW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuZGVjb3JhdGUiLAogICJ1dWlkIjogInVuZGVjb3JhdGVAdGFiZGV2ZWxvcGVyLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "1ikbxwqdc204w6vjn1slbrmqvxmkcbyzgqg35jacv8r1z66n6nwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdW5kZWNvcmF0ZSBvcHRpb24gdG8gd2luZG93IG1lbnUgdG8gdG9nZ2xlIHdpbmRvdyBkZWNvcmF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAibmFtZSI6ICJVbmRlY29yYXRlIFdpbmRvdyBmb3IgV2F5bGFuZCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iLAogICAgInRpbUB0YWJkZXZlbG9wZXIuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmRlY29yYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJyYW55ZW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuZGVjb3JhdGUiLAogICJ1dWlkIjogInVuZGVjb3JhdGVAdGFiZGV2ZWxvcGVyLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "1ikbxwqdc204w6vjn1slbrmqvxmkcbyzgqg35jacv8r1z66n6nwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdW5kZWNvcmF0ZSBvcHRpb24gdG8gd2luZG93IG1lbnUgdG8gdG9nZ2xlIHdpbmRvdyBkZWNvcmF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAibmFtZSI6ICJVbmRlY29yYXRlIFdpbmRvdyBmb3IgV2F5bGFuZCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iLAogICAgInRpbUB0YWJkZXZlbG9wZXIuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmRlY29yYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJyYW55ZW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuZGVjb3JhdGUiLAogICJ1dWlkIjogInVuZGVjb3JhdGVAdGFiZGV2ZWxvcGVyLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "zenbook-duo@laurinneff.ch", "name": "Asus ZenBook Duo Integration", "pname": "asus-zenbook-duo-integration", "description": "Integrate the features of the Asus ZenBook Duo into GNOME", "link": "https://extensions.gnome.org/extension/4607/asus-zenbook-duo-integration/", "shell_version_map": {"40": {"version": "5", "sha256": "1xljk5qklm8f9k6hx6ax2axp6r6si510706bksrsbzy72i2dp46w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSB0aGUgZmVhdHVyZXMgb2YgdGhlIEFzdXMgWmVuQm9vayBEdW8gaW50byBHTk9NRSIsCiAgIm5hbWUiOiAiQXN1cyBaZW5Cb29rIER1byBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJpbm5lZmYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXplbmJvb2stZHVvIiwKICAidXVpZCI6ICJ6ZW5ib29rLWR1b0BsYXVyaW5uZWZmLmNoIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1xljk5qklm8f9k6hx6ax2axp6r6si510706bksrsbzy72i2dp46w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSB0aGUgZmVhdHVyZXMgb2YgdGhlIEFzdXMgWmVuQm9vayBEdW8gaW50byBHTk9NRSIsCiAgIm5hbWUiOiAiQXN1cyBaZW5Cb29rIER1byBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJpbm5lZmYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXplbmJvb2stZHVvIiwKICAidXVpZCI6ICJ6ZW5ib29rLWR1b0BsYXVyaW5uZWZmLmNoIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "1xljk5qklm8f9k6hx6ax2axp6r6si510706bksrsbzy72i2dp46w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSB0aGUgZmVhdHVyZXMgb2YgdGhlIEFzdXMgWmVuQm9vayBEdW8gaW50byBHTk9NRSIsCiAgIm5hbWUiOiAiQXN1cyBaZW5Cb29rIER1byBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJpbm5lZmYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXplbmJvb2stZHVvIiwKICAidXVpZCI6ICJ6ZW5ib29rLWR1b0BsYXVyaW5uZWZmLmNoIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "batterythreshold@francku.gitlab.com", "name": "Battery threshold", "pname": "battery-threshold", "description": "A simple extension for gnome-shell that let easily set a threshold to limit battery charge level.\n\nThis extension uses \"pkexec\" since sudo permissions are needed to change the threshold level.\n\nTested on Fedora Silverblue 35 (gnome-shell 3.41) on an Asus Vivobook.\n\nGithub page: https://github.com/francku/gnome-shell-extension-battery-threshold", "link": "https://extensions.gnome.org/extension/4612/battery-threshold/", "shell_version_map": {"41": {"version": "3", "sha256": "0jydbi1lwz6ls0rg3660b3s7gwlmkd9a08v1mhx12zp89rgrxfm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZ25vbWUtc2hlbGwgdGhhdCBsZXQgZWFzaWx5IHNldCBhIHRocmVzaG9sZCB0byBsaW1pdCBiYXR0ZXJ5IGNoYXJnZSBsZXZlbC5cblxuVGhpcyBleHRlbnNpb24gdXNlcyBcInBrZXhlY1wiIHNpbmNlIHN1ZG8gcGVybWlzc2lvbnMgYXJlIG5lZWRlZCB0byBjaGFuZ2UgdGhlIHRocmVzaG9sZCBsZXZlbC5cblxuVGVzdGVkIG9uIEZlZG9yYSBTaWx2ZXJibHVlIDM1IChnbm9tZS1zaGVsbCAzLjQxKSBvbiBhbiBBc3VzIFZpdm9ib29rLlxuXG5HaXRodWIgcGFnZTogaHR0cHM6Ly9naXRodWIuY29tL2ZyYW5ja3UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWJhdHRlcnktdGhyZXNob2xkIiwKICAibmFtZSI6ICJCYXR0ZXJ5IHRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJiYXR0ZXJ5dGhyZXNob2xkQGZyYW5ja3UuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0jydbi1lwz6ls0rg3660b3s7gwlmkd9a08v1mhx12zp89rgrxfm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZ25vbWUtc2hlbGwgdGhhdCBsZXQgZWFzaWx5IHNldCBhIHRocmVzaG9sZCB0byBsaW1pdCBiYXR0ZXJ5IGNoYXJnZSBsZXZlbC5cblxuVGhpcyBleHRlbnNpb24gdXNlcyBcInBrZXhlY1wiIHNpbmNlIHN1ZG8gcGVybWlzc2lvbnMgYXJlIG5lZWRlZCB0byBjaGFuZ2UgdGhlIHRocmVzaG9sZCBsZXZlbC5cblxuVGVzdGVkIG9uIEZlZG9yYSBTaWx2ZXJibHVlIDM1IChnbm9tZS1zaGVsbCAzLjQxKSBvbiBhbiBBc3VzIFZpdm9ib29rLlxuXG5HaXRodWIgcGFnZTogaHR0cHM6Ly9naXRodWIuY29tL2ZyYW5ja3UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWJhdHRlcnktdGhyZXNob2xkIiwKICAibmFtZSI6ICJCYXR0ZXJ5IHRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJiYXR0ZXJ5dGhyZXNob2xkQGZyYW5ja3UuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0jydbi1lwz6ls0rg3660b3s7gwlmkd9a08v1mhx12zp89rgrxfm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZ25vbWUtc2hlbGwgdGhhdCBsZXQgZWFzaWx5IHNldCBhIHRocmVzaG9sZCB0byBsaW1pdCBiYXR0ZXJ5IGNoYXJnZSBsZXZlbC5cblxuVGhpcyBleHRlbnNpb24gdXNlcyBcInBrZXhlY1wiIHNpbmNlIHN1ZG8gcGVybWlzc2lvbnMgYXJlIG5lZWRlZCB0byBjaGFuZ2UgdGhlIHRocmVzaG9sZCBsZXZlbC5cblxuVGVzdGVkIG9uIEZlZG9yYSBTaWx2ZXJibHVlIDM1IChnbm9tZS1zaGVsbCAzLjQxKSBvbiBhbiBBc3VzIFZpdm9ib29rLlxuXG5HaXRodWIgcGFnZTogaHR0cHM6Ly9naXRodWIuY29tL2ZyYW5ja3UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWJhdHRlcnktdGhyZXNob2xkIiwKICAibmFtZSI6ICJCYXR0ZXJ5IHRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJiYXR0ZXJ5dGhyZXNob2xkQGZyYW5ja3UuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} @@ -650,13 +650,13 @@ , {"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: minimize if one window is open, overview if many 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": "58", "sha256": "0z4k8mc6dqfhr8p7irqwimxskcn51gnrj9pyk6fw101rmqb0xm72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "41": {"version": "58", "sha256": "0z4k8mc6dqfhr8p7irqwimxskcn51gnrj9pyk6fw101rmqb0xm72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "42": {"version": "58", "sha256": "0z4k8mc6dqfhr8p7irqwimxskcn51gnrj9pyk6fw101rmqb0xm72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "43": {"version": "58", "sha256": "0z4k8mc6dqfhr8p7irqwimxskcn51gnrj9pyk6fw101rmqb0xm72", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}}} , {"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": "29", "sha256": "0x49f6j1jfk54aki0if1w5y6582p7dn486qc7aczbz304rq311va", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "41": {"version": "29", "sha256": "0x49f6j1jfk54aki0if1w5y6582p7dn486qc7aczbz304rq311va", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "42": {"version": "29", "sha256": "0x49f6j1jfk54aki0if1w5y6582p7dn486qc7aczbz304rq311va", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "43": {"version": "29", "sha256": "0x49f6j1jfk54aki0if1w5y6582p7dn486qc7aczbz304rq311va", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}}} -, {"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": "2", "sha256": "1xsnrdzqckr5l6lp8biz2zamkmsagdi43nhhlf15wbk7919xnrbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAicHJldmVudC1kb3VibGUtZW1wdHktd2luZG93QHNpbGxpZXdvdXMubmwiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1xsnrdzqckr5l6lp8biz2zamkmsagdi43nhhlf15wbk7919xnrbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAicHJldmVudC1kb3VibGUtZW1wdHktd2luZG93QHNpbGxpZXdvdXMubmwiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "1xsnrdzqckr5l6lp8biz2zamkmsagdi43nhhlf15wbk7919xnrbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAicHJldmVudC1kb3VibGUtZW1wdHktd2luZG93QHNpbGxpZXdvdXMubmwiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"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": "6", "sha256": "0x3ih2fpwg4sf07wwygf0bjf8n1z32x90a09bzrfffjlycqwhbqd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0x3ih2fpwg4sf07wwygf0bjf8n1z32x90a09bzrfffjlycqwhbqd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "0x3ih2fpwg4sf07wwygf0bjf8n1z32x90a09bzrfffjlycqwhbqd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "6", "sha256": "0x3ih2fpwg4sf07wwygf0bjf8n1z32x90a09bzrfffjlycqwhbqd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzIFZvbHVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"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="}}} , {"uuid": "countdown-timer@eexpss.gmail.com", "name": "Countdown & Timer", "pname": "countdown-timer", "description": "Countdown in minutes, or enter text containing HH:MM format to set the Timer.", "link": "https://extensions.gnome.org/extension/4720/countdown-timer/", "shell_version_map": {"40": {"version": "9", "sha256": "08va385j93b9d1n8w7b3sia656abl4x25ka1kff4kzg0rd0b74c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY291bnRkb3duLXRpbWVyIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "08va385j93b9d1n8w7b3sia656abl4x25ka1kff4kzg0rd0b74c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY291bnRkb3duLXRpbWVyIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "08va385j93b9d1n8w7b3sia656abl4x25ka1kff4kzg0rd0b74c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY291bnRkb3duLXRpbWVyIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "workspace-dry-names@benmoussatmouad.github.io", "name": "Worksapce Dry Names", "pname": "worksapce-dry-names", "description": "Workspace dry-names is a simple gnome extension that enables tags for desktop workspaces. It shows text labels on the left side of the main panel with randomly generated cities names (or an other category of names). Names can also be modified.\n\nhttps://github.com/benmoussatMouad/gnome-workspace-dry-names.git", "link": "https://extensions.gnome.org/extension/4721/worksapce-dry-names/", "shell_version_map": {"38": {"version": "1", "sha256": "0ljprv3ar01p1y24p6j7hc8g7afca7ir0b2zyapjpzndz7mv1zcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBkcnktbmFtZXMgaXMgYSBzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIHRoYXQgZW5hYmxlcyB0YWdzIGZvciBkZXNrdG9wIHdvcmtzcGFjZXMuIEl0IHNob3dzIHRleHQgbGFiZWxzIG9uIHRoZSBsZWZ0IHNpZGUgb2YgdGhlIG1haW4gcGFuZWwgd2l0aCByYW5kb21seSBnZW5lcmF0ZWQgY2l0aWVzIG5hbWVzIChvciBhbiBvdGhlciBjYXRlZ29yeSBvZiBuYW1lcykuIE5hbWVzIGNhbiBhbHNvIGJlIG1vZGlmaWVkLlxuXG5odHRwczovL2dpdGh1Yi5jb20vYmVubW91c3NhdE1vdWFkL2dub21lLXdvcmtzcGFjZS1kcnktbmFtZXMuZ2l0IiwKICAibmFtZSI6ICJXb3Jrc2FwY2UgRHJ5IE5hbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1kcnktbmFtZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtZHJ5LW5hbWVzQGJlbm1vdXNzYXRtb3VhZC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "0ljprv3ar01p1y24p6j7hc8g7afca7ir0b2zyapjpzndz7mv1zcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBkcnktbmFtZXMgaXMgYSBzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIHRoYXQgZW5hYmxlcyB0YWdzIGZvciBkZXNrdG9wIHdvcmtzcGFjZXMuIEl0IHNob3dzIHRleHQgbGFiZWxzIG9uIHRoZSBsZWZ0IHNpZGUgb2YgdGhlIG1haW4gcGFuZWwgd2l0aCByYW5kb21seSBnZW5lcmF0ZWQgY2l0aWVzIG5hbWVzIChvciBhbiBvdGhlciBjYXRlZ29yeSBvZiBuYW1lcykuIE5hbWVzIGNhbiBhbHNvIGJlIG1vZGlmaWVkLlxuXG5odHRwczovL2dpdGh1Yi5jb20vYmVubW91c3NhdE1vdWFkL2dub21lLXdvcmtzcGFjZS1kcnktbmFtZXMuZ2l0IiwKICAibmFtZSI6ICJXb3Jrc2FwY2UgRHJ5IE5hbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1kcnktbmFtZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtZHJ5LW5hbWVzQGJlbm1vdXNzYXRtb3VhZC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "0ljprv3ar01p1y24p6j7hc8g7afca7ir0b2zyapjpzndz7mv1zcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBkcnktbmFtZXMgaXMgYSBzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIHRoYXQgZW5hYmxlcyB0YWdzIGZvciBkZXNrdG9wIHdvcmtzcGFjZXMuIEl0IHNob3dzIHRleHQgbGFiZWxzIG9uIHRoZSBsZWZ0IHNpZGUgb2YgdGhlIG1haW4gcGFuZWwgd2l0aCByYW5kb21seSBnZW5lcmF0ZWQgY2l0aWVzIG5hbWVzIChvciBhbiBvdGhlciBjYXRlZ29yeSBvZiBuYW1lcykuIE5hbWVzIGNhbiBhbHNvIGJlIG1vZGlmaWVkLlxuXG5odHRwczovL2dpdGh1Yi5jb20vYmVubW91c3NhdE1vdWFkL2dub21lLXdvcmtzcGFjZS1kcnktbmFtZXMuZ2l0IiwKICAibmFtZSI6ICJXb3Jrc2FwY2UgRHJ5IE5hbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1kcnktbmFtZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtZHJ5LW5hbWVzQGJlbm1vdXNzYXRtb3VhZC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "window-calls@domandoman.xyz", "name": "Window Calls", "pname": "window-calls", "description": "Adds dbus calls which can return list of windows, move, resize, close them etc", "link": "https://extensions.gnome.org/extension/4724/window-calls/", "shell_version_map": {"40": {"version": "12", "sha256": "08gsyi51f0c3wdi0r3y1ykja9avdkyaplzd7vd8fydlsh4bya18g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgZGJ1cyBjYWxscyB3aGljaCBjYW4gcmV0dXJuIGxpc3Qgb2Ygd2luZG93cywgbW92ZSwgcmVzaXplLCBjbG9zZSB0aGVtIGV0YyIsCiAgIm5hbWUiOiAiV2luZG93IENhbGxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lja3lpY2t5L3dpbmRvdy1jYWxscyIsCiAgInV1aWQiOiAid2luZG93LWNhbGxzQGRvbWFuZG9tYW4ueHl6IiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "08gsyi51f0c3wdi0r3y1ykja9avdkyaplzd7vd8fydlsh4bya18g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgZGJ1cyBjYWxscyB3aGljaCBjYW4gcmV0dXJuIGxpc3Qgb2Ygd2luZG93cywgbW92ZSwgcmVzaXplLCBjbG9zZSB0aGVtIGV0YyIsCiAgIm5hbWUiOiAiV2luZG93IENhbGxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lja3lpY2t5L3dpbmRvdy1jYWxscyIsCiAgInV1aWQiOiAid2luZG93LWNhbGxzQGRvbWFuZG9tYW4ueHl6IiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "08gsyi51f0c3wdi0r3y1ykja9avdkyaplzd7vd8fydlsh4bya18g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgZGJ1cyBjYWxscyB3aGljaCBjYW4gcmV0dXJuIGxpc3Qgb2Ygd2luZG93cywgbW92ZSwgcmVzaXplLCBjbG9zZSB0aGVtIGV0YyIsCiAgIm5hbWUiOiAiV2luZG93IENhbGxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lja3lpY2t5L3dpbmRvdy1jYWxscyIsCiAgInV1aWQiOiAid2luZG93LWNhbGxzQGRvbWFuZG9tYW4ueHl6IiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "08gsyi51f0c3wdi0r3y1ykja9avdkyaplzd7vd8fydlsh4bya18g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgZGJ1cyBjYWxscyB3aGljaCBjYW4gcmV0dXJuIGxpc3Qgb2Ygd2luZG93cywgbW92ZSwgcmVzaXplLCBjbG9zZSB0aGVtIGV0YyIsCiAgIm5hbWUiOiAiV2luZG93IENhbGxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lja3lpY2t5L3dpbmRvdy1jYWxscyIsCiAgInV1aWQiOiAid2luZG93LWNhbGxzQGRvbWFuZG9tYW4ueHl6IiwKICAidmVyc2lvbiI6IDEyCn0="}}} -, {"uuid": "primary_input_on_lockscreen@sagidayan.com", "name": "Primary Input on LockScreen", "pname": "primary-input-on-lockscreen", "description": "Automatically change input layout to primary on lock screen", "link": "https://extensions.gnome.org/extension/4727/primary-input-on-lockscreen/", "shell_version_map": {"40": {"version": "3", "sha256": "00i0wl4yb5gmj35zzj0b8kbdbm7y50b0kls6dlackdxbqgh88ji3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zYWdpZGF5YW4vcHJpbWFyeS1pbnB1dC1vbi1sb2Nrc2NyZWVuIiwKICAidXVpZCI6ICJwcmltYXJ5X2lucHV0X29uX2xvY2tzY3JlZW5Ac2FnaWRheWFuLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "00i0wl4yb5gmj35zzj0b8kbdbm7y50b0kls6dlackdxbqgh88ji3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zYWdpZGF5YW4vcHJpbWFyeS1pbnB1dC1vbi1sb2Nrc2NyZWVuIiwKICAidXVpZCI6ICJwcmltYXJ5X2lucHV0X29uX2xvY2tzY3JlZW5Ac2FnaWRheWFuLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "00i0wl4yb5gmj35zzj0b8kbdbm7y50b0kls6dlackdxbqgh88ji3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zYWdpZGF5YW4vcHJpbWFyeS1pbnB1dC1vbi1sb2Nrc2NyZWVuIiwKICAidXVpZCI6ICJwcmltYXJ5X2lucHV0X29uX2xvY2tzY3JlZW5Ac2FnaWRheWFuLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "primary_input_on_lockscreen@sagidayan.com", "name": "Primary Input on LockScreen", "pname": "primary-input-on-lockscreen", "description": "Automatically change input layout to primary on lock screen", "link": "https://extensions.gnome.org/extension/4727/primary-input-on-lockscreen/", "shell_version_map": {"40": {"version": "4", "sha256": "0dj9lkvi6qwwiwx8bhj5d8d3v5msrynqv8lfi31cgb9an72rc23y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2FnaWRheWFuL3ByaW1hcnktaW5wdXQtb24tbG9ja3NjcmVlbiIsCiAgInV1aWQiOiAicHJpbWFyeV9pbnB1dF9vbl9sb2Nrc2NyZWVuQHNhZ2lkYXlhbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0dj9lkvi6qwwiwx8bhj5d8d3v5msrynqv8lfi31cgb9an72rc23y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2FnaWRheWFuL3ByaW1hcnktaW5wdXQtb24tbG9ja3NjcmVlbiIsCiAgInV1aWQiOiAicHJpbWFyeV9pbnB1dF9vbl9sb2Nrc2NyZWVuQHNhZ2lkYXlhbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "0dj9lkvi6qwwiwx8bhj5d8d3v5msrynqv8lfi31cgb9an72rc23y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2FnaWRheWFuL3ByaW1hcnktaW5wdXQtb24tbG9ja3NjcmVlbiIsCiAgInV1aWQiOiAicHJpbWFyeV9pbnB1dF9vbl9sb2Nrc2NyZWVuQHNhZ2lkYXlhbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "43": {"version": "4", "sha256": "0dj9lkvi6qwwiwx8bhj5d8d3v5msrynqv8lfi31cgb9an72rc23y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2FnaWRheWFuL3ByaW1hcnktaW5wdXQtb24tbG9ja3NjcmVlbiIsCiAgInV1aWQiOiAicHJpbWFyeV9pbnB1dF9vbl9sb2Nrc2NyZWVuQHNhZ2lkYXlhbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "browser-tabs@com.github.harshadgavali", "name": "Browser tabs", "pname": "browser-tabs", "description": "Search and switch to browser tabs using GNOME overview/ArcMenu\n\nSee following github link for installing necessary browser extension and host app!", "link": "https://extensions.gnome.org/extension/4733/browser-tabs/", "shell_version_map": {"40": {"version": "4", "sha256": "1r1m6cfi9pv0sz651b95ji2rk40rhwmdnivq2jaf030w3qrkwysf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcnNoYWRnYXZhbGkvc2VhcmNocHJvdmlkZXItZm9yLWJyb3dzZXItdGFicy5naXQvIiwKICAidXVpZCI6ICJicm93c2VyLXRhYnNAY29tLmdpdGh1Yi5oYXJzaGFkZ2F2YWxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1r1m6cfi9pv0sz651b95ji2rk40rhwmdnivq2jaf030w3qrkwysf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcnNoYWRnYXZhbGkvc2VhcmNocHJvdmlkZXItZm9yLWJyb3dzZXItdGFicy5naXQvIiwKICAidXVpZCI6ICJicm93c2VyLXRhYnNAY29tLmdpdGh1Yi5oYXJzaGFkZ2F2YWxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "1r1m6cfi9pv0sz651b95ji2rk40rhwmdnivq2jaf030w3qrkwysf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcnNoYWRnYXZhbGkvc2VhcmNocHJvdmlkZXItZm9yLWJyb3dzZXItdGFicy5naXQvIiwKICAidXVpZCI6ICJicm93c2VyLXRhYnNAY29tLmdpdGh1Yi5oYXJzaGFkZ2F2YWxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "smart-auto-move@khimaros.com", "name": "Smart Auto Move", "pname": "smart-auto-move", "description": "Smart Auto Move learns the size and position of your application windows and restores them to the correct place on subsequent launches. Supports Wayland.\n\nNOTE: Optimized for use with static workspaces. For more control, can be set to default IGNORE and then selectively RESTORE only desired apps.", "link": "https://extensions.gnome.org/extension/4736/smart-auto-move/", "shell_version_map": {"41": {"version": "17", "sha256": "07h7vx2l4yvvfh4blkaxqd2h30v398d5478qb7gjh94cs7n4hgqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toaW1hcm9zL3NtYXJ0LWF1dG8tbW92ZSIsCiAgInV1aWQiOiAic21hcnQtYXV0by1tb3ZlQGtoaW1hcm9zLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "42": {"version": "17", "sha256": "07h7vx2l4yvvfh4blkaxqd2h30v398d5478qb7gjh94cs7n4hgqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toaW1hcm9zL3NtYXJ0LWF1dG8tbW92ZSIsCiAgInV1aWQiOiAic21hcnQtYXV0by1tb3ZlQGtoaW1hcm9zLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "43": {"version": "17", "sha256": "07h7vx2l4yvvfh4blkaxqd2h30v398d5478qb7gjh94cs7n4hgqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2toaW1hcm9zL3NtYXJ0LWF1dG8tbW92ZSIsCiAgInV1aWQiOiAic21hcnQtYXV0by1tb3ZlQGtoaW1hcm9zLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}}} , {"uuid": "hplip-menu2@grizzlysmit.smit.id.au", "name": "Alternate Menu for Hplip2", "pname": "alternate-menu-for-hplip2", "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.\nThis is a replacement for the old \"Alternate Menu for Hplip\" which doesn't work under the new Gome-Shell I have cleaned it up a bit and it has a few new menu's but it is still basically the same thing.\n Added even more menus all most all system settings ones.\n\nNote: the menu will be too big if your resolution is way too low like 800x600 I have no soln for this just now.\nDutch language support added by Vistaus (Heimen Stoffels) https://github.com/Vistaus", "link": "https://extensions.gnome.org/extension/4739/alternate-menu-for-hplip2/", "shell_version_map": {"40": {"version": "7", "sha256": "06g0p9l5yg6anppmlydlzbmqzplj3v959bvz7p2zj2vm9ly6p55a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cbkR1dGNoIGxhbmd1YWdlIHN1cHBvcnQgYWRkZWQgYnkgVmlzdGF1cyAoSGVpbWVuIFN0b2ZmZWxzKSBodHRwczovL2dpdGh1Yi5jb20vVmlzdGF1cyIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "06g0p9l5yg6anppmlydlzbmqzplj3v959bvz7p2zj2vm9ly6p55a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cbkR1dGNoIGxhbmd1YWdlIHN1cHBvcnQgYWRkZWQgYnkgVmlzdGF1cyAoSGVpbWVuIFN0b2ZmZWxzKSBodHRwczovL2dpdGh1Yi5jb20vVmlzdGF1cyIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "06g0p9l5yg6anppmlydlzbmqzplj3v959bvz7p2zj2vm9ly6p55a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cbkR1dGNoIGxhbmd1YWdlIHN1cHBvcnQgYWRkZWQgYnkgVmlzdGF1cyAoSGVpbWVuIFN0b2ZmZWxzKSBodHRwczovL2dpdGh1Yi5jb20vVmlzdGF1cyIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "06g0p9l5yg6anppmlydlzbmqzplj3v959bvz7p2zj2vm9ly6p55a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy5cbkR1dGNoIGxhbmd1YWdlIHN1cHBvcnQgYWRkZWQgYnkgVmlzdGF1cyAoSGVpbWVuIFN0b2ZmZWxzKSBodHRwczovL2dpdGh1Yi5jb20vVmlzdGF1cyIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwMiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ocGxpcC1tZW51MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDcKfQ=="}}} @@ -666,12 +666,12 @@ , {"uuid": "toggleimwheel@mijorus.it", "name": "Toggle imwheel", "pname": "toggle-imwheel", "description": "This simple extension wants to mitigate the lack of a dedicated mouse wheel control on most of the modern linux distributions. Many are using imwheel as a temporary fix; however, if you are using a laptop, you might want to have two different settings for the touchpad and the mouse. \n This extension will add an icon in the top bar which lets you toggle imwheel between two custom settings. \n https://github.com/mijorus/toggle-imwheel", "link": "https://extensions.gnome.org/extension/4748/toggle-imwheel/", "shell_version_map": {"40": {"version": "8", "sha256": "0wlb32ml77hwzh1wln0zzscc44pagga15wnwv9fa17jdi0z78pla", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2ltcGxlIGV4dGVuc2lvbiB3YW50cyB0byBtaXRpZ2F0ZSB0aGUgbGFjayBvZiBhIGRlZGljYXRlZCBtb3VzZSB3aGVlbCBjb250cm9sIG9uIG1vc3Qgb2YgdGhlIG1vZGVybiBsaW51eCBkaXN0cmlidXRpb25zLiBNYW55IGFyZSB1c2luZyBpbXdoZWVsIGFzIGEgdGVtcG9yYXJ5IGZpeDsgaG93ZXZlciwgaWYgeW91IGFyZSB1c2luZyBhIGxhcHRvcCwgeW91IG1pZ2h0IHdhbnQgdG8gaGF2ZSB0d28gZGlmZmVyZW50IHNldHRpbmdzIGZvciB0aGUgdG91Y2hwYWQgYW5kIHRoZSBtb3VzZS4gXG4gVGhpcyBleHRlbnNpb24gd2lsbCBhZGQgYW4gaWNvbiBpbiB0aGUgdG9wIGJhciB3aGljaCBsZXRzIHlvdSB0b2dnbGUgaW13aGVlbCBiZXR3ZWVuIHR3byBjdXN0b20gc2V0dGluZ3MuIFxuIGh0dHBzOi8vZ2l0aHViLmNvbS9taWpvcnVzL3RvZ2dsZS1pbXdoZWVsIiwKICAibmFtZSI6ICJUb2dnbGUgaW13aGVlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0b2dnbGVpbXdoZWVsQG1pam9ydXMuaXQiLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "0wlb32ml77hwzh1wln0zzscc44pagga15wnwv9fa17jdi0z78pla", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2ltcGxlIGV4dGVuc2lvbiB3YW50cyB0byBtaXRpZ2F0ZSB0aGUgbGFjayBvZiBhIGRlZGljYXRlZCBtb3VzZSB3aGVlbCBjb250cm9sIG9uIG1vc3Qgb2YgdGhlIG1vZGVybiBsaW51eCBkaXN0cmlidXRpb25zLiBNYW55IGFyZSB1c2luZyBpbXdoZWVsIGFzIGEgdGVtcG9yYXJ5IGZpeDsgaG93ZXZlciwgaWYgeW91IGFyZSB1c2luZyBhIGxhcHRvcCwgeW91IG1pZ2h0IHdhbnQgdG8gaGF2ZSB0d28gZGlmZmVyZW50IHNldHRpbmdzIGZvciB0aGUgdG91Y2hwYWQgYW5kIHRoZSBtb3VzZS4gXG4gVGhpcyBleHRlbnNpb24gd2lsbCBhZGQgYW4gaWNvbiBpbiB0aGUgdG9wIGJhciB3aGljaCBsZXRzIHlvdSB0b2dnbGUgaW13aGVlbCBiZXR3ZWVuIHR3byBjdXN0b20gc2V0dGluZ3MuIFxuIGh0dHBzOi8vZ2l0aHViLmNvbS9taWpvcnVzL3RvZ2dsZS1pbXdoZWVsIiwKICAibmFtZSI6ICJUb2dnbGUgaW13aGVlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0b2dnbGVpbXdoZWVsQG1pam9ydXMuaXQiLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "0wlb32ml77hwzh1wln0zzscc44pagga15wnwv9fa17jdi0z78pla", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2ltcGxlIGV4dGVuc2lvbiB3YW50cyB0byBtaXRpZ2F0ZSB0aGUgbGFjayBvZiBhIGRlZGljYXRlZCBtb3VzZSB3aGVlbCBjb250cm9sIG9uIG1vc3Qgb2YgdGhlIG1vZGVybiBsaW51eCBkaXN0cmlidXRpb25zLiBNYW55IGFyZSB1c2luZyBpbXdoZWVsIGFzIGEgdGVtcG9yYXJ5IGZpeDsgaG93ZXZlciwgaWYgeW91IGFyZSB1c2luZyBhIGxhcHRvcCwgeW91IG1pZ2h0IHdhbnQgdG8gaGF2ZSB0d28gZGlmZmVyZW50IHNldHRpbmdzIGZvciB0aGUgdG91Y2hwYWQgYW5kIHRoZSBtb3VzZS4gXG4gVGhpcyBleHRlbnNpb24gd2lsbCBhZGQgYW4gaWNvbiBpbiB0aGUgdG9wIGJhciB3aGljaCBsZXRzIHlvdSB0b2dnbGUgaW13aGVlbCBiZXR3ZWVuIHR3byBjdXN0b20gc2V0dGluZ3MuIFxuIGh0dHBzOi8vZ2l0aHViLmNvbS9taWpvcnVzL3RvZ2dsZS1pbXdoZWVsIiwKICAibmFtZSI6ICJUb2dnbGUgaW13aGVlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0b2dnbGVpbXdoZWVsQG1pam9ydXMuaXQiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "yakuake-extension@kde.org", "name": "Yakuake", "pname": "yakuake", "description": "A Gnome shell extension to use Yakuake on Gnome. Adds a global shortcut to show/hide yakuake and makes the console appear focussed.", "link": "https://extensions.gnome.org/extension/4757/yakuake/", "shell_version_map": {"40": {"version": "6", "sha256": "069fk11nr2nnssyb8ljzdf3xb15lvbgny2jp8skq1ky7w8k7a0cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxiZXJ0dmFrYS95YWt1YWtlLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAieWFrdWFrZS1leHRlbnNpb25Aa2RlLm9yZyIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "069fk11nr2nnssyb8ljzdf3xb15lvbgny2jp8skq1ky7w8k7a0cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxiZXJ0dmFrYS95YWt1YWtlLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAieWFrdWFrZS1leHRlbnNpb25Aa2RlLm9yZyIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "069fk11nr2nnssyb8ljzdf3xb15lvbgny2jp8skq1ky7w8k7a0cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxiZXJ0dmFrYS95YWt1YWtlLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAieWFrdWFrZS1leHRlbnNpb25Aa2RlLm9yZyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "dnf-shotcuts@rx1310", "name": "Shortcuts for DNF", "pname": "shortcuts-for-dnf", "description": "A small extension that adds buttons to the panel to check for DNF updates through the terminal without entering commands.", "link": "https://extensions.gnome.org/extension/4758/shortcuts-for-dnf/", "shell_version_map": {"38": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "speedbackground@luke.vader", "name": "Speed background", "pname": "speed-background", "description": "Increase how often Gnome will check the background.", "link": "https://extensions.gnome.org/extension/4761/speed-background/", "shell_version_map": {"40": {"version": "6", "sha256": "1dwq6v0w15ycrfmma67csjha8axdc11y0dj05fpp2y4b4sgahy53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0x1a2VWYWRlci1JVi9nbm9tZS1zcGVlZC1iYWNrZ3JvdW5kLWV4dGVuc2lvbi8iLAogICJ1dWlkIjogInNwZWVkYmFja2dyb3VuZEBsdWtlLnZhZGVyIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1dwq6v0w15ycrfmma67csjha8axdc11y0dj05fpp2y4b4sgahy53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0x1a2VWYWRlci1JVi9nbm9tZS1zcGVlZC1iYWNrZ3JvdW5kLWV4dGVuc2lvbi8iLAogICJ1dWlkIjogInNwZWVkYmFja2dyb3VuZEBsdWtlLnZhZGVyIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "1dwq6v0w15ycrfmma67csjha8axdc11y0dj05fpp2y4b4sgahy53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0x1a2VWYWRlci1JVi9nbm9tZS1zcGVlZC1iYWNrZ3JvdW5kLWV4dGVuc2lvbi8iLAogICJ1dWlkIjogInNwZWVkYmFja2dyb3VuZEBsdWtlLnZhZGVyIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} +, {"uuid": "speedbackground@luke.vader", "name": "Speed background", "pname": "speed-background", "description": "Increase how often Gnome will check the background.", "link": "https://extensions.gnome.org/extension/4761/speed-background/", "shell_version_map": {"40": {"version": "7", "sha256": "1snlqcyv39z02ml400qa1i7mcznpf88g3fzd4gvhc1fj3h8i6frn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MdWtlVmFkZXItSVYvZ25vbWUtc3BlZWQtYmFja2dyb3VuZC1leHRlbnNpb24vIiwKICAidXVpZCI6ICJzcGVlZGJhY2tncm91bmRAbHVrZS52YWRlciIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1snlqcyv39z02ml400qa1i7mcznpf88g3fzd4gvhc1fj3h8i6frn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MdWtlVmFkZXItSVYvZ25vbWUtc3BlZWQtYmFja2dyb3VuZC1leHRlbnNpb24vIiwKICAidXVpZCI6ICJzcGVlZGJhY2tncm91bmRAbHVrZS52YWRlciIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "1snlqcyv39z02ml400qa1i7mcznpf88g3fzd4gvhc1fj3h8i6frn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MdWtlVmFkZXItSVYvZ25vbWUtc3BlZWQtYmFja2dyb3VuZC1leHRlbnNpb24vIiwKICAidXVpZCI6ICJzcGVlZGJhY2tncm91bmRAbHVrZS52YWRlciIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "7", "sha256": "1snlqcyv39z02ml400qa1i7mcznpf88g3fzd4gvhc1fj3h8i6frn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MdWtlVmFkZXItSVYvZ25vbWUtc3BlZWQtYmFja2dyb3VuZC1leHRlbnNpb24vIiwKICAidXVpZCI6ICJzcGVlZGJhY2tncm91bmRAbHVrZS52YWRlciIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "bottom-panel@sulincix", "name": "Bottom Panel", "pname": "bottompanel", "description": "move top panel to bottom", "link": "https://extensions.gnome.org/extension/4764/bottompanel/", "shell_version_map": {"38": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "FuzzyClock@johngoetz", "name": "Fuzzy Clock", "pname": "fuzzy-clock", "description": "A human-readable clock for the gnome-shell panel", "link": "https://extensions.gnome.org/extension/4771/fuzzy-clock/", "shell_version_map": {"40": {"version": "4", "sha256": "10bhb3abmiinh6aw0jddljd47sllp0gqhwl2wz1wigfw0kp93mwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "10bhb3abmiinh6aw0jddljd47sllp0gqhwl2wz1wigfw0kp93mwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "10bhb3abmiinh6aw0jddljd47sllp0gqhwl2wz1wigfw0kp93mwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "clip-note@eexpss.gmail.com", "name": "Clip Note", "pname": "clip-note", "description": "Save clip contents to multiple notes with separate tags. Notes locate at ~/.local/share/clip-note/. Dots in filename means splited tags.", "link": "https://extensions.gnome.org/extension/4774/clip-note/", "shell_version_map": {"40": {"version": "11", "sha256": "0bfpxlvyibcpd7vi1a65r5awggmh8i9yc705mfb6vpm92ry7iny3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLW5vdGUiLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0bfpxlvyibcpd7vi1a65r5awggmh8i9yc705mfb6vpm92ry7iny3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLW5vdGUiLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0bfpxlvyibcpd7vi1a65r5awggmh8i9yc705mfb6vpm92ry7iny3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLW5vdGUiLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "ssh-tray@mario.cardia.com.br", "name": "SSH Tray", "pname": "ssh-tray", "description": "Simple SSH extension to allow you to connect to your hosts at ~/.ssh/config and ~/ssh/know_hosts file from Gnome top bar.", "link": "https://extensions.gnome.org/extension/4779/ssh-tray/", "shell_version_map": {"41": {"version": "1", "sha256": "1c7ndcv3bnsc95sijdkq39fshybpaq9fqdk3gvwm1lx40r1ibgih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBTU0ggZXh0ZW5zaW9uIHRvIGFsbG93IHlvdSB0byBjb25uZWN0IHRvIHlvdXIgaG9zdHMgYXQgfi8uc3NoL2NvbmZpZyBhbmQgfi9zc2gva25vd19ob3N0cyBmaWxlIGZyb20gR25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIlNTSCBUcmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzc2gtdHJheUBtYXJpby5jYXJkaWEuY29tLmJyIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} -, {"uuid": "glasa@lyrahgames.github.io", "name": "Glasa", "pname": "glasa", "description": "This extension puts an icon in the panel consisting of two comic-like eyes following the cursor.", "link": "https://extensions.gnome.org/extension/4780/glasa/", "shell_version_map": {"38": {"version": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "7", "sha256": "1nkv8bjsjdp4scklmpn7f74fhnyqd65dvhlplzn54qad74afdjdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1nkv8bjsjdp4scklmpn7f74fhnyqd65dvhlplzn54qad74afdjdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "8", "sha256": "0g82ks2kcn7a9jc31yj8lqyblbhxqph9h5kh1n8srqgz03lzx8pv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlyYWhnYW1lcy9nbm9tZS1leHRlbnNpb24tZ2xhc2EiLAogICJ1dWlkIjogImdsYXNhQGx5cmFoZ2FtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} +, {"uuid": "glasa@lyrahgames.github.io", "name": "Glasa", "pname": "glasa", "description": "This extension puts an icon in the panel consisting of two comic-like eyes following the cursor.", "link": "https://extensions.gnome.org/extension/4780/glasa/", "shell_version_map": {"38": {"version": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "7", "sha256": "1nkv8bjsjdp4scklmpn7f74fhnyqd65dvhlplzn54qad74afdjdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1nkv8bjsjdp4scklmpn7f74fhnyqd65dvhlplzn54qad74afdjdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "9", "sha256": "1i84rwbdfnjkipvdvlpsa0xqd6vi38vjby1rbyr1ibrbhvwijxmf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "1i84rwbdfnjkipvdvlpsa0xqd6vi38vjby1rbyr1ibrbhvwijxmf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "avatar@pawel.swiszcz.com", "name": "Avatar", "pname": "avatar", "description": "The Avatar Extension can add into the panel: \n * Avatar (horizontal/vertical, shades, visibility of username and hostname) \n * Primary buttons \n * MPRIS \n * Top image (can be Your own image from system) ", "link": "https://extensions.gnome.org/extension/4782/avatar/", "shell_version_map": {"41": {"version": "19", "sha256": "14r0q2s96cmhnb56sqjbs64pjp3j81xyr1hfjnv4n7qq02k7lj7c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBdmF0YXIgRXh0ZW5zaW9uIGNhbiBhZGQgaW50byB0aGUgcGFuZWw6IFxuICogQXZhdGFyIChob3Jpem9udGFsL3ZlcnRpY2FsLCBzaGFkZXMsIHZpc2liaWxpdHkgb2YgdXNlcm5hbWUgYW5kIGhvc3RuYW1lKSBcbiAqIFByaW1hcnkgYnV0dG9ucyBcbiAqIE1QUklTIFxuICogVG9wIGltYWdlIChjYW4gYmUgWW91ciBvd24gaW1hZ2UgZnJvbSBzeXN0ZW0pICIsCiAgIm5hbWUiOiAiQXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF3ZWxzd2lzemN6L0F2YXRhci1Hbm9tZS1TaGVsbC1FeHRlbnNpb24iLAogICJ1dWlkIjogImF2YXRhckBwYXdlbC5zd2lzemN6LmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "19", "sha256": "14r0q2s96cmhnb56sqjbs64pjp3j81xyr1hfjnv4n7qq02k7lj7c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBdmF0YXIgRXh0ZW5zaW9uIGNhbiBhZGQgaW50byB0aGUgcGFuZWw6IFxuICogQXZhdGFyIChob3Jpem9udGFsL3ZlcnRpY2FsLCBzaGFkZXMsIHZpc2liaWxpdHkgb2YgdXNlcm5hbWUgYW5kIGhvc3RuYW1lKSBcbiAqIFByaW1hcnkgYnV0dG9ucyBcbiAqIE1QUklTIFxuICogVG9wIGltYWdlIChjYW4gYmUgWW91ciBvd24gaW1hZ2UgZnJvbSBzeXN0ZW0pICIsCiAgIm5hbWUiOiAiQXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF3ZWxzd2lzemN6L0F2YXRhci1Hbm9tZS1TaGVsbC1FeHRlbnNpb24iLAogICJ1dWlkIjogImF2YXRhckBwYXdlbC5zd2lzemN6LmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "43": {"version": "19", "sha256": "14r0q2s96cmhnb56sqjbs64pjp3j81xyr1hfjnv4n7qq02k7lj7c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBdmF0YXIgRXh0ZW5zaW9uIGNhbiBhZGQgaW50byB0aGUgcGFuZWw6IFxuICogQXZhdGFyIChob3Jpem9udGFsL3ZlcnRpY2FsLCBzaGFkZXMsIHZpc2liaWxpdHkgb2YgdXNlcm5hbWUgYW5kIGhvc3RuYW1lKSBcbiAqIFByaW1hcnkgYnV0dG9ucyBcbiAqIE1QUklTIFxuICogVG9wIGltYWdlIChjYW4gYmUgWW91ciBvd24gaW1hZ2UgZnJvbSBzeXN0ZW0pICIsCiAgIm5hbWUiOiAiQXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGF3ZWxzd2lzemN6L0F2YXRhci1Hbm9tZS1TaGVsbC1FeHRlbnNpb24iLAogICJ1dWlkIjogImF2YXRhckBwYXdlbC5zd2lzemN6LmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}}} , {"uuid": "default-workspace@mateusrodcosta.com", "name": "Default Workspace", "pname": "default-workspace", "description": "Switches to the specified workspace on login.\nUseful for fixed number of workspace setups where the first workspace isn't the main one.", "link": "https://extensions.gnome.org/extension/4783/default-workspace/", "shell_version_map": {"40": {"version": "2", "sha256": "05s1bzh917vv3j7xfx2gljwfzxkb9lsvp8zgcgch75hfvywvpgb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "05s1bzh917vv3j7xfx2gljwfzxkb9lsvp8zgcgch75hfvywvpgb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "alt-mouse@eexpss.gmail.com", "name": "Alt Mouse", "pname": "alt-mouse", "description": "* Alt + Mouse control window\nDetailed instructions are on the home page and in config interface. \nDisable desktop BackgroundMenu, Disable Panel dragMode. \nAdd a gap at right screen edge. \nAdd Top-Left and Top-Right corner as hot coner.", "link": "https://extensions.gnome.org/extension/4786/alt-mouse/", "shell_version_map": {"40": {"version": "12", "sha256": "1kcsbvvm6wigw0h2d23rx4vsqdawa7m5gfynjdc9xzxn3q8sxx0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQWx0ICsgTW91c2UgY29udHJvbCB3aW5kb3dcbkRldGFpbGVkIGluc3RydWN0aW9ucyBhcmUgb24gdGhlIGhvbWUgcGFnZSBhbmQgaW4gY29uZmlnIGludGVyZmFjZS4gXG5EaXNhYmxlIGRlc2t0b3AgQmFja2dyb3VuZE1lbnUsIERpc2FibGUgUGFuZWwgZHJhZ01vZGUuIFxuQWRkIGEgZ2FwIGF0IHJpZ2h0IHNjcmVlbiBlZGdlLiBcbkFkZCBUb3AtTGVmdCBhbmQgVG9wLVJpZ2h0IGNvcm5lciBhcyBob3QgY29uZXIuIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "1kcsbvvm6wigw0h2d23rx4vsqdawa7m5gfynjdc9xzxn3q8sxx0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQWx0ICsgTW91c2UgY29udHJvbCB3aW5kb3dcbkRldGFpbGVkIGluc3RydWN0aW9ucyBhcmUgb24gdGhlIGhvbWUgcGFnZSBhbmQgaW4gY29uZmlnIGludGVyZmFjZS4gXG5EaXNhYmxlIGRlc2t0b3AgQmFja2dyb3VuZE1lbnUsIERpc2FibGUgUGFuZWwgZHJhZ01vZGUuIFxuQWRkIGEgZ2FwIGF0IHJpZ2h0IHNjcmVlbiBlZGdlLiBcbkFkZCBUb3AtTGVmdCBhbmQgVG9wLVJpZ2h0IGNvcm5lciBhcyBob3QgY29uZXIuIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "24", "sha256": "1j20kzq4va9s0jpvcm2y91wjk0c772mx4xk1rmr49hy1rb2crdpc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQWx0ICsgTW91c2UgY29udHJvbCB3aW5kb3dcbkRldGFpbGVkIGluc3RydWN0aW9ucyBhcmUgb24gdGhlIGhvbWUgcGFnZSBhbmQgaW4gY29uZmlnIGludGVyZmFjZS4gXG5EaXNhYmxlIGRlc2t0b3AgQmFja2dyb3VuZE1lbnUsIERpc2FibGUgUGFuZWwgZHJhZ01vZGUuIFxuQWRkIGEgZ2FwIGF0IHJpZ2h0IHNjcmVlbiBlZGdlLiBcbkFkZCBUb3AtTGVmdCBhbmQgVG9wLVJpZ2h0IGNvcm5lciBhcyBob3QgY29uZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx0LW1vdXNlIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx0LW1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLWFsdC1tb3VzZSIsCiAgInV1aWQiOiAiYWx0LW1vdXNlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}}} @@ -712,7 +712,7 @@ , {"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="}}} -, {"uuid": "eepresetselector@ulville.github.io", "name": "EasyEffects Preset Selector", "pname": "easyeffects-preset-selector", "description": "Quickly show and load EasyEffects Presets", "link": "https://extensions.gnome.org/extension/4907/easyeffects-preset-selector/", "shell_version_map": {"38": {"version": "11", "sha256": "0mswrakibw50gmm6libgjdmll24k3s04zv0lvw73n7q269qzrwsv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "0mswrakibw50gmm6libgjdmll24k3s04zv0lvw73n7q269qzrwsv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0mswrakibw50gmm6libgjdmll24k3s04zv0lvw73n7q269qzrwsv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0mswrakibw50gmm6libgjdmll24k3s04zv0lvw73n7q269qzrwsv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} +, {"uuid": "eepresetselector@ulville.github.io", "name": "EasyEffects Preset Selector", "pname": "easyeffects-preset-selector", "description": "Quickly show and load EasyEffects Presets", "link": "https://extensions.gnome.org/extension/4907/easyeffects-preset-selector/", "shell_version_map": {"38": {"version": "12", "sha256": "1fp65hv89f8v3ckffq26x0f435sa1m9p5cwd5ixyykiix0l5q9xl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "1fp65hv89f8v3ckffq26x0f435sa1m9p5cwd5ixyykiix0l5q9xl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "1fp65hv89f8v3ckffq26x0f435sa1m9p5cwd5ixyykiix0l5q9xl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "1fp65hv89f8v3ckffq26x0f435sa1m9p5cwd5ixyykiix0l5q9xl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "1fp65hv89f8v3ckffq26x0f435sa1m9p5cwd5ixyykiix0l5q9xl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"uuid": "gnomehub@gnome-hub.github.io", "name": "gnomehub", "pname": "gnomehub", "description": "An all in one extension which catagorizes notifications and displays system information", "link": "https://extensions.gnome.org/extension/4913/gnomehub/", "shell_version_map": {"38": {"version": "6", "sha256": "15dgj0jbfhsa0p87gi0ai6c55kj4nj9yz5ydpzamwy69k9jjjcd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsbCBpbiBvbmUgZXh0ZW5zaW9uIHdoaWNoIGNhdGFnb3JpemVzIG5vdGlmaWNhdGlvbnMgYW5kIGRpc3BsYXlzIHN5c3RlbSBpbmZvcm1hdGlvbiIsCiAgIm5hbWUiOiAiZ25vbWVodWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dub21lLWh1Yi5naXRodWIuaW8vIiwKICAidXVpZCI6ICJnbm9tZWh1YkBnbm9tZS1odWIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "15dgj0jbfhsa0p87gi0ai6c55kj4nj9yz5ydpzamwy69k9jjjcd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsbCBpbiBvbmUgZXh0ZW5zaW9uIHdoaWNoIGNhdGFnb3JpemVzIG5vdGlmaWNhdGlvbnMgYW5kIGRpc3BsYXlzIHN5c3RlbSBpbmZvcm1hdGlvbiIsCiAgIm5hbWUiOiAiZ25vbWVodWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dub21lLWh1Yi5naXRodWIuaW8vIiwKICAidXVpZCI6ICJnbm9tZWh1YkBnbm9tZS1odWIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "volume_scroller@noskoski", "name": "Volume Scroller", "pname": "volume-scroller", "description": "Scroll up or down in the Top Bar to adjust volume.", "link": "https://extensions.gnome.org/extension/4916/volume-scroller/", "shell_version_map": {"38": {"version": "2", "sha256": "0524g5yc4k0sgdy1v6dah5y3nrf95zdl94nmqp5x77nwmdxvdpqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9za29za2kvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAbm9za29za2kiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "0524g5yc4k0sgdy1v6dah5y3nrf95zdl94nmqp5x77nwmdxvdpqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9za29za2kvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAbm9za29za2kiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "0524g5yc4k0sgdy1v6dah5y3nrf95zdl94nmqp5x77nwmdxvdpqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9za29za2kvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAbm9za29za2kiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "0524g5yc4k0sgdy1v6dah5y3nrf95zdl94nmqp5x77nwmdxvdpqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9za29za2kvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAbm9za29za2kiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"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="}}} @@ -729,13 +729,13 @@ , {"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": "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": "2", "sha256": "153c6gwlgpi6lhsd2ym9qhcp6add58za3i2djdqj39n9zx0q1gy2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzZWxpZ2VyL3dpbmRvdy1jYWxscy1leHRlbmRlZCIsCiAgInV1aWQiOiAid2luZG93LWNhbGxzLWV4dGVuZGVkQGhzZWxpZ2VyLmV1IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "153c6gwlgpi6lhsd2ym9qhcp6add58za3i2djdqj39n9zx0q1gy2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzZWxpZ2VyL3dpbmRvdy1jYWxscy1leHRlbmRlZCIsCiAgInV1aWQiOiAid2luZG93LWNhbGxzLWV4dGVuZGVkQGhzZWxpZ2VyLmV1IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"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"}}} , {"uuid": "disable-workspace-switcher@jbradaric.me", "name": "Disable Workspace Switcher", "pname": "disable-workspace-switcher", "description": "Disable the workspace switcher popup.", "link": "https://extensions.gnome.org/extension/4980/disable-workspace-switcher/", "shell_version_map": {"42": {"version": "2", "sha256": "0r9ia17agk7xmg5lazjjhc629pciqp0sgsrs1f5pk47slx3rnnvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cC4iLAogICJuYW1lIjogIkRpc2FibGUgV29ya3NwYWNlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qYnJhZGFyaWMvZGlzYWJsZS13b3Jrc3BhY2Utc3dpdGNoZXIiLAogICJ1dWlkIjogImRpc2FibGUtd29ya3NwYWNlLXN3aXRjaGVyQGpicmFkYXJpYy5tZSIsCiAgInZlcnNpb24iOiAyCn0="}, "43": {"version": "2", "sha256": "0r9ia17agk7xmg5lazjjhc629pciqp0sgsrs1f5pk47slx3rnnvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cC4iLAogICJuYW1lIjogIkRpc2FibGUgV29ya3NwYWNlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qYnJhZGFyaWMvZGlzYWJsZS13b3Jrc3BhY2Utc3dpdGNoZXIiLAogICJ1dWlkIjogImRpc2FibGUtd29ya3NwYWNlLXN3aXRjaGVyQGpicmFkYXJpYy5tZSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "nextcloud-folder@cosinus.org", "name": "Nextcloud Folder", "pname": "nextcloud-folder", "description": "Simple and lightweight GNOME 42+ extension to open Nextcloud folder in one click.", "link": "https://extensions.gnome.org/extension/4983/nextcloud-folder/", "shell_version_map": {"42": {"version": "4", "sha256": "1cdkfd03y0bfh09m40zikl51mcli311sarjqicnnqw6bzj1zqskj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbGlnaHR3ZWlnaHQgR05PTUUgNDIrIGV4dGVuc2lvbiB0byBvcGVuIE5leHRjbG91ZCBmb2xkZXIgaW4gb25lIGNsaWNrLiIsCiAgIm5hbWUiOiAiTmV4dGNsb3VkIEZvbGRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXh0Y2xvdWQtZm9sZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZXNjZGIvbmV4dGNsb3VkLWZvbGRlciIsCiAgInV1aWQiOiAibmV4dGNsb3VkLWZvbGRlckBjb3NpbnVzLm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "php-laravel-valet@rahulhaque", "name": "PHP Laravel Valet", "pname": "php-laravel-valet", "description": "A PHP Laravel Valet status indicator and manager.", "link": "https://extensions.gnome.org/extension/4985/php-laravel-valet/", "shell_version_map": {"40": {"version": "4", "sha256": "0h1hfh8i6sqzi0dy0sbh35s7flncqwpsxha4yr1bgrmg2a0gshzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUEhQIExhcmF2ZWwgVmFsZXQgc3RhdHVzIGluZGljYXRvciBhbmQgbWFuYWdlci4iLAogICJuYW1lIjogIlBIUCBMYXJhdmVsIFZhbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFodWxoYXF1ZS9waHAtbGFyYXZlbC12YWxldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBocC1sYXJhdmVsLXZhbGV0QHJhaHVsaGFxdWUiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0h1hfh8i6sqzi0dy0sbh35s7flncqwpsxha4yr1bgrmg2a0gshzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUEhQIExhcmF2ZWwgVmFsZXQgc3RhdHVzIGluZGljYXRvciBhbmQgbWFuYWdlci4iLAogICJuYW1lIjogIlBIUCBMYXJhdmVsIFZhbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFodWxoYXF1ZS9waHAtbGFyYXZlbC12YWxldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBocC1sYXJhdmVsLXZhbGV0QHJhaHVsaGFxdWUiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "0h1hfh8i6sqzi0dy0sbh35s7flncqwpsxha4yr1bgrmg2a0gshzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUEhQIExhcmF2ZWwgVmFsZXQgc3RhdHVzIGluZGljYXRvciBhbmQgbWFuYWdlci4iLAogICJuYW1lIjogIlBIUCBMYXJhdmVsIFZhbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFodWxoYXF1ZS9waHAtbGFyYXZlbC12YWxldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBocC1sYXJhdmVsLXZhbGV0QHJhaHVsaGFxdWUiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "Home-Server@sven.kramer", "name": "Home-Server", "pname": "home-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.", "link": "https://extensions.gnome.org/extension/4989/home-server/", "shell_version_map": {"38": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "dash2dock-lite@icedman.github.com", "name": "Dash2Dock Lite", "pname": "dash2dock-lite", "description": "minimal implementation of dash to dock", "link": "https://extensions.gnome.org/extension/4994/dash2dock-lite/", "shell_version_map": {"40": {"version": "16", "sha256": "1lhz53rc221rp409niawsxdwqxv7rddrnr91c64vyx43za9jkw41", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "1lhz53rc221rp409niawsxdwqxv7rddrnr91c64vyx43za9jkw41", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "42": {"version": "16", "sha256": "1lhz53rc221rp409niawsxdwqxv7rddrnr91c64vyx43za9jkw41", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "43": {"version": "16", "sha256": "1lhz53rc221rp409niawsxdwqxv7rddrnr91c64vyx43za9jkw41", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} +, {"uuid": "dash2dock-lite@icedman.github.com", "name": "Dash2Dock Lite", "pname": "dash2dock-lite", "description": "minimal implementation of dash to dock", "link": "https://extensions.gnome.org/extension/4994/dash2dock-lite/", "shell_version_map": {"40": {"version": "17", "sha256": "07mgyasq8pwsg9zfmlm3zg433zgp2d4nmd3v4mm2fknzsq67rcbp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "07mgyasq8pwsg9zfmlm3zg433zgp2d4nmd3v4mm2fknzsq67rcbp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "42": {"version": "17", "sha256": "07mgyasq8pwsg9zfmlm3zg433zgp2d4nmd3v4mm2fknzsq67rcbp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "43": {"version": "17", "sha256": "07mgyasq8pwsg9zfmlm3zg433zgp2d4nmd3v4mm2fknzsq67rcbp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"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="}}} @@ -746,7 +746,7 @@ , {"uuid": "simple-message@freddez", "name": "Simple Message", "pname": "simple-message", "description": "Show a message written by the user on the top bar.", "link": "https://extensions.gnome.org/extension/5018/simple-message/", "shell_version_map": {"40": {"version": "10", "sha256": "1sjlqnfmprfp6jhyb2835nz53s1bcp00bfris6y60lm9g7sji387", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAibmFtZSI6ICJTaW1wbGUgTWVzc2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaW1wbGUtbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZGV6L2dub21lLXNoZWxsLXNpbXBsZS1tZXNzYWdlIiwKICAidXVpZCI6ICJzaW1wbGUtbWVzc2FnZUBmcmVkZGV6IiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1sjlqnfmprfp6jhyb2835nz53s1bcp00bfris6y60lm9g7sji387", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAibmFtZSI6ICJTaW1wbGUgTWVzc2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaW1wbGUtbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZGV6L2dub21lLXNoZWxsLXNpbXBsZS1tZXNzYWdlIiwKICAidXVpZCI6ICJzaW1wbGUtbWVzc2FnZUBmcmVkZGV6IiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "1sjlqnfmprfp6jhyb2835nz53s1bcp00bfris6y60lm9g7sji387", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAibmFtZSI6ICJTaW1wbGUgTWVzc2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaW1wbGUtbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZGV6L2dub21lLXNoZWxsLXNpbXBsZS1tZXNzYWdlIiwKICAidXVpZCI6ICJzaW1wbGUtbWVzc2FnZUBmcmVkZGV6IiwKICAidmVyc2lvbiI6IDEwCn0="}, "43": {"version": "10", "sha256": "1sjlqnfmprfp6jhyb2835nz53s1bcp00bfris6y60lm9g7sji387", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSBtZXNzYWdlIHdyaXR0ZW4gYnkgdGhlIHVzZXIgb24gdGhlIHRvcCBiYXIuIiwKICAibmFtZSI6ICJTaW1wbGUgTWVzc2FnZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaW1wbGUtbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZGV6L2dub21lLXNoZWxsLXNpbXBsZS1tZXNzYWdlIiwKICAidXVpZCI6ICJzaW1wbGUtbWVzc2FnZUBmcmVkZGV6IiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"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": "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": "3", "sha256": "1mk058ayvyiank9iisvdwkhlwh1sgm17viax4jd0kwfjwf7vvxvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGV4Y3ovU3RhcnQtT3ZlcmxheS1pbi1BcHBsaWNhdGlvbi1WaWV3LWZvci1Hbm9tZS00MC0iLAogICJ1dWlkIjogInN0YXJ0LW92ZXJsYXktaW4tYXBwbGljYXRpb24tdmlld0BIZXhfY3oiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1mk058ayvyiank9iisvdwkhlwh1sgm17viax4jd0kwfjwf7vvxvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGV4Y3ovU3RhcnQtT3ZlcmxheS1pbi1BcHBsaWNhdGlvbi1WaWV3LWZvci1Hbm9tZS00MC0iLAogICJ1dWlkIjogInN0YXJ0LW92ZXJsYXktaW4tYXBwbGljYXRpb24tdmlld0BIZXhfY3oiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "1mk058ayvyiank9iisvdwkhlwh1sgm17viax4jd0kwfjwf7vvxvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gYWN0aXZhdGluZyBvdmVydmlldyAoU3VwZXIgYnV0dG9uKSwgdGhlIGFwcGxpY2F0aW9uIHZpZXcgaXMgc2hvd24gaW5zdGVhZCBvZiB0aGUgdmlldyB3aXRoIHRoZSB3aW5kb3dzLiIsCiAgIm5hbWUiOiAiU3RhcnQgT3ZlcmxheSBpbiBBcHBsaWNhdGlvbiBWaWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGV4Y3ovU3RhcnQtT3ZlcmxheS1pbi1BcHBsaWNhdGlvbi1WaWV3LWZvci1Hbm9tZS00MC0iLAogICJ1dWlkIjogInN0YXJ0LW92ZXJsYXktaW4tYXBwbGljYXRpb24tdmlld0BIZXhfY3oiLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"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="}}} , {"uuid": "wallpaper-changer@ghostkeeper.github.com", "name": "Wallpaper Changer Continued", "pname": "wallpaper-changer-continued", "description": "Fork of wallpaper-changer@jomik.org, updated for Gnome 4", "link": "https://extensions.gnome.org/extension/5049/wallpaper-changer-continued/", "shell_version_map": {"40": {"version": "3", "sha256": "0kvjljwppdz95napbczb0zskmr5x2xsib3y5yk3qm3ig26k00j56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Ygd2FsbHBhcGVyLWNoYW5nZXJAam9taWsub3JnLCB1cGRhdGVkIGZvciBHbm9tZSA0IiwKICAibmFtZSI6ICJXYWxscGFwZXIgQ2hhbmdlciBDb250aW51ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HaG9zdGtlZXBlci9nbm9tZS13YWxscGFwZXItY2hhbmdlciIsCiAgInV1aWQiOiAid2FsbHBhcGVyLWNoYW5nZXJAZ2hvc3RrZWVwZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "0kvjljwppdz95napbczb0zskmr5x2xsib3y5yk3qm3ig26k00j56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Ygd2FsbHBhcGVyLWNoYW5nZXJAam9taWsub3JnLCB1cGRhdGVkIGZvciBHbm9tZSA0IiwKICAibmFtZSI6ICJXYWxscGFwZXIgQ2hhbmdlciBDb250aW51ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HaG9zdGtlZXBlci9nbm9tZS13YWxscGFwZXItY2hhbmdlciIsCiAgInV1aWQiOiAid2FsbHBhcGVyLWNoYW5nZXJAZ2hvc3RrZWVwZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0kvjljwppdz95napbczb0zskmr5x2xsib3y5yk3qm3ig26k00j56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Ygd2FsbHBhcGVyLWNoYW5nZXJAam9taWsub3JnLCB1cGRhdGVkIGZvciBHbm9tZSA0IiwKICAibmFtZSI6ICJXYWxscGFwZXIgQ2hhbmdlciBDb250aW51ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HaG9zdGtlZXBlci9nbm9tZS13YWxscGFwZXItY2hhbmdlciIsCiAgInV1aWQiOiAid2FsbHBhcGVyLWNoYW5nZXJAZ2hvc3RrZWVwZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "xremap@k0kubun.com", "name": "Xremap", "pname": "xremap", "description": "Allow xremap to fetch the focused app name using D-Bus", "link": "https://extensions.gnome.org/extension/5060/xremap/", "shell_version_map": {"38": {"version": "4", "sha256": "01kx3ljy383p0rr0i4wdji30w6px2vjbvz4476pn6vrh6g2yzj7r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHhyZW1hcCB0byBmZXRjaCB0aGUgZm9jdXNlZCBhcHAgbmFtZSB1c2luZyBELUJ1cyIsCiAgIm5hbWUiOiAiWHJlbWFwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hyZW1hcC94cmVtYXAtZ25vbWUiLAogICJ1dWlkIjogInhyZW1hcEBrMGt1YnVuLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "01kx3ljy383p0rr0i4wdji30w6px2vjbvz4476pn6vrh6g2yzj7r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHhyZW1hcCB0byBmZXRjaCB0aGUgZm9jdXNlZCBhcHAgbmFtZSB1c2luZyBELUJ1cyIsCiAgIm5hbWUiOiAiWHJlbWFwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hyZW1hcC94cmVtYXAtZ25vbWUiLAogICJ1dWlkIjogInhyZW1hcEBrMGt1YnVuLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "01kx3ljy383p0rr0i4wdji30w6px2vjbvz4476pn6vrh6g2yzj7r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHhyZW1hcCB0byBmZXRjaCB0aGUgZm9jdXNlZCBhcHAgbmFtZSB1c2luZyBELUJ1cyIsCiAgIm5hbWUiOiAiWHJlbWFwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hyZW1hcC94cmVtYXAtZ25vbWUiLAogICJ1dWlkIjogInhyZW1hcEBrMGt1YnVuLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "01kx3ljy383p0rr0i4wdji30w6px2vjbvz4476pn6vrh6g2yzj7r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHhyZW1hcCB0byBmZXRjaCB0aGUgZm9jdXNlZCBhcHAgbmFtZSB1c2luZyBELUJ1cyIsCiAgIm5hbWUiOiAiWHJlbWFwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hyZW1hcC94cmVtYXAtZ25vbWUiLAogICJ1dWlkIjogInhyZW1hcEBrMGt1YnVuLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "01kx3ljy383p0rr0i4wdji30w6px2vjbvz4476pn6vrh6g2yzj7r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHhyZW1hcCB0byBmZXRjaCB0aGUgZm9jdXNlZCBhcHAgbmFtZSB1c2luZyBELUJ1cyIsCiAgIm5hbWUiOiAiWHJlbWFwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hyZW1hcC94cmVtYXAtZ25vbWUiLAogICJ1dWlkIjogInhyZW1hcEBrMGt1YnVuLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} @@ -769,7 +769,7 @@ , {"uuid": "touch-ux@dblandford.com", "name": "Touch-UX", "pname": "touch-ux", "description": "Provides a swipe up gesture bar and a status bar shortcut to force the on screen keyboard to show in scenarios that it does not automatically show when expected.", "link": "https://extensions.gnome.org/extension/5108/touch-ux/", "shell_version_map": {"42": {"version": "3", "sha256": "1vjchsz0jml0qaj2mz0khsagacxz1m60ypcjnymh3swrx9lj765m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgc3dpcGUgdXAgZ2VzdHVyZSBiYXIgYW5kIGEgc3RhdHVzIGJhciBzaG9ydGN1dCB0byBmb3JjZSB0aGUgb24gc2NyZWVuIGtleWJvYXJkIHRvIHNob3cgaW4gc2NlbmFyaW9zIHRoYXQgaXQgZG9lcyBub3QgYXV0b21hdGljYWxseSBzaG93IHdoZW4gZXhwZWN0ZWQuIiwKICAibmFtZSI6ICJUb3VjaC1VWCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EYW5pZWwtQmxhbmRmb3JkL1RvdWNoLVVYIiwKICAidXVpZCI6ICJ0b3VjaC11eEBkYmxhbmRmb3JkLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "display-scale-switcher@knokelmaat.gitlab.com", "name": "Display Scale Switcher", "pname": "display-scale-switcher", "description": "Quickly change the display scaling factor from the system menu.", "link": "https://extensions.gnome.org/extension/5111/display-scale-switcher/", "shell_version_map": {"42": {"version": "1", "sha256": "14yd0xzgqvqxq1s11pbspqn1y1sqjsdgq2giqkwf8r1n2rn1wc94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IHNjYWxpbmcgZmFjdG9yIGZyb20gdGhlIHN5c3RlbSBtZW51LiIsCiAgIm5hbWUiOiAiRGlzcGxheSBTY2FsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9rbm9rZWxtYWF0L2Rpc3BsYXktc2NhbGUtc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LXNjYWxlLXN3aXRjaGVyQGtub2tlbG1hYXQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "43": {"version": "3", "sha256": "0lkyfzks9l7y784rswadfg831rfqk5jknzzg5pvbjqhyk6v22cc7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IHNjYWxpbmcgZmFjdG9yIGZyb20gdGhlIHN5c3RlbSBtZW51LiIsCiAgIm5hbWUiOiAiRGlzcGxheSBTY2FsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9rbm9rZWxtYWF0L2Rpc3BsYXktc2NhbGUtc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LXNjYWxlLXN3aXRjaGVyQGtub2tlbG1hYXQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "tailscale-status@maxgallup.github.com", "name": "Tailscale Status", "pname": "tailscale-status", "description": "Manage Tailscale connections and check status from desktop read more at https://github.com/maxgallup/tailscale-status/blob/main/README.md", "link": "https://extensions.gnome.org/extension/5112/tailscale-status/", "shell_version_map": {"42": {"version": "16", "sha256": "1f69xhqy5qddqwswqsrq97jc0x65d5r95a38vp6vwkmdxlpf67sv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "1f69xhqy5qddqwswqsrq97jc0x65d5r95a38vp6vwkmdxlpf67sv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}}} -, {"uuid": "simple-timer@majortomvr.github.com", "name": "Simple Timer", "pname": "simple-timer", "description": "Simple Timer is a Gnome Shell Extension that adds a Timer to the Panel.", "link": "https://extensions.gnome.org/extension/5115/simple-timer/", "shell_version_map": {"41": {"version": "1", "sha256": "1k1qxygahg7h5x5g2b6c13j0hnv0sy9k82nw45ixjkzmfrx99pr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "4", "sha256": "1vdca39k7w3fw4naipd1c77diszbiadwn88f93q00lk772n0fz8m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "simple-timer@majortomvr.github.com", "name": "Simple Timer", "pname": "simple-timer", "description": "Simple Timer is a Gnome Shell Extension that adds a Timer to the Panel.", "link": "https://extensions.gnome.org/extension/5115/simple-timer/", "shell_version_map": {"41": {"version": "1", "sha256": "1k1qxygahg7h5x5g2b6c13j0hnv0sy9k82nw45ixjkzmfrx99pr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "7", "sha256": "1zvw5mr36rcbs1qhkk8arss44g9f3qmgvasy16n4bxl5p0hzr2q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWpvcnRvbVZSL3NpbXBsZS10aW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInNpbXBsZS10aW1lckBtYWpvcnRvbXZyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "1zvw5mr36rcbs1qhkk8arss44g9f3qmgvasy16n4bxl5p0hzr2q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWpvcnRvbVZSL3NpbXBsZS10aW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInNpbXBsZS10aW1lckBtYWpvcnRvbXZyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "translate-assistant@atareao.es", "name": "Translate assistant", "pname": "translate-assistant", "description": "Translate with DeepL Translator", "link": "https://extensions.gnome.org/extension/5124/translate-assistant/", "shell_version_map": {"42": {"version": "6", "sha256": "0rql3ax7m3pr8g5h7iadl4isa2wv2wyzl9n0nihwf2js19i6ya97", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3aXRoIERlZXBMIFRyYW5zbGF0b3IiLAogICJleHRlbnNpb24taWQiOiAidHJhbnNsYXRlLWFzc2lzdGFudEBhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHJhbnNsYXRlLWFzc2lzdGFudEBhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJ0cmFuc2xhdGUtYXNzaXN0YW50LWljb24iLAogICJuYW1lIjogIlRyYW5zbGF0ZSBhc3Npc3RhbnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNsYXRlLWFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL3RyYW5zbGF0ZS1hc3Npc3RhbnQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1hc3Npc3RhbnRAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "stand-with-ukraine@vshut", "name": "Stand With Ukraine", "pname": "stand-with-ukraine", "description": "Displays Ukraine emoji flag in the top panel and provides menu with useful links.", "link": "https://extensions.gnome.org/extension/5126/stand-with-ukraine/", "shell_version_map": {"38": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "audio-selector@harald65.simon.gmail.com", "name": "Audio Selector", "pname": "audio-selector", "description": "Select audio output and/or input port", "link": "https://extensions.gnome.org/extension/5135/audio-selector/", "shell_version_map": {"42": {"version": "5", "sha256": "00ww12j34fpbrqlxkc6d47s0i542byz6r39yrshyf8xrcs8r7ifm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlbGVjdCBhdWRpbyBvdXRwdXQgYW5kL29yIGlucHV0IHBvcnQiLAogICJuYW1lIjogIkF1ZGlvIFNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzNjUvR25vbWUtU2hlbGwtRXh0ZW5zaW9uLUF1ZGlvLVNlbGVjdG9yLmdpdCIsCiAgInV1aWQiOiAiYXVkaW8tc2VsZWN0b3JAaGFyYWxkNjUuc2ltb24uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} @@ -782,7 +782,7 @@ , {"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": "1", "sha256": "0nv9iwyx0pqf81jhdgfm5dsjh7ryp8y25w32l1ll1w7223chz2v7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvbm9hMTF5IiwKICAidXVpZCI6ICJub2ExMXlAcG9wb3Y4OTUudWtyLm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"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 find this extension useful, please leave a comment, your feedback is important to me, be it positive or negative!\nPlease report bugs and feature requests on the GitHub page linked below as Extension Homepage.", "link": "https://extensions.gnome.org/extension/5177/vertical-workspaces/", "shell_version_map": {"40": {"version": "13", "sha256": "1vy3wk8fjv8brbny638fyhkq84q8x00h9scqf7qi6dr1mvzf93g6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBmaW5kIHRoaXMgZXh0ZW5zaW9uIHVzZWZ1bCwgcGxlYXNlIGxlYXZlIGEgY29tbWVudCwgeW91ciBmZWVkYmFjayBpcyBpbXBvcnRhbnQgdG8gbWUsIGJlIGl0IHBvc2l0aXZlIG9yIG5lZ2F0aXZlIVxuUGxlYXNlIHJlcG9ydCBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "1vy3wk8fjv8brbny638fyhkq84q8x00h9scqf7qi6dr1mvzf93g6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBmaW5kIHRoaXMgZXh0ZW5zaW9uIHVzZWZ1bCwgcGxlYXNlIGxlYXZlIGEgY29tbWVudCwgeW91ciBmZWVkYmFjayBpcyBpbXBvcnRhbnQgdG8gbWUsIGJlIGl0IHBvc2l0aXZlIG9yIG5lZ2F0aXZlIVxuUGxlYXNlIHJlcG9ydCBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "42": {"version": "13", "sha256": "1vy3wk8fjv8brbny638fyhkq84q8x00h9scqf7qi6dr1mvzf93g6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBmaW5kIHRoaXMgZXh0ZW5zaW9uIHVzZWZ1bCwgcGxlYXNlIGxlYXZlIGEgY29tbWVudCwgeW91ciBmZWVkYmFjayBpcyBpbXBvcnRhbnQgdG8gbWUsIGJlIGl0IHBvc2l0aXZlIG9yIG5lZ2F0aXZlIVxuUGxlYXNlIHJlcG9ydCBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "1vy3wk8fjv8brbny638fyhkq84q8x00h9scqf7qi6dr1mvzf93g6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZlcnRpY2FsIG9yaWVudGF0aW9uIG9mIHdvcmtzcGFjZXMgYW5kIG9wdGlvbnMgdG8gY3VzdG9taXplIEFjdGl2aXRpZXMgb3ZlcnZpZXcgbGF5b3V0IGFuZCBjb250ZW50IGZvciBHTk9NRSA0MCsuXG5cbklmIHlvdSBmaW5kIHRoaXMgZXh0ZW5zaW9uIHVzZWZ1bCwgcGxlYXNlIGxlYXZlIGEgY29tbWVudCwgeW91ciBmZWVkYmFjayBpcyBpbXBvcnRhbnQgdG8gbWUsIGJlIGl0IHBvc2l0aXZlIG9yIG5lZ2F0aXZlIVxuUGxlYXNlIHJlcG9ydCBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC92ZXJ0aWNhbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC13b3Jrc3BhY2VzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} -, {"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": "5", "sha256": "1hbiy9bbxr0k3bvq5mqkz0dvc7cqrz1mya4alipfsrc29qdxyj97", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LWlzLWF3ZXNvbWUvZ25vbWVfZXh0ZW5zaW9uX3JvY2tldGJhciIsCiAgInV1aWQiOiAicm9ja2V0YmFyQGNoZXBrdW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"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="}}} , {"uuid": "super-key@tommimon.github.com", "name": "Super Key", "pname": "super-key", "description": "Fork of Pop Launcher Super-Key: Bind the Super-Key to a custom action", "link": "https://extensions.gnome.org/extension/5188/super-key/", "shell_version_map": {"42": {"version": "3", "sha256": "0jrhj7c7826xvdr4v2p5fi59fav5ralym3bsxaiv308fpcapzns0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIExhdW5jaGVyIFN1cGVyLUtleTogQmluZCB0aGUgU3VwZXItS2V5IHRvIGEgY3VzdG9tIGFjdGlvbiIsCiAgIm5hbWUiOiAiU3VwZXIgS2V5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9tbWltb24iLAogICJ1dWlkIjogInN1cGVyLWtleUB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "0jrhj7c7826xvdr4v2p5fi59fav5ralym3bsxaiv308fpcapzns0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIExhdW5jaGVyIFN1cGVyLUtleTogQmluZCB0aGUgU3VwZXItS2V5IHRvIGEgY3VzdG9tIGFjdGlvbiIsCiAgIm5hbWUiOiAiU3VwZXIgS2V5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9tbWltb24iLAogICJ1dWlkIjogInN1cGVyLWtleUB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} @@ -798,7 +798,7 @@ , {"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": "9", "sha256": "1cvwj03ikmq6yl89a60sss671fsd2yrijy62v29y1xbxw03l2ma9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "1cvwj03ikmq6yl89a60sss671fsd2yrijy62v29y1xbxw03l2ma9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "1cvwj03ikmq6yl89a60sss671fsd2yrijy62v29y1xbxw03l2ma9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "1cvwj03ikmq6yl89a60sss671fsd2yrijy62v29y1xbxw03l2ma9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbG96dC9yb3VuZGVkLXdpbmRvdy1jb3JuZXJzIiwKICAidXVpZCI6ICJyb3VuZGVkLXdpbmRvdy1jb3JuZXJzQHlpbG96dCIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"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 (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\nPlease see Readme for full details of new features. Works only on Wayland, please see Readme for why it does not work on X11.\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": "0ky61l014dxhcymdx8028w8m6n92acjvqps97lq4qfva01inc0kk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsICBmdW5jdGlvbnMgYXJlIGFzeW5jIHdoZXJlIHBvc3NpYmxlLCBtdWx0aXBsZSBmaXhlcyBhbmQgbmV3IGZlYXR1cmVzLVxuXG4qIE1ha2UgTGlua3Mgb24gRGVza3RvcC5cbiogQ29waWVkL2Ryb3BwZWQvcGFzdGVkIGZpbGVzIHJldGFpbiBkcm9wcGVkIHBvc2l0aW9uLlxuKiBSaWdodCBDbGljayBNZW51cyB3aWxsIG5vdCBnbyB1bmRlciB0aGUgZG9jay5cbiogQmV0dGVyIG11bHRpIG1vbml0b3Igc3VwcG9ydCwgcHJlZmVyZW5jZSB0byBwbGFjZSBpY29ucyBvbiBub24gcHJpbWFyeSBtb25pdG9yLlxuKiBHU2Nvbm5lY3QgZXh0ZW5zaW9uIGludGVncmF0aW9uLCBjYW4gc2VuZCBmaWxlcyBmcm9tIGRlc2t0b3AgZGlyZWN0bHkgdG8gbW9iaWxlIGRldmljZS5cbiogRHJhZyBhbmQgZHJvcCBGYXZvcml0ZSBhcHBzIGZyb20gRGFzaCB0byBEb2NrLCBEYXNoIHRvIFBhbmVsIGRpcmVjdGx5IHRvIERlc2t0b3Agb3IgcmVtb3ZlIGZyb20gZmF2b3JpdGVzLlxuKiBJbXByb3ZlZCBnZXN0dXJlIHN3aXRjaGluZyBvZiB3b3Jrc3BhY2VzLCBpY29ucyBhcHBlYXIgdG8gYmUgb24gYWxsIHdvcmtzcGFjZXMgaW4gbW92aW5nIHdpbmRvd3MuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBvbmx5IG9uIFdheWxhbmQsIHBsZWFzZSBzZWUgUmVhZG1lIGZvciB3aHkgaXQgZG9lcyBub3Qgd29yayBvbiBYMTEuXG5cblBsZWFzZSByZXBvcnQgYWxsIGlzc3VlcyBvbiB0aGUgZ2l0bGFiIGxpbmsgYmVsb3csIHRoaXMgcGFnZSBpcyBub3QgbW9uaXRvcmVkLiIsCiAgImdldHRleHQtZG9tYWluIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyB3aXRoIEdTY29ubmVjdCBpbnRlZ3JhdGlvbiAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "0ky61l014dxhcymdx8028w8m6n92acjvqps97lq4qfva01inc0kk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsICBmdW5jdGlvbnMgYXJlIGFzeW5jIHdoZXJlIHBvc3NpYmxlLCBtdWx0aXBsZSBmaXhlcyBhbmQgbmV3IGZlYXR1cmVzLVxuXG4qIE1ha2UgTGlua3Mgb24gRGVza3RvcC5cbiogQ29waWVkL2Ryb3BwZWQvcGFzdGVkIGZpbGVzIHJldGFpbiBkcm9wcGVkIHBvc2l0aW9uLlxuKiBSaWdodCBDbGljayBNZW51cyB3aWxsIG5vdCBnbyB1bmRlciB0aGUgZG9jay5cbiogQmV0dGVyIG11bHRpIG1vbml0b3Igc3VwcG9ydCwgcHJlZmVyZW5jZSB0byBwbGFjZSBpY29ucyBvbiBub24gcHJpbWFyeSBtb25pdG9yLlxuKiBHU2Nvbm5lY3QgZXh0ZW5zaW9uIGludGVncmF0aW9uLCBjYW4gc2VuZCBmaWxlcyBmcm9tIGRlc2t0b3AgZGlyZWN0bHkgdG8gbW9iaWxlIGRldmljZS5cbiogRHJhZyBhbmQgZHJvcCBGYXZvcml0ZSBhcHBzIGZyb20gRGFzaCB0byBEb2NrLCBEYXNoIHRvIFBhbmVsIGRpcmVjdGx5IHRvIERlc2t0b3Agb3IgcmVtb3ZlIGZyb20gZmF2b3JpdGVzLlxuKiBJbXByb3ZlZCBnZXN0dXJlIHN3aXRjaGluZyBvZiB3b3Jrc3BhY2VzLCBpY29ucyBhcHBlYXIgdG8gYmUgb24gYWxsIHdvcmtzcGFjZXMgaW4gbW92aW5nIHdpbmRvd3MuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBvbmx5IG9uIFdheWxhbmQsIHBsZWFzZSBzZWUgUmVhZG1lIGZvciB3aHkgaXQgZG9lcyBub3Qgd29yayBvbiBYMTEuXG5cblBsZWFzZSByZXBvcnQgYWxsIGlzc3VlcyBvbiB0aGUgZ2l0bGFiIGxpbmsgYmVsb3csIHRoaXMgcGFnZSBpcyBub3QgbW9uaXRvcmVkLiIsCiAgImdldHRleHQtZG9tYWluIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyB3aXRoIEdTY29ubmVjdCBpbnRlZ3JhdGlvbiAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "42": {"version": "18", "sha256": "1mjnmxvd29lwkjj7b43kmx8lvhhd21d5ygpllf7qrs9lryr79z8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsICBmdW5jdGlvbnMgYXJlIGFzeW5jIHdoZXJlIHBvc3NpYmxlLCBtdWx0aXBsZSBmaXhlcyBhbmQgbmV3IGZlYXR1cmVzLVxuXG4qIE1ha2UgTGlua3Mgb24gRGVza3RvcC5cbiogQ29waWVkL2Ryb3BwZWQvcGFzdGVkIGZpbGVzIHJldGFpbiBkcm9wcGVkIHBvc2l0aW9uLlxuKiBSaWdodCBDbGljayBNZW51cyB3aWxsIG5vdCBnbyB1bmRlciB0aGUgZG9jay5cbiogQmV0dGVyIG11bHRpIG1vbml0b3Igc3VwcG9ydCwgcHJlZmVyZW5jZSB0byBwbGFjZSBpY29ucyBvbiBub24gcHJpbWFyeSBtb25pdG9yLlxuKiBHU2Nvbm5lY3QgZXh0ZW5zaW9uIGludGVncmF0aW9uLCBjYW4gc2VuZCBmaWxlcyBmcm9tIGRlc2t0b3AgZGlyZWN0bHkgdG8gbW9iaWxlIGRldmljZS5cbiogRHJhZyBhbmQgZHJvcCBGYXZvcml0ZSBhcHBzIGZyb20gRGFzaCB0byBEb2NrLCBEYXNoIHRvIFBhbmVsIGRpcmVjdGx5IHRvIERlc2t0b3Agb3IgcmVtb3ZlIGZyb20gZmF2b3JpdGVzLlxuKiBJbXByb3ZlZCBnZXN0dXJlIHN3aXRjaGluZyBvZiB3b3Jrc3BhY2VzLCBpY29ucyBhcHBlYXIgdG8gYmUgb24gYWxsIHdvcmtzcGFjZXMgaW4gbW92aW5nIHdpbmRvd3MuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBvbmx5IG9uIFdheWxhbmQsIHBsZWFzZSBzZWUgUmVhZG1lIGZvciB3aHkgaXQgZG9lcyBub3Qgd29yayBvbiBYMTEuXG5cblBsZWFzZSByZXBvcnQgYWxsIGlzc3VlcyBvbiB0aGUgZ2l0bGFiIGxpbmsgYmVsb3csIHRoaXMgcGFnZSBpcyBub3QgbW9uaXRvcmVkLiIsCiAgImdldHRleHQtZG9tYWluIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyB3aXRoIEdTY29ubmVjdCBpbnRlZ3JhdGlvbiAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "43": {"version": "18", "sha256": "1mjnmxvd29lwkjj7b43kmx8lvhhd21d5ygpllf7qrs9lryr79z8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd0azQgUG9ydCBvZiBEZXNrdG9wIEljb25zIE5HIHdpdGggdXBkYXRlZCBhbmQgbW9kaWZpZWQgY29kZSBiYXNlLCB1c2VzIGdpbyBtZW51cywgYWxsICBmdW5jdGlvbnMgYXJlIGFzeW5jIHdoZXJlIHBvc3NpYmxlLCBtdWx0aXBsZSBmaXhlcyBhbmQgbmV3IGZlYXR1cmVzLVxuXG4qIE1ha2UgTGlua3Mgb24gRGVza3RvcC5cbiogQ29waWVkL2Ryb3BwZWQvcGFzdGVkIGZpbGVzIHJldGFpbiBkcm9wcGVkIHBvc2l0aW9uLlxuKiBSaWdodCBDbGljayBNZW51cyB3aWxsIG5vdCBnbyB1bmRlciB0aGUgZG9jay5cbiogQmV0dGVyIG11bHRpIG1vbml0b3Igc3VwcG9ydCwgcHJlZmVyZW5jZSB0byBwbGFjZSBpY29ucyBvbiBub24gcHJpbWFyeSBtb25pdG9yLlxuKiBHU2Nvbm5lY3QgZXh0ZW5zaW9uIGludGVncmF0aW9uLCBjYW4gc2VuZCBmaWxlcyBmcm9tIGRlc2t0b3AgZGlyZWN0bHkgdG8gbW9iaWxlIGRldmljZS5cbiogRHJhZyBhbmQgZHJvcCBGYXZvcml0ZSBhcHBzIGZyb20gRGFzaCB0byBEb2NrLCBEYXNoIHRvIFBhbmVsIGRpcmVjdGx5IHRvIERlc2t0b3Agb3IgcmVtb3ZlIGZyb20gZmF2b3JpdGVzLlxuKiBJbXByb3ZlZCBnZXN0dXJlIHN3aXRjaGluZyBvZiB3b3Jrc3BhY2VzLCBpY29ucyBhcHBlYXIgdG8gYmUgb24gYWxsIHdvcmtzcGFjZXMgaW4gbW92aW5nIHdpbmRvd3MuXG5cblBsZWFzZSBzZWUgUmVhZG1lIGZvciBmdWxsIGRldGFpbHMgb2YgbmV3IGZlYXR1cmVzLiBXb3JrcyBvbmx5IG9uIFdheWxhbmQsIHBsZWFzZSBzZWUgUmVhZG1lIGZvciB3aHkgaXQgZG9lcyBub3Qgd29yayBvbiBYMTEuXG5cblBsZWFzZSByZXBvcnQgYWxsIGlzc3VlcyBvbiB0aGUgZ2l0bGFiIGxpbmsgYmVsb3csIHRoaXMgcGFnZSBpcyBub3QgbW9uaXRvcmVkLiIsCiAgImdldHRleHQtZG9tYWluIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJuYW1lIjogIkd0azQgRGVza3RvcCBJY29ucyBORyB3aXRoIEdTY29ubmVjdCBpbnRlZ3JhdGlvbiAoRElORykiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0azQtZGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc21lZGl1cy9kZXNrdG9wLWljb25zLW5nIiwKICAidXVpZCI6ICJndGs0LWRpbmdAc21lZGl1cy5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} +, {"uuid": "gtk4-ding@smedius.gitlab.com", "name": "Gtk4, GSconnect, Desktop Icons NG (DING)", "pname": "gtk4-desktop-icons-ng-ding", "description": "Adds Gtk4 icons to the Gnome desktop. Gtk4 Fork of the original Desktop Icons extension, with several enhancements.\n\nWorks only on Wayland, see readme for X11\n\nPlease report all issues to the homepage 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": "1h1wnp23p75b8vcnr542wgaj7ypkzmdx9b22zas3291cp61jqyyh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy5cblxuV29ya3Mgb25seSBvbiBXYXlsYW5kLCBzZWUgcmVhZG1lIGZvciBYMTFcblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIHRvIHRoZSBob21lcGFnZSBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCwgR1Njb25uZWN0LCBEZXNrdG9wIEljb25zIE5HIChESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "17", "sha256": "1h1wnp23p75b8vcnr542wgaj7ypkzmdx9b22zas3291cp61jqyyh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy5cblxuV29ya3Mgb25seSBvbiBXYXlsYW5kLCBzZWUgcmVhZG1lIGZvciBYMTFcblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIHRvIHRoZSBob21lcGFnZSBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCwgR1Njb25uZWN0LCBEZXNrdG9wIEljb25zIE5HIChESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NtZWRpdXMvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "42": {"version": "18", "sha256": "0q4dzgwhf16sv4nf57nphn6i5aibw700ydw7fwshjsx7lnpy1gsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy5cblxuV29ya3Mgb25seSBvbiBXYXlsYW5kLCBzZWUgcmVhZG1lIGZvciBYMTFcblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIHRvIHRoZSBob21lcGFnZSBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCwgR1Njb25uZWN0LCBEZXNrdG9wIEljb25zIE5HIChESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "43": {"version": "18", "sha256": "0q4dzgwhf16sv4nf57nphn6i5aibw700ydw7fwshjsx7lnpy1gsx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgR3RrNCBpY29ucyB0byB0aGUgR25vbWUgZGVza3RvcC4gR3RrNCBGb3JrIG9mIHRoZSBvcmlnaW5hbCBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiwgd2l0aCBzZXZlcmFsIGVuaGFuY2VtZW50cy5cblxuV29ya3Mgb25seSBvbiBXYXlsYW5kLCBzZWUgcmVhZG1lIGZvciBYMTFcblxuUGxlYXNlIHJlcG9ydCBhbGwgaXNzdWVzIHRvIHRoZSBob21lcGFnZSBiZWxvdywgdGhpcyBwYWdlIGlzIG5vdCBtb25pdG9yZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrNC1kaW5nQHNtZWRpdXMuZ2l0bGFiLmNvbSIsCiAgIm5hbWUiOiAiR3RrNCwgR1Njb25uZWN0LCBEZXNrdG9wIEljb25zIE5HIChESU5HKSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrNC1kaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zbWVkaXVzL2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImd0azQtZGluZ0BzbWVkaXVzLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}}} , {"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": "5", "sha256": "17h04ypqmmsbkd8ski7rznv6adsd1y3jlabxjvmshjqy7w9xqbsv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpZ2h0bHkgaW50ZWdyYXRlcyBGaWcgd2l0aCBHTk9NRSBzaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgIm5hbWUiOiAiRmlnIEdOT01FIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2l0aGZpZy9nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbkBmaWcuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "17h04ypqmmsbkd8ski7rznv6adsd1y3jlabxjvmshjqy7w9xqbsv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpZ2h0bHkgaW50ZWdyYXRlcyBGaWcgd2l0aCBHTk9NRSBzaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgIm5hbWUiOiAiRmlnIEdOT01FIEludGVncmF0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpZy1nbm9tZS1pbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2l0aGZpZy9nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImZpZy1nbm9tZS1pbnRlZ3JhdGlvbkBmaWcuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"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=="}}} @@ -813,15 +813,15 @@ , {"uuid": "quick-touchpad-toggle@kramo.hu", "name": "Quick Touchpad Toggle", "pname": "quick-touchpad-toggle", "description": "Toggle the \"disable touchpad while typing\" setting more easily.", "link": "https://extensions.gnome.org/extension/5292/quick-touchpad-toggle/", "shell_version_map": {"40": {"version": "4", "sha256": "1wqdvla5nm0v80h9df6js8cbwkwn3qv26n7gmq46f3in3zmjm73x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va3JhLW1vL3F1aWNrLXRvdWNocGFkLXRvZ2dsZS8iLAogICJ1dWlkIjogInF1aWNrLXRvdWNocGFkLXRvZ2dsZUBrcmFtby5odSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1wqdvla5nm0v80h9df6js8cbwkwn3qv26n7gmq46f3in3zmjm73x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va3JhLW1vL3F1aWNrLXRvdWNocGFkLXRvZ2dsZS8iLAogICJ1dWlkIjogInF1aWNrLXRvdWNocGFkLXRvZ2dsZUBrcmFtby5odSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1wqdvla5nm0v80h9df6js8cbwkwn3qv26n7gmq46f3in3zmjm73x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va3JhLW1vL3F1aWNrLXRvdWNocGFkLXRvZ2dsZS8iLAogICJ1dWlkIjogInF1aWNrLXRvdWNocGFkLXRvZ2dsZUBrcmFtby5odSIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "6", "sha256": "0nr0msrgplc3nj0f1990zhdb8lpw1iq7zcxdnkj118x6asrk02jc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgXCJkaXNhYmxlIHRvdWNocGFkIHdoaWxlIHR5cGluZ1wiIHNldHRpbmcgbW9yZSBlYXNpbHkuIiwKICAibmFtZSI6ICJRdWljayBUb3VjaHBhZCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va3JhLW1vL3F1aWNrLXRvdWNocGFkLXRvZ2dsZS8iLAogICJ1dWlkIjogInF1aWNrLXRvdWNocGFkLXRvZ2dsZUBrcmFtby5odSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "desktop-zoom@colin.kinlo.ch", "name": "Desktop Zoom", "pname": "desktop-zoom", "description": "Scroll to zoom gnome desktop.\n\nUsage: Hold Alt and Scroll\n\nCursor must not be over a window (must be over background or top bar).\nMagnifier / zoom must be enabled in accessibility.\n\nTo disable zoom after removing the extension, disable zoom in gnomes accessibility settings:\nhttps://help.gnome.org/users/gnome-help/stable/a11y-mag.html.en\n\nReport issues on GITHUB.COM", "link": "https://extensions.gnome.org/extension/5297/desktop-zoom/", "shell_version_map": {"42": {"version": "6", "sha256": "14vi9jzdcnc9srsf8r4x38ymcjjxjl8xyb49rndcb3ldbr60wxpj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB0byB6b29tIGdub21lIGRlc2t0b3AuXG5cblVzYWdlOiBIb2xkIEFsdCBhbmQgU2Nyb2xsXG5cbkN1cnNvciBtdXN0IG5vdCBiZSBvdmVyIGEgd2luZG93IChtdXN0IGJlIG92ZXIgYmFja2dyb3VuZCBvciB0b3AgYmFyKS5cbk1hZ25pZmllciAvIHpvb20gbXVzdCBiZSBlbmFibGVkIGluIGFjY2Vzc2liaWxpdHkuXG5cblRvIGRpc2FibGUgem9vbSBhZnRlciByZW1vdmluZyB0aGUgZXh0ZW5zaW9uLCBkaXNhYmxlIHpvb20gaW4gZ25vbWVzIGFjY2Vzc2liaWxpdHkgc2V0dGluZ3M6XG5odHRwczovL2hlbHAuZ25vbWUub3JnL3VzZXJzL2dub21lLWhlbHAvc3RhYmxlL2ExMXktbWFnLmh0bWwuZW5cblxuUmVwb3J0IGlzc3VlcyBvbiBHSVRIVUIuQ09NIiwKICAibmFtZSI6ICJEZXNrdG9wIFpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NvbGluS2lubG9jaC9kZXNrdG9wLXpvb20tZ25vbWUtc2hlbGwiLAogICJ1dWlkIjogImRlc2t0b3Atem9vbUBjb2xpbi5raW5sby5jaCIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "14vi9jzdcnc9srsf8r4x38ymcjjxjl8xyb49rndcb3ldbr60wxpj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB0byB6b29tIGdub21lIGRlc2t0b3AuXG5cblVzYWdlOiBIb2xkIEFsdCBhbmQgU2Nyb2xsXG5cbkN1cnNvciBtdXN0IG5vdCBiZSBvdmVyIGEgd2luZG93IChtdXN0IGJlIG92ZXIgYmFja2dyb3VuZCBvciB0b3AgYmFyKS5cbk1hZ25pZmllciAvIHpvb20gbXVzdCBiZSBlbmFibGVkIGluIGFjY2Vzc2liaWxpdHkuXG5cblRvIGRpc2FibGUgem9vbSBhZnRlciByZW1vdmluZyB0aGUgZXh0ZW5zaW9uLCBkaXNhYmxlIHpvb20gaW4gZ25vbWVzIGFjY2Vzc2liaWxpdHkgc2V0dGluZ3M6XG5odHRwczovL2hlbHAuZ25vbWUub3JnL3VzZXJzL2dub21lLWhlbHAvc3RhYmxlL2ExMXktbWFnLmh0bWwuZW5cblxuUmVwb3J0IGlzc3VlcyBvbiBHSVRIVUIuQ09NIiwKICAibmFtZSI6ICJEZXNrdG9wIFpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NvbGluS2lubG9jaC9kZXNrdG9wLXpvb20tZ25vbWUtc2hlbGwiLAogICJ1dWlkIjogImRlc2t0b3Atem9vbUBjb2xpbi5raW5sby5jaCIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "zoomwayland@polyte.de", "name": "Zoom Wayland Extension", "pname": "zoom-wayland-extension", "description": "Enables Zoom Screensharing under Wayland", "link": "https://extensions.gnome.org/extension/5302/zoom-wayland-extension/", "shell_version_map": {"42": {"version": "1", "sha256": "0dnd2mi0aq2ddgp7kvc8vbsl61yi3akawp97wi38z1nbbqflgmag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgWm9vbSBTY3JlZW5zaGFyaW5nIHVuZGVyIFdheWxhbmQiLAogICJuYW1lIjogIlpvb20gV2F5bGFuZCBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanVsaWFucG9sbG1hbm4vem9vbS13YXlsYW5kLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiem9vbXdheWxhbmRAcG9seXRlLmRlIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} -, {"uuid": "firefox-pip@bennypowers.com", "name": "Firefox PiP Always on Top", "pname": "firefox-pip-always-on-top", "description": "Ensure that Firefox Picture-in-Picture window are always on top", "link": "https://extensions.gnome.org/extension/5306/firefox-pip-always-on-top/", "shell_version_map": {"42": {"version": "2", "sha256": "0vgxva1gksjp9n82cxplyd692k8iibcf73lkh2sfqfycdgva6dx3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuc3VyZSB0aGF0IEZpcmVmb3ggUGljdHVyZS1pbi1QaWN0dXJlIHdpbmRvdyBhcmUgYWx3YXlzIG9uIHRvcCIsCiAgIm5hbWUiOiAiRmlyZWZveCBQaVAgQWx3YXlzIG9uIFRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZmlyZWZveC1waXBAYmVubnlwb3dlcnMuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "firefox-pip@bennypowers.com", "name": "Firefox PiP Always on Top", "pname": "firefox-pip-always-on-top", "description": "Ensure that Firefox Picture-in-Picture window are always on top", "link": "https://extensions.gnome.org/extension/5306/firefox-pip-always-on-top/", "shell_version_map": {"42": {"version": "3", "sha256": "0473sbsjp7qg1cla28s5r9rrpg3qa2fk015h3gv101ndn32mfs6l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuc3VyZSB0aGF0IEZpcmVmb3ggUGljdHVyZS1pbi1QaWN0dXJlIHdpbmRvdyBhcmUgYWx3YXlzIG9uIHRvcCIsCiAgIm5hbWUiOiAiRmlyZWZveCBQaVAgQWx3YXlzIG9uIFRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmVubnlwb3dlcnMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZpcmVmb3gtcGlwIiwKICAidXVpZCI6ICJmaXJlZm94LXBpcEBiZW5ueXBvd2Vycy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "0473sbsjp7qg1cla28s5r9rrpg3qa2fk015h3gv101ndn32mfs6l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuc3VyZSB0aGF0IEZpcmVmb3ggUGljdHVyZS1pbi1QaWN0dXJlIHdpbmRvdyBhcmUgYWx3YXlzIG9uIHRvcCIsCiAgIm5hbWUiOiAiRmlyZWZveCBQaVAgQWx3YXlzIG9uIFRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmVubnlwb3dlcnMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZpcmVmb3gtcGlwIiwKICAidXVpZCI6ICJmaXJlZm94LXBpcEBiZW5ueXBvd2Vycy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "activitiesworkspacename@ahmafi.ir", "name": "Activities Workspace Name", "pname": "activities-workspace-name", "description": "Replace Activities Text with Current Workspace Name", "link": "https://extensions.gnome.org/extension/5311/activities-workspace-name/", "shell_version_map": {"42": {"version": "1", "sha256": "1syxsxw713ly8a2fbppvad91hw0i94bgi8xa0h5za87y34qqd7gz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBUZXh0IHdpdGggQ3VycmVudCBXb3Jrc3BhY2UgTmFtZSIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBXb3Jrc3BhY2UgTmFtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haG1hZmkvZ25vbWUtYWN0aXZpdGllcy13b3Jrc3BhY2UtbmFtZSIsCiAgInV1aWQiOiAiYWN0aXZpdGllc3dvcmtzcGFjZW5hbWVAYWhtYWZpLmlyIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "webfeed@xynium.github.com", "name": "WebFeed", "pname": "webfeed", "description": "RSS and Atom Feed reader for GNOME Shell", "link": "https://extensions.gnome.org/extension/5321/webfeed/", "shell_version_map": {"42": {"version": "6", "sha256": "0p6cv0hrpd52s215w3ilhkdyqb2x97j1kijcpw4byiajfkvqc1i6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJTUyBhbmQgQXRvbSBGZWVkIHJlYWRlciBmb3IgR05PTUUgU2hlbGwiLAogICJuYW1lIjogIldlYkZlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS93ZWJmZWVkIiwKICAidXVpZCI6ICJ3ZWJmZWVkQHh5bml1bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "6", "sha256": "0p6cv0hrpd52s215w3ilhkdyqb2x97j1kijcpw4byiajfkvqc1i6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJTUyBhbmQgQXRvbSBGZWVkIHJlYWRlciBmb3IgR05PTUUgU2hlbGwiLAogICJuYW1lIjogIldlYkZlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS93ZWJmZWVkIiwKICAidXVpZCI6ICJ3ZWJmZWVkQHh5bml1bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"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": "13", "sha256": "0x85rzam1iaggmq8z3bqkpb5rr0acz8rgblrphln1av20lzwfixq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "13", "sha256": "0x85rzam1iaggmq8z3bqkpb5rr0acz8rgblrphln1av20lzwfixq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDEzCn0="}}} +, {"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": "14", "sha256": "0bmv10sarbl0hn3hknw0ad9msm09xjm8bb98a9xydqqbaba08l1a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "43": {"version": "14", "sha256": "0bmv10sarbl0hn3hknw0ad9msm09xjm8bb98a9xydqqbaba08l1a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "supergfxctl-gex@asus-linux.org", "name": "supergfxctl-gex", "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": "1wfgxshafzm1p2i3f2xyr16ak2sgmvyxc61pslh11qd3d23xchbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJzdXBlcmdmeGN0bC1nZXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VwZXJnZnhjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInN1cGVyZ2Z4Y3RsIjogIjUuMC4xIiwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3VwZXJnZnhjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAic3VwZXJnZnhjdGwtZ2V4LWRldkBhc3VzLWxpbnV4Lm9yZyIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "22", "sha256": "1wfgxshafzm1p2i3f2xyr16ak2sgmvyxc61pslh11qd3d23xchbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJzdXBlcmdmeGN0bC1nZXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VwZXJnZnhjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInN1cGVyZ2Z4Y3RsIjogIjUuMC4xIiwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3VwZXJnZnhjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAic3VwZXJnZnhjdGwtZ2V4LWRldkBhc3VzLWxpbnV4Lm9yZyIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "22", "sha256": "1wfgxshafzm1p2i3f2xyr16ak2sgmvyxc61pslh11qd3d23xchbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJzdXBlcmdmeGN0bC1nZXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VwZXJnZnhjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInN1cGVyZ2Z4Y3RsIjogIjUuMC4xIiwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3VwZXJnZnhjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAic3VwZXJnZnhjdGwtZ2V4LWRldkBhc3VzLWxpbnV4Lm9yZyIsCiAgInZlcnNpb24iOiAyMgp9"}, "43": {"version": "21", "sha256": "06hqq7j48wfzq3k607zx7a5126d3xl7miymv2z9qqa8qs650036a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJzdXBlcmdmeGN0bC1nZXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VwZXJnZnhjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjEKfQ=="}}} , {"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": "2", "sha256": "1p6rwpqnysv2kb4yyjmivfpr09jn3g0zf6020fkm84azh3gp5ccb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2lzaG9ydjA2L3dpbmRvdy1zdGF0ZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3aW5kb3ctc3RhdGUtbWFuYWdlckBraXNob3J2MDYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"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=="}}} , {"uuid": "smartlock@huy.im", "name": "Bluetooth Smart Lock", "pname": "bluetooth-smart-lock", "description": "Dynamic lock for GNOME. Use your smart phone/watch/band to lock your desktop automatically when you step away.\n\nWhen your device is out of bluetooth range or get disconnected, it will lock your desktop automatically.", "link": "https://extensions.gnome.org/extension/5359/bluetooth-smart-lock/", "shell_version_map": {"42": {"version": "13", "sha256": "1bajl6xmnv2lb7vh4wc8i02g9kqac9ljq31f035nshha4p324b6z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkR5bmFtaWMgbG9jayBmb3IgR05PTUUuIFVzZSB5b3VyIHNtYXJ0IHBob25lL3dhdGNoL2JhbmQgdG8gbG9jayB5b3VyIGRlc2t0b3AgYXV0b21hdGljYWxseSB3aGVuIHlvdSBzdGVwIGF3YXkuXG5cbldoZW4geW91ciBkZXZpY2UgaXMgb3V0IG9mIGJsdWV0b290aCByYW5nZSBvciBnZXQgZGlzY29ubmVjdGVkLCBpdCB3aWxsIGxvY2sgeW91ciBkZXNrdG9wIGF1dG9tYXRpY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXNtYXJ0bG9jayIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIFNtYXJ0IExvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmx1ZXRvb3RoX3NtYXJ0bG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmEwZjMvZ25vbWUtYmx1ZXRvb3RoLXNtYXJ0bG9jayIsCiAgInV1aWQiOiAic21hcnRsb2NrQGh1eS5pbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "1bajl6xmnv2lb7vh4wc8i02g9kqac9ljq31f035nshha4p324b6z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkR5bmFtaWMgbG9jayBmb3IgR05PTUUuIFVzZSB5b3VyIHNtYXJ0IHBob25lL3dhdGNoL2JhbmQgdG8gbG9jayB5b3VyIGRlc2t0b3AgYXV0b21hdGljYWxseSB3aGVuIHlvdSBzdGVwIGF3YXkuXG5cbldoZW4geW91ciBkZXZpY2UgaXMgb3V0IG9mIGJsdWV0b290aCByYW5nZSBvciBnZXQgZGlzY29ubmVjdGVkLCBpdCB3aWxsIGxvY2sgeW91ciBkZXNrdG9wIGF1dG9tYXRpY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXNtYXJ0bG9jayIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIFNtYXJ0IExvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmx1ZXRvb3RoX3NtYXJ0bG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmEwZjMvZ25vbWUtYmx1ZXRvb3RoLXNtYXJ0bG9jayIsCiAgInV1aWQiOiAic21hcnRsb2NrQGh1eS5pbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "gnome-wireguard-extension@SJBERTRAND.github.com", "name": "WireGuard-VPN-extension", "pname": "wireguard-vpn-extension", "description": "Enable/Disable Wireguard tunnels", "link": "https://extensions.gnome.org/extension/5362/wireguard-vpn-extension/", "shell_version_map": {"42": {"version": "5", "sha256": "0xl60kd28kvsdgci2kr80chxpybhwf9fxjzrmxjp6p04icrmy68z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAibmFtZSI6ICJXaXJlR3VhcmQtVlBOLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU0pCRVJUUkFORC9nbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "43": {"version": "5", "sha256": "0xl60kd28kvsdgci2kr80chxpybhwf9fxjzrmxjp6p04icrmy68z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIFdpcmVndWFyZCB0dW5uZWxzIiwKICAibmFtZSI6ICJXaXJlR3VhcmQtVlBOLWV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU0pCRVJUUkFORC9nbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS13aXJlZ3VhcmQtZXh0ZW5zaW9uQFNKQkVSVFJBTkQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} @@ -853,7 +853,7 @@ , {"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": "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": "1", "sha256": "12pk2gai1g4cax952kq19jfk74ryjr4j627ipnhbj5n77z063g58", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIHVzZXIgYXZhdGFyIGluIHRoZSBRdWljayBTZXR0aW5ncyBtZW51LCBwYXJ0IG9mIHRoZSBcIlN5c3RlbVwiIHNldHRpbmdzIiwKICAibmFtZSI6ICJVc2VyIEF2YXRhciBJbiBRdWljayBTZXR0aW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kLWdvL3F1aWNrLXNldHRpbmdzLWF2YXRhciIsCiAgInV1aWQiOiAicXVpY2stc2V0dGluZ3MtYXZhdGFyQGQtZ28iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"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": "2", "sha256": "038fcpl2zbb99v7wqv8g5g4gj81vb6d779j2mi8628k0ibpri385", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "038fcpl2zbb99v7wqv8g5g4gj81vb6d779j2mi8628k0ibpri385", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "038fcpl2zbb99v7wqv8g5g4gj81vb6d779j2mi8628k0ibpri385", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiAyCn0="}, "43": {"version": "2", "sha256": "038fcpl2zbb99v7wqv8g5g4gj81vb6d779j2mi8628k0ibpri385", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"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": "3", "sha256": "08n87kw0642n9wdw8w86pw0y41cz0mzd6byyqzs6wq6qc682y9bg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "08n87kw0642n9wdw8w86pw0y41cz0mzd6byyqzs6wq6qc682y9bg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "08n87kw0642n9wdw8w86pw0y41cz0mzd6byyqzs6wq6qc682y9bg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "08n87kw0642n9wdw8w86pw0y41cz0mzd6byyqzs6wq6qc682y9bg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQXlsdXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nLXBhbmVsIiwKICAidXVpZCI6ICJmbG9hdGluZy1wYW5lbEBheWx1ciIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "tun0-ip-address@adamantisspinae.github.com", "name": "tun0 IP Address", "pname": "tun0-ip-address", "description": "Show tun0 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 depedency", "link": "https://extensions.gnome.org/extension/5518/tun0-ip-address/", "shell_version_map": {"40": {"version": "7", "sha256": "08zfm6g38g54km5ks83i78b019v6cihqz0qp636iislhpz6gzylp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdHVuMCBJUCBhZGRyZXNzIG9uIEdOT01FIHBhbmVsLiBEbyBub3Qgc2hvdyBsb29wYmFjayBhZGRyZXNzZXMgKDEyNy4wLjAuMC84KSBvciBvdGhlciBuZXR3b3JrIGludGVyZmFjZSBJUCBhZGRyZXNzZXMuIFBsZWFzZSBpbnN0YWxsIG1vcmV1dGlscyBwYWNrYWdlIGFzIGEgZGVwZWRlbmN5IiwKICAibmFtZSI6ICJ0dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWRhbWFudGlzU3BpbmFlL2dub21lLWV4dGVuc2lvbi10dW4wLWlwLWFkZHJlc3MiLAogICJ1dWlkIjogInR1bjAtaXAtYWRkcmVzc0BhZGFtYW50aXNzcGluYWUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "08zfm6g38g54km5ks83i78b019v6cihqz0qp636iislhpz6gzylp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdHVuMCBJUCBhZGRyZXNzIG9uIEdOT01FIHBhbmVsLiBEbyBub3Qgc2hvdyBsb29wYmFjayBhZGRyZXNzZXMgKDEyNy4wLjAuMC84KSBvciBvdGhlciBuZXR3b3JrIGludGVyZmFjZSBJUCBhZGRyZXNzZXMuIFBsZWFzZSBpbnN0YWxsIG1vcmV1dGlscyBwYWNrYWdlIGFzIGEgZGVwZWRlbmN5IiwKICAibmFtZSI6ICJ0dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWRhbWFudGlzU3BpbmFlL2dub21lLWV4dGVuc2lvbi10dW4wLWlwLWFkZHJlc3MiLAogICJ1dWlkIjogInR1bjAtaXAtYWRkcmVzc0BhZGFtYW50aXNzcGluYWUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "08zfm6g38g54km5ks83i78b019v6cihqz0qp636iislhpz6gzylp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdHVuMCBJUCBhZGRyZXNzIG9uIEdOT01FIHBhbmVsLiBEbyBub3Qgc2hvdyBsb29wYmFjayBhZGRyZXNzZXMgKDEyNy4wLjAuMC84KSBvciBvdGhlciBuZXR3b3JrIGludGVyZmFjZSBJUCBhZGRyZXNzZXMuIFBsZWFzZSBpbnN0YWxsIG1vcmV1dGlscyBwYWNrYWdlIGFzIGEgZGVwZWRlbmN5IiwKICAibmFtZSI6ICJ0dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWRhbWFudGlzU3BpbmFlL2dub21lLWV4dGVuc2lvbi10dW4wLWlwLWFkZHJlc3MiLAogICJ1dWlkIjogInR1bjAtaXAtYWRkcmVzc0BhZGFtYW50aXNzcGluYWUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "43": {"version": "7", "sha256": "08zfm6g38g54km5ks83i78b019v6cihqz0qp636iislhpz6gzylp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdHVuMCBJUCBhZGRyZXNzIG9uIEdOT01FIHBhbmVsLiBEbyBub3Qgc2hvdyBsb29wYmFjayBhZGRyZXNzZXMgKDEyNy4wLjAuMC84KSBvciBvdGhlciBuZXR3b3JrIGludGVyZmFjZSBJUCBhZGRyZXNzZXMuIFBsZWFzZSBpbnN0YWxsIG1vcmV1dGlscyBwYWNrYWdlIGFzIGEgZGVwZWRlbmN5IiwKICAibmFtZSI6ICJ0dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWRhbWFudGlzU3BpbmFlL2dub21lLWV4dGVuc2lvbi10dW4wLWlwLWFkZHJlc3MiLAogICJ1dWlkIjogInR1bjAtaXAtYWRkcmVzc0BhZGFtYW50aXNzcGluYWUuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "nano-lights@chlumskyvaclav.gmail.com", "name": "Nano Lights", "pname": "nano-lights", "description": "This extension controls Nanoleaf shapes and possibly others Nanoleaf devices on your local (wifi) network. If you are experiencing an error on the upgrade, please log out and log in again.", "link": "https://extensions.gnome.org/extension/5519/nano-lights/", "shell_version_map": {"43": {"version": "2", "sha256": "12pm2carzgm8pj0zwwx184drh4nnq3rfixdws2k9cirp3gxj2i6y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIE5hbm9sZWFmIHNoYXBlcyBhbmQgcG9zc2libHkgb3RoZXJzIE5hbm9sZWFmIGRldmljZXMgb24geW91ciBsb2NhbCAod2lmaSkgbmV0d29yay4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibmFuby1saWdodHMiLAogICJuYW1lIjogIk5hbm8gTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vbmFuby1saWdodHMiLAogICJ1dWlkIjogIm5hbm8tbGlnaHRzQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "just-another-search-bar@xelad0m", "name": "Just Another Search Bar", "pname": "just-another-search-bar", "description": "Search from desktop with google/yandex/baidu in default browser\nLocal search is also available using the recoll desktop search tool\nTo open click on the search icon on the menu bar or press Ctrl+Alt+F", "link": "https://extensions.gnome.org/extension/5522/just-another-search-bar/", "shell_version_map": {"43": {"version": "2", "sha256": "1w9zsqnh5pb8nv2r3vvbnfydw6zk5sawkjmxl7nid03xldzh53ls", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBmcm9tIGRlc2t0b3Agd2l0aCBnb29nbGUveWFuZGV4L2JhaWR1IGluIGRlZmF1bHQgYnJvd3NlclxuTG9jYWwgc2VhcmNoIGlzIGFsc28gYXZhaWxhYmxlIHVzaW5nIHRoZSByZWNvbGwgZGVza3RvcCBzZWFyY2ggdG9vbFxuVG8gb3BlbiBjbGljayBvbiB0aGUgc2VhcmNoIGljb24gb24gdGhlIG1lbnUgYmFyIG9yIHByZXNzIEN0cmwrQWx0K0YiLAogICJuYW1lIjogIkp1c3QgQW5vdGhlciBTZWFyY2ggQmFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS1zaGVsbC5leHRlbnNpb25zLmp1c3QtYW5vdGhlci1zZWFyY2gtYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hlbGFkMG0vanVzdC1hbm90aGVyLXNlYXJjaC1iYXIiLAogICJ1dWlkIjogImp1c3QtYW5vdGhlci1zZWFyY2gtYmFyQHhlbGFkMG0iLAogICJ2ZXJzaW9uIjogMgp9"}}} From ed1e60878eb2563152ce3840fc00c6852143e9e3 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 17 Nov 2022 23:05:13 +0000 Subject: [PATCH 287/797] odin2: install lv2 and clap plugins --- pkgs/applications/audio/odin2/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/odin2/default.nix b/pkgs/applications/audio/odin2/default.nix index feafe9caf181..beb126467935 100644 --- a/pkgs/applications/audio/odin2/default.nix +++ b/pkgs/applications/audio/odin2/default.nix @@ -62,10 +62,12 @@ stdenv.mkDerivation rec { ]; installPhase = '' - mkdir -p $out/bin $out/lib/vst3 + mkdir -p $out/bin $out/lib/vst3 $out/lib/lv2 $out/lib/clap cd Odin2_artefacts/Release + cp Standalone/Odin2 $out/bin cp -r VST3/Odin2.vst3 $out/lib/vst3 - cp -r Standalone/Odin2 $out/bin + cp -r LV2/Odin2.lv2 $out/lib/lv2 + cp -r CLAP/Odin2.clap $out/lib/clap ''; From fd2e3968aeff866f408abe37d40a29de6f274848 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 23:19:38 +0000 Subject: [PATCH 288/797] crowdin-cli: 3.9.0 -> 3.9.1 --- pkgs/tools/text/crowdin-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index 475bba31069e..e2573861f300 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - sha256 = "sha256-6km0hJKnSHyIkMZ0LznzzmK6KZ4kZBpI94XE5SZ4xxs="; + sha256 = "sha256-n5eDe29+HhH4YHNLzRhIpx2ceH1pw0TaXdTtVZYNT48="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; From acad0b3a098c9a3a5c6785356b034a496094373f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Nov 2022 00:30:12 +0100 Subject: [PATCH 289/797] Revert "python310Packages.h11: 0.13.0 -> 0.14.0" This reverts commit 2477683031cbed6e6b336ffd1902f1f27ca1060e. Reckless bumping of h11 broke httpcore and dealing with the fallout would require bumping httpcore and subsequently other packages, which is too risky before the branch-off. --- pkgs/development/python-modules/h11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix index 5e58310106ac..98dd8eef6cbd 100644 --- a/pkgs/development/python-modules/h11/default.nix +++ b/pkgs/development/python-modules/h11/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "h11"; - version = "0.14.0"; + version = "0.13.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jxn7vpnnJCD/NcALJ6NMuZN+kCqLgQ4siDAMbwo7aZ0="; + sha256 = "sha256-cIE8ETUIeiSKTTjMDhoBgf+rIYgUGpPq9WeUDDlX/wY="; }; checkInputs = [ pytestCheckHook ]; From be8520de569bd00282a2e082da558f80e4c4fb02 Mon Sep 17 00:00:00 2001 From: piegames Date: Thu, 17 Nov 2022 23:55:07 +0100 Subject: [PATCH 290/797] gnomeExtensions.emoji-selecter: Use automatic package Not sure why it was still manually packaged, the automatic package works fine without flaws. --- .../extensions/emoji-selector/default.nix | 41 ------------------- .../gnome/extensions/manuallyPackaged.nix | 1 - 2 files changed, 42 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/emoji-selector/default.nix diff --git a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix deleted file mode 100644 index bb8931510876..000000000000 --- a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, glib, gettext }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-emoji-selector"; - version = "22"; - - src = fetchFromGitHub { - owner = "maoschanz"; - repo = "emoji-selector-for-gnome"; - rev = version; - sha256 = "sha256-sD/xlNrs2ntI7KaPMopT5CnFyuXd9ZKuKPNQYgiho0U="; - }; - - passthru = { - extensionUuid = "emoji-selector@maestroschan.fr"; - extensionPortalSlug = "emoji-selector"; - }; - - nativeBuildInputs = [ glib ]; - - buildPhase = '' - runHook preBuild - glib-compile-schemas "./emoji-selector@maestroschan.fr/schemas" - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r "emoji-selector@maestroschan.fr" $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = - "GNOME Shell extension providing a searchable popup menu displaying most emojis"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ rawkode ]; - homepage = "https://github.com/maoschanz/emoji-selector-for-gnome"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index f37a321dae6e..879eb601fc99 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -6,7 +6,6 @@ "dash-to-dock@micxgx.gmail.com" = callPackage ./dash-to-dock { }; "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; - "emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { }; "gsconnect@andyholmes.github.io" = callPackage ./gsconnect { }; "icon-hider@kalnitsky.org" = callPackage ./icon-hider { }; "impatience@gfxmonk.net" = callPackage ./impatience { }; From 57c6bb1b89c4be06e5f97d1711707e330e28d97c Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 17 Nov 2022 19:06:36 -0500 Subject: [PATCH 291/797] ruff: 0.0.125 -> 0.0.126 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index ea05b768a278..ccd9d3744931 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.125"; + version = "0.0.126"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DKIe5tb0xMG6ieuiecHWWYT7rE4soyok3oh0OPseKks="; + sha256 = "sha256-Qcjj+WgNsdms2VNOT/Ax66TruigxrHmC+tyoe5fCgo4="; }; - cargoSha256 = "sha256-qIvXg/rh7UisVt65fwNxWOxM8brBWfF9zoRlfs7Nv/Y="; + cargoSha256 = "sha256-aIZ3ZBiUFMC/RmJQp/V0Rjq/+oLg61Ve0zZJSZpT7nw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From c9a56e77a87baa3c28d570ac6ec5f5e3d9293ce8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Nov 2022 01:07:51 +0100 Subject: [PATCH 292/797] python3Packages.pytz-deprecation-shim: disable flaky tests --- .../python-modules/pytz-deprecation-shim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix index 6ea1c2c8f2e0..76f0046a7e28 100644 --- a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix +++ b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix @@ -43,8 +43,8 @@ buildPythonPackage rec { # https://github.com/pganssle/pytz-deprecation-shim/issues/27 doCheck = pythonAtLeast "3.9"; - disabledTests = [ - "test_localize_explicit_is_dst" + disabledTestPaths = [ + "tests/test_pytz_equivalent.py" ]; meta = with lib; { From 905ffc76669672cb27ac999d2002954793ee7599 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 00:18:56 +0000 Subject: [PATCH 293/797] doctl: 1.85.0 -> 1.87.0 --- pkgs/development/tools/doctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index ab83d20b5a79..f4daa199e209 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.85.0"; + version = "1.87.0"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-zA+9RpGGiRlu/xQoKjkI5zg6d2fPR7WKW0Sj2ggSypA="; + sha256 = "sha256-y5RHICd82FLWDkygCcmrnPwISEv/WuRwQiXXqS6cSKg="; }; meta = with lib; { From a214ea8457da219477bedc5e9cacc0b060430111 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Nov 2022 01:59:36 +0100 Subject: [PATCH 294/797] prometheus-smartctl-exporter: build on linux only --- pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix b/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix index 45315a0f3d76..21ccb8178c34 100644 --- a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix @@ -36,6 +36,7 @@ buildGoModule rec { description = "Export smartctl statistics for Prometheus"; homepage = "https://github.com/prometheus-community/smartctl_exporter"; license = licenses.lgpl3; + platforms = platforms.linux; maintainers = with maintainers; [ hexa ]; }; } From b491cf37844f86e3eab570aa38948f645e1a6788 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 01:00:51 +0000 Subject: [PATCH 295/797] eksctl: 0.118.0 -> 0.119.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 39d1577226ec..1253531a3fcf 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.118.0"; + version = "0.119.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-YeAFJYJ+MLRGyL/T2qazS5/knSjMGs7hEZUcm40klxo="; + sha256 = "sha256-eW16B3VSxuqKVqhVmxtyTnm1wItJS5HZMW7a7DDiIVg="; }; - vendorSha256 = "sha256-7gg/ujVlTLA7gWLBmQ2st24r5qsOsDefw8d4Z7L/VVc="; + vendorSha256 = "sha256-/WSc6Q/OBxPKuVrdmMczaKCZO7MvQXkzQ2Q1y43w3Hw="; doCheck = false; From 398d0926aa221149c60a71aa2ef29ab00a5cfaae Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 18 Nov 2022 02:08:38 +0100 Subject: [PATCH 296/797] libheimdal: turn into proper alias --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 ++-- .../networking/mailreaders/thunderbird-bin/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 +-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 3048f047485e..0ad125beb53e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -36,7 +36,7 @@ , pango , pipewire , pciutils -, libheimdal +, heimdal , libpulseaudio , systemd , channel @@ -134,7 +134,7 @@ stdenv.mkDerivation { pango pipewire pciutils - libheimdal + heimdal libpulseaudio systemd ffmpeg diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index ff93dd61351d..9bd99c86e773 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -42,7 +42,7 @@ , pango , pipewire , pciutils -, libheimdal +, heimdal , libpulseaudio , systemd , writeScript @@ -137,7 +137,7 @@ stdenv.mkDerivation { pango pipewire pciutils - libheimdal + heimdal libpulseaudio systemd ffmpeg diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5086a129337a..b1d46cc93b72 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -754,6 +754,7 @@ mapAliases ({ libgpgerror = libgpg-error; # Added 2021-09-04 libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21 libgumbo = throw "'libgumbo' has been renamed to/replaced by 'gumbo'"; # Converted to throw 2022-02-22 + libheimdal = heimdal; # Added 2022-11-18 libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14 libixp_hg = libixp; libjpeg_drop = libjpeg_original; # Added 2020-06-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 232fc9563863..c7c9dc29a73e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18582,7 +18582,7 @@ with pkgs; cypress = callPackage ../development/web/cypress { }; cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { - libkrb5 = if stdenv.isFreeBSD then libheimdal else libkrb5; + libkrb5 = if stdenv.isFreeBSD then heimdal else libkrb5; openssl = openssl_1_1; }; @@ -19501,7 +19501,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; autoreconfHook = buildPackages.autoreconfHook269; }; - libheimdal = heimdal; harfbuzz = callPackage ../development/libraries/harfbuzz { inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreText; From 3cd3cbd2d3869f59f01046dbdbb633697b920ef7 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Fri, 28 Oct 2022 10:20:33 -0700 Subject: [PATCH 297/797] =?UTF-8?q?mindustry:=20126.2=20=E2=86=92=20140.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...1-fix-include-path-for-SDL2-on-linux.patch | 8 +-- pkgs/games/mindustry/default.nix | 68 +++++++++++++------ pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 51 insertions(+), 31 deletions(-) diff --git a/pkgs/games/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch b/pkgs/games/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch index d4fe7be19183..3df759d63e21 100644 --- a/pkgs/games/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch +++ b/pkgs/games/mindustry/0001-fix-include-path-for-SDL2-on-linux.patch @@ -4,13 +4,13 @@ Date: Fri, 8 Jan 2021 04:49:14 +0100 Subject: [PATCH] fix include path for SDL2 on linux --- - .../src/main/java/arc/backend/sdl/jni/SDL.java | 8 -------- + .../src/arc/backend/sdl/jni/SDL.java | 8 -------- 1 file changed, 8 deletions(-) -diff --git a/backends/backend-sdl/src/main/java/arc/backend/sdl/jni/SDL.java b/backends/backend-sdl/src/main/java/arc/backend/sdl/jni/SDL.java +diff --git a/backends/backend-sdl/src/arc/backend/sdl/jni/SDL.java b/backends/backend-sdl/src/arc/backend/sdl/jni/SDL.java index 62d9286a..2853119d 100644 ---- a/Arc/backends/backend-sdl/src/main/java/arc/backend/sdl/jni/SDL.java -+++ b/Arc/backends/backend-sdl/src/main/java/arc/backend/sdl/jni/SDL.java +--- a/Arc/backends/backend-sdl/src/arc/backend/sdl/jni/SDL.java ++++ b/Arc/backends/backend-sdl/src/arc/backend/sdl/jni/SDL.java @@ -8,16 +8,8 @@ import java.nio.*; public class SDL{ /*JNI diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 680d341d335b..2605862f7edc 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv +{ lib, stdenv, fetchurl , makeWrapper , makeDesktopItem , copyDesktopItems , fetchFromGitHub -, gradle_6 +, gradle , jdk , perl @@ -16,6 +16,11 @@ , alsa-plugins , glew +# for soloud +, libpulseaudio ? null +, libjack2 ? null + + # Make the build version easily overridable. # Server and client build versions must match, and an empty build version means # any build is allowed, so this parameter acts as a simple whitelist. @@ -27,30 +32,42 @@ let pname = "mindustry"; - # Note: when raising the version, ensure that all SNAPSHOT versions in - # build.gradle are replaced by a fixed version - # (the current one at the time of release) (see postPatch). - version = "126.2"; + version = "140.4"; buildVersion = makeBuildVersion version; Mindustry = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "URmjmfzQAVVl6erbh3+FVFdN7vGTNwYKPtcrwtt9vkg="; + sha256 = "0lfDISvC5dOd76BuPPniPf+8hXWQ/wtreNHN75k2jVA="; }; Arc = fetchFromGitHub { owner = "Anuken"; repo = "Arc"; rev = "v${version}"; - sha256 = "pUUak5P9t4RmSdT+/oH/8oo6l7rjIN08XDJ06TcUn8I="; + sha256 = "lZ3ACijauUC9jVRq9I/QwX9ozFF/dw+ArEMND+RMItM="; }; soloud = fetchFromGitHub { owner = "Anuken"; repo = "soloud"; - # this is never pinned in upstream, see https://github.com/Anuken/Arc/issues/39 - rev = "b33dfc5178fcb2613ee68136f4a4869cadc0b06a"; - sha256 = "1vf68i3pnsixch37285ib7afkwmlrc05v783395jsdjzj9i67lj3"; + # This is pinned in Arc's arc-core/build.gradle + rev = "v0.9"; + sha256 = "6KlqOtA19MxeqZttNyNrMU7pKqzlNiA4rBZKp9ekanc="; + }; + freetypeSource = fetchurl { + # This is pinned in Arc's extensions/freetype/build.gradle + url = "https://download.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.gz"; + sha256 = "1b4dcngjcly9n80hnyr4d5s6qp8bspabfs7v3h07gb13pdg7kasy"; + }; + glewSource = fetchurl { + # This is pinned in Arc's backends/backend-sdl/build.gradle + url = "https://github.com/nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0.zip"; + sha256 = "1m702jzfjhdr76cb71qplv6amhw15nnb1h6wbq4mlfbl6y8nl159"; + }; + SDLmingwSource = fetchurl { + # This is pinned in Arc's backends/backend-sdl/build.gradle + url = "https://www.libsdl.org/release/SDL2-devel-2.0.20-mingw.tar.gz"; + sha256 = "1lbbjxl3a8vdillvv7654m6mp34lfkncvig5a8iwdmjpm214s29q"; }; patches = [ @@ -81,14 +98,9 @@ let sed -i '/robo(vm|VM)/d' build.gradle rm ios/build.gradle - # Pin 'SNAPSHOT' versions - sed -i 's/com.github.anuken:packr:-SNAPSHOT/com.github.anuken:packr:034efe51781d2d8faa90370492133241bfb0283c/' build.gradle - popd ''; - gradle = (gradle_6.override (old: { java = jdk; })); - # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { pname = "${pname}-deps"; @@ -113,7 +125,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "+7vSwQT6LwHgKE9DubISznq4G4DgvlnD7WaF1KywBzU="; + outputHash = "FbLd3kk/awFz91o8pZcwJTFozwJ7R+RlDOsMRaala5Q="; }; in @@ -124,8 +136,8 @@ stdenv.mkDerivation rec { postPatch = '' # ensure the prebuilt shared objects don't accidentally get shipped - rm Arc/natives/natives-desktop/libs/libarc*.so - rm Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so + rm -r Arc/natives/natives-*/libs/* + rm -r Arc/backends/backend-*/libs/* '' + cleanupMindustrySrc; buildInputs = lib.optionals enableClient [ @@ -149,18 +161,29 @@ stdenv.mkDerivation rec { export GRADLE_USER_HOME=$(mktemp -d) # point to offline repo + sed -ie "1ipluginManagement { repositories { maven { url '${deps}' } } }; " Mindustry/settings.gradle sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" Mindustry/build.gradle sed -ie "s#mavenCentral()#mavenCentral(); maven { url '${deps}' }#g" Arc/build.gradle + sed -ie "s#wget.*freetype.* -O #cp ${freetypeSource} #" Arc/extensions/freetype/build.gradle + sed -ie "/curl.*glew/{;s#curl -o #cp ${glewSource} #;s# -L http.*\.zip##;}" Arc/backends/backend-sdl/build.gradle + sed -ie "/curl.*sdlmingw/{;s#curl -o #cp ${SDLmingwSource} #;s# -L http.*\.tar.gz##;}" Arc/backends/backend-sdl/build.gradle pushd Mindustry '' + optionalString enableClient '' + + pushd ../Arc gradle --offline --no-daemon jnigenBuild -Pbuildversion=${buildVersion} - gradle --offline --no-daemon sdlnatives -Pdynamic -Pbuildversion=${buildVersion} + gradle --offline --no-daemon jnigenJarNativesDesktop -Pbuildversion=${buildVersion} glewlib=${lib.getLib glew}/lib/libGLEW.so sdllib=${lib.getLib SDL2}/lib/libSDL2.so - patchelf ../Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so \ + patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \ --add-needed $glewlib \ --add-needed $sdllib + # Put the freshly-built libraries where the pre-built libraries used to be: + cp arc-core/libs/*/* natives/natives-desktop/libs/ + cp extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/ + popd + gradle --offline --no-daemon desktop:dist -Pbuildversion=${buildVersion} '' + optionalString enableServer '' gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion} @@ -173,6 +196,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper ${jdk}/bin/java $out/bin/mindustry \ --add-flags "-jar $out/share/mindustry.jar" \ + --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libpulseaudio alsa-lib libjack2]} \ --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/ # Retain runtime depends to prevent them from being cleaned up. @@ -204,7 +228,7 @@ stdenv.mkDerivation rec { binaryBytecode # deps ]; license = licenses.gpl3Plus; - maintainers = with maintainers; [ fgaz ]; + maintainers = with maintainers; [ chkno fgaz ]; platforms = platforms.x86_64; # Hash mismatch on darwin: # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b12165c98c3..0961530c2049 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34400,16 +34400,12 @@ with pkgs; methane = callPackage ../games/methane { }; - mindustry = callPackage ../games/mindustry { - jdk = adoptopenjdk-hotspot-bin-15; - }; + mindustry = callPackage ../games/mindustry { }; mindustry-wayland = callPackage ../games/mindustry { - jdk = adoptopenjdk-hotspot-bin-15; glew = glew-egl; }; mindustry-server = callPackage ../games/mindustry { - jdk = adoptopenjdk-hotspot-bin-15; enableClient = false; enableServer = true; }; From 138be4cfbbe219de1be4f896b633f6cad5fdbed3 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Fri, 28 Oct 2022 11:03:25 -0700 Subject: [PATCH 298/797] mindustry: More uniform source cleanup --- pkgs/games/mindustry/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 2605862f7edc..2a3177fdb9db 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -91,14 +91,14 @@ let }; cleanupMindustrySrc = '' - pushd Mindustry + # Ensure the prebuilt shared objects don't accidentally get shipped + rm -r Arc/natives/natives-*/libs/* + rm -r Arc/backends/backend-*/libs/* # Remove unbuildable iOS stuff - sed -i '/^project(":ios"){/,/^}/d' build.gradle - sed -i '/robo(vm|VM)/d' build.gradle - rm ios/build.gradle - - popd + sed -i '/^project(":ios"){/,/^}/d' Mindustry/build.gradle + sed -i '/robo(vm|VM)/d' Mindustry/build.gradle + rm Mindustry/ios/build.gradle ''; # fake build to pre-download deps into fixed-output derivation @@ -134,11 +134,7 @@ assert lib.assertMsg (enableClient || enableServer) stdenv.mkDerivation rec { inherit pname version unpackPhase patches; - postPatch = '' - # ensure the prebuilt shared objects don't accidentally get shipped - rm -r Arc/natives/natives-*/libs/* - rm -r Arc/backends/backend-*/libs/* - '' + cleanupMindustrySrc; + postPatch = cleanupMindustrySrc; buildInputs = lib.optionals enableClient [ SDL2 From 4bd2de6ec4d3ee5a13e214e63393d985900a6371 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 01:20:21 +0000 Subject: [PATCH 299/797] python310Packages.hahomematic: 2022.11.1 -> 2022.11.2 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 183bdc734ee4..d4e0fabc6073 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.11.1"; + version = "2022.11.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-de901mQEnJCHihrrQsVk9t8JVedff4AEKvQ45mnnauU="; + sha256 = "sha256-m28UDaBk2EFwulkjvuT6zpLEeVL/oofHUVSop+AKYvc="; }; nativeBuildInputs = [ From d8426de14642a68fcdfeeeb9747c57cbca006340 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 17 Nov 2022 20:51:34 -0500 Subject: [PATCH 300/797] scripts/pluginupdate: fix fetchgit indentation --- maintainers/scripts/pluginupdate.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 46788edd236e..3341fea29106 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -142,10 +142,10 @@ class Repo: def as_nix(self, plugin: "Plugin") -> str: return f'''fetchgit {{ - url = "{self.uri}"; - rev = "{plugin.commit}"; - sha256 = "{plugin.sha256}"; - }}''' + url = "{self.uri}"; + rev = "{plugin.commit}"; + sha256 = "{plugin.sha256}"; + }}''' class RepoGitHub(Repo): From e75622fc389226edc46868f7f79ef8dac9d705a7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 17 Nov 2022 20:52:35 -0500 Subject: [PATCH 301/797] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 114 ++++++++---------- 1 file changed, 51 insertions(+), 63 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index a1e984a20fef..0d5fa1bcd314 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1697,18 +1697,6 @@ final: prev: meta.homepage = "https://github.com/neoclide/coc-neco/"; }; - coc-spell-checker = buildVimPluginFrom2Nix { - pname = "coc-spell-checker"; - version = "2022-11-14"; - src = fetchFromGitHub { - owner = "iamcco"; - repo = "coc-spell-checker"; - rev = "7988d47ad1942808f1a6f0420cda0abf493e1567"; - sha256 = "0qakmv3c9iaqy6gncjaq3j1vgs42gb5f1nl3p99ddyz5w3vq58jr"; - }; - meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; - }; - coc-svelte = buildVimPluginFrom2Nix { pname = "coc-svelte"; version = "2022-03-14"; @@ -2023,24 +2011,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-11-17"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "3f13b718b8066e565ffc0b0ad9d45211b79d7843"; - sha256 = "0wikjlpx77da1inhmb4a3466sl6nnimw8mh7c8djf76l4g8lszyz"; + rev = "b8a01364b727cdbc826005852ce69a36311f669e"; + sha256 = "11ma2b0pv7m1vc3ixmpwjnwng5q3ycysld95j2mh0fhknfls5jq6"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-11-17"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "42b6b53b8364794ecd3db62b74bd0d2777b2c4f1"; - sha256 = "1a3pvp2q8hhckyvd49z6l9xg0apx1hcl53v1ikhb769r5i55p1ha"; + rev = "80b659a05f9317526d49a459b63cbcaf5dcca4a9"; + sha256 = "01w03w9f2hiw2q3j8gkwz5g0vl5wvasv2wfkv14hkl1v91pfrz66"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2059,12 +2047,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-11-17"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "4083b51b732186dcd4fd52e75bc0d7d9559c1ee9"; - sha256 = "1a1p58n8wd4zvc41ask6k6v9sddsg0753j8r8x4sqj3rwpxv3av5"; + rev = "b9ff595175281277e3bdfa3ee059e87c4172f4c5"; + sha256 = "0i3cmf4cvqdsmyn9w69wglsii9xmynv3521pvfj1xphdg6y3bj22"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2095,12 +2083,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-09-25"; + version = "2022-11-17"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "1dffccc0a95f656ebe00cacb4de282473430c5a1"; - sha256 = "0riwlbd5sxg5r9zh8b0i3nwls9rdnwxqmb51fw3ic53j1ychs87c"; + rev = "e11e27864428a68b25e43b833e9081e350a38d96"; + sha256 = "15yma6waw0914i3z3ck50ndris4s7b9297lcjzsb7vxwkfnrkn9i"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2517,12 +2505,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete.nvim"; - version = "2022-09-28"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "14578f1d0c7ed8faca7e640104840b7eaa1c35ee"; - sha256 = "1gwq7nhd90ifh1gys2jvrq2s8521pyz7w3nsr2pmnv64h3yl1f2f"; + rev = "4e91c4d3d0aa7630bea7d7b7f5ac259356c1959d"; + sha256 = "161racr3vhnh9j06wkmhmigkjmcw53agflh6znl4gn6sx18s4amc"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -2593,8 +2581,8 @@ final: prev: src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "d5662d416bd1f12b73a288769ad8dedab7cc92c9"; - sha256 = "0l0rixn90zraldxnqbipdd5lnm1vsknsc5f4941xyb17l7wf8ys3"; + rev = "f32a7224096cca11c3c91b0dd412808e63f3d720"; + sha256 = "0a5dwjqnnpn05mvnz7khgy2mzqrxc0fbhm2iz8dwj5r4zjx1wg38"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2940,12 +2928,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2022-11-10"; + version = "2022-11-17"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "fc336d95ca00ae9c2a7c4fad57f131494fc825dd"; - sha256 = "0rkn63i5jqxxq122hb5gpcdy42sm09qnqd115ijx1l7ri803fc40"; + rev = "b666a057108c7655882cbc64217222228aad68da"; + sha256 = "0m2zmpcnv3zbjq83v0qfbqa7wvmhdscrsyfs9kr0yq3rfb7bmpzz"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3446,10 +3434,10 @@ final: prev: pname = "hare.vim"; version = "2022-10-10"; src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "267fb4dac4e8cd4df1d9b57fa587ce718f5fc256"; - sha256 = "1spl17vd8w5k5xgqvmr80fi5samzhxfcqnkmzpqjk2sf5z88k80k"; - }; + url = "https://git.sr.ht/~sircmpwn/hare.vim"; + rev = "267fb4dac4e8cd4df1d9b57fa587ce718f5fc256"; + sha256 = "1spl17vd8w5k5xgqvmr80fi5samzhxfcqnkmzpqjk2sf5z88k80k"; + }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; @@ -3467,12 +3455,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2022-11-16"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "34b6e9cf771d0c98a58ff2e8d413e8e6725232a6"; - sha256 = "1r0mj4gfqjx6v6wmwymg0va059xrinfdh45rx0i266m56xsq8fqb"; + rev = "da59ded100703c510dd0878d125a2a2e5454d305"; + sha256 = "0asf0vljs9nsrdsfjqd9p5f7wibnjkz67ph2ilj15flrfgngf7x4"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4044,12 +4032,12 @@ final: prev: legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2022-11-16"; + version = "2022-11-17"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "84f8b0f3200c16cb05a4745ec4412bf2870f69b6"; - sha256 = "1ipscjk4bv4yygq6g9xn3pv3s8zx9zzcnln5vdjzsmgrc38bw9d6"; + rev = "3b643d7bb4a521e0c9f0fcd00f299b1432441eb8"; + sha256 = "1mq7c382bzd8kwqlx2lljqkd96cr0yz9zha2zyg6vz4l60aa53h3"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4394,10 +4382,10 @@ final: prev: pname = "lsp_lines.nvim"; version = "2022-11-16"; src = fetchgit { - url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "ec98b45c8280e5ef8c84028d4f38aa447276c002"; - sha256 = "0xwbhznwbs6bshp1l501caymdcs486apn4rx4p9vnryrxdzc4chy"; - }; + url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; + rev = "ec98b45c8280e5ef8c84028d4f38aa447276c002"; + sha256 = "0xwbhznwbs6bshp1l501caymdcs486apn4rx4p9vnryrxdzc4chy"; + }; meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; }; @@ -4475,12 +4463,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-11-14"; + version = "2022-11-17"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "95ccfd97b2087e22676e2797e4ef024ec5b6b0bb"; - sha256 = "1nf6qmgyba3miagfjscvar715visabswhvs19qac71cj8j6dba5k"; + rev = "59bb7ea0d26524cef0fce6dcf6192963ec232fdf"; + sha256 = "0lazbc8vrx17p4jc27agqqdzn4rik7r1k824s8yk8dr07134byh5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5260,8 +5248,8 @@ final: prev: src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "b3f691534ebc60986d44d0ac113621e6e2e61314"; - sha256 = "1yl6hcc6rk82k25mxfya1klk4hajszi10970hvxsmchi9z0pzx0i"; + rev = "c2a0494480c9ad44f0fb31885f320a37cc09dbdd"; + sha256 = "02vfabdm8anjbrccwpajqmb4ccxbxx56n5za438i7nf6c54shpgd"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5904,12 +5892,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-11-06"; + version = "2022-11-17"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "611a35398c1e162023f635bd99b2fc10e2d2ea77"; - sha256 = "07c8bdya5px48wsmwp8617ya0zadw7q3asjkk9fmmwy9vm0sf2pn"; + rev = "1071ddc47e9d9629ba754ffbf3cc11fa8be4218b"; + sha256 = "17wr3g4f4nk98jzp4g94l8nhksmwc32lc5v7bk56zn0933gr3m1v"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6024,12 +6012,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2022-11-16"; + version = "2022-11-17"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "eb2f7e64d929229ea80c271d115fee0e45cf2789"; - sha256 = "1vnq8kc0k32f4p8wxvjrv1g9a083lbxm7bdhh78wf0acs9il46gv"; + rev = "a6a86665ba52d299b69259d7a020e5ee11fce31e"; + sha256 = "139gfsgpj22zf4dm60my82f4z5qsbhwwdpj0aqwj63chr3i0knpq"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -13418,12 +13406,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-11-14"; + version = "2022-11-17"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "0184121f9d6565610ddffa8284512b7643ee723e"; - sha256 = "1z1h4js4yrq3js6cznsi9smh3ryl55rfhys963gj938rm423axzd"; + rev = "eb1daa495273039b0723496eb088b0566281bf83"; + sha256 = "198ivr25gwdi5jk9nd117qn0l1pnyidllrwiccfny7axsaysh91h"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13442,12 +13430,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-11-17"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "b2f02e5cd38ec0bd8d90688bff4e08c23bdb1003"; - sha256 = "0p640j84ypj61kcw5v78d5yx5xnj12p6v8mrxa446ndyq5whxzg0"; + rev = "0cf23d38e29c7dbc8dde02d5384f0567494dccc8"; + sha256 = "04cr4dph2b1yizp7icmggsl2hj60sg0nx2z94f1d8wmv40c8rfvz"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; From 89763f5da8da39d85a110124cb0570483fdf205e Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 17 Nov 2022 21:48:09 -0500 Subject: [PATCH 302/797] ytt: 0.43.0 -> 0.44.0 --- pkgs/development/tools/ytt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 165f438edf91..a26e71522e5f 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-oxN4IfJ6ATw92Yri2l1R0EF1CKsGrXikaaEPpnU9qqc="; + sha256 = "sha256-mhfRrmZkeQWbYlgDEsjiUSOALXc6tI8eK81rjLYSXwk="; }; vendorSha256 = null; From e7f13761d4ffb27f0e3f95d159f75ae6d8a96e69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 03:07:42 +0000 Subject: [PATCH 303/797] fnm: 1.31.1 -> 1.32.0 --- pkgs/development/tools/fnm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index ffcd313de0b0..b6d1688e5e68 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "fnm"; - version = "1.31.1"; + version = "1.32.0"; src = fetchFromGitHub { owner = "Schniz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5DonN9tzap3mMu6/WS5evXtOjpRg4g80evCaSOsTgQA="; + sha256 = "sha256-ttprb8w4EWq2F8TbeUt+rCc0paxLXkEzISnAskIstmo="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ]; - cargoSha256 = "sha256-E4Zbk3+fbjZMXRxBcTn9S8XMSts+5m78UIP33oZOsXQ="; + cargoSha256 = "sha256-6nw7q/XQ3EOaXmyiqJJjLSX4W9Mn9W5nfl8shUttBx0="; doCheck = false; From c2e17b7e5eaec26e53eba3869191688fa11064ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 03:13:34 +0000 Subject: [PATCH 304/797] freerdp: 2.8.1 -> 2.9.0 --- pkgs/applications/networking/remote/freerdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index ea09e1a942f1..d072a03c0b47 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -62,13 +62,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-0heCwXFms6Ni/F1TaS5QEK+ePlR9DXUrzVj3vA5DvCk="; + sha256 = "sha256-I9xJWHoY8fZ5T9zca77gFciC+7JdD6fMwV16giiY4FU="; }; postPatch = '' From 1ea076247f765ce1df6e4e7a220932873cde1ebd Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sun, 4 Sep 2022 13:18:47 -0400 Subject: [PATCH 305/797] python3Packages.prodict: init at 0.8.6 --- .../python-modules/prodict/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/prodict/default.nix diff --git a/pkgs/development/python-modules/prodict/default.nix b/pkgs/development/python-modules/prodict/default.nix new file mode 100644 index 000000000000..a6fdc61658dd --- /dev/null +++ b/pkgs/development/python-modules/prodict/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, lib +}: + +buildPythonPackage rec { + pname = "prodict"; + version = "0.8.6"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ramazanpolat"; + repo = pname; + rev = version; + hash = "sha256-c46JEQFg4KRwerqpMSgh6+tYRpKTOX02Lzsq4/meS3o="; + }; + + # make setuptools happy on case-sensitive filesystems + postPatch = ''if [[ ! -f README.md ]]; then mv README.MD README.md; fi''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "prodict" ]; + + meta = { + description = "Access Python dictionary as a class with type hinting and autocompletion"; + homepage = "https://github.com/ramazanpolat/prodict"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e01b0f15281..4a5f5c630b20 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6825,6 +6825,8 @@ in { ppdeep = callPackage ../development/python-modules/ppdeep { }; + prodict = callPackage ../development/python-modules/prodict { }; + proxy_tools = callPackage ../development/python-modules/proxy_tools { }; py-nextbusnext = callPackage ../development/python-modules/py-nextbusnext { }; From c0c0a4ae2e67420c9b99b39a9ecfd4fac9fc8d95 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 17 Nov 2022 23:15:27 -0500 Subject: [PATCH 306/797] tree-sitter/grammar.nix: accept extra arguments --- pkgs/development/tools/parsing/tree-sitter/grammar.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix index 0debac64393c..e819a55eef37 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix @@ -14,12 +14,12 @@ # source for the language grammar , source , location ? null -, generate ? false, -}: +, generate ? false +, ... +}@args: -stdenv.mkDerivation rec { +stdenv.mkDerivation ({ pname = "${language}-grammar"; - inherit version; src = source; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { fi runHook postInstall ''; -} +} // removeAttrs args [ "language" "source" "location" "generate" ]) From c92e3b8b3800a299c57c91e06c0318b0ff0461e6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 18 Nov 2022 04:20:00 +0000 Subject: [PATCH 307/797] python310Packages.geopy: add format attribute --- pkgs/development/python-modules/geopy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index c22f86fc43ef..22428ecacc17 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "geopy"; version = "2.3.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { From 72ff99d064c51ffcce3fd6099c213d5d2be1c532 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 18 Nov 2022 04:20:00 +0000 Subject: [PATCH 308/797] python310Packages.pydata-sphinx-theme: 0.11.0 -> 0.12.0 https://github.com/pydata/pydata-sphinx-theme/releases/tag/v0.12.0 --- .../python-modules/pydata-sphinx-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index 70b047733d6a..b828120a309c 100644 --- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.11.0"; + version = "0.12.0"; format = "wheel"; @@ -21,7 +21,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - sha256 = "sha256-ZPH8THmh8Ga5E1QRFs1afoPhQLoOmDUJ7t2eZuH5SMg="; + sha256 = "sha256-wX26tno3dPBvNPY3jolvzQZozItdocG6AX5lzx3wr1g="; }; propagatedBuildInputs = [ From 4324d95bf9a7c596a6e4667d3731a8a109874e99 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 18 Nov 2022 04:20:00 +0000 Subject: [PATCH 309/797] nodejs-19_x: 19.0.1 -> 19.1.0 https://github.com/nodejs/node/releases/tag/v19.1.0 --- pkgs/development/web/nodejs/v19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v19.nix b/pkgs/development/web/nodejs/v19.nix index b9aed788bcd3..0e30ec899bd0 100644 --- a/pkgs/development/web/nodejs/v19.nix +++ b/pkgs/development/web/nodejs/v19.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "19.0.1"; - sha256 = "sha256-7OXCjOtHY/Xn8nb4ySUbNiHh+m5FyULnV8TRUfi/AW0="; + version = "19.1.0"; + sha256 = "sha256-Tqm6H5koFfuCOwIqYrYfU2Eh+XD+iMY5XH469OnPRqA="; patches = [ (fetchpatch { # Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200 From b63a262de7368025ba9507f5ab58287eee15a288 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 18 Nov 2022 04:20:00 +0000 Subject: [PATCH 310/797] python310Packages.sphinx-jupyterbook-latex: 0.5.1 -> 0.5.2 https://github.com/executablebooks/sphinx-jupyterbook-latex/releases/tag/v0.5.2 --- .../python-modules/sphinx-jupyterbook-latex/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix b/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix index 5aa69c47beb2..a27d4019d863 100644 --- a/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix +++ b/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinx-jupyterbook-latex"; - version = "0.5.1"; + version = "0.5.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,12 +16,12 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_jupyterbook_latex"; - sha256 = "sha256-QErSEpolSEkJaQLzfcF0oDlugEhN5Y9/KwVwC2IknLY="; + sha256 = "sha256-2h060Cj1XdvxC5Ewu58k/GDK+2ccvTnf2VU3qvyQly4="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace "sphinx>=3,<5" "sphinx>=3" + --replace "sphinx>=4,<5.1" "sphinx" ''; propagatedBuildInputs = [ sphinx ] @@ -32,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Latex specific features for jupyter book"; homepage = "https://github.com/executablebooks/sphinx-jupyterbook-latex"; + changelog = "https://github.com/executablebooks/sphinx-jupyterbook-latex/raw/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; }; From d2226ea6e01f7892b56332a137d6e56e0b3421c5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 18 Nov 2022 04:20:00 +0000 Subject: [PATCH 311/797] racket,racket-minimal: 8.6 -> 8.7 https://download.racket-lang.org/v8.7.html --- pkgs/development/interpreters/racket/default.nix | 4 ++-- pkgs/development/interpreters/racket/minimal.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 479557e0890f..41e196d00fb5 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "8.6"; # always change at once with ./minimal.nix + version = "8.7"; # always change at once with ./minimal.nix src = (lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "sha256-Lv8+l7x6EM+gMg2psH8NSIZTsLW4SQMiyC84SuD6Gig="; + sha256 = "sha256-dqfmbUfnPrDcP8on/IGONuHUv/502iY8Xv47iAGjCgE="; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 4796a2591064..9ddaa0f14143 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -6,7 +6,7 @@ racket.overrideAttrs (oldAttrs: rec { version = oldAttrs.version; src = oldAttrs.src.override { name = "${pname}-${version}"; - sha256 = "sha256-AdUJ1f/YKSD/S7Qd6EwH7MavkSKVNxatQ9hKp7OTn0g="; + sha256 = "sha256-Iy7ZzxfNf3Q7LM9z13XsNbWvJrJeVREprrYDi7DNwOw="; }; meta = oldAttrs.meta // { From 763fdd330fbc5bbabf2aabae27a1875d89e60a59 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 18 Nov 2022 04:20:00 +0000 Subject: [PATCH 312/797] python310Packages.geopy: remove outdated postPatch --- pkgs/development/python-modules/geopy/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 22428ecacc17..965411fe4af8 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geopy"; version = "2.3.0"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; @@ -22,11 +22,6 @@ buildPythonPackage rec { sha256 = "sha256-bHfjUfuiEH3AxRDTLmbm67bKOw6fBuMQDUQA2NLg800="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "geographiclib<2,>=1.49" "geographiclib" - ''; - propagatedBuildInputs = [ geographiclib ]; From 1ebd2d6b60c795090573bf1498bdf8d22472b4c0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 18 Nov 2022 04:20:00 +0000 Subject: [PATCH 313/797] millet: 0.5.16 -> 0.6.0 --- pkgs/development/tools/millet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index 3046df98839c..ccc895b89569 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.5.16"; + version = "0.6.0"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-YdCdB72f7IQsi8WKVmGlqAybcewisK1J7jfR5Irp6VE="; + hash = "sha256-tP1ccUtHfj+JPUYGo+QFYjbz56uNl3p53QNeE/xaCt4="; }; - cargoHash = "sha256-2WEptDHo2t6p8nzd00fPu/XQqq0gUlLAyuSraMfbHL0="; + cargoHash = "sha256-umOlvHDA8AtoAeB1i8nNgbjvzTmzwZfdjF+TCTKzqAU="; postPatch = '' rm .cargo/config.toml From b007fb3031486d2f0e9c6e6b2a39d430153b4ef3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 18 Nov 2022 04:20:00 +0000 Subject: [PATCH 314/797] luau: 0.552 -> 0.554 https://github.com/Roblox/luau/releases/tag/0.553 https://github.com/Roblox/luau/releases/tag/0.554 --- pkgs/development/interpreters/luau/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index 1202f2fa1456..03fd14d03dd6 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.552"; + version = "0.554"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - sha256 = "sha256-dxxzM9VKN4yDkVpU3uQNgiFbBXBa+ALWSG/Ut6JKOEY="; + sha256 = "sha256-BgCeLvMwMPsXIopSO2OH50SPqwZ4Ehqmog+3DydJ3vU="; }; nativeBuildInputs = [ cmake ]; From ce06a0c1d91df1be3b498ef0bc5321a6ffc40147 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 18 Nov 2022 04:20:00 +0000 Subject: [PATCH 315/797] tflint: 0.42.2 -> 0.43.0 https://github.com/terraform-linters/tflint/releases/tag/v0.43.0 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 061a5d348ead..4531a1661afe 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.42.2"; + version = "0.43.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hlmIf8VD8LUxHrhEephw1e+RK6e+Jdf1HvhHu6bZxco="; + sha256 = "sha256-a5rTG+4qObdmInVZH8QkMdWmRrDA9ZUl2NL5p53D2MY="; }; - vendorSha256 = "sha256-KDXS/YWuA83MeBF6rXn3zm0oIHWJaxhdQazD2kRR0mM="; + vendorSha256 = "sha256-hdevIQ0Ugn7+MtvNbF+HjJAMyBtGYuJPCFFcxS8p35E="; doCheck = false; From 876ea29d501cbf90a1fd463e81068f556c879687 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 18 Nov 2022 04:20:00 +0000 Subject: [PATCH 316/797] postgresqlPackages.plpgsql_check: 2.2.2 -> 2.2.3 https://github.com/okbob/plpgsql_check/releases/tag/v2.2.3 --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 0650cf8a7b2a..6ee0f55b2bc1 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Nxq4wpOWYt4oyoLxERWPhlEwWmLiDEk27EFyDtW/BfI="; + sha256 = "sha256-XluwevRw+cP0Tx8cr4ixTnX1rakj9zq98rclcrxfMKI="; }; buildInputs = [ postgresql ]; From e6262471afdb9afb5e773c799b2461ca35d15984 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 18 Nov 2022 04:20:00 +0000 Subject: [PATCH 317/797] postgresqlPackages.pg_repack: use release tag https://github.com/reorg/pg_repack/releases/tag/ver_1.4.8 --- pkgs/servers/sql/postgresql/ext/pg_repack.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index 83c3ac0796a7..d7991ebde4b6 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "reorg"; repo = "pg_repack"; - rev = "f42c1bd707bd5d69a9eb33494133db2e47a2c05a"; # no release tag - sha256 = "sha256-pZjspnmPTXS/SbyLAd7vcoF01cbC6PnxZjuto4lUuQA="; + rev = "ver_${version}"; + sha256 = "sha256-Et8aMRzG7ez0uy9wG6qsg57/kPPZdUhb+/gFxW86D08="; }; installPhase = '' From 1edc531d8ba3fb0e2f6fc21f4f25311967d44b8d Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 17 Nov 2022 23:16:55 -0500 Subject: [PATCH 318/797] vimPlugins.nvim-treesitter: set meta.homepage for grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 136 ++++++++++++++++++ .../vim/plugins/nvim-treesitter/update.py | 5 +- 2 files changed, 139 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index e67e968069af..09b70ad0f982 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -12,6 +12,7 @@ rev = "80ea622cf952a0059e168e5c92a798b2f1925652"; hash = "sha256-D63jvITL2RA8yg/TBSi6GsOxwLKzSHibbm3hwIKzesU="; }; + meta.homepage = "https://github.com/AusCyberman/tree-sitter-agda"; }; astro = buildGrammar { language = "astro"; @@ -22,6 +23,7 @@ rev = "947e93089e60c66e681eba22283f4037841451e7"; hash = "sha256-q1ni++SPbq5y+47fPb6TryMw86gpULwNcXwi5yjXCWI="; }; + meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; awk = buildGrammar { language = "awk"; @@ -32,6 +34,7 @@ rev = "a799bc5da7c2a84bc9a06ba5f3540cf1191e4ee3"; hash = "sha256-A/mvLYD9+Ms/nBdAebBF2edVkFUkWyz3TiEIt4G5iWc="; }; + meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; bash = buildGrammar { language = "bash"; @@ -42,6 +45,7 @@ rev = "77cf8a7cab8904baf1a721762e012644ac1d4c7b"; hash = "sha256-UPMJ7iL8Y0NkAHtPDrkTjG1qFwr8rXuGqvsG+LTWqEY="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; beancount = buildGrammar { language = "beancount"; @@ -52,6 +56,7 @@ rev = "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c"; hash = "sha256-Uh9/yBYXNKBvdpqNv1kr5eREYmKy3Z/kvaSZQpUl+0U="; }; + meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; bibtex = buildGrammar { language = "bibtex"; @@ -62,6 +67,7 @@ rev = "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"; hash = "sha256-wgduSxlpbJy/ITenBLfj5lhziUM1BApX6MjXhWcb7lQ="; }; + meta.homepage = "https://github.com/latex-lsp/tree-sitter-bibtex"; }; blueprint = buildGrammar { language = "blueprint"; @@ -72,6 +78,7 @@ rev = "6ef91ca8270f0112b9c6d27ecb9966c741a5d103"; hash = "sha256-E7SWUWQFlFWXfmdqNXt2eKkvFusnBUILHerQEFj2JTg="; }; + meta.homepage = "https://gitlab.com/gabmus/tree-sitter-blueprint.git"; }; c = buildGrammar { language = "c"; @@ -82,6 +89,7 @@ rev = "7175a6dd5fc1cee660dce6fe23f6043d75af424a"; hash = "sha256-G9kVqX8walvpI7gPvPzS8g7X8RVM9y5wJHGOcyjJA/A="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c_sharp = buildGrammar { language = "c_sharp"; @@ -92,6 +100,7 @@ rev = "3ef3f7f99e16e528e6689eae44dff35150993307"; hash = "sha256-xBRSwuodQTrKHjwx3JVgnwsAkp9EO+6su3hc2d+6DBQ="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; clojure = buildGrammar { language = "clojure"; @@ -102,6 +111,7 @@ rev = "087bac78c53fe1387756cd5b8e68a69b3f6d7244"; hash = "sha256-KiuSAchtqlVlwyBL4rU+p0fPjm52DrNDPq2ETVXOHQU="; }; + meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure"; }; cmake = buildGrammar { language = "cmake"; @@ -112,6 +122,7 @@ rev = "6e51463ef3052dd3b328322c22172eda093727ad"; hash = "sha256-2xJaDgrCJQ2obGYvhsHk2/2p8lFNwuScjbjdxJihh5I="; }; + meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; comment = buildGrammar { language = "comment"; @@ -122,6 +133,7 @@ rev = "a37ca370310ac6f89b6e0ebf2b86b2219780494e"; hash = "sha256-wiFY2uMNv8Wet3qKh0bSe8FSO1sjGu1uTOBxnt/HHHg="; }; + meta.homepage = "https://github.com/stsewd/tree-sitter-comment"; }; commonlisp = buildGrammar { language = "commonlisp"; @@ -132,6 +144,7 @@ rev = "c7e814975ab0d0d04333d1f32391c41180c58919"; hash = "sha256-63B9d5feHzwY7WDoeoPAwsuLYgVvoGQf0wkUdDO/A8M="; }; + meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp"; }; cooklang = buildGrammar { language = "cooklang"; @@ -142,6 +155,7 @@ rev = "5e113412aadb78955c27010daa4dbe1d202013cf"; hash = "sha256-Ny55gdN+3o7bFJEnXvctstl6gjqkwrp1uE33OobyH7U="; }; + meta.homepage = "https://github.com/addcninblue/tree-sitter-cooklang"; }; cpp = buildGrammar { language = "cpp"; @@ -152,6 +166,7 @@ rev = "5ead1e26c6ab71919db0f1880c46a278a93bc5ea"; hash = "sha256-h6mJdmQzJlxYIcY+d5IiaFghraUgBGZwqFPKwB3E4pQ="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; css = buildGrammar { language = "css"; @@ -162,6 +177,7 @@ rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"; hash = "sha256-5Qti/bFac2A1PJxqZEOuSLK3GGKYwPDKAp3OOassBxU="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-css"; }; cuda = buildGrammar { language = "cuda"; @@ -172,6 +188,7 @@ rev = "7f1a79e612160aa02be87f1a24469ae3655fe818"; hash = "sha256-zBlv/KyUPNHRA8fKWaDgCeE1AX3EYTkwjo/RYHaKjK0="; }; + meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; d = buildGrammar { language = "d"; @@ -183,6 +200,7 @@ hash = "sha256-1aW3nLZ5MbsOEiJ9PH6N/bBUlRihosWa4OWRcAmT3kc="; }; generate = true; + meta.homepage = "https://github.com/CyberShadow/tree-sitter-d"; }; dart = buildGrammar { language = "dart"; @@ -193,6 +211,7 @@ rev = "53485a8f301254e19c518aa20c80f1bcf7cf5c62"; hash = "sha256-1IcvFcxIkcrOuq6bypD08PeYw6J/pL/MbYPt+dKHQbc="; }; + meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; devicetree = buildGrammar { language = "devicetree"; @@ -204,6 +223,7 @@ hash = "sha256-ZiUMIsjVMxpchxmJQ3g2yXIn+/kAWPwTzMzx3IlW93o="; }; generate = true; + meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; diff = buildGrammar { language = "diff"; @@ -214,6 +234,7 @@ rev = "330eb648bbc257b4e91621e82a85372be7dde27a"; hash = "sha256-WK6pEUvIu6Xwsy5RuuUyNWLuSKkNkWh5R0hmyksIu8k="; }; + meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff"; }; dockerfile = buildGrammar { language = "dockerfile"; @@ -224,6 +245,7 @@ rev = "f913be9bb8689af22114605012693146fbe9ddaa"; hash = "sha256-EoZDjUyL4dEwE6E9r9KruQ8Kb83bAyyFq7a/NFBdZjU="; }; + meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; dot = buildGrammar { language = "dot"; @@ -234,6 +256,7 @@ rev = "9ab85550c896d8b294d9b9ca1e30698736f08cea"; hash = "sha256-w4DInIT7mkTvQ6Hmi8yaAww6ktyNgRz0tPfBLGnOawQ="; }; + meta.homepage = "https://github.com/rydesun/tree-sitter-dot"; }; eex = buildGrammar { language = "eex"; @@ -244,6 +267,7 @@ rev = "f742f2fe327463335e8671a87c0b9b396905d1d1"; hash = "sha256-UPq62MkfGFh9m/UskoB9uBDIYOcotITCJXDyrbg/wKY="; }; + meta.homepage = "https://github.com/connorlay/tree-sitter-eex"; }; elixir = buildGrammar { language = "elixir"; @@ -254,6 +278,7 @@ rev = "b20eaa75565243c50be5e35e253d8beb58f45d56"; hash = "sha256-BxFqSZIrDQFMCl+t88/j6ykpdD+ag5uIIWLrEWcHDMQ="; }; + meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; elm = buildGrammar { language = "elm"; @@ -264,6 +289,7 @@ rev = "28bb193640d916dfaf947912c1413cebb0484841"; hash = "sha256-Ijw9Ov8+IBLl0fQlkuH6rQ6E7tlKeD+huj0GZdz6XH8="; }; + meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; elvish = buildGrammar { language = "elvish"; @@ -274,6 +300,7 @@ rev = "f32711e31e987fd5c2c002f3daba02f25c68672f"; hash = "sha256-/3npcIfTH8w5ekLTb//ZCTxuSGhOXkUBaCq3WWcK2J4="; }; + meta.homepage = "https://github.com/ckafi/tree-sitter-elvish"; }; embedded_template = buildGrammar { language = "embedded_template"; @@ -284,6 +311,7 @@ rev = "91fc5ae1140d5c9d922312431f7d251a48d7b8ce"; hash = "sha256-WAMCwKS+gOvBVC9h0qKHLgNedCRQwbJV+++SDqHhK5g="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; }; erlang = buildGrammar { language = "erlang"; @@ -294,6 +322,7 @@ rev = "3a9c769444f08bbccce03845270efac0c641c5e7"; hash = "sha256-ZsjHTNUfTEPo3Wb1ihW0M2YTWK6mpNhxQG/nLfMaG4I="; }; + meta.homepage = "https://github.com/AbstractMachinesLab/tree-sitter-erlang"; }; fennel = buildGrammar { language = "fennel"; @@ -304,6 +333,7 @@ rev = "517195970428aacca60891b050aa53eabf4ba78d"; hash = "sha256-7bmrLJunNAus8XbBcBiTS5enhSzZ1mecAAyqlZUtSgo="; }; + meta.homepage = "https://github.com/travonted/tree-sitter-fennel"; }; fish = buildGrammar { language = "fish"; @@ -314,6 +344,7 @@ rev = "84436cf24c2b3176bfbb220922a0fdbd0141e406"; hash = "sha256-oJuCd+2mTCEP/rNQzweShc7TZiqwKBIDRQqnV8VqQ4s="; }; + meta.homepage = "https://github.com/ram02z/tree-sitter-fish"; }; foam = buildGrammar { language = "foam"; @@ -324,6 +355,7 @@ rev = "fdb7f14b885abfc4df57728c9b2a2f2ad24d3cb7"; hash = "sha256-E5Fr8185ypZbkaGIDE9lhQ0Vf1Dphx7n5suNkK0AFHU="; }; + meta.homepage = "https://github.com/FoamScience/tree-sitter-foam"; }; fortran = buildGrammar { language = "fortran"; @@ -334,6 +366,7 @@ rev = "f0f2f100952a353e64e26b0fa710b4c296d7af13"; hash = "sha256-ylQLalRFqRu5N/lUxvwOds/UbLH2JJ7T/rOpo9H4MZ4="; }; + meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; fusion = buildGrammar { language = "fusion"; @@ -344,6 +377,7 @@ rev = "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"; hash = "sha256-195q39pZYipT0G08kQlwnDE28ODjAz2/Sq1tzpEGFmU="; }; + meta.homepage = "https://gitlab.com/jirgn/tree-sitter-fusion.git"; }; gdscript = buildGrammar { language = "gdscript"; @@ -354,6 +388,7 @@ rev = "2a6abdaa47fcb91397e09a97c7433fd995ea46c6"; hash = "sha256-YDLPYwWHnwqj7CpgUKRXQYj2a6ZJUKc0bcalVSJ99Ew="; }; + meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript"; }; git_rebase = buildGrammar { language = "git_rebase"; @@ -364,6 +399,7 @@ rev = "127f5b56c1ad3e8a449a7d6e0c7412ead7f7724c"; hash = "sha256-4XGQTrflV+txVjXbgaQSd6rFES8TkuiXEurJLBdg59E="; }; + meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase"; }; gitattributes = buildGrammar { language = "gitattributes"; @@ -374,6 +410,7 @@ rev = "cee9f8865694b29bb9e85e0b90805f92ad3fc47e"; hash = "sha256-Ne9D4c58AWvZz/2ytP0lJzKIss2hJtZFgSKsot9MOJE="; }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes"; }; gitignore = buildGrammar { language = "gitignore"; @@ -385,6 +422,7 @@ hash = "sha256-MjoY1tlVZgN6JqoTjhhg0zSdHzc8yplMr8824sfIKp8="; }; generate = true; + meta.homepage = "https://github.com/shunsambongi/tree-sitter-gitignore"; }; gleam = buildGrammar { language = "gleam"; @@ -395,6 +433,7 @@ rev = "cfcbca3f8f734773878e00d7bfcedea98eb10be2"; hash = "sha256-lwaTlIIh4jA92ECMuxV7NtebKrjJSNoXtCe90YIQ4eE="; }; + meta.homepage = "https://github.com/J3RN/tree-sitter-gleam"; }; glimmer = buildGrammar { language = "glimmer"; @@ -405,6 +444,7 @@ rev = "abcc9970da0ed0645741bf52ea70232374bc9e52"; hash = "sha256-kkNnyaAXeZJ770Jl4mmOdyXvq6bQd/9Q6eVyr+JV2jY="; }; + meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; }; glsl = buildGrammar { language = "glsl"; @@ -415,6 +455,7 @@ rev = "a743ada24fa17da9acc5665133f07d56e03530be"; hash = "sha256-l2t2U4fZYMMpc1Nkv8JODtDny0/kSUsbiJ/VVD5VyhI="; }; + meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; go = buildGrammar { language = "go"; @@ -425,6 +466,7 @@ rev = "05900faa3cdb5d2d8c8bd5e77ee698487e0a8611"; hash = "sha256-f885YTswEDH/QfRPUxcLp/1E2zXLKl25R9IyTGKb1eM="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; godot_resource = buildGrammar { language = "godot_resource"; @@ -436,6 +478,7 @@ hash = "sha256-ws/8nL+HOoPb6Hcdh4pihjPoRw90R1fy7MB0V9Lb9ik="; }; generate = true; + meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-godot-resource"; }; gomod = buildGrammar { language = "gomod"; @@ -446,6 +489,7 @@ rev = "4a65743dbc2bb3094114dd2b43da03c820aa5234"; hash = "sha256-znvUD/xqwSUeHCDxwXIgPXiB94bY1wEOjRQSvURcdME="; }; + meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; gowork = buildGrammar { language = "gowork"; @@ -456,6 +500,7 @@ rev = "949a8a470559543857a62102c84700d291fc984c"; hash = "sha256-Tode7W05xaOKKD5QOp3rayFgLEOiMJUeGpVsIrizxto="; }; + meta.homepage = "https://github.com/omertuc/tree-sitter-go-work"; }; graphql = buildGrammar { language = "graphql"; @@ -466,6 +511,7 @@ rev = "5e66e961eee421786bdda8495ed1db045e06b5fe"; hash = "sha256-NvE9Rpdp4sALqKSRWJpqxwl6obmqnIIdvrL1nK5peXc="; }; + meta.homepage = "https://github.com/bkegley/tree-sitter-graphql"; }; hack = buildGrammar { language = "hack"; @@ -476,6 +522,7 @@ rev = "b7bd6928532ada34dddb1dece4a158ab62c6e783"; hash = "sha256-TSbi4Ik/AjswuIdTaFfJ53S0c/qfq0JYPzVv07JASmc="; }; + meta.homepage = "https://github.com/slackhq/tree-sitter-hack"; }; haskell = buildGrammar { language = "haskell"; @@ -486,6 +533,7 @@ rev = "bee6b49543e34c2967c6294a4b05e8bd2bf2da59"; hash = "sha256-/6WsOONbKS/5xM5xKa5i8LuWWkWiXZiLnOpvayj1Nxk="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; hcl = buildGrammar { language = "hcl"; @@ -496,6 +544,7 @@ rev = "45ce22c16ec924e34517cf785e23c07952e45893"; hash = "sha256-SczU8y70mdqDl2iVKTfD8Taq580x31xMswUhoU48yfE="; }; + meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; heex = buildGrammar { language = "heex"; @@ -506,6 +555,7 @@ rev = "52b804b1cb2d57e58d90090326d3ef9bd19cf16c"; hash = "sha256-fuxvX0AM9FEXVdpXu9/H6y7N+S+q6X/QYuLqKdb8PGI="; }; + meta.homepage = "https://github.com/connorlay/tree-sitter-heex"; }; help = buildGrammar { language = "help"; @@ -516,6 +566,7 @@ rev = "49cdef52ded4a886bf34bc474876b09f9270d48f"; hash = "sha256-szNY2yw5i9pgF+MpaEAkP8BgSYEe6nrFW+17sbSZ6Yc="; }; + meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; hjson = buildGrammar { language = "hjson"; @@ -526,6 +577,7 @@ rev = "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"; hash = "sha256-NsTf3DR3gHVMYZDmTNvThB5bJcDwTcJ1+3eJhvsiDn8="; }; + meta.homepage = "https://github.com/winston0410/tree-sitter-hjson"; }; hlsl = buildGrammar { language = "hlsl"; @@ -536,6 +588,7 @@ rev = "384b26ec65e10f26cf147bfcde772c50ca5ef0d0"; hash = "sha256-f6jKhC1vPpNTY0Rv1WMdJMNXRFiLsCApy/kIv7CBesA="; }; + meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; hocon = buildGrammar { language = "hocon"; @@ -546,6 +599,7 @@ rev = "c390f10519ae69fdb03b3e5764f5592fb6924bcc"; hash = "sha256-9Zo3YYoo9mJ4Buyj7ofSrlZURrwstBo0vgzeTq1jMGw="; }; + meta.homepage = "https://github.com/antosha417/tree-sitter-hocon"; }; html = buildGrammar { language = "html"; @@ -556,6 +610,7 @@ rev = "29f53d8f4f2335e61bf6418ab8958dac3282077a"; hash = "sha256-v84N9erFL+QMoxh1dtfVdAJ5iTCoiFcT3kQ2+yq8TXE="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; http = buildGrammar { language = "http"; @@ -566,6 +621,7 @@ rev = "30a9c1789d64429a830802cde5b1760ff1064312"; hash = "sha256-XpKw6v6fnowdJmoIZGn3N1r9JXdJnNifgj+DPNFuoz0="; }; + meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; java = buildGrammar { language = "java"; @@ -576,6 +632,7 @@ rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e"; hash = "sha256-tGBi6gJJIPpp6oOwmAQdqBD6eaJRBRcYbWtm1BHsgBA="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; @@ -586,6 +643,7 @@ rev = "936d976a782e75395d9b1c8c7c7bf4ba6fe0d86b"; hash = "sha256-uZW1L9ZE1YSZbwxiqSDiKycWv5mSRG4k4MlWFYoWRbw="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; jsdoc = buildGrammar { language = "jsdoc"; @@ -596,6 +654,7 @@ rev = "189a6a4829beb9cdbe837260653b4a3dfb0cc3db"; hash = "sha256-Zhl9mEpJE9Qy3MVScE2JK4i8OFZUXl5KMhKMS4bw+mI="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-jsdoc"; }; json = buildGrammar { language = "json"; @@ -606,6 +665,7 @@ rev = "73076754005a460947cafe8e03a8cf5fa4fa2938"; hash = "sha256-wbE7CQ6l1wlhJdAoDVAj1QzyvlYnevbrlVCO0TMU7to="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-json"; }; json5 = buildGrammar { language = "json5"; @@ -616,6 +676,7 @@ rev = "5dd5cdc418d9659682556b6adca2dd9ace0ac6d2"; hash = "sha256-B3wZS/OtW4hKOHsoYdYK2zsJGID8fuIm8C+IuAteR9E="; }; + meta.homepage = "https://github.com/Joakker/tree-sitter-json5"; }; jsonc = buildGrammar { language = "jsonc"; @@ -626,6 +687,7 @@ rev = "02b01653c8a1c198ae7287d566efa86a135b30d5"; hash = "sha256-iWc2ePRiQnZ0FEdMAaAwa3iYt/SY0bEjQrZyqE9EhlU="; }; + meta.homepage = "https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git"; }; jsonnet = buildGrammar { language = "jsonnet"; @@ -636,6 +698,7 @@ rev = "0475a5017ad7dc84845d1d33187f2321abcb261d"; hash = "sha256-7LdIA+tsFUIvAk9GoqJwSU5tJDNPtsziv0rbiiLmCLY="; }; + meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet"; }; julia = buildGrammar { language = "julia"; @@ -646,6 +709,7 @@ rev = "628713553c42f30595a3b0085bb587e9359b986a"; hash = "sha256-vB9HnWQ+659Itu8cvd0meLbbLzn62/dDroA3vB7ZtIs="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; kotlin = buildGrammar { language = "kotlin"; @@ -656,6 +720,7 @@ rev = "b953dbdd05257fcb2b64bc4d9c1578fac12e3c28"; hash = "sha256-xTbRn7bDN6FR9UOzw43RVHIahI/DFjwLGQj3cYoPurY="; }; + meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; lalrpop = buildGrammar { language = "lalrpop"; @@ -666,6 +731,7 @@ rev = "7744b56f03ac1e5643fad23c9dd90837fe97291e"; hash = "sha256-xz+D1lS/bpHHu2rJEjalpMajSKl3yn+bQI9JN0Bm7tU="; }; + meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop"; }; latex = buildGrammar { language = "latex"; @@ -676,6 +742,7 @@ rev = "8c75e93cd08ccb7ce1ccab22c1fbd6360e3bcea6"; hash = "sha256-zkp4De2eBoOsPZRHHT3mIPVWFPYboTvn6AQ4AkwXhFE="; }; + meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; }; ledger = buildGrammar { language = "ledger"; @@ -686,6 +753,7 @@ rev = "47b8971448ce5e9abac865f450c1b14fb3b6eee9"; hash = "sha256-Doz561oVrWkmUAL3VUTjraO+F0aDuahhBB+xXevTrkg="; }; + meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger"; }; llvm = buildGrammar { language = "llvm"; @@ -696,6 +764,7 @@ rev = "e9948edc41e9e5869af99dddb2b5ff5cc5581af6"; hash = "sha256-M7smrjU+7L9a2kpz0wM+G+YQGTQaqsVL/Q+OCKlPpzQ="; }; + meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm"; }; lua = buildGrammar { language = "lua"; @@ -706,6 +775,7 @@ rev = "fb30e8cb605e2ebd6c643e6981325a63fbbde320"; hash = "sha256-gT2WHH3rkFzb6iER0ryVU7bqVbh36RbTI9HSWMh3DsI="; }; + meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; }; m68k = buildGrammar { language = "m68k"; @@ -716,6 +786,7 @@ rev = "d097b123f19c6eaba2bf181c05420d88b9fc489d"; hash = "sha256-y1nioJ2R0YgGLH7dkJsTxIkejfMnh1CU+A++yTaQdb0="; }; + meta.homepage = "https://github.com/grahambates/tree-sitter-m68k"; }; make = buildGrammar { language = "make"; @@ -726,6 +797,7 @@ rev = "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"; hash = "sha256-qQqapnKKH5X8rkxbZG5PjnyxvnpyZHpFVi/CLkIn/x0="; }; + meta.homepage = "https://github.com/alemuller/tree-sitter-make"; }; markdown = buildGrammar { language = "markdown"; @@ -737,6 +809,7 @@ hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE="; }; location = "tree-sitter-markdown"; + meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; @@ -748,6 +821,7 @@ hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE="; }; location = "tree-sitter-markdown-inline"; + meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; menhir = buildGrammar { language = "menhir"; @@ -758,6 +832,7 @@ rev = "db7953acb0d5551f207373c81fa07a57d7b085cb"; hash = "sha256-w/ibFZ4bMPPRTgTJFLQrAzMecykJFcrjJjekKMXwqSI="; }; + meta.homepage = "https://github.com/Kerl13/tree-sitter-menhir"; }; meson = buildGrammar { language = "meson"; @@ -768,6 +843,7 @@ rev = "153d22588fb5c1eee16a165a084f9ea30f29d941"; hash = "sha256-q0qcRe94+zFvNzZV6vGGihL5xLl8Vr0lwDZAIYKPq2A="; }; + meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson"; }; nickel = buildGrammar { language = "nickel"; @@ -778,6 +854,7 @@ rev = "9d83db400b6c11260b9106f131f93ddda8131933"; hash = "sha256-Jv7GMm6TpJE8+0pG045rFWkW/9rkv1Pn/6ko2a0bpmY="; }; + meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; ninja = buildGrammar { language = "ninja"; @@ -788,6 +865,7 @@ rev = "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"; hash = "sha256-e/LpQUL3UHHko4QvMeT40LCvPZRT7xTGZ9z1Zaboru4="; }; + meta.homepage = "https://github.com/alemuller/tree-sitter-ninja"; }; nix = buildGrammar { language = "nix"; @@ -798,6 +876,7 @@ rev = "6b71a810c0acd49b980c50fc79092561f7cee307"; hash = "sha256-uTgSj4zz8WvzwIr7UO78F45nzVSjjitdtKY8GV4iL+w="; }; + meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; norg = buildGrammar { language = "norg"; @@ -808,6 +887,7 @@ rev = "dfac5ad2740a79b18ae849590a924e7bad3f1b23"; hash = "sha256-nH9Y2mYXRehqvq0kp1DkoI2dIAaCidFAxlKos8wZmks="; }; + meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; ocaml = buildGrammar { language = "ocaml"; @@ -819,6 +899,7 @@ hash = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM="; }; location = "ocaml"; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; @@ -830,6 +911,7 @@ hash = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM="; }; location = "interface"; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocamllex = buildGrammar { language = "ocamllex"; @@ -841,6 +923,7 @@ hash = "sha256-XRxAnl+9F6AYPyd6BGNQOo+KjRs2el78ziyo7NeD1IE="; }; generate = true; + meta.homepage = "https://github.com/atom-ocaml/tree-sitter-ocamllex"; }; org = buildGrammar { language = "org"; @@ -851,6 +934,7 @@ rev = "081179c52b3e8175af62b9b91dc099d010c38770"; hash = "sha256-tD9sL84LKvkhBzTU40pfd32ggxAcPG2Qk9HIhNXKM0E="; }; + meta.homepage = "https://github.com/milisims/tree-sitter-org"; }; pascal = buildGrammar { language = "pascal"; @@ -861,6 +945,7 @@ rev = "2fd40f477d3e2794af152618ccfac8d92eb72a66"; hash = "sha256-/nChZspacQymw+1P7yrkOpa7BIBVIKeLKUv0y9Hk8oc="; }; + meta.homepage = "https://github.com/Isopod/tree-sitter-pascal.git"; }; perl = buildGrammar { language = "perl"; @@ -871,6 +956,7 @@ rev = "749d26fe13fb131b92e6515416096e572575b981"; hash = "sha256-VOLvfgh1ZbuDk1BKBW9ln/9b/seudFv0PTIOFe1AtNE="; }; + meta.homepage = "https://github.com/ganezdragon/tree-sitter-perl"; }; php = buildGrammar { language = "php"; @@ -881,6 +967,7 @@ rev = "ab2e72179ceb8bb0b249c8ac9162a148e911b3dc"; hash = "sha256-Lg4gEi6bCYosakr2McmgOwGHsmsVSjD+oyG6XNTd0j0="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; phpdoc = buildGrammar { language = "phpdoc"; @@ -891,6 +978,7 @@ rev = "2f4d16c861b5a454b577d057f247f9902d7b47f5"; hash = "sha256-7oriB1AWNvedT1JRoCYuF2m5+E9MYr85Lg38KRZ+BKo="; }; + meta.homepage = "https://github.com/claytonrcarter/tree-sitter-phpdoc"; }; pioasm = buildGrammar { language = "pioasm"; @@ -901,6 +989,7 @@ rev = "924aadaf5dea2a6074d72027b064f939acf32e20"; hash = "sha256-og5DjoyTtKUTp0V4/PpcGb8xwzLeidsb2lq0+QF7u9M="; }; + meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm"; }; prisma = buildGrammar { language = "prisma"; @@ -911,6 +1000,7 @@ rev = "17a59236ac25413b81b1613ea6ba5d8d52d7cd6c"; hash = "sha256-EdeKTmai/OM0WzCjcLmzHI41EqJWH/dOJJxvCE2sid8="; }; + meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma"; }; proto = buildGrammar { language = "proto"; @@ -921,6 +1011,7 @@ rev = "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"; hash = "sha256-cX+0YARIa9i8UymPPviyoj+Wh37AFYl9fsoNZMQXPgA="; }; + meta.homepage = "https://github.com/mitchellh/tree-sitter-proto"; }; pug = buildGrammar { language = "pug"; @@ -931,6 +1022,7 @@ rev = "63e214905970e75f065688b1e8aa90823c3aacdc"; hash = "sha256-t/KRUV1DMlU/xu5BRe1VZm+dliXdtUVhFO+6psiHf+Q="; }; + meta.homepage = "https://github.com/zealot128/tree-sitter-pug"; }; python = buildGrammar { language = "python"; @@ -941,6 +1033,7 @@ rev = "b14614e2144b8f9ee54deed5a24f3c6f51f9ffa8"; hash = "sha256-4TDEK3v7hqinisXtAi/iJL0rUKqII07oVg/Jz3IV2yA="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; ql = buildGrammar { language = "ql"; @@ -951,6 +1044,7 @@ rev = "bd087020f0d8c183080ca615d38de0ec827aeeaf"; hash = "sha256-2QOtNguYAIhIhGuVqyx/33gFu3OqcxAPBZOk85Q226M="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql"; }; qmljs = buildGrammar { language = "qmljs"; @@ -961,6 +1055,7 @@ rev = "0b2b25bcaa7d4925d5f0dda16f6a99c588a437f1"; hash = "sha256-Hf8LfrN3YjN9hpGtTVmK3ZjJ/b/fsRCg9FG7hSSj/mk="; }; + meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; query = buildGrammar { language = "query"; @@ -971,6 +1066,7 @@ rev = "0695cd0760532de7b54f23c667d459b5d1332b44"; hash = "sha256-DwhvOvUb3hNmZTTk5HkZ9X1DCWz+G3+YJ0l/PqLVDdU="; }; + meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; }; r = buildGrammar { language = "r"; @@ -981,6 +1077,7 @@ rev = "80efda55672d1293aa738f956c7ae384ecdc31b4"; hash = "sha256-qUfyITSZRnSm4zZHfkM/Dm5AeFEFLcCtRrInx0Xs/tg="; }; + meta.homepage = "https://github.com/r-lib/tree-sitter-r"; }; racket = buildGrammar { language = "racket"; @@ -991,6 +1088,7 @@ rev = "09cb27a06415bce529a26774a842f5a80d50d362"; hash = "sha256-+chEzpHh4eBTEpx2+sFXDMco18zNPFUu5HMQ3dB+LwI="; }; + meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; rasi = buildGrammar { language = "rasi"; @@ -1001,6 +1099,7 @@ rev = "12391343979463a2484e6353e5afb6dcb8c31e8b"; hash = "sha256-JmL2Ei2DZhsZ4jFQ8s6B0ig9bflDs9dLr5/QknDqqRc="; }; + meta.homepage = "https://github.com/Fymyte/tree-sitter-rasi"; }; regex = buildGrammar { language = "regex"; @@ -1011,6 +1110,7 @@ rev = "e1cfca3c79896ff79842f057ea13e529b66af636"; hash = "sha256-lDsr3sLrLf6wXu/juIA+bTtv1SBo+Jgwqw/6yBAE0kg="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex"; }; rego = buildGrammar { language = "rego"; @@ -1021,6 +1121,7 @@ rev = "6174f05f58e8c35d8c82323dd8c599b90b3171b3"; hash = "sha256-hO89IYKOHDLmuq+JrXJCi3tjxn3zMwjTnWxC6ld09YA="; }; + meta.homepage = "https://github.com/FallenAngel97/tree-sitter-rego"; }; rnoweb = buildGrammar { language = "rnoweb"; @@ -1031,6 +1132,7 @@ rev = "502c1126dc6777f09af5bef16e72a42f75bd081e"; hash = "sha256-aGEhy4uMhKFbL0+JO5rrn3GIe//8PZpDHEMDGHDlBCY="; }; + meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb"; }; rst = buildGrammar { language = "rst"; @@ -1041,6 +1143,7 @@ rev = "25e6328872ac3a764ba8b926aea12719741103f1"; hash = "sha256-g3CovnXY15SkxAdVk15M4hAxizqLc551omwKKG+Vozg="; }; + meta.homepage = "https://github.com/stsewd/tree-sitter-rst"; }; ruby = buildGrammar { language = "ruby"; @@ -1051,6 +1154,7 @@ rev = "c91960320d0f337bdd48308a8ad5500bd2616979"; hash = "sha256-zUNs7s7SLGLU4h08FHLUA3YhbhRotMQVqk+zG9bmtjE="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; rust = buildGrammar { language = "rust"; @@ -1061,6 +1165,7 @@ rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9"; hash = "sha256-DnUq8TwLGPtN1GXw0AV2t+tj7UKrU4kU32rjGoCHMpE="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; @@ -1071,6 +1176,7 @@ rev = "140c96cf398693189d4e50f76d19ddfcd8a018f8"; hash = "sha256-Sr4+avj0v1y8K6XXPAVwJDTa6+RmbKe/4dzd0k0y3cE="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; scheme = buildGrammar { language = "scheme"; @@ -1081,6 +1187,7 @@ rev = "bdcd2c8496701153506a9e3e1b76dfed852873ba"; hash = "sha256-KfcWGE92nx9lrs3V/lKeE0pPqCqFC/mHamkyryrcdoo="; }; + meta.homepage = "https://github.com/6cdh/tree-sitter-scheme"; }; scss = buildGrammar { language = "scss"; @@ -1091,6 +1198,7 @@ rev = "c478c6868648eff49eb04a4df90d703dc45b312a"; hash = "sha256-BFtMT6eccBWUyq6b8UXRAbB1R1XD3CrrFf1DM3aUI5c="; }; + meta.homepage = "https://github.com/serenadeai/tree-sitter-scss"; }; slint = buildGrammar { language = "slint"; @@ -1101,6 +1209,7 @@ rev = "d422300f5d6ccce8f9a617dfed57aafb636fadb2"; hash = "sha256-j6NBJaix0oOUKLAaeo+/1XdYatStqyaTyLKawq/nFvc="; }; + meta.homepage = "https://github.com/jrmoulton/tree-sitter-slint"; }; solidity = buildGrammar { language = "solidity"; @@ -1111,6 +1220,7 @@ rev = "52ed0880c0126df2f2c7693f215fe6f38e4a2e0a"; hash = "sha256-ZyeUYtE0pyQIPnZhza6u6yQO0Mx8brgAUmUpIXYZwb4="; }; + meta.homepage = "https://github.com/YongJieYongJie/tree-sitter-solidity"; }; sparql = buildGrammar { language = "sparql"; @@ -1121,6 +1231,7 @@ rev = "05f949d3c1c15e3261473a244d3ce87777374dec"; hash = "sha256-KBalxmAukeSbjyelEy+ZqMcBlRd0V0/pntCwTeINTAQ="; }; + meta.homepage = "https://github.com/BonaBeavis/tree-sitter-sparql"; }; sql = buildGrammar { language = "sql"; @@ -1131,6 +1242,7 @@ rev = "70c50264ae022193adb364ffa7a767d765ed9857"; hash = "sha256-0HlkjL+Wy82SmVLSPXL7o3Y3l/zSDaPeBygLSvdCRZs="; }; + meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; supercollider = buildGrammar { language = "supercollider"; @@ -1141,6 +1253,7 @@ rev = "90c6d9f777d2b8c4ce497c48b5f270a44bcf3ea0"; hash = "sha256-YF+JFLcRHrWIRky2aI5s294+G6jSyVUgt/1bnZkYGLw="; }; + meta.homepage = "https://github.com/madskjeldgaard/tree-sitter-supercollider"; }; surface = buildGrammar { language = "surface"; @@ -1151,6 +1264,7 @@ rev = "f4586b35ac8548667a9aaa4eae44456c1f43d032"; hash = "sha256-Fn/pF8yvU+Ll7WmoMHnEcNxb3dsfNhuKhXA1UgXeviA="; }; + meta.homepage = "https://github.com/connorlay/tree-sitter-surface"; }; svelte = buildGrammar { language = "svelte"; @@ -1161,6 +1275,7 @@ rev = "52e122ae68b316d3aa960a0a422d3645ba717f42"; hash = "sha256-ACRpn1/2d6/ambLvr0xr7kT9gTzFFHXtvbQRTxEoet0="; }; + meta.homepage = "https://github.com/Himujjal/tree-sitter-svelte"; }; swift = buildGrammar { language = "swift"; @@ -1172,6 +1287,7 @@ hash = "sha256-x9m5QFQY33NWdkq0lkWiskfKxqRPz5ePSbVUDY7IBLU="; }; generate = true; + meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; }; sxhkdrc = buildGrammar { language = "sxhkdrc"; @@ -1182,6 +1298,7 @@ rev = "440d5f913d9465c9c776a1bd92334d32febcf065"; hash = "sha256-AGhGYomrMe6Wj+EHLQT4v0BiU4jxhxXpVQkU2xU/1ZI="; }; + meta.homepage = "https://github.com/RaafatTurki/tree-sitter-sxhkdrc"; }; teal = buildGrammar { language = "teal"; @@ -1193,6 +1310,7 @@ hash = "sha256-IGSZurROJLOp1pRPLowHGO1Pu/ehieLKWgI+RCE7wLc="; }; generate = true; + meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal"; }; tiger = buildGrammar { language = "tiger"; @@ -1203,6 +1321,7 @@ rev = "eb1d3714998977ae76ca7c6a102b10ee37efc2b5"; hash = "sha256-kbwERaTHk5Pj5AfpbXPuRS6speB+xLMfrhRXTVOyMNw="; }; + meta.homepage = "https://github.com/ambroisie/tree-sitter-tiger"; }; tlaplus = buildGrammar { language = "tlaplus"; @@ -1213,6 +1332,7 @@ rev = "deaf0e5c573ad4e2bbfc9a29abb7b6dcb572556e"; hash = "sha256-D4A2k14SpVR4iKCMwql403XjHGg7p17EYazvAUiJ2gY="; }; + meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; todotxt = buildGrammar { language = "todotxt"; @@ -1223,6 +1343,7 @@ rev = "0207f6a4ab6aeafc4b091914d31d8235049a2578"; hash = "sha256-FWVW+qWOUSri+qf+qistf8bKWJCTxUKkoO66yUYtwHI="; }; + meta.homepage = "https://github.com/arnarg/tree-sitter-todotxt.git"; }; toml = buildGrammar { language = "toml"; @@ -1233,6 +1354,7 @@ rev = "8bd2056818b21860e3d756b5a58c4f6e05fb744e"; hash = "sha256-z9MWNOBxLHBd/pVs5/QiSSGtaW+DUd7y3wZXcl3hWnk="; }; + meta.homepage = "https://github.com/ikatyang/tree-sitter-toml"; }; tsx = buildGrammar { language = "tsx"; @@ -1244,6 +1366,7 @@ hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8="; }; location = "tsx"; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; turtle = buildGrammar { language = "turtle"; @@ -1254,6 +1377,7 @@ rev = "085437f5cb117703b7f520dd92161140a684f092"; hash = "sha256-ub777Pjody2SvP2EjW7IwWj8YnMuMzdJ4AlrkP6WrdA="; }; + meta.homepage = "https://github.com/BonaBeavis/tree-sitter-turtle"; }; twig = buildGrammar { language = "twig"; @@ -1264,6 +1388,7 @@ rev = "035f549ec8c043e734f04341d7ccdc669bb2ba91"; hash = "sha256-XSE0E6a9o+WpvmMIXHu0N89VqzaIk9eFHofKAPHtT20="; }; + meta.homepage = "https://github.com/gbprod/tree-sitter-twig"; }; typescript = buildGrammar { language = "typescript"; @@ -1275,6 +1400,7 @@ hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8="; }; location = "typescript"; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; v = buildGrammar { language = "v"; @@ -1286,6 +1412,7 @@ hash = "sha256-R6Irz3sdyzKH1qWOUwUYK1OKhYs0PUYS/azYn/nb6jk="; }; location = "tree_sitter_v"; + meta.homepage = "https://github.com/vlang/vls"; }; vala = buildGrammar { language = "vala"; @@ -1296,6 +1423,7 @@ rev = "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"; hash = "sha256-YZTE3PkBPCEkMXnLC0HSQ86v5+3/J7/ETDQp8eguFW8="; }; + meta.homepage = "https://github.com/vala-lang/tree-sitter-vala"; }; verilog = buildGrammar { language = "verilog"; @@ -1306,6 +1434,7 @@ rev = "4457145e795b363f072463e697dfe2f6973c9a52"; hash = "sha256-l4DgThuP9EFU55YQ9lgvVP/8pXojOllQ870gRsBF3FE="; }; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-verilog"; }; vhs = buildGrammar { language = "vhs"; @@ -1316,6 +1445,7 @@ rev = "2f87b9d973597e69552ecf6a4fe16470fbd8c44e"; hash = "sha256-G1ytXVBeGN1606aFrPdNFp3Khlg/BTFq2VS176Knb7k="; }; + meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs"; }; vim = buildGrammar { language = "vim"; @@ -1326,6 +1456,7 @@ rev = "4ae7bd67706d7e10afed827ce2ded884ab41650f"; hash = "sha256-5gNqs6ykt2m48ghFv9y5OxsHDPTWRicdT9eR+DDiXiA="; }; + meta.homepage = "https://github.com/vigoux/tree-sitter-viml"; }; vue = buildGrammar { language = "vue"; @@ -1336,6 +1467,7 @@ rev = "91fe2754796cd8fba5f229505a23fa08f3546c06"; hash = "sha256-NeuNpMsKZUP5mrLCjJEOSLD6tlJpNO4Z/rFUqZLHE1A="; }; + meta.homepage = "https://github.com/ikatyang/tree-sitter-vue"; }; wgsl = buildGrammar { language = "wgsl"; @@ -1346,6 +1478,7 @@ rev = "af16e7d9e230004888fb52d33599ad38b4cf6052"; hash = "sha256-rp6SqiGVAxlAbrYhNLhwqawjpFXZd2R4A4cNQx6qFZs="; }; + meta.homepage = "https://github.com/szebniok/tree-sitter-wgsl"; }; yaml = buildGrammar { language = "yaml"; @@ -1356,6 +1489,7 @@ rev = "0e36bed171768908f331ff7dff9d956bae016efb"; hash = "sha256-bpiT3FraOZhJaoiFWAoVJX1O+plnIi8aXOW2LwyU23M="; }; + meta.homepage = "https://github.com/ikatyang/tree-sitter-yaml"; }; yang = buildGrammar { language = "yang"; @@ -1366,6 +1500,7 @@ rev = "8e9d175982afcefa3dac8ca20d40d1643accd2bd"; hash = "sha256-QSOy5wLb52hKkfW8bJY827zGrXTsMO5sZtl2NaNLmBA="; }; + meta.homepage = "https://github.com/Hubro/tree-sitter-yang"; }; zig = buildGrammar { language = "zig"; @@ -1376,5 +1511,6 @@ rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca"; hash = "sha256-vdfXC9PUyv4YynfrKi7M708zFbNIV6AERBd63/EAp1A="; }; + meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; }; } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index d23e9b39cf15..580c1aa22dab 100755 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -91,8 +91,9 @@ def generate_grammar(item): generated += """ generate = true;""" - generated += """ - }; + generated += f""" + meta.homepage = "{url}"; + }}; """ return generated From b39bb37ec2dc650b963e20d052e95402a088aae9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 04:33:02 +0000 Subject: [PATCH 319/797] blas-reference: 3.10.0 -> 3.11.0 --- pkgs/development/libraries/science/math/blas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index acb737836c0d..84a4486b6e3a 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "blas"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; - sha256 = "sha256-LjYNmcm9yEB6YYiMQKqFP7QhlCDruCZNtIbLiGBGirM="; + sha256 = "sha256-LZ/e59NhlU/uUyEApQ5gKCbJzBFT+M0Fe6pl7VfpAoM="; }; passthru = { inherit blas64; }; From 84b4f550bdfd1b237971a61d45fdd1f2577ff8cc Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 18 Nov 2022 14:29:31 +0900 Subject: [PATCH 320/797] haskellPackages.ghc-lib: 9_2_4_20220729 -> 9_2_5_20221107 --- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 587af092fc47..fdabda3e58a9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -105,8 +105,8 @@ self: super: { self.data-default ] ++ drv.libraryHaskellDepends or []; }) super.ghc-exactprint; - ghc-lib = doDistribute self.ghc-lib_9_2_4_20220729; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_4_20220729; + ghc-lib = doDistribute self.ghc-lib_9_2_5_20221107; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_5_20221107; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1; hackage-security = doJailbreak super.hackage-security; hashable = super.hashable_1_4_1_0; From da038b4146f0a3409971412db8f738ce6dc3535f Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 18 Nov 2022 14:34:10 +0900 Subject: [PATCH 321/797] haskell.packages.ghc94.ghc-lib: 9_4_2_20220822 -> 9_4_3_20221104 --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 420c80404ed2..b650d5e50092 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -95,8 +95,8 @@ in { dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; ghc-byteorder = doJailbreak super.ghc-byteorder; - ghc-lib = doDistribute self.ghc-lib_9_4_2_20220822; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_2_20220822; + ghc-lib = doDistribute self.ghc-lib_9_4_3_20221104; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_3_20221104; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_4_0_0; hackage-security = doJailbreak super.hackage-security; hashable = super.hashable_1_4_1_0; From 5fcbc58784a6f7332c917f81f95d50064d0eae26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 07:52:59 +0000 Subject: [PATCH 322/797] ccid: 1.5.0 -> 1.5.1 --- pkgs/tools/security/ccid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index b8d0baf5a55d..761c91ed46e1 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ccid"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "sha256-gVSbNCJGnVA5ltA6Ou0u8TdbNZFn8Q1mvp44ROcpMi4="; + sha256 = "sha256-56eMOY7A1hek+YuscNW2T3hokoTdCuh9RpLihX8Rc3c="; }; postPatch = '' From bcb2de4443268e009b82f22570567b2b013d5523 Mon Sep 17 00:00:00 2001 From: Arul Agrawal Date: Fri, 18 Nov 2022 10:11:19 +0200 Subject: [PATCH 323/797] renameutils: fix package on darwin (#195807) Co-authored-by: Sandro --- pkgs/tools/misc/renameutils/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix index 2dff399cc9a4..1b6c70a2773d 100644 --- a/pkgs/tools/misc/renameutils/default.nix +++ b/pkgs/tools/misc/renameutils/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, readline}: +{lib, stdenv, fetchurl, readline, coreutils }: stdenv.mkDerivation rec { pname = "renameutils"; @@ -11,8 +11,23 @@ stdenv.mkDerivation rec { patches = [ ./install-exec.patch ]; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace src/apply.c \ + --replace "command = \"mv\"" "command = \"${coreutils}/bin/mv\"" \ + --replace "command = \"cp\"" "command = \"${coreutils}/bin/cp\"" + substituteInPlace src/icmd.c \ + --replace "#define MV_COMMAND \"mv\"" "#define MV_COMMAND \"${coreutils}/bin/mv\"" \ + --replace "#define CP_COMMAND \"cp\"" "#define CP_COMMAND \"${coreutils}/bin/cp\"" + substituteInPlace src/qcmd.c \ + --replace "ls_program = xstrdup(\"ls\")" "ls_program = xstrdup(\"${coreutils}/bin/ls\")" + ''; + nativeBuildInputs = [ readline ]; + preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + export ac_cv_func_lstat64=no + ''; + meta = { homepage = "https://www.nongnu.org/renameutils/"; description = "A set of programs to make renaming of files faster"; From 733bf445f2addef7f2ecfc40ac3d1883d4a4f34e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 08:12:36 +0000 Subject: [PATCH 324/797] corosync: 3.1.6 -> 3.1.7 --- pkgs/servers/corosync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 4df8a547dff5..678f97e97743 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { pname = "corosync"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-ym7TK01/M+1hSvzodg/ljQ3pLGi1ddSWnrrNiS89Hic="; + sha256 = "sha256-5lVrOjhZZfITMLk4Pc0XkPKKT3ngk5grQOouwj4KKfo="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; From c3b773d802f0987f2f2f670aa6bc695d47c6ae52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 18 Nov 2022 09:14:33 +0100 Subject: [PATCH 325/797] git-absorb: 0.6.7 -> 0.6.9 --- .../version-management/git-and-tools/git-absorb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index ca312188987e..d80e481bd5bf 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.7"; + version = "0.6.9"; src = fetchFromGitHub { owner = "tummychow"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-qhUw1wjXn1tyiH175+BadcoKoZ0wHxpMTKDIKOcJjQ0="; + sha256 = "sha256-z02bMJ+KQaLHqIzsdB3BCVzTQ0NRG0ylAfTHYgOxZYk="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-Wh2kA12CggbgdofWJwPAy+587qfMUPSy9nQmO11+keY="; + cargoSha256 = "sha256-lP0fU2Cirta4WWha7Pgje537u6TbD5oiHLfamfzJtpU="; postInstall = '' installManPage Documentation/git-absorb.1 From 79c817774c25cef4ed27af5890830afc4560c42b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 18 Nov 2022 16:37:56 +0800 Subject: [PATCH 326/797] traefik: 2.9.4 -> 2.9.5 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 9abfa13c6031..5f064beaab9b 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.9.4"; + version = "2.9.5"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-tz4B9QgnExv8Je9o4T88WTFmOczQRrybBsdqKZ65f/g="; + sha256 = "sha256-o8SFR6xPh6oc6vr9xhSyOnkJTxFv142BovmvAURY3SY="; stripRoot = false; }; - vendorSha256 = "sha256-olYsWMTaRwRnDPwy4ewKnks5d8p+vmPTQKaXZSlG8co="; + vendorSha256 = "sha256-/+cyh0hFPc+Mu1tmlLDU/v0w6N1czqLVDBbEJT907wE="; subPackages = [ "cmd/traefik" ]; From 7d589b68e651aa384cff7892d032e0897f4c0e01 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 18 Nov 2022 16:45:33 +0800 Subject: [PATCH 327/797] julia_18-bin: 1.8.2 -> 1.8.3 --- pkgs/development/compilers/julia/1.8-bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/julia/1.8-bin.nix b/pkgs/development/compilers/julia/1.8-bin.nix index 59966f48fd3f..325ed73e2d58 100644 --- a/pkgs/development/compilers/julia/1.8-bin.nix +++ b/pkgs/development/compilers/julia/1.8-bin.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.8.2"; + version = "1.8.3"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "sha256-ZxzzpFC2OnF+Hu3X9pCH44VvAVsuFGy1SSjxmjwF55Y="; + sha256 = "sha256-M8Owk1b/qiXTMxw2RrHy1LCZROj5P8uZSVeAG4u/WKk="; }; aarch64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz"; - sha256 = "sha256-+RwnZCj/swrMIJ4Os+cLHJEmDoh+EdS2b1VFCEtTBUc="; + sha256 = "sha256-2/+xNKQTtxLUqOHujmZepV7bCGVxmhutmXkSPWQzrMk="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From 2d67cb5fe3e0cc5880040b02486df39ce25b00a2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 18 Oct 2022 11:18:22 +0800 Subject: [PATCH 328/797] uucp: fix cross compilation by setting AR in makeFlags --- pkgs/tools/misc/uucp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index 443c4b10457e..28f7a6572c18 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sed -i '/chown $(OWNER)/d' Makefile.in ''; + makeFlags = [ "AR:=$(AR)" ]; + meta = { description = "Unix-unix cp over serial line, also includes cu program"; From f6a2ef3840e0efa5969e311efe7da45fd733ba8a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 10 Jan 2022 13:44:37 +0800 Subject: [PATCH 329/797] autojump: fix cross compilation --- pkgs/tools/misc/autojump/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index 47c4cbcb4e74..844e3ba99ea9 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1rgpsh70manr2dydna9da4x7p8ahii7dgdgwir5fka340n1wrcws"; }; - buildInputs = [ python3 bash ]; + nativeBuildInputs = [ python3 ]; dontBuild = true; installPhase = '' From e0940d55db0185a15d64dbc4b38405835ef9fda0 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 18 Nov 2022 04:13:19 -0500 Subject: [PATCH 330/797] maliit-framework: 2.0.0 -> 2.3.0 --- .../misc/maliit-framework/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index ca942ca72d47..7c27b3b97146 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -24,24 +24,15 @@ mkDerivation rec { pname = "maliit-framework"; - version = "2.0.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "maliit"; repo = "framework"; - rev = version; - sha256 = "138jyvw130kmrldksbk4l38gvvahh3x51zi4vyplad0z5nxmbazb"; + rev = "refs/tags/${version}"; + sha256 = "sha256-q+hiupwlA0PfG+xtomCUp2zv6HQrGgmOd9CU193ucrY="; }; - # in master post 2.2.1, see https://github.com/maliit/framework/issues/106 - patches = [ - (fetchpatch { - name = "fix-pkg-config.patch"; - url = "https://github.com/maliit/framework/commit/1e20a4a5113f1c092295f5a5f04ab6e584f6fcff.patch"; - sha256 = "0h7jfqnqvjka626wx2z2g150rch4air7q3zbq59gcb12g7x6gfyn"; - }) - ]; - buildInputs = [ at-spi2-atk at-spi2-core From f146169c14e4aa291579499f0350ff6829912930 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 18 Nov 2022 04:13:34 -0500 Subject: [PATCH 331/797] maliit-keyboard: 2.0.0 -> 2.3.1 --- pkgs/applications/misc/maliit-keyboard/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix index fcbd6cbff19b..b662c2522df8 100644 --- a/pkgs/applications/misc/maliit-keyboard/default.nix +++ b/pkgs/applications/misc/maliit-keyboard/default.nix @@ -22,23 +22,15 @@ mkDerivation rec { pname = "maliit-keyboard"; - version = "2.0.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "maliit"; repo = "keyboard"; rev = version; - sha256 = "10dh0abxq90024dqq3fs8mjxww3igb4l09d19i2fq9f3flvh11hc"; + sha256 = "sha256-XH3sKQuNMLgJi2aV+bnU2cflwkFIw4RYVfxzQiejCT0="; }; - patches = [ - (fetchpatch { - # https://github.com/maliit/keyboard/pull/34 - url = "https://github.com/maliit/keyboard/commit/9848a73b737ad46b5790ebf713a559d340c91b82.patch"; - sha256 = "0qrsga0npahjrgbl6mycvl6d6vjm0d17i5jadcn7y6khbhq2y6rg"; - }) - ]; - postPatch = '' substituteInPlace data/schemas/org.maliit.keyboard.maliit.gschema.xml \ --replace /usr/share "$out/share" From 4ec2521ebb93a60b46d5d771b10294b760243c61 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 18 Nov 2022 04:34:14 -0500 Subject: [PATCH 332/797] nixos/plasma5: Sync kwinrc defaults with upstream This was missed when updating Plasma Mobile last time. --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 44faa19bc22a..a6ab3053087c 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -590,9 +590,9 @@ in }; }; kwinrc = { - Windows = { - # Forces windows to be maximized - Placement = lib.mkDefault "Maximizing"; + "Wayland" = { + "InputMethod[$e]" = "/run/current-system/sw/share/applications/com.github.maliit.keyboard.desktop"; + "VirtualKeyboardEnabled" = "true"; }; "org.kde.kdecoration2" = { # No decorations (title bar) From 374e8d3faab0ef602e7a856b14973b0937f430b5 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Fri, 18 Nov 2022 01:39:26 -0800 Subject: [PATCH 333/797] python3Packages.plotext: init at 5.2.8 --- .../python-modules/plotext/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/plotext/default.nix diff --git a/pkgs/development/python-modules/plotext/default.nix b/pkgs/development/python-modules/plotext/default.nix new file mode 100644 index 000000000000..8c6d0b39985c --- /dev/null +++ b/pkgs/development/python-modules/plotext/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +}: + +buildPythonPackage rec { + pname = "plotext"; + version = "5.2.8"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "piccolomo"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-V7N7p5RxLKYLmJeojikYJ/tT/IpVGzG3ZPVvUisDAVs="; + }; + + # Package does not have a conventional test suite that can be run with either + # `pytestCheckHook` or the standard setuptools testing situation. + doCheck = false; + + pythonImportsCheck = [ "plotext" ]; + + meta = with lib; { + description = "Plotting directly in the terminal"; + homepage = "https://github.com/piccolomo/plotext"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6af64e445511..304ca34e7796 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7143,6 +7143,8 @@ self: super: with self; { plone-testing = callPackage ../development/python-modules/plone-testing { }; + plotext = callPackage ../development/python-modules/plotext { }; + plotly = callPackage ../development/python-modules/plotly { }; plotnine = callPackage ../development/python-modules/plotnine { }; From d34d237a728d161da7ce1ee0a39367f251178a33 Mon Sep 17 00:00:00 2001 From: Krisztian Szabo Date: Fri, 18 Nov 2022 10:42:55 +0100 Subject: [PATCH 334/797] maintainainers: add thenonameguy --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f4ee00d45446..793fa7f83b48 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13538,6 +13538,12 @@ githubId = 3105057; name = "Jan Beinke"; }; + thenonameguy = { + email = "thenonameguy24@gmail.com"; + name = "Krisztian Szabo"; + github = "thenonameguy"; + githubId = 2217181; + }; therealansh = { email = "tyagiansh23@gmail.com"; github = "therealansh"; From d26d3c6cf0b7154687c9fab32c02d493c1774845 Mon Sep 17 00:00:00 2001 From: Krisztian Szabo Date: Sun, 23 Oct 2022 14:44:59 +0200 Subject: [PATCH 335/797] sftpgo: init at 2.4.0 --- pkgs/servers/sftpgo/default.nix | 52 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/servers/sftpgo/default.nix diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix new file mode 100644 index 000000000000..f59c0b6cc3ca --- /dev/null +++ b/pkgs/servers/sftpgo/default.nix @@ -0,0 +1,52 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "sftpgo"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "drakkan"; + repo = "sftpgo"; + rev = "v${version}"; + sha256 = "sha256-A4+YmChUPn+6P0rBuzYcABXyjXRZWY5KS1YcFZHCrYo="; + }; + + vendorHash = "sha256-kwluXCkbclrfRsrdqSxb5+TCBpVPZmDmrbpzR+yuQdQ="; + + ldflags = [ + "-s" + "-w" + "-X github.com/drakkan/sftpgo/v2/internal/version.commit=${src.rev}" + "-X github.com/drakkan/sftpgo/v2/internal/version.date=1970-01-01T00:00:00Z" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + doCheck = false; + + subPackages = [ "." ]; + + postInstall = '' + $out/bin/sftpgo gen man + installManPage man/*.1 + + installShellCompletion --cmd sftpgo \ + --bash <($out/bin/sftpgo gen completion bash) \ + --zsh <($out/bin/sftpgo gen completion zsh) \ + --fish <($out/bin/sftpgo gen completion fish) + ''; + + meta = { + homepage = "https://github.com/drakkan/sftpgo"; + description = "Fully featured and highly configurable SFTP server"; + longDescription = '' + Fully featured and highly configurable SFTP server + with optional HTTP/S, FTP/S and WebDAV support. + Several storage backends are supported: + local filesystem, encrypted local filesystem, S3 (compatible) Object Storage, + Google Cloud Storage, Azure Blob Storage, SFTP. + ''; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ thenonameguy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ef2108e841f..61f38367a8fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11241,6 +11241,10 @@ with pkgs; sftpman = callPackage ../tools/filesystems/sftpman { }; + sftpgo = callPackage ../servers/sftpgo { + buildGoModule = buildGo119Module; + }; + screenfetch = callPackage ../tools/misc/screenfetch { }; sg3_utils = callPackage ../tools/system/sg3_utils { }; From aeedbe0037eb368741d16abc8518a50a1f106b34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 10:22:16 +0000 Subject: [PATCH 336/797] flyctl: 0.0.431 -> 0.0.432 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index fc469acb27c5..c14ef92cf6ae 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.431"; + version = "0.0.432"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-X3zKD5AyLYNhVtNpvGShbXjX+bNN7xYjVSfs1TqhgeQ="; + sha256 = "sha256-nBBvhl5Ls/zKSLFzatCl61Wa1eXDHLwED+Q6o4xMJ5c="; }; - vendorSha256 = "sha256-pc9+m6oZGYBqDwE642HB4Ku549L3bMA52jWSmzV3tHc="; + vendorSha256 = "sha256-8Vf9JRahGkp8/5D5oDt0fnbeeLAD0q656XWdUDtceq8="; subPackages = [ "." ]; From 9199067158002373105c25fcc17e5cb7f9838321 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 11:32:49 +0000 Subject: [PATCH 337/797] appthreat-depscan: 2.3.0 -> 3.0.0 --- pkgs/development/tools/appthreat-depscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index eb974ee4cfb8..f37e71387346 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "2.3.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-9N/PQVglXyHY0La1guvLzTHNq7QFftDWxPPwMN4Pvvo="; + hash = "sha256-S86EfPWA3mZV/SLQJEdwzz5hZ1qK+WQ6k2xCs+J0jPk="; }; propagatedBuildInputs = with python3.pkgs; [ From 9e4a35d13f528b0195c1be79613f6c25cbf02646 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 15 Nov 2022 18:25:03 +0300 Subject: [PATCH 338/797] =?UTF-8?q?libmodbus:=203.1.7=20=E2=86=92=203.1.8,?= =?UTF-8?q?=20enable=20on=20darwin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libmodbus/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index d5a5647837dd..1ce3b0d4a007 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libmodbus"; - version = "3.1.7"; + version = "3.1.8"; - src = fetchurl { - url = "http://libmodbus.org/releases/libmodbus-${version}.tar.gz"; - sha256 = "sha256-ff6VhDHQVwsnHhpbMpt2pljonGFM8RnrWq23Jch/j70="; + src = fetchFromGitHub { + owner = "stephane"; + repo = "libmodbus"; + rev = "v${version}"; + hash = "sha256-rIsMTSyctPZmIh6hFeL3MxyNzey0+iOc2lbBKTkE7To="; }; + nativeBuildInputs = [ autoreconfHook ]; + configureFlags = [ # when cross-compiling we assume that the host system will return a valid # pointer for calls to malloc(0) or realloc(0) @@ -23,7 +27,7 @@ stdenv.mkDerivation rec { description = "Library to send/receive data according to the Modbus protocol"; homepage = "https://libmodbus.org/"; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } From 7e53f5f41cdc9923fd8a62a877cc3165de02b19d Mon Sep 17 00:00:00 2001 From: maralorn Date: Fri, 18 Nov 2022 12:54:51 +0100 Subject: [PATCH 339/797] haskellPackages.fourmolu_0_9_0_0: Fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ pkgs/development/haskell-modules/configuration-darwin.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 2 +- pkgs/development/haskell-modules/configuration-nix.nix | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cea6fd2a8ba8..7b6776164bc2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1619,6 +1619,9 @@ self: super: { # 2022-09-19: https://github.com/haskell/haskell-language-server/issues/3200 hls-refactor-plugin = dontCheck super.hls-refactor-plugin; + # 2022-11-18: https://github.com/haskell/haskell-language-server/commit/c1a7527c4fb348bee6093d9794b7d3e0c8d563f2 + hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.1.0.0"; doJailbreak super.hls-fourmolu-plugin; + # 2022-10-27: implicit-hie 0.1.3.0 needs a newer version of Cabal-syntax. implicit-hie = super.implicit-hie.override { Cabal-syntax = self.Cabal-syntax_3_8_1_0; diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 468e2ca08c6a..5ad58d156300 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -304,9 +304,9 @@ self: super: ({ ormolu_0_5_0_1 = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; }) (disableCabalFlag "fixity-th" super.ormolu_0_5_0_1); - fourmolu_0_8_2_0 = overrideCabal (drv: { + fourmolu_0_9_0_0 = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; - }) (disableCabalFlag "fixity-th" super.fourmolu_0_8_2_0); + }) (disableCabalFlag "fixity-th" super.fourmolu_0_9_0_0); } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index fdabda3e58a9..9e0ee396b2c7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -208,7 +208,7 @@ self: super: { jacinda = doDistribute super.jacinda; some = doJailbreak super.some; - fourmolu = super.fourmolu_0_8_2_0; + fourmolu = super.fourmolu_0_9_0_0; implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8f9e6d0ce185..d37fd3f7e6a5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -989,11 +989,11 @@ self: super: builtins.intersectAttrs super { }) super.procex; # Test suite wants to run main executable - fourmolu_0_8_2_0 = overrideCabal (drv: { + fourmolu_0_9_0_0 = overrideCabal (drv: { preCheck = drv.preCheck or "" + '' export PATH="$PWD/dist/build/fourmolu:$PATH" ''; - }) super.fourmolu_0_8_2_0; + }) super.fourmolu_0_9_0_0; # Test suite needs to execute 'disco' binary disco = overrideCabal (drv: { From 6a815221aeceb59740de90722058961729c9b2e5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 18 Nov 2022 22:08:30 +1000 Subject: [PATCH 340/797] fzf: 0.35.0 -> 0.35.1 https://github.com/junegunn/fzf/releases/tag/0.35.1 --- pkgs/tools/misc/fzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index d321ef6ae891..aee012197730 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.35.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "sha256-Wa0mMsogVWCY1Z0+bVcS4k56vTCfJ3h+wFpT3P3iEjU="; + sha256 = "sha256-Zn//z66apkhUd2RvLZSV8PqmocQdVmPngfyK4jmWsfs="; }; vendorSha256 = "sha256-EjcOcrADHdwTCGimv2BRvbjqSZxz4isWhGmPbWQ7YDE="; From 7f640597e6c42d5cf2ca6d9f239007095ca89a30 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Thu, 17 Nov 2022 23:39:09 +0100 Subject: [PATCH 341/797] xdp-tools: 1.2.6 -> 1.2.8 --- pkgs/tools/networking/xdp-tools/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/xdp-tools/default.nix b/pkgs/tools/networking/xdp-tools/default.nix index 4861347e38fe..e126cfc7a778 100644 --- a/pkgs/tools/networking/xdp-tools/default.nix +++ b/pkgs/tools/networking/xdp-tools/default.nix @@ -15,25 +15,17 @@ }: stdenv.mkDerivation rec { pname = "xdp-tools"; - version = "1.2.6"; + version = "1.2.8"; src = fetchFromGitHub { owner = "xdp-project"; repo = "xdp-tools"; rev = "v${version}"; - sha256 = "xKxR20Jz+pGKzazFoZe0i0pv7AuaxdL8Yt3IE4JAje8="; + sha256 = "7QYlC0YBQsXH2VxjgBbmTgEvp83lXloTLCHY2fTrZuQ="; }; outputs = [ "out" "lib" ]; - patches = [ - (fetchpatch { - # Compat with libbpf 1.0: https://github.com/xdp-project/xdp-tools/pull/221 - url = "https://github.com/xdp-project/xdp-tools/commit/f8592d0609807f5b2b73d27eb3bd623da4bd1997.diff"; - sha256 = "+NpR0d5YE1TMFeyidBuXCDkcBTa2W0094nqYiEWKpY4="; - }) - ]; - buildInputs = [ libbpf elfutils @@ -74,7 +66,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/xdp-project/xdp-tools"; description = "Library and utilities for use with XDP"; license = with licenses; [ gpl2 lgpl21 bsd2 ]; - maintainers = with maintainers; [ tirex vcunat ]; + maintainers = with maintainers; [ tirex vcunat vifino ]; platforms = platforms.linux; }; } From 6390d01e1302ea3473620fcdd57f27dabe4844d1 Mon Sep 17 00:00:00 2001 From: Krisztian Szabo Date: Thu, 27 Oct 2022 16:46:14 +0200 Subject: [PATCH 342/797] postgresqlPackages.pg_relusage: init at 0.0.1 --- .../sql/postgresql/ext/pg_relusage.nix | 29 +++++++++++++++++++ pkgs/servers/sql/postgresql/packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/ext/pg_relusage.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix new file mode 100644 index 000000000000..043adf725033 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + pname = "pg_relusage"; + version = "0.0.1"; + + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "adept"; + repo = pname; + rev = "refs/tags/${version}"; + sha256 = "8hJNjQ9MaBk3J9a73l+yQMwMW/F2N8vr5PO2o+5GvYs="; + }; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; + + meta = with lib; { + description = "pg_relusage extension for PostgreSQL: discover and log the relations used in your statements"; + homepage = "https://github.com/adept/pg_relusage"; + maintainers = with maintainers; [ thenonameguy ]; + platforms = postgresql.meta.platforms; + license = licenses.postgresql; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 8d0b46ebc3ea..80065bde4ba1 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -62,6 +62,8 @@ self: super: { pg_partman = super.callPackage ./ext/pg_partman.nix { }; + pg_relusage = super.callPackage ./ext/pg_relusage.nix { }; + pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { }; repmgr = super.callPackage ./ext/repmgr.nix { }; From f05186306c36add207ba6e098e34d4cedbaef373 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 18 Nov 2022 07:03:03 -0500 Subject: [PATCH 343/797] tremor-language-server: init at 0.12.4 --- pkgs/tools/misc/tremor-rs/ls.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/misc/tremor-rs/ls.nix diff --git a/pkgs/tools/misc/tremor-rs/ls.nix b/pkgs/tools/misc/tremor-rs/ls.nix new file mode 100644 index 000000000000..90fe5686f814 --- /dev/null +++ b/pkgs/tools/misc/tremor-rs/ls.nix @@ -0,0 +1,29 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, llvmPackages +}: + +rustPlatform.buildRustPackage rec { + pname = "tremor-language-server"; + version = "0.12.4"; + + src = fetchFromGitHub { + owner = "tremor-rs"; + repo = "tremor-language-server"; + rev = "v${version}"; + sha256 = "sha256-odYhpb3FkbIF1dc2DSpz3Lg+r39lhDKml9KGmbqJAtA="; + }; + + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + + cargoSha256 = "sha256-/RKwmslhMm30QxviVV7HthDHSmTmaGZn1hdt6bNF3d4="; + + meta = with lib; { + description = "Tremor Language Server (Trill)"; + homepage = "https://www.tremor.rs/docs/next/getting-started/tooling"; + license = licenses.asl20; + platforms = platforms.x86_64; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c195a0bd8a5..41ff5fb69f59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12724,6 +12724,8 @@ with pkgs; openssl = openssl_1_1; }; + tremor-language-server = callPackage ../tools/misc/tremor-rs/ls.nix { }; + truecrack = callPackage ../tools/security/truecrack { }; truecrack-cuda = truecrack.override { cudaSupport = true; }; From 58bb52af959752861b27290dd290d66b5aa0e4fb Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 18 Nov 2022 13:35:53 +0100 Subject: [PATCH 344/797] chroma: 2.3.0 -> 2.4.0 https://github.com/alecthomas/chroma/releases/tag/v2.4.0 --- pkgs/tools/text/chroma/default.nix | 4 ++-- pkgs/tools/text/chroma/src.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index e005b8bd258e..fd2462d52284 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -6,7 +6,7 @@ in buildGoModule rec { pname = "chroma"; - version = "2.3.0"; + version = "2.4.0"; # To update: # nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json @@ -17,7 +17,7 @@ buildGoModule rec { inherit (srcInfo) sha256; }; - vendorSha256 = "01ia5y030zfapyf0fk77h6qj1k46djn9jh9fcyip5iazc87vzhr6"; + vendorSha256 = "02malb9qilixhdjrdd8bf0yml1c2rkvfvdmr25b4xdv0vwvgb9gg"; modRoot = "./cmd/chroma"; diff --git a/pkgs/tools/text/chroma/src.json b/pkgs/tools/text/chroma/src.json index 173f509308cd..a7b2e841243c 100644 --- a/pkgs/tools/text/chroma/src.json +++ b/pkgs/tools/text/chroma/src.json @@ -1,9 +1,9 @@ { "url": "https://github.com/alecthomas/chroma.git", - "rev": "6138519d55582350e5dec0147cb8f5ddcb78f8cf", - "date": "2022-09-16T01:14:11-07:00", - "path": "/nix/store/bnlx3v849jw7vf8i15q2bv91p1bzprhs-chroma", - "sha256": "1h2i4hqn0h4iplhid0x6rv6l7a2zglivv6w33gg8z1cvd6acjzcl", + "rev": "aecedef97da5c01d46cd3c8b427df5aae92b3089", + "date": "2022-11-15T18:57:46+11:00", + "path": "/nix/store/fnwldb1pkdws3rqj7y4cs1rk93ar6kqr-chroma", + "sha256": "0l5x256d6v1089ww8cxhd6bwav58rbwj76av2x1vld3n3w4j3148", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From 2018e786a35c5c0c7c6fb27ef59d223568e19cc2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Nov 2022 13:54:28 +0100 Subject: [PATCH 345/797] thunderbird-unwrapped: 102.4.1 -> 102.5.0 https://www.thunderbird.net/en-US/thunderbird/102.5.0/releasenotes/ https://www.mozilla.org/en-US/security/known-vulnerabilities/thunderbird/#thunderbird102.5 Fixes: CVE-2022-45403, CVE-2022-45404, CVE-2022-45405, CVE-2022-45406, CVE-2022-45408, CVE-2022-45409, CVE-2022-45410, CVE-2022-45411, CVE-2022-45412, CVE-2022-45416, CVE-2022-45418, CVE-2022-45420, CVE-2022-45421 --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index b9eaf73043db..7721834fea2d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.4.1"; + version = "102.5.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "8855f7bf1ee2c9f6859189f3aa8afa5d851af2f4edb1a63e3804ec7796f228addf2819028ca6213f7c3f6c452cf4915801df1e706d7c84d8f15e0a627c77b7b6"; + sha512 = "b6f2828b23616db5620e0364a1ebb02a8676e184d5e361c0aa87f36b64eb6b7f4b1bc3c42675b3ae3092953fbda6b01c18c068b167d40469481b1e18af1dcaa1"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. From 1afe1b2b005b92db551154fb38eb5994792e054f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Nov 2022 13:56:23 +0100 Subject: [PATCH 346/797] thunderbird-bin-unwrapped: 102.4.1 -> 102.5.0 https://www.thunderbird.net/en-US/thunderbird/102.5.0/releasenotes/ https://www.mozilla.org/en-US/security/known-vulnerabilities/thunderbird/#thunderbird102.5 Fixes: CVE-2022-45403, CVE-2022-45404, CVE-2022-45405, CVE-2022-45406, CVE-2022-45408, CVE-2022-45409, CVE-2022-45410, CVE-2022-45411, CVE-2022-45412, CVE-2022-45416, CVE-2022-45418, CVE-2022-45420, CVE-2022-45421 --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 34fa9826bcb6..495764bf5ee2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "102.4.1"; + version = "102.5.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/af/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/af/thunderbird-102.5.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "08073df6cdbe071c3386b889ddc6f3023847528065c6e02a596ce376553eacb6"; + sha256 = "80b1e18e826369d4f34449e8a90630cfa8425b43a4b113f49026a909e591916a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/ar/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ar/thunderbird-102.5.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "1c1db09f3b666911328080dc0f7b3c3dbc6fe06011a0851edf9ae50ecabc3724"; + sha256 = "bcc6d43b1fd182f15ad502a622a74f97fd02374ecd89168b1c165e62f12c1841"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/ast/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ast/thunderbird-102.5.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "4df7f18fe166460d42e6a3a9755ceeca2935152603255810fe8bf32a828b9a26"; + sha256 = "6fbd2e7c1f8c86c7a5aed8362ae3df99ffe7b03ad4885024983e58d9f71b137a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/be/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/be/thunderbird-102.5.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d0c81fcea6f33749b51465428c7469aa34711013b46241543ccd5c5168523740"; + sha256 = "b353f925236872f35aded0b8b3992ce83284debf7f1c774a4600f9a67e548de6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/bg/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/bg/thunderbird-102.5.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "d6ffdda120ae73ab82bfef6647ee7b4ba81c3c0cb890d1fc5e5ef4c9ef739cec"; + sha256 = "149c22f4f4674800320e204d287d09c6143517276e113cf7ba9e73c193ef7d77"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/br/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/br/thunderbird-102.5.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "b1d6890f43cd5fe4c85fbf14cc9455dcaafe1f17a187e843017938357610595c"; + sha256 = "23d114474845d0d6a6f044baa59421b81f14badfdf306c154e9739b03d28995a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/ca/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ca/thunderbird-102.5.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "616261967c700a01fa4f018723fefdddd3264ea4e96e33bfd88fac419fd2ee1c"; + sha256 = "43bf01934dee664033adeb22ee3af77a693f7cc9ec3c6357dabff08277f94f91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/cak/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/cak/thunderbird-102.5.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a9384ad2644dc1fe5e6a152d519c3644701ef48c6dcff1c107f30763ed2e79f4"; + sha256 = "274a3dc9b29e9a1684cd60c5401adb180a4996aaceeaa64546101c1920007ab3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/cs/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/cs/thunderbird-102.5.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "59d99c6e4f1cae756356ec85d71d0dad534ca32922dd13ee8766c24dd0a24197"; + sha256 = "382e85e0b46d539c9b39b9488cd1a24eb9a5e62a20e59575d094b8efb4423d02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/cy/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/cy/thunderbird-102.5.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "acf84ee8bc408c44766533c75c4d56fce9b85a09c19e5c50cbc5fba535462e01"; + sha256 = "e33f9cf6a06e7e60e7238ef6f55d4f68ec348809e5be20881ac86f5414613b89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/da/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/da/thunderbird-102.5.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e8ae4e045e54f2f242e598b67cd95dfecb54d23167a28871249b667814f68b9f"; + sha256 = "939195d3a4d184582aba103150dd220a471ba2a932bf7b78f91c17260374900c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/de/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/de/thunderbird-102.5.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "3f8417b4ce6403892145e8b9a4c8fb0113c83b252f05af721be3c9d090923d97"; + sha256 = "aebba6f46e94b3988273def89f0381d3993054ca7f2b3eae07870447ed1f0f56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/dsb/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/dsb/thunderbird-102.5.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "293dd78f61b56be58c38ea18ece6f680d9255427d2169ee9e40cc4acd1518d87"; + sha256 = "7b9da40217aef8b8c77c97bc64ae18084142dba0e380848037a512e2b82bcd6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/el/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/el/thunderbird-102.5.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "f105f81e72a937312d11d453cd293275770c21f4bfb873ddf486f8fa6fcb9770"; + sha256 = "f992c7476b31e664755fa53c3310baa28da2d22482cb3a9804787fc53a93646c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/en-CA/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/en-CA/thunderbird-102.5.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "18299fbdd4c800b8a460d423f024f273a3dd30a3af9f53c8556ad861f69f44e4"; + sha256 = "6910ec50a0e227cac5e2e1abbf60bcb0c913884b31c71db8a66141939e4ed5af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/en-GB/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/en-GB/thunderbird-102.5.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "9553a14d31accd87a7dcbe7ecb19c03c558d0d98a6421335fefa6035cd36055a"; + sha256 = "fb3bc64c3b7266e1531d56ab0607e7031b6425435fc452fab1b38bea3623e73e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/en-US/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/en-US/thunderbird-102.5.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "45c4f16f243d563eca70be66cacd8a92931e143b6ccd4b88e1592f6918a16050"; + sha256 = "e803a265cc40c8a0a306939a7e9effb087bacbfaeacee0ffea291d5948c14741"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/es-AR/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/es-AR/thunderbird-102.5.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "8cb47779ed6d146a165375e75c3e399421cf625ed96459e62cf66df0ac1c5632"; + sha256 = "42ed5e1d668a75a04f3d2ef2c0429dabc1a64a2c03c7c946a936c160ce98f3a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/es-ES/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/es-ES/thunderbird-102.5.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "ad2dbb613a14569709f4a45efe4e4a1bc95c048334e60313b470779b301ad24a"; + sha256 = "d9bbb9197b48231ce1b62983cf51cca7d21db8f7530fd036e5c4706564dc5ad5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/es-MX/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/es-MX/thunderbird-102.5.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "92d4f904bc0448eebcb282c154b8fac2fb440e18d33efad39e1158b632d141bb"; + sha256 = "b6aaf5311c8f7156fea7a4c32fc7e45828edae7515776f6d2f531aadb46ced71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/et/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/et/thunderbird-102.5.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "0de025d42b2e832ee750bfedde7042ca33b06eda72daadd4f253fa7694151815"; + sha256 = "fda67cbf589f6c16b8b70f9a9adf4e66ced2a075cccdd7082257936f36515f26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/eu/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/eu/thunderbird-102.5.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "73b78650bdf5cc4c7ffd749d65e7981497501b14f722daade518dbe47a4cf0fc"; + sha256 = "1f2b63138db4722f93479134c9496d5764d0022b98f883859ef993eb1d1a354a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/fi/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/fi/thunderbird-102.5.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "3c3ec6c58005559519493a15c1cc68b03a4d5d8dc2f53f43f7d7ba6be838f962"; + sha256 = "3903b745f2e630e7e9eb373fe1be824f658098427a022885e8e4b3702dd0e3ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/fr/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/fr/thunderbird-102.5.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ea221972a549c82ab7f13c6ec891edf7d1bfcc96cbb41650bf67e781bb22f3b7"; + sha256 = "e55f2383cf4724a2730e4c9cbea45b94e248516457422b9a4f351ec5490166f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/fy-NL/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/fy-NL/thunderbird-102.5.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e858beb5d5f4766d8d3b71d9ddd911bc2193e542237e38919e230659c192830c"; + sha256 = "662a3cccc13461e42dfac524285e1d0e632da195d962cb0e5d8464174c28cd9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/ga-IE/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ga-IE/thunderbird-102.5.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "f92a5030d465d70caea048d27820a31941b5e37fbd78d589fa19aaf24dce7e66"; + sha256 = "703ff33f3d096f5f96e447ea8753c485eea44f5c4337146e8cd8b142660891d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/gd/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/gd/thunderbird-102.5.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "f076f07c58b67bb6463dcac79d6a458cebda1d6a3d17ec8adcc8bdd102207ff7"; + sha256 = "94892f71e8fcae4061d37ba2b30f4a097af3472cdd9233836063616db1e71628"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/gl/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/gl/thunderbird-102.5.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "cafcb519043c5f4895a08c19d942204c24488c3cee1f02290fe686b524ba4976"; + sha256 = "d7539b557ea31966780c6f6c892ac3041f3976f94869f386106c3815031e6ac6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/he/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/he/thunderbird-102.5.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "d337901a548cd409282f597624ff4231c843a775fa56ba468f976227cb34c51a"; + sha256 = "96ceac6f559f636d11d433e05bc0997f70c0dc055d04e2a378e35a69437ea93e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/hr/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/hr/thunderbird-102.5.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "d606d6d81645d66f466e9d6b494922dcd6259aff72b268bbc7ee8a917bada0ef"; + sha256 = "50ea1a69e96ec98fba3469ced119d70d020b061bd261267a5aaaf9a50293bf6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/hsb/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/hsb/thunderbird-102.5.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2bbbb19b7abbeea16ca2e09937a622442da448b32f1fd80cf74a14a2218fa990"; + sha256 = "6df3cb2437541cb897c9bd7c65d019fa0938df54c13c513547a36ad9f6409d14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/hu/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/hu/thunderbird-102.5.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "1e9e283bb54336eb182262773d490f8097b00c224dc4c9c97077c7921411ac14"; + sha256 = "8798d9f4deb2b1d75f38e10dcd184a0d82d1e5ca69fb171b024b636cc5366bb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/hy-AM/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/hy-AM/thunderbird-102.5.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "aacd3c2286c571399678e5f37650382f8c16d98fbcad1085e61314d7fa501716"; + sha256 = "e5e569436fb883fce500ccbf138f2237e8d641957177b0e9323a0091713c25d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/id/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/id/thunderbird-102.5.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "d3e5f61effbe3ad52a054fc59905ecf857935d20642b8efb7d0d43c7dfd15141"; + sha256 = "dfb81f988c1a6bfe2ba9913e5b31ec2c172dae9ade4a05961202a867e4192367"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/is/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/is/thunderbird-102.5.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9e58e251f4845b93e25fc0cbcd52a913747cc4e7f0cc71d5ba0fff9f4a193020"; + sha256 = "a3f1a999a31b02c130a74408c7fb3e910124ade35e4d8ce4274d162d4dd1e30a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/it/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/it/thunderbird-102.5.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "c128eb6aa3d32a1b53ca9e022b033137281d362404536ea8cbe8fbbde208389d"; + sha256 = "ed75d139aff75595f05c42e621a71c42316fd9b4c82f9c63b32ea2bcbafb9f97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/ja/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ja/thunderbird-102.5.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "4d3600bb1a618e0add841bb1e0f6afd4d25963ea317204eb015a2692996307ca"; + sha256 = "deff788766133ecd6d1f8d01d36f58c6d89cf9dca41005e97a3bfca1f4ac8de7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/ka/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ka/thunderbird-102.5.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "a8af3f899683a50f1f2aaf8ec4190c6367edd1282216bd9a8a8073b3ede0f5dd"; + sha256 = "5a7de96a5f4d933a420694810ab32c7ce397c1a31e539dcad42ada81c7edfdb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/kab/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/kab/thunderbird-102.5.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2d24b25375add713bc46dd400a2c8eb34228ddfc78e14ec388cbeee42f84a592"; + sha256 = "ecd5bc56051fbed9641c7adb9a4d9ba627586b50b3fc1f564fcaf8b4f891c643"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/kk/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/kk/thunderbird-102.5.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a77b99661316fcb7072d85c20924a5df246328d49b5c760967ce9217cf9a3e31"; + sha256 = "dc46b7cb231dc71b7481796bcebcf12f50cb0b1212fc0a619747524567aef257"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/ko/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ko/thunderbird-102.5.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "f2c086cb766718cc9780f3b0a6e101c5af4bcff4bea71f7dcff8a4ce233dca37"; + sha256 = "919b35ed688c7a0f6deba8e31e696ca804c62abd5cde119af2a2f4300a83c8d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/lt/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/lt/thunderbird-102.5.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "105148d01371f2c302fe3e275b5d23d31365d844e368e761eac5dff8d91e426b"; + sha256 = "50f1a50545befdafee3c0ec1df0386d28ac041dde3e72653cd3834d8c136f705"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/lv/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/lv/thunderbird-102.5.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b905760d84f3a2df91ee1d9ede23cad1fe354f14d5623e97cf766f8e6b42943e"; + sha256 = "943abb80c6c57437a62923c311fa17b28a0381da727f5d2e492cf68cce11917d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/ms/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ms/thunderbird-102.5.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "95e9955220bbddf8a5b890ebd6dc783a19a7a9c2b2f20fe5c09f7d7570590a45"; + sha256 = "c6918b2df57f5ca08f6a24b1e9d0355bbda199ca8a08a950200e344c360388e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/nb-NO/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/nb-NO/thunderbird-102.5.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "bff46e27874a753e97f36acba4ebb0af7888a07fdc0c069e49eb34c000dac5a3"; + sha256 = "44ef771b91f4310332e2cb79c81a323cef65bdbeae2dfc44eb1b4ebe81516278"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/nl/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/nl/thunderbird-102.5.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "0fe3f1a9490dfc81e13f199f91829e7eb22a8e8f1f660561029ccc093db5bc44"; + sha256 = "43e16f65802000586493e38901de3c5acfbc2ac7fbd96964a6fc815ea9d1a2b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/nn-NO/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/nn-NO/thunderbird-102.5.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "deee98fd0fb6be6c2974c54112e170a247336fe1e58d1e63c382b6be02a002cd"; + sha256 = "eac4fec574f33372499f94c9a1d4995ba88c41f5e7d1d9dfc2b34001857a007c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/pa-IN/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/pa-IN/thunderbird-102.5.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c7f3f847b96ce57ab79ea2d1e27b9525beb4218cb9747453b558def01fb367dd"; + sha256 = "fb3d7789404180960fcd59b8b16cb9e16c5c3fedabe872e330d73b944654a0ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/pl/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/pl/thunderbird-102.5.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a7058bf0ae48d4be0369dae1f1f006f78a0e5e914c92e3dbd86ccafeac9d0384"; + sha256 = "e9f6c26b6956114ad0a56a9690d4f8edd96e23ca82afe68d28e990e5f0f67408"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/pt-BR/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/pt-BR/thunderbird-102.5.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "98c8bdff3e4747849a9dccf0c43292e85cddb67a8c21dd450fff693c7fa722ac"; + sha256 = "675132e4f4faaeaa6b4a4853d4b47d3d09cab5842d271cd3243c49c783afa45b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/pt-PT/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/pt-PT/thunderbird-102.5.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "07271ac0c4cdbf7bed8a57c440b581321cd34c6345332bc12c8ee1739091c6e6"; + sha256 = "abfc6b22ea322d70973624e3b3544887adba99eda1a086d8ae67f3904d47dc06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/rm/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/rm/thunderbird-102.5.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "46343d73ce9854103c67aee2497af8ed2fa0e727f8fc1516f9a53389c1fb825a"; + sha256 = "652d391ee8e934914d158b0c9e1f8df5078290dc5ddac321a11297360b22c982"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/ro/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ro/thunderbird-102.5.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "3ef064c0e8d29ab43b8f4eb6457532d00c08f494a0780139751a2a5edf6686fb"; + sha256 = "2e2326714706b12c8123d9952da8630b02a621eeda398631614d638a9a2aeec4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/ru/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/ru/thunderbird-102.5.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e950647fb3d7cad84e2d52c37187f001b22f4526106ebb45b22a47d49c7c6569"; + sha256 = "8fdcfb3fa172755204fb9263202988fef1d70a8f0be16b59bacc05fe47a9c124"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/sk/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sk/thunderbird-102.5.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "75d1779f445c20b9e2d86398fe3f97ec9a994d731cdb0a7973879f32b08cb4e3"; + sha256 = "e722b0e8e80e20c169f8d691ba81bd81bc97f77e1b9a03778f8ee93850dd9c29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/sl/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sl/thunderbird-102.5.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "9a433ee3876e57a4d48d61b86e0ff1fd4c92aa7be6cb1275360eda50d1e9e869"; + sha256 = "8322877e87880e76a41eeebd268858a20caf7c5c95e728f21c4ab29959e96e9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/sq/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sq/thunderbird-102.5.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "3a10eea6c49c7400e4c80ac4999c21acdba0ef94279e51129dd099cb3a1429a6"; + sha256 = "88297cb69a678af8db0dfe7584fefb518df1a9cfe0f87f1ff8cc30f52d5a3d64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/sr/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sr/thunderbird-102.5.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "aee0848c3bf945586a99e0007cc54d64a3635d83f9e28b8e3541561a5e1d1cc3"; + sha256 = "4c8382d66320d98a3dfd9e254c8e72c371a39e49e07267ed6a9d4e0ba1a2d343"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/sv-SE/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/sv-SE/thunderbird-102.5.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "0109d45d6398428ead4273eaf350833bbb8b467abc6e9ab4fd19020b0cdfa107"; + sha256 = "1dd4ad25cf7557119588e98f31fb8875ab1cac2fba6c08be6a18eed8ed7f7008"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/th/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/th/thunderbird-102.5.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "7d32e7b70231d6d496d0341a8706f22eb6671327982016076dd55022f1705f1d"; + sha256 = "cec22b02870bdcd60e1ffdd3524a36e71bff5d32497787bf10af7e257c02aada"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/tr/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/tr/thunderbird-102.5.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "65f7f282d4129fe26c90589fd4d408f9566ab004010a54b12399556ecb4473f0"; + sha256 = "68aebdfba935442388825991682280092920b1bbd6aaf14c5f8aa4b48d6fb38a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/uk/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/uk/thunderbird-102.5.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4ff7402cd57afc078851db23ba4a19d205097786451fafae356032f1e1a82296"; + sha256 = "f9f2f91cce1c6a41ea6783cabdcced5132174c0064bd1571ea1c425e8ee9050a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/uz/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/uz/thunderbird-102.5.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1d505372aee160d1c1cad1d5cf1c4805666da0b24ee8ba992ac3b72808d326f0"; + sha256 = "bc5236d3a61b35c674694605e5ee65c7b2599cb8969eab112767f0510ba14c81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/vi/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/vi/thunderbird-102.5.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "1c8577b45a00f1495eb498dccca5b022556e483d76a6af39989f7acec93f3270"; + sha256 = "b32afcecb7c1e7b67dff0a4b07e7d9eeb9cd939d017f5a1aea594fb282222118"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/zh-CN/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/zh-CN/thunderbird-102.5.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e1dee1a41cdf2e551268d43732c48823f2bb7409724ae9410d01cea3d02bc903"; + sha256 = "866371f13123180e76a0be8adcde3bde1123633a18012e9f0e71a2e75f61c838"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-x86_64/zh-TW/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-x86_64/zh-TW/thunderbird-102.5.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "0f1558f845ba2820003a18623432a2461296923e7e9a373b7811c6555998d6fc"; + sha256 = "fec9c01a6bc7c46a5febbd9c7f9e0fb29d9e2cfc44bd05109a3e4fe65d8f6471"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/af/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/af/thunderbird-102.5.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "fd83eff1f30660df048fad80a6797c88416441ef0a134a5199afe51316a37c8d"; + sha256 = "18ac6f84834865ae4dc1db83c025a1a1f48619aa59a29e0db52f312c9e0706eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/ar/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ar/thunderbird-102.5.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "0a2f05ebd9419d68d0786f2e2302e75660c21c0045c34f312179a28f1ff16b28"; + sha256 = "00903f552a47f6d206ece18a67367ba13035f962a68566700f7ed8416a88b570"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/ast/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ast/thunderbird-102.5.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "31c8a1603645756e44f23be4e4697a2dc58ea3cbe74370a3f473d049de1276b3"; + sha256 = "800b55130ed716abf55dcd08644bb6df5c3588388e4d713e027dda144146bea9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/be/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/be/thunderbird-102.5.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "94466eecd618a29f5c1f0886c0a86d9ed97d554f35e81a9f15378314bc30a2f7"; + sha256 = "78cd3a41302afc90580327c94f0ea6c3d3d4d9444e264549767f485f18a796e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/bg/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/bg/thunderbird-102.5.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "dbfdaf7aeea04c34fad89485da4546dbd47528bd5903b5f51165238c1568383c"; + sha256 = "fcbc8017e9cf0de78d615b89aa844c0d2453a47e000995cd1077bb0125afb08d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/br/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/br/thunderbird-102.5.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "2f707fadf4f1b56d42123be86ea56044162c1699855016d5bee0849eb217d8b2"; + sha256 = "f22aa80ee04d152e8485c111b52fd8a40029c7f3b0abd558f37eca6ea1f2f3aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/ca/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ca/thunderbird-102.5.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "94a1d06c6d62194c7a0fd07bd9e55580ff939b1a6714e82bcf4614c3a8e7b5db"; + sha256 = "1c98fd50645a51bfb57f0c8a5800144603230535901a0790b137a854f600df19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/cak/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/cak/thunderbird-102.5.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "c97a4ec5da61b6a1f95d184dd1ec0d6a53fdfbae38e4f868f2de20ba60b9e1d6"; + sha256 = "f1a4711b1613bedca484ee594c5ad415fe617f5d950c47153810918afacdddf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/cs/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/cs/thunderbird-102.5.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "3861b9df1d2f7c23beebaa192bc1c052c70d50626e87233321d208be36073584"; + sha256 = "572401b5d7fb5919e48d67c992a8bccc0f7989cfb4e4a59b703a99d93b64bd58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/cy/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/cy/thunderbird-102.5.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "fba48b7dd7de6b7d01898e8b2b21206b7583a71cb9b76860af1ebf8cdf5ceda4"; + sha256 = "023f03cd9a84547d7a427bfd4d7989b687573f591e327a15d888d2fb0baabd38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/da/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/da/thunderbird-102.5.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "b4c662fdbcfa6e43d2f6f3c01f76c78c390ac99987b45721389859a0aba688de"; + sha256 = "94e11b08163e7608b6aeb772b6571174468951bb99d97e7de2f3e8623c26702c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/de/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/de/thunderbird-102.5.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "3fe043fcab6c987e59339a08844c8328fa0f6dc9f27b5e78d5f5b08183e73500"; + sha256 = "f5a85b5ab6dc1241b7d51dc2cdad97aa29eebf4d4ed5bbe8906199ae634c0598"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/dsb/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/dsb/thunderbird-102.5.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "2433e03b4e5a680572f88dc81665d238fd933dc11ced970fab9671cab80695f8"; + sha256 = "9f592e41dff37d58ef081b5219026c37e1d6822116e769ccab52071e1721052a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/el/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/el/thunderbird-102.5.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "1cb691404d9772fe0f676a75915604264a617474effa5dd7bc9a7af948698d22"; + sha256 = "14d8c519f366a101e0389a81f8a15e15241c69b1b523e07a71a1dce4d785eba0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/en-CA/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/en-CA/thunderbird-102.5.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "912c66112f579d4d1706fde17ca9486b87b8f41704d097133917fe19b17de207"; + sha256 = "22f6c1dbebaf52bd33f169229ddcaa487c5016d549e1b511af69e89f07ca862c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/en-GB/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/en-GB/thunderbird-102.5.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "44b565dc144279634a09e7df19acb8305a849a595544fb76441024be86445e77"; + sha256 = "eca6df9a2ffbae931a786dfe33bc447bb4e5470afe8f21da24b4d50a1bed8deb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/en-US/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/en-US/thunderbird-102.5.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "90af8e3e27da95f19c57d7caa8bccdd10edcc8885d896459fad97d810f7145b9"; + sha256 = "8d7882f46d4d78626749c200688c2d9713a00a60357e745e60464ab11c1ae4a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/es-AR/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/es-AR/thunderbird-102.5.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "86b73f1335573c7eef2526450862f3d972212eca17701692bfa4772c0dff80e5"; + sha256 = "3cb2a530cac1b0b5f6c7da7bd17b62fab1a196ae554469a76636782e55f7ee4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/es-ES/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/es-ES/thunderbird-102.5.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "4839baf4f37b792d090682a1abd85f22070e417dde366b8b7d0ead0760801d55"; + sha256 = "8f19d223a4a212144d2cd88e594f746ae611d12d891fd39bfcb4c72046b2a96a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/es-MX/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/es-MX/thunderbird-102.5.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "65ab28668cc350cd267c6253ea4a005003ce15957731630a51980c92993ece26"; + sha256 = "89f530f790c8b33b880bc67b652a1c351bec41625808c2a78664b9e521a711a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/et/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/et/thunderbird-102.5.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "2460aea7a1ca6d2b4f7e7e0e9b50faae4f6b3ff32da08d17d2fa2b1b27117748"; + sha256 = "361eedd14a241b87d38a5f0768f8bea70fb5e94ea300b17b3bf5b6b1b63f1c88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/eu/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/eu/thunderbird-102.5.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "6a9811c55c58fa8289470b09e712809f61ef3a63183f091f385b6d2ba4ab8944"; + sha256 = "a563c1f6e8c207d656227adafb164948cf81638bc2293a5eca3383a78da48fac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/fi/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/fi/thunderbird-102.5.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "a96a55089b5c308cdb62eb06bdaf48a409b359e725bfbba503a0a8c0ad4bd326"; + sha256 = "e6770ae91921874ffa980daef3c9b687aff460a9658aecdcce05723fcd1a6ac6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/fr/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/fr/thunderbird-102.5.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "a01c8d0b02660ad13ec481ce422323149e0715c76b4578f64faa99d0ac02d875"; + sha256 = "2fb45cb868ac4da79ff4b2d3d664b5dd2e8e7eefcc488785da812cceed36336c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/fy-NL/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/fy-NL/thunderbird-102.5.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "24d9c5c3fed8a6f28a2a745589ab4cf21befbb8672eacf04f91894b2813e4f1d"; + sha256 = "38282f455d0ff8096634c6bff0a953b5654a80185925712ce5a774140c06fab2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/ga-IE/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ga-IE/thunderbird-102.5.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "1fe82aed70a135e2d0a1d554d377d62f3589847cabd40d7cd52c4967b149019d"; + sha256 = "45a8b6c21f7a086ce3d0ed75b4043e3cf546fa4a9bd2cdfe89f47633ea5a0337"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/gd/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/gd/thunderbird-102.5.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "6dcb8795cb011c82cdc0b9546bfbe82a2cc60b3c2d48b411d34289f2af2ca5a8"; + sha256 = "065fc2c78c66ee04fd4343bc4247b3a24f83a6f50d0511b2555249310f3053e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/gl/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/gl/thunderbird-102.5.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "4782e04e116b5ffdfd44be22b395230a1ff038b8a9139d63603202b59b9e64f2"; + sha256 = "85c3ba755fc279b4ec746113f194f54f476bf60d359050c585e4d33698bbb750"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/he/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/he/thunderbird-102.5.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b5ae398d3d4e938a291acead5d142457eddd35cf684e11a71a59bf7234e3990d"; + sha256 = "12cf7e48c98de087b0c4aa20e61bf2aa012ed4ad9e356e6e9f1a9bb9764d62e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/hr/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/hr/thunderbird-102.5.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "d77d401127a36b18af9f2943d1715ac275511b8f81a1b8e7e4f01b7526a40b39"; + sha256 = "60e56d042f45bfb6a297e4cd9bbb7dc4855a576e37adb3a630f8f2aac460d24f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/hsb/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/hsb/thunderbird-102.5.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "04b8a940833c3014dcea58a8a86562e6f972ef804421d4faaa06b6b35e19857f"; + sha256 = "cd8f0e82622ff4617d659b7df38f6d07dbfacd0a262c56039f0667cbb474db86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/hu/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/hu/thunderbird-102.5.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "f1fb7b74b67fb3f370128c77c1a983d2902bf5c128d256c6a3b7db980f7c6760"; + sha256 = "ab2f1fcd4fc076862ec2f2c6102712f45b7bf2e3da8577fdcc5ca6803773ab92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/hy-AM/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/hy-AM/thunderbird-102.5.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "234b9c7ce41db8a299d1539f3b60205a35124ec228c5cebe128d2a0668c80a52"; + sha256 = "84626379ebcc40f60ab94ec22d60b6a0a60b1af86d0d815a22b875e123d4b7fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/id/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/id/thunderbird-102.5.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b03b878f22baeadcebd1fc23097acf98fefb225b95deb237b32325948acf953d"; + sha256 = "d49834cf21d985738d17306a7dff8fd158032c0b32fe6df2e2bebe722350ae6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/is/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/is/thunderbird-102.5.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "100a22dbe23e9f54bc64557b0ee84dfb8521cb5a9731e042f34369b33627a712"; + sha256 = "50f16148a4937381824691023d0acc736fcd517ca1523a5e2113fc0611b9f599"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/it/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/it/thunderbird-102.5.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "654a68be2e5fa83a6662a1e4b3d63a5689cdac0b09e6e77783e8c81b55ccab99"; + sha256 = "85a75ac95e8533f7fe186e49cdf335e71332be527f801d775c85cf5a1acf9835"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/ja/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ja/thunderbird-102.5.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "707dbe36c38cd81ca249def1ad8e5c9d37f27f73cfb136505afc6ae1b27d2053"; + sha256 = "732df69293cf19d05aa081dbc815533352049f21bec37ad020fbf81764790bc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/ka/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ka/thunderbird-102.5.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "f2194efcd5acfcec0b0a6b92160ff1466f6d0774115dd8c36309e0faabaeca09"; + sha256 = "bc8a0520e86296f8cb23187bfc35420a15c21e52d915fb8c272b872694e84697"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/kab/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/kab/thunderbird-102.5.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "57e4eb29c16c60e17529ba15ece3fc4402593a52d648afc7df966f8e6fb615fc"; + sha256 = "907055485720ac96fc4fcff5a2458cb8978d7ac1047d61c304524f20058db227"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/kk/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/kk/thunderbird-102.5.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "aba703a49c0af16b2657d7a91b87f4bad76931156a841f894970df0084ca54a5"; + sha256 = "a0b5629060637275083d189f33196f06b23f00dfdc96c45a08e6934ea9ba31aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/ko/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ko/thunderbird-102.5.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "c20dec78ede44f9d415de07c33fdd5485109a6741a961a1f00dadbeabb07743e"; + sha256 = "52a37de38cd370042f80e1d3e008850fc37de4e08dfead8cb0d1a8dce90a577a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/lt/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/lt/thunderbird-102.5.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5e4bfa86cb6205c125535682c99ef1ebabd10d6a2b86e70a9e8c8e3bbb75b938"; + sha256 = "77d60e886dd86a1c31c427dfcea2f74b0fd9f9b1ed6c21b6239032cc009edda9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/lv/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/lv/thunderbird-102.5.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "5f96da9f4b3554e3f49cd604c37e5550ab05eda2509721303fd69291f3200731"; + sha256 = "d8b96ce3750df74fd789c28ad13fbc4bff739e7085de1b05a898e242663e75a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/ms/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ms/thunderbird-102.5.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "243bfaff279b46c93cdb43bb60f47571b88127bc6ff3708655244e89f3b7b79a"; + sha256 = "e3e8c88bb5d57ec84f2e84717a1c98be462ce0463744de5cdf2c7b74bbd0905c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/nb-NO/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/nb-NO/thunderbird-102.5.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "1968e30fc26c664e37e3d5613f1be7b7d4e374cbd651a3f3959e0645394da573"; + sha256 = "d6fe64522d534b17b0e97cd670df853a352d65b105e0fe09415a46fcdd49d0fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/nl/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/nl/thunderbird-102.5.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "9bafdb18d55822ca1144068fa6e2ac98486db6ba8ca6484d4c65c00b3e6e04d7"; + sha256 = "e6a7b5ff2d6fcae50791a6376369c5c87021e0970f21f303a67e970eb6663d16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/nn-NO/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/nn-NO/thunderbird-102.5.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "def8e916acd5d93e949e6ef8d115e8feef54b208ed8476bb4921b691125778eb"; + sha256 = "5861a050a47871f9c443daa363497ddc007d964be1b3a27ca6c5c1e2cacd82a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/pa-IN/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/pa-IN/thunderbird-102.5.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "4cba4e78b252360634efb558cb5fcf6389613d60012a2a416f2f82e212fa204f"; + sha256 = "58ef386087cdc68fdbe58444baa13375c40ae2e9447600ece3acf88373915533"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/pl/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/pl/thunderbird-102.5.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "eae5a29e37bedaf349068ff780ed7eb9e1091cb4a9253de03bf22ec93a959602"; + sha256 = "09b33a0a5230f58b867018f74146d40e63cfb9a321eb587ac92f70b2806fbd20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/pt-BR/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/pt-BR/thunderbird-102.5.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "9114d726fc80221b827cd33204fdd7e7e34d49690d4a7c252ce6b27e44cb8c98"; + sha256 = "83e0a0b52d3d92e892389f308bb52a05728bfedfde0c9216ed687534aede07e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/pt-PT/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/pt-PT/thunderbird-102.5.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "9dcb58828d399f7fc45a9382f998b6c33fff6719d6559be8e3de71807ceb7673"; + sha256 = "5c9523ecf41e306c01b884caa30fc23d02a5d9f871a39fcd186776851530ea14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/rm/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/rm/thunderbird-102.5.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "049160cd75f2677dcf31e96932a6f69c2c2d3261466b6eb91681d7cb3b8b9875"; + sha256 = "54aeaf1ea767343a144f85f65618e2ee0d300d11efd520615690d1620fba47c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/ro/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ro/thunderbird-102.5.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "9edfb7e929bdf6b99bb689057b397d6fe02bc62d8082f35fd9341d94b840b316"; + sha256 = "345f4952d17240eb03da38ec4c1b99e46b488ab058b13d258f013668d2e26651"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/ru/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/ru/thunderbird-102.5.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "eabaeadbfa7ab6cfc44ad52dd724a93227b02bd84e2b5df71cac08279fccfe56"; + sha256 = "67e5b2cd8ca619592d57935fcbfe128c79ee167ef535614ab7f1c5b65b091365"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/sk/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sk/thunderbird-102.5.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7034db34602ff5c0c7bac02d3b04ad5765ade99896ab84cc96020bcca93f655d"; + sha256 = "e6a55333fcb707f1b7f1302168799dc42efe2eec5bc371087bacba1182560870"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/sl/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sl/thunderbird-102.5.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e3069c0f783bcb2b6113d5a48341ecab30c0aef950312edaea778a540bb9a85a"; + sha256 = "3995e35537d02a660231e8ef900a5912b1eab8b551a579e75cb306940ae9976b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/sq/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sq/thunderbird-102.5.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "c07ce8c31a21d0f7f52fcf4d0fb069be0530ad3bc9e198cd6003aa4e28293ab9"; + sha256 = "6b742595020681bd1066de0aca867954a273e10c076f39d0df1d83e5d8504b6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/sr/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sr/thunderbird-102.5.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "af8c3097acb38299a4b5e28af64fb24e447970b0447b670b98b105d17e58555c"; + sha256 = "ffa7e636f5c0d541c007f52a2e829155e95b01ad0b279580d68260f6fe9132c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/sv-SE/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/sv-SE/thunderbird-102.5.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "24e97a18161fda49002455d5bd971f418a4968e4549ef262974a996fa3595313"; + sha256 = "7172e07df01e6685873b99150fc6f3da77623ff7e90edc88c37497e5114bad9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/th/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/th/thunderbird-102.5.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "cc6c8cc43e57e1ef99f41e27e71c49d56505cd15cf0768276dfeb2619e498f09"; + sha256 = "47fad6489e19b7acb53bc1f1b3001ad55b933d612271d08cfec642875f0cafe9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/tr/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/tr/thunderbird-102.5.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "805ce60935c470d39b2d254f2011c52e152b4762c6074372e85968bba327c1c5"; + sha256 = "05d2eb31e99c09350aa0ec4cba2b046ea0c9871f32e9328b3c50c27fd4219b81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/uk/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/uk/thunderbird-102.5.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "e853a99a029ad1e44e3f5427c0cc75bb09ce12a786a4c9237c330e09d6a2dadf"; + sha256 = "8475840589710c68c996ba9740308d07677edc7ccb97585b4f9bcdc17d8397a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/uz/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/uz/thunderbird-102.5.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "577fe9f24adfa657728a6ff5739deb51e1fe587b8a56f2ed13784959e3cc74c3"; + sha256 = "944077ed7e95392123f5a8bc1521cf23693c8cf968ef8b9b14127d3e1bf40747"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/vi/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/vi/thunderbird-102.5.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "12e92bf539e5d85fcac7c66272c4386c4d30415b47cf47e7333b15916e1c3e2f"; + sha256 = "7d7188470c3e0e4056df45f0032a7e5d31229ee4f07255d074eeea58801edb1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/zh-CN/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/zh-CN/thunderbird-102.5.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "ddbce4614458821f01c7b09426afa230788042fd3412d8b565e4012fea3e4542"; + sha256 = "a7c995a24c9f75ecf2c87e7c4651cfd5efb57b4ae5f6efabd1fc2b2458a47830"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.1/linux-i686/zh-TW/thunderbird-102.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.5.0/linux-i686/zh-TW/thunderbird-102.5.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "c7e82984695a17192bd07ad6d826545daaea8074d1e8723b0397db888162fa60"; + sha256 = "6e2f90e0ccfc26cc834a97b32bd70903e51926631bb3eb7df3e1b0b4db46350c"; } ]; } From 57d39374e26e7a281063be23732e03f490383c7b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 18 Nov 2022 14:37:22 +0100 Subject: [PATCH 347/797] gromacs: 2022.3 -> 2022.4 --- .../science/molecular-dynamics/gromacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 125283589aef..576c5745b35c 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2022.3"; + version = "2022.4"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "sha256-FM+xMN2vj3WaOvZDwE9aDQ0ysJvDRIsWr6W2F/XjXa4="; + sha256 = "sha256-xRG+YC/ylAIGW1CQaEHe+YdSY5uSqV8bChBg2bXicpc="; }; nativeBuildInputs = [ cmake ]; From 1c28f357bb3851a185c35d595cbc663e43ce5720 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 18 Nov 2022 14:34:04 +0100 Subject: [PATCH 348/797] smtube: use default version of Qt 5 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41ff5fb69f59..4a66d2ebe435 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30828,7 +30828,7 @@ with pkgs; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt514.callPackage ../applications/video/smtube {}; + smtube = libsForQt5.callPackage ../applications/video/smtube {}; softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {}; From 67fe14bca4b56d17e9f1f8b9c2d75ec7df5f021c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= <65870+suhr@users.noreply.github.com> Date: Fri, 18 Nov 2022 16:50:37 +0300 Subject: [PATCH 349/797] kvirc: 5.0.0 -> 2022-06-29 --- pkgs/applications/networking/irc/kvirc/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix index cfc03fe37d3b..8c1a96d5234f 100644 --- a/pkgs/applications/networking/irc/kvirc/default.nix +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "kvirc"; - version = "5.0.0"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "kvirc"; repo = "KVIrc"; - rev = version; - sha256 = "1dq7v6djw0gz56rvghs4r5gfhzx4sfg60rnv6b9zprw0vlvcxbn4"; + rev = "eb3fdd6b1d824f148fd6e582852dcba77fc9a271"; + sha256 = "sha256-RT5UobpMt/vBLgWur1TkodS3dMyIWQkDPiBYCYx/FI4="; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41ff5fb69f59..184494deb7a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29972,7 +29972,7 @@ with pkgs; kupfer = callPackage ../applications/misc/kupfer { }; - kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; + kvirc = libsForQt515.callPackage ../applications/networking/irc/kvirc { }; lame = callPackage ../development/libraries/lame { }; From 1aaa78109188ce9e85e3a8ad915e8a2c88cc6c02 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Nov 2022 15:03:00 +0100 Subject: [PATCH 350/797] commix: 3.5 -> 3.6 --- pkgs/tools/security/commix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/commix/default.nix b/pkgs/tools/security/commix/default.nix index 452279883bac..b2632c2d42ed 100644 --- a/pkgs/tools/security/commix/default.nix +++ b/pkgs/tools/security/commix/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "commix"; - version = "3.5"; + version = "3.6"; format = "setuptools"; src = fetchFromGitHub { owner = "commixproject"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3UCHTgIW7ArXQD0Kj5XwE1I5VszsueXDJ68QWdQrAho="; + hash = "sha256-QdhJp7oUqOY8Z36haIrHgP4hVGaFXlOxNVg1ams7uhg="; }; # Project has no tests From 824c0ae5613bf26535f1c6fb8adddcd3ae871066 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Nov 2022 15:08:23 +0100 Subject: [PATCH 351/797] python310Packages.whois: 0.9.17 -> 0.9.18 --- pkgs/development/python-modules/whois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index 78f8a0147281..bb67d36974da 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "whois"; - version = "0.9.17"; + version = "0.9.18"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "DannyCork"; repo = "python-whois"; rev = "refs/tags/${version}"; - sha256 = "sha256-r77M0IxZ72Sl5c6rA7z8EdZ6rYS/oMrdvdt/E/Pw7nQ="; + sha256 = "sha256-15oa7E33VQMPtI2LJ0XVKd42m9BY9jZLL3XGXpAhv/A="; }; propagatedBuildInputs = [ From efc0dc287402c9fb20d2635f8facaf5f55091888 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 18 Nov 2022 17:25:49 +0300 Subject: [PATCH 352/797] libhv: init at 1.3.0 --- pkgs/development/libraries/libhv/default.nix | 34 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/libhv/default.nix diff --git a/pkgs/development/libraries/libhv/default.nix b/pkgs/development/libraries/libhv/default.nix new file mode 100644 index 000000000000..a4314b996f22 --- /dev/null +++ b/pkgs/development/libraries/libhv/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, Security }: + +stdenv.mkDerivation (finalAttrs: { + pname = "libhv"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "ithewei"; + repo = "libhv"; + rev = "v${finalAttrs.version}"; + hash = "sha256-LMk8B/1EofcQcIF3kGmtPdM2s+/gN9ctcsybwTpf4Po="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ curl openssl ] ++ lib.optional stdenv.isDarwin Security; + + cmakeFlags = [ + "-DENABLE_UDS=ON" + "-DWITH_MQTT=ON" + "-DWITH_CURL=ON" + "-DWITH_NGHTTP2=ON" + "-DWITH_OPENSSL=ON" + "-DWITH_KCP=ON" + ]; + + meta = with lib; { + description = "A c/c++ network library for developing TCP/UDP/SSL/HTTP/WebSocket/MQTT client/server"; + homepage = "https://github.com/ithewei/libhv"; + license = licenses.bsd3; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ab3efcda739..00497d53b00a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20400,6 +20400,10 @@ with pkgs; libhugetlbfs = callPackage ../development/libraries/libhugetlbfs { }; + libhv = callPackage ../development/libraries/libhv { + inherit (darwin.apple_sdk.frameworks) Security; + }; + libhwy = callPackage ../development/libraries/libhwy { }; libHX = callPackage ../development/libraries/libHX { }; From bb5827a6926dcd576e029459ed8e7e723d963616 Mon Sep 17 00:00:00 2001 From: mupdt <25388474+mupdt@users.noreply.github.com> Date: Fri, 18 Nov 2022 09:31:53 -0500 Subject: [PATCH 353/797] dockerTools: prefer local builds --- pkgs/build-support/docker/default.nix | 8 +++++++- pkgs/build-support/references-by-popularity/default.nix | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index a3145e504f23..6b07865928e6 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -547,10 +547,14 @@ rec { pure = writeText "${baseName}-config.json" (builtins.toJSON { inherit created config; architecture = defaultArch; + preferLocalBuild = true; os = "linux"; }); impure = runCommand "${baseName}-config.json" - { nativeBuildInputs = [ jq ]; } + { + nativeBuildInputs = [ jq ]; + preferLocalBuild = true; + } '' jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out ''; @@ -925,6 +929,7 @@ rec { { inherit fromImage maxLayers created; imageName = lib.toLower name; + preferLocalBuild = true; passthru.imageTag = if tag != null then tag @@ -1015,6 +1020,7 @@ rec { result = runCommand "stream-${baseName}" { inherit (conf) imageName; + preferLocalBuild = true; passthru = passthru // { inherit (conf) imageTag; diff --git a/pkgs/build-support/references-by-popularity/default.nix b/pkgs/build-support/references-by-popularity/default.nix index 4cae2dcf3ca9..dfc25275f34c 100644 --- a/pkgs/build-support/references-by-popularity/default.nix +++ b/pkgs/build-support/references-by-popularity/default.nix @@ -5,6 +5,7 @@ path: runCommand "closure-paths" { exportReferencesGraph.graph = path; __structuredAttrs = true; + preferLocalBuild = true; PATH = "${coreutils}/bin:${python3}/bin"; builder = builtins.toFile "builder" '' From a437e9c7b609eaf89b2e01932400d315df3626fa Mon Sep 17 00:00:00 2001 From: Jairo Llopis <973709+yajo@users.noreply.github.com> Date: Fri, 18 Nov 2022 14:52:28 +0000 Subject: [PATCH 354/797] pre-commit-hooks: fix conditional dependency on tomli (#200178) * pre-commit-hooks: fix conditional dependency on tomli As seen in https://github.com/pre-commit/pre-commit-hooks/commit/fc88f3fa495385e6b367f7c4c8cf10940ad053da, upstream changed their dependency from `toml` to `tomli>=1.1.0;python_version<"3.11"`. Without this patch, running `check-toml` from this package fails with: ``` Traceback (most recent call last): File "/nix/store/06qpfmlgkhxakgjs8g7gk5jlkczij0m6-python3.10-pre-commit-hooks-4.3.0/bin/.check-toml-wrapped", line 6, in from pre_commit_hooks.check_toml import main File "/nix/store/06qpfmlgkhxakgjs8g7gk5jlkczij0m6-python3.10-pre-commit-hooks-4.3.0/lib/python3.10/site-packages/pre_commit_hooks/check_toml.py", line 10, in import tomli as tomllib ModuleNotFoundError: No module named 'tomli' ``` See https://github.com/pre-commit/pre-commit-hooks/issues/833. * pre-commit-hooks: use lib.optionals helper for clarity Co-authored-by: Fabian Affolter Co-authored-by: Fabian Affolter --- pkgs/development/python-modules/pre-commit-hooks/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index 282dd59a05c0..db3aef0b2bb0 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -6,7 +6,7 @@ , pytestCheckHook , pythonOlder , ruamel-yaml -, toml +, tomli }: buildPythonPackage rec { @@ -25,7 +25,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ ruamel-yaml - toml + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; checkInputs = [ From a2cd287864f488fb236263679f7db2039a011b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BE=E5=9C=B0=20=E5=B8=8C=E7=95=99=E8=80=B6?= <65301509+KiruyaMomochi@users.noreply.github.com> Date: Fri, 18 Nov 2022 22:56:07 +0800 Subject: [PATCH 355/797] microsoft-edge: 105.0.1343.42 -> 107.0.1418.52 --- .../networking/browsers/microsoft-edge/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 12aeadbca109..7a9e69421495 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "106.0.1370.17"; + version = "108.0.1462.20"; revision = "1"; - sha256 = "sha256:0g9w3a7znc3iq0y27drjv5l45zk8lm0c1djd1r30iijln8a1diak"; + sha256 = "sha256:0dfmzjfy4y07pqifyzv3rc8dbmxz8rr3v2idanla7jrks0pghcxm"; }; dev = import ./browser.nix { channel = "dev"; - version = "107.0.1375.0"; + version = "109.0.1495.2"; revision = "1"; - sha256 = "sha256:1a014jyrk5f11dr2s2mf1m8kfq39rbc5rh0bkmclbwsl83rdfdi4"; + sha256 = "sha256:1bk7dx3mf020ahzmvr9cdgcn72rjrn2420j9g362vwcl1khyxciw"; }; stable = import ./browser.nix { channel = "stable"; - version = "105.0.1343.42"; + version = "107.0.1418.52"; revision = "1"; - sha256 = "sha256:18jnq1q65989xl98j2n3wlim0j00krkjxxnkfx2h7kymqjgysm6d"; + sha256 = "sha256:1k3c5r9lq3vpc190bzs5fn944bi3af6wjxzwcliy4wzzrb5g0day"; }; } From 9d14bfb7d5f4a58c763cf811c3ba51508f636f4b Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Thu, 10 Nov 2022 20:50:16 -0300 Subject: [PATCH 356/797] apgdiff: init at 2.7.0 Co-authored by: AndersonTorres --- .../tools/database/apgdiff/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/tools/database/apgdiff/default.nix diff --git a/pkgs/development/tools/database/apgdiff/default.nix b/pkgs/development/tools/database/apgdiff/default.nix new file mode 100644 index 000000000000..016259f0bbb4 --- /dev/null +++ b/pkgs/development/tools/database/apgdiff/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, makeWrapper +, jre +}: +stdenvNoCC.mkDerivation (finalAttrs: { + version = "2.7.0"; + pname = "apgdiff"; + + src = fetchurl { + url = "https://github.com/fordfrog/apgdiff/raw/release_${finalAttrs.version}/releases/apgdiff-${finalAttrs.version}.jar"; + sha256 = "sha256-6OempDmedl6LOwP/s5y0hOIxGDWHd7qM7/opW3UwQ+I="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + install -Dm644 $src $out/lib/apgdiff.jar + + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/apgdiff \ + --argv0 apgdiff \ + --add-flags "-jar $out/lib/apgdiff.jar" + ''; + + meta = with lib; { + description = "Another PostgreSQL diff tool"; + homepage = "https://apgdiff.com"; + license = licenses.mit; + inherit (jre.meta) platforms; + sourceProvenance = sourceTypes.binaryBytecode; + maintainers = [ maintainers.misterio77 ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8aca0fa76410..530e725ea0fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16203,6 +16203,8 @@ with pkgs; anybadge = with python3Packages; toPythonApplication anybadge; + apgdiff = callPackage ../development/tools/database/apgdiff { }; + apkg = callPackage ../tools/package-management/apkg { }; augeas = callPackage ../tools/system/augeas { }; From 962929884a5b841521faf914497f847d5f07955f Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 18 Nov 2022 17:17:51 +0200 Subject: [PATCH 357/797] lib/sources: make commitIdFromGitRepoOrError internal and use # for comments so that it doesn't make the manual build fail > Apparently this is related to the combination of this new function not getting exported from the file, while still getting documented. --- lib/sources.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/sources.nix b/lib/sources.nix index 9db3d2329542..3ad7dc633554 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -166,7 +166,7 @@ let in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts; in cleanSourceWith { inherit filter src; }; - pathIsGitRepo = path: (commitIdFromGitRepoOrError path)?value; + pathIsGitRepo = path: (_commitIdFromGitRepoOrError path)?value; /* Get the commit id of a git repo. @@ -174,17 +174,16 @@ let Example: commitIdFromGitRepo */ commitIdFromGitRepo = path: - let commitIdOrError = commitIdFromGitRepoOrError path; + let commitIdOrError = _commitIdFromGitRepoOrError path; in commitIdOrError.value or (throw commitIdOrError.error); - /* - Get the commit id of a git repo. + # Get the commit id of a git repo. - Returns `{ value = commitHash }` or `{ error = "... message ..." }`. + # Returns `{ value = commitHash }` or `{ error = "... message ..." }`. - Example: commitIdFromGitRepo - */ - commitIdFromGitRepoOrError = + # Example: commitIdFromGitRepo + # not exported, used for commitIdFromGitRepo + _commitIdFromGitRepoOrError = let readCommitFromFile = file: path: let fileName = path + "/${file}"; packedRefsName = path + "/packed-refs"; From d1fb9085be86814b3a72a0386222005d825dfc8e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Nov 2022 16:33:13 +0100 Subject: [PATCH 358/797] =?UTF-8?q?babl:=200.1.96=20=E2=86=92=200.1.98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/babl/-/compare/BABL_0_1_96...BABL_0_1_98 --- pkgs/development/libraries/babl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index a09d95798920..010f4c57aede 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.96"; + version = "0.1.98"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-M2c/5Fmpg/QRJFpJ+B/X8ZZq8eqOypsJWpQMVCuFRfY="; + sha256 = "87Ii+E5GJzXeY/qcNlGULyt4/TFMc6IuBf98c6/SOvE="; }; nativeBuildInputs = [ From 04c70eed326e4fe6cd19d0f0841735c1f6c8d8eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Nov 2022 17:13:00 +0100 Subject: [PATCH 359/797] python310Packages.tplink-omada-client: 1.0.1 -> 1.0.2 --- .../python-modules/tplink-omada-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 187e3c85a984..04e7f890bf1c 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-72Oxrjn1KNasdW9XITuqM5L59/5/R/BvM175d18eFmI="; + hash = "sha256-W3WJPYQofNcpW5AyIW3ms6FxQ2yWzocL3nrZGCdm+gk="; }; nativeBuildInputs = [ From 05f7af3a4368df39622c0b9eb569109d4e24b0cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Oct 2022 17:22:44 +0000 Subject: [PATCH 360/797] git-cinnabar: 0.5.10 -> 0.5.11 --- .../version-management/git-and-tools/git-cinnabar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix b/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix index 4141c6c1b6a4..a48fd5f20c37 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix @@ -9,13 +9,13 @@ in stdenv.mkDerivation rec { pname = "git-cinnabar"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromGitHub { owner = "glandium"; repo = "git-cinnabar"; rev = version; - sha256 = "sha256-vHHugCZ7ikB4lIv/TcNuOMSQsm0zCkGqu2hAFrqygu0="; + sha256 = "sha256-64ofKGeHwCqiZHOA6MrYrN2eV/qqClcjerDuSqsjKDg="; fetchSubmodules = true; }; From d10e3216b8afdc163e028462412fd3ce611afcea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 18 Nov 2022 17:24:02 +0100 Subject: [PATCH 361/797] qt*.qtwayland: fix build of versions before 5.15 /cc the PR adding this patch: #200872 --- pkgs/development/libraries/qt-5/modules/qtwayland.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index e4870ec48463..10e18b3b9844 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -1,4 +1,4 @@ -{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config, fetchpatch }: +{ lib, qtModule, qtbase, qtquickcontrols, wayland, pkg-config, fetchpatch }: qtModule { pname = "qtwayland"; @@ -11,13 +11,14 @@ qtModule { # wrapped executables from `wrapQtAppsHook` (see comment in patch for further # context). Beware: shared among different Qt5 versions. ./qtwayland-app_id.patch + ] ++ lib.optional (lib.versionAtLeast qtbase.version "5.15") # Backport of https://codereview.qt-project.org/c/qt/qtwayland/+/388338 # Pulled from Fedora as they modified it to not apply to KDE as Plasma 5.x # doesn't behave properly with the patch applied. See the discussion at # https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/39 for details + # This patch won't apply to versions before 5.15. (fetchpatch { url = "https://src.fedoraproject.org/rpms/qt5-qtwayland/raw/46376bb00d4c3dd3db2e82ad7ca5301ce16ea4ab/f/0080-Client-set-constraint-adjustments-for-popups-in-xdg.patch"; sha256 = "sha256-XP+noYCk8fUdA0ItCqMjV7lSXDlNdB7Az9q7NRpupHc="; - }) - ]; + }); } From 4e732ec071d510df17ba80ae388c895ae6201cf7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 18 Nov 2022 16:34:27 +0100 Subject: [PATCH 362/797] =?UTF-8?q?gegl:=200.4.38=20=E2=86=92=200.4.40?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now requires OpenMP. https://gitlab.gnome.org/GNOME/gegl/-/compare/GEGL_0_4_38...GEGL_0_4_40 --- pkgs/development/libraries/gegl/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index fb50c2c8fc07..61106d7f620e 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -10,6 +10,7 @@ , glib , babl , libpng +, llvmPackages , cairo , libjpeg , librsvg @@ -36,14 +37,14 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.38"; + version = "0.4.40"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-5KM8hDClBC+6hDm1lTSOcYcPDZX7+IX/VT+QIMG+11A="; + sha256 = "zd6A0VpJ2rmmFO+Y+ATIzm5M/hM5o8JAw08/tFQ2uF0="; }; nativeBuildInputs = [ @@ -77,7 +78,11 @@ stdenv.mkDerivation rec { luajit openexr suitesparse - ] ++ lib.optional stdenv.isDarwin OpenCL; + ] ++ lib.optionals stdenv.isDarwin [ + OpenCL + ] ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp + ]; # for gegl-4.0.pc propagatedBuildInputs = [ From 70225566221179720a110bcbd66267dd8f4ec536 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 18 Nov 2022 06:54:41 +0200 Subject: [PATCH 363/797] lib.overrideDerivation: override attrs in __spliced --- lib/customisation.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index cc9a9b1c55d0..de424b0d722b 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -38,12 +38,14 @@ rec { // (drv.passthru or {}) // - (if (drv ? crossDrv && drv ? nativeDrv) - then { - crossDrv = overrideDerivation drv.crossDrv f; - nativeDrv = overrideDerivation drv.nativeDrv f; - } - else { })); + (lib.optionalAttrs (drv ? crossDrv && drv ? nativeDrv) { + crossDrv = overrideDerivation drv.crossDrv f; + nativeDrv = overrideDerivation drv.nativeDrv f; + }) + // + lib.optionalAttrs (drv ? __spliced) { + __spliced = {} // (lib.mapAttrs (_: sDrv: overrideDerivation sDrv f) drv.__spliced); + }); /* `makeOverridable` takes a function from attribute set to attribute set and From a79542fa48ef98d5b5202f6be1a0c2cf975e4e7b Mon Sep 17 00:00:00 2001 From: toastal <561087+toastal@users.noreply.github.com> Date: Fri, 18 Nov 2022 16:44:44 +0000 Subject: [PATCH 364/797] vimPlugins.himalaya-vim: fix source due to repo split (#195927) Previously the Vim plugin was a part of the main repository, but the author has elected to split out the project and move away from GitHub to an open source Git forge @ https://git.sr.ht/~soywod/himalaya-vim/ As such, the previous plugin is currently broken, but now it can be updated indepentently. Co-authored-by: figsoda --- .../editors/vim/plugins/generated.nix | 11 +++++++++++ .../editors/vim/plugins/overrides.nix | 18 ++++++------------ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 0d5fa1bcd314..e79797471a8b 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3501,6 +3501,17 @@ final: prev: meta.homepage = "https://github.com/travitch/hasksyn/"; }; + himalaya-vim = buildVimPluginFrom2Nix { + pname = "himalaya-vim"; + version = "2022-10-10"; + src = fetchgit { + url = "https://git.sr.ht/~soywod/himalaya-vim"; + rev = "747ff2a6055839cb5b403b540883515af37b7117"; + sha256 = "sha256-0WP9JoKN/A5bmnRjQJnquk3mRC7NEflUAdqki7+zqBU="; + }; + meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; + }; + hiPairs = buildVimPluginFrom2Nix { pname = "hiPairs"; version = "2020-12-10"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 9330377601cf..d821dea94917 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -471,20 +471,14 @@ self: super: { dependencies = with self; [ lush-nvim ]; }); - himalaya-vim = buildVimPluginFrom2Nix { - pname = "himalaya-vim"; - inherit (himalaya) src version; - dependencies = with self; [ himalaya ]; - configurePhase = '' - cd vim + himalaya-vim = super.himalaya-vim.overrideAttrs (old: { + postPatch = '' substituteInPlace plugin/himalaya.vim \ - --replace 'if !executable("himalaya")' 'if v:false' + --replace "if !executable('himalaya')" "if v:false" + substituteInPlace autoload/himalaya/request.vim \ + --replace "'himalaya" "'${himalaya}/bin/himalaya" ''; - postFixup = '' - mkdir -p $out/bin - ln -s ${himalaya}/bin/himalaya $out/bin/himalaya - ''; - }; + }); jedi-vim = super.jedi-vim.overrideAttrs (old: { # checking for python3 support in vim would be neat, too, but nobody else seems to care diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4b99d9d2b144..8e9bb27161d1 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -293,6 +293,7 @@ https://github.com/MrcJkb/haskell-tools.nvim/,HEAD, https://github.com/neovimhaskell/haskell-vim/,, https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, https://github.com/travitch/hasksyn/,, +https://git.sr.ht/~soywod/himalaya-vim,, https://github.com/Yggdroot/hiPairs/,, https://github.com/mpickering/hlint-refactor-vim/,, https://github.com/edluffy/hologram.nvim/,, From 5dcab938e0c5219937cc22bf7b3555babfb3e457 Mon Sep 17 00:00:00 2001 From: Astro Date: Fri, 18 Nov 2022 18:44:36 +0100 Subject: [PATCH 365/797] cloud-hypervisor: 26.0 -> 28.0 (#201572) --- .../virtualization/cloud-hypervisor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index ee840598930e..b14ae35f5fa5 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "26.0"; + version = "28.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-choTT20TVp42nN/vS6xCDA7Mbf1ZuAE1tFQZn49g9ak="; + sha256 = "sha256-gl8LgR2Sz0DxPAYeyfTvLJg4Esotg/eBfCjbdgEUfRI="; }; separateDebugInfo = true; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "sha256-mmyaT24he33wLI3zLOOKhVtzrPRyWzKgXUvc37suy5E="; + cargoSha256 = "sha256-qPlk8MHuXnfmtQSqIiFBYQK7TgHun1CxLqVOz/DDvrs="; OPENSSL_NO_VENDOR = true; From 80f9c2c366c5347a9d6e5bb23c097f0749897029 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 30 Sep 2022 21:08:58 +0000 Subject: [PATCH 366/797] crosvm: switch back to old git repo URL Despite having moved the main repo to crosvm/crosvm, release branches are still only being created on chromiumos/platform/crosvm. So we should have crosvm/crosvm as the homepage, but fetch from chromiumos/platform/crosvm. Link: https://github.com/NixOS/nixpkgs/pull/193746 --- pkgs/applications/virtualization/crosvm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index a4de1433ae73..ae216001c5e2 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { version = "104.0"; src = fetchgit { - url = "https://chromium.googlesource.com/crosvm/crosvm"; + url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; rev = "265aab613b1eb31598ea0826f04810d9f010a2c6"; sha256 = "OzbtPHs6BWK83RZ/6eCQHA61X6SY8FoBkaN70a37pvc="; fetchSubmodules = true; From fcdbfc3d119f67ffb44f2782a38386b969f9505f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 30 Sep 2022 21:08:59 +0000 Subject: [PATCH 367/797] crosvm.updateScript: update release branch format For R106 and onwards, upstream has gone back to not having a separation between chromeos and not. --- pkgs/applications/virtualization/crosvm/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py index d912c49078c6..64adec429575 100755 --- a/pkgs/applications/virtualization/crosvm/update.py +++ b/pkgs/applications/virtualization/crosvm/update.py @@ -34,7 +34,7 @@ with urlopen('https://chromiumdash.appspot.com/cros/download_serving_builds_csv? chrome_major_version = chrome_version[0] chromeos_tip_build = platform_version[0] -release_branch = f'release-R{chrome_major_version}-{chromeos_tip_build}.B-chromeos' +release_branch = f'release-R{chrome_major_version}-{chromeos_tip_build}.B' # Determine the git revision. with urlopen(f'https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/{release_branch}?format=JSON') as resp: From fb60a5c9473b0796738aa1b1443b8ee5e5ecd1cb Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 30 Sep 2022 21:09:00 +0000 Subject: [PATCH 368/797] crosvm: 104.0 -> 107.1 crosvm now includes a Cargo.lock again, so we don't need to vendor it into Nixpkgs. Its build system now compiles the seccomp policies into the binary, so we don't need to build and install those ourselves any more. --- .../virtualization/crosvm/Cargo.lock | 2214 ----------------- .../crosvm/default-seccomp-policy-dir.diff | 15 - .../virtualization/crosvm/default.nix | 54 +- 3 files changed, 25 insertions(+), 2258 deletions(-) delete mode 100644 pkgs/applications/virtualization/crosvm/Cargo.lock delete mode 100644 pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff diff --git a/pkgs/applications/virtualization/crosvm/Cargo.lock b/pkgs/applications/virtualization/crosvm/Cargo.lock deleted file mode 100644 index 646562bd27d6..000000000000 --- a/pkgs/applications/virtualization/crosvm/Cargo.lock +++ /dev/null @@ -1,2214 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aarch64" -version = "0.1.0" -dependencies = [ - "arch", - "base", - "data_model", - "devices", - "hypervisor", - "kernel_cmdline", - "kernel_loader", - "kvm", - "kvm_sys", - "libc", - "memoffset 0.6.5", - "minijail", - "remain", - "resources", - "sync", - "thiserror", - "vm_control", - "vm_memory", -] - -[[package]] -name = "acpi_tables" -version = "0.1.0" -dependencies = [ - "data_model", - "tempfile", -] - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "android_system_properties" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" -dependencies = [ - "libc", -] - -[[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.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "508b352bb5c066aac251f6daf6b36eccd03e8a88e8081cd44959ea277a3af9a8" - -[[package]] -name = "arch" -version = "0.1.0" -dependencies = [ - "acpi_tables", - "anyhow", - "base", - "devices", - "gdbstub_arch", - "hypervisor", - "kernel_cmdline", - "libc", - "minijail", - "power_monitor", - "remain", - "resources", - "sync", - "thiserror", - "vm_control", - "vm_memory", -] - -[[package]] -name = "argh" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e7e4aa7e40747e023c0761dafcb42333a9517575bbf1241747f68dd3177a62" -dependencies = [ - "argh_derive", - "argh_shared", -] - -[[package]] -name = "argh_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f2bd7ff6ed6414f4e5521bd509bae46454bbd513801767ced3f21a751ab4bc" -dependencies = [ - "argh_shared", - "heck", - "proc-macro2", - "quote 1.0.21", - "syn 1.0.99", -] - -[[package]] -name = "argh_helpers" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "syn 1.0.99", -] - -[[package]] -name = "argh_shared" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47253b98986dafc7a3e1cf3259194f1f47ac61abb57a57f46ec09e48d004ecda" - -[[package]] -name = "assertions" -version = "0.1.0" - -[[package]] -name = "async-task" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" - -[[package]] -name = "async-trait" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "syn 1.0.99", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "audio_streams" -version = "0.1.0" -dependencies = [ - "async-trait", - "futures", - "remain", - "thiserror", -] - -[[package]] -name = "autocfg" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "balloon_control" -version = "0.1.0" -dependencies = [ - "serde", -] - -[[package]] -name = "base" -version = "0.1.0" -dependencies = [ - "audio_streams", - "base_event_token_derive", - "cfg-if", - "chrono", - "data_model", - "env_logger", - "lazy_static", - "libc", - "log", - "once_cell", - "rand 0.8.5", - "regex", - "remain", - "serde", - "serde_json", - "smallvec", - "sync", - "tempfile", - "thiserror", - "uuid", - "win_util", - "winapi", -] - -[[package]] -name = "base_event_token_derive" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "syn 1.0.99", -] - -[[package]] -name = "bit_field" -version = "0.1.0" -dependencies = [ - "bit_field_derive", -] - -[[package]] -name = "bit_field_derive" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "syn 1.0.99", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "broker_ipc" -version = "0.1.0" -dependencies = [ - "anyhow", - "base", - "metrics", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "cbindgen" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e3973b165dc0f435831a9e426de67e894de532754ff7a3f307c03ee5dec7dc" -dependencies = [ - "clap", - "heck", - "indexmap", - "log", - "proc-macro2", - "quote 1.0.21", - "serde", - "serde_json", - "syn 1.0.99", - "tempfile", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "serde", - "time", - "wasm-bindgen", - "winapi", -] - -[[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 = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - -[[package]] -name = "const-sha1" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d" - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "cros_async" -version = "0.1.1" -dependencies = [ - "anyhow", - "async-task", - "async-trait", - "audio_streams", - "base", - "cfg-if", - "data_model", - "futures", - "futures-executor", - "futures-util", - "intrusive-collections", - "io_uring", - "libc", - "once_cell", - "paste", - "pin-utils", - "remain", - "serde", - "slab", - "smallvec", - "sync", - "tempfile", - "thiserror", - "win_util", - "winapi", -] - -[[package]] -name = "cros_fuzz" -version = "0.1.0" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "crosvm" -version = "0.1.0" -dependencies = [ - "aarch64", - "acpi_tables", - "anyhow", - "arch", - "argh", - "argh_helpers", - "assertions", - "audio_streams", - "base", - "bit_field", - "broker_ipc", - "cfg-if", - "crosvm_plugin", - "data_model", - "devices", - "disk", - "enumn", - "gdbstub", - "gdbstub_arch", - "hypervisor", - "kernel_cmdline", - "kernel_loader", - "kvm", - "kvm_sys", - "lazy_static", - "libc", - "libcras", - "log", - "metrics", - "minijail", - "net_util", - "p9", - "protobuf", - "protos", - "remain", - "resources", - "rutabaga_gfx", - "scudo", - "serde_json", - "serde_keyvalue", - "sync", - "tempfile", - "terminal_size", - "thiserror", - "tube_transporter", - "uuid", - "vhost", - "vm_control", - "vm_memory", - "x86_64", -] - -[[package]] -name = "crosvm-fuzz" -version = "0.0.1" -dependencies = [ - "base", - "cros_fuzz", - "data_model", - "devices", - "disk", - "fuse", - "hypervisor", - "kernel_loader", - "libc", - "rand 0.6.5", - "tempfile", - "usb_util", - "vm_memory", -] - -[[package]] -name = "crosvm_control" -version = "0.1.0" -dependencies = [ - "anyhow", - "base", - "cbindgen", - "libc", - "vm_control", -] - -[[package]] -name = "crosvm_plugin" -version = "0.17.0" -dependencies = [ - "base", - "kvm", - "kvm_sys", - "libc", - "protobuf", - "protos", -] - -[[package]] -name = "data_model" -version = "0.1.0" -dependencies = [ - "assertions", - "cfg-if", - "libc", - "remain", - "serde", - "thiserror", - "winapi", -] - -[[package]] -name = "dbus" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8bcdd56d2e5c4ed26a529c5a9029f5db8290d433497506f958eae3be148eb6" -dependencies = [ - "libc", - "libdbus-sys", - "winapi", -] - -[[package]] -name = "derive-into-owned" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576fce04d31d592013a5887ba8d9c3830adff329e5096d7e1eb5e8e61262ca62" -dependencies = [ - "quote 0.3.15", - "syn 0.11.11", -] - -[[package]] -name = "devices" -version = "0.1.0" -dependencies = [ - "acpi_tables", - "anyhow", - "argh", - "async-task", - "audio_streams", - "balloon_control", - "base", - "bit_field", - "cfg-if", - "cros_async", - "data_model", - "dbus", - "disk", - "enumn", - "fuse", - "futures", - "gpu_display", - "hypervisor", - "kvm_sys", - "libc", - "libcras", - "libvda", - "linux_input_sys", - "memoffset 0.6.5", - "minijail", - "net_sys", - "net_util", - "once_cell", - "p9", - "power_monitor", - "protobuf", - "protos", - "rand 0.7.3", - "remain", - "resources", - "rutabaga_gfx", - "serde", - "serde_json", - "serde_keyvalue", - "smallvec", - "sync", - "system_api", - "tempfile", - "thiserror", - "tpm2", - "usb_util", - "uuid", - "vfio_sys", - "vhost", - "virtio_sys", - "vm_control", - "vm_memory", - "vmm_vhost", -] - -[[package]] -name = "disk" -version = "0.1.0" -dependencies = [ - "async-trait", - "base", - "cfg-if", - "crc32fast", - "cros_async", - "data_model", - "futures", - "libc", - "protobuf", - "protos", - "remain", - "serde", - "tempfile", - "thiserror", - "uuid", - "vm_memory", -] - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "either" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" - -[[package]] -name = "enumn" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038b1afa59052df211f9efd58f8b1d84c242935ede1c3dbaed26b018a9e06ae2" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "syn 1.0.99", -] - -[[package]] -name = "env_logger" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "fuse" -version = "0.1.0" -dependencies = [ - "base", - "bitflags", - "crossbeam-utils", - "data_model", - "enumn", - "libc", - "remain", - "thiserror", -] - -[[package]] -name = "futures" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" - -[[package]] -name = "futures-executor" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", - "num_cpus", -] - -[[package]] -name = "futures-io" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" - -[[package]] -name = "futures-macro" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "syn 1.0.99", -] - -[[package]] -name = "futures-sink" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" - -[[package]] -name = "futures-task" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" - -[[package]] -name = "futures-util" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gdbstub" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c1f9371c87c11642ee94dcf92cb48b1484ba250b8e8bff3df71c28651f3f4e7" -dependencies = [ - "bitflags", - "cfg-if", - "log", - "managed", - "num-traits", - "paste", -] - -[[package]] -name = "gdbstub_arch" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f469ba9556c5a063d6df35a8a338025fccf96ecae44f330a156b686f7a268" -dependencies = [ - "gdbstub", - "num-traits", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gpu_display" -version = "0.1.0" -dependencies = [ - "base", - "cc", - "data_model", - "libc", - "linux_input_sys", - "pkg-config", - "remain", - "thiserror", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[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 = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hypervisor" -version = "0.1.0" -dependencies = [ - "base", - "bit_field", - "bitflags", - "data_model", - "downcast-rs", - "enumn", - "fnv", - "kvm", - "kvm_sys", - "libc", - "memoffset 0.6.5", - "serde", - "sync", - "tempfile", - "vm_memory", - "win_util", - "winapi", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf7d67cf4a22adc5be66e75ebdf769b3f2ea032041437a7061f97a63dad4b" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg 1.1.0", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "integration_tests" -version = "0.1.0" -dependencies = [ - "anyhow", - "arch", - "base", - "libc", - "tempfile", -] - -[[package]] -name = "intrusive-collections" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe531a7789d7120f3e17d4f3f2cd95f54418ba7354f60b7b622b6644a07888a" -dependencies = [ - "memoffset 0.5.6", -] - -[[package]] -name = "io_uring" -version = "0.1.1" -dependencies = [ - "base", - "data_model", - "libc", - "remain", - "sync", - "tempfile", - "thiserror", -] - -[[package]] -name = "itoa" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" - -[[package]] -name = "js-sys" -version = "0.3.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kernel_cmdline" -version = "0.1.0" -dependencies = [ - "libc", - "remain", - "thiserror", -] - -[[package]] -name = "kernel_loader" -version = "0.1.0" -dependencies = [ - "base", - "data_model", - "libc", - "remain", - "tempfile", - "thiserror", - "vm_memory", -] - -[[package]] -name = "kvm" -version = "0.1.0" -dependencies = [ - "base", - "data_model", - "kvm_sys", - "libc", - "sync", - "vm_memory", -] - -[[package]] -name = "kvm_sys" -version = "0.1.0" -dependencies = [ - "base", - "data_model", - "libc", -] - -[[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.131" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c3b4822ccebfa39c02fc03d1534441b22ead323fa0f48bb7ddd8e6ba076a40" - -[[package]] -name = "libcras" -version = "0.1.0" - -[[package]] -name = "libdbus-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "libslirp-sys" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2772370ce9b7fa05c7eae0bd033005e139a64d52cee498a7905b3eb5d243c5f4" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "libvda" -version = "0.1.0" -dependencies = [ - "enumn", - "libc", - "pkg-config", -] - -[[package]] -name = "linux_input_sys" -version = "0.1.0" -dependencies = [ - "base", - "data_model", - "libc", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "managed" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "metrics" -version = "0.1.0" -dependencies = [ - "anyhow", - "base", - "cfg-if", - "chrono", - "lazy_static", - "libc", - "protobuf", - "protoc-rust", - "serde", - "serde_json", - "sync", - "winapi", - "wmi", -] - -[[package]] -name = "minijail" -version = "0.2.3" -dependencies = [ - "libc", - "minijail-sys", -] - -[[package]] -name = "minijail-sys" -version = "0.0.13" -dependencies = [ - "libc", - "pkg-config", - "which", -] - -[[package]] -name = "net_sys" -version = "0.1.0" -dependencies = [ - "base", - "libc", -] - -[[package]] -name = "net_util" -version = "0.1.0" -dependencies = [ - "base", - "cfg-if", - "cros_async", - "data_model", - "libc", - "libslirp-sys", - "metrics", - "net_sys", - "pcap-file", - "remain", - "serde", - "smallvec", - "thiserror", - "virtio_sys", - "winapi", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg 1.1.0", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" - -[[package]] -name = "p9" -version = "0.1.0" -dependencies = [ - "libc", - "wire_format_derive", -] - -[[package]] -name = "paste" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9423e2b32f7a043629287a536f21951e8c6a82482d0acb1eeebfc90bc2225b22" - -[[package]] -name = "pcap-file" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ad13fed1a83120159aea81b265074f21d753d157dd16b10cc3790ecba40a341" -dependencies = [ - "byteorder", - "derive-into-owned", - "thiserror", -] - -[[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 = "pkg-config" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" - -[[package]] -name = "power_monitor" -version = "0.1.0" -dependencies = [ - "base", - "dbus", - "protobuf", - "protoc-rust", - "remain", - "thiserror", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - -[[package]] -name = "proc-macro2" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "protobuf" -version = "2.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96" -dependencies = [ - "serde", - "serde_derive", -] - -[[package]] -name = "protobuf-codegen" -version = "2.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec1632b7c8f2e620343439a7dfd1f3c47b18906c4be58982079911482b5d707" -dependencies = [ - "protobuf", -] - -[[package]] -name = "protoc" -version = "2.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ef1dc036942fac2470fdb8a911f125404ee9129e9e807f3d12d8589001a38f" -dependencies = [ - "log", - "which", -] - -[[package]] -name = "protoc-rust" -version = "2.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9e315121c8e7e21396e940a3d27f92280a6d28e3931213bf6cbfea76c5cc94" -dependencies = [ - "protobuf", - "protobuf-codegen", - "protoc", - "tempfile", -] - -[[package]] -name = "protos" -version = "0.1.0" -dependencies = [ - "kvm_sys", - "protobuf", - "protoc-rust", -] - -[[package]] -name = "qcow_utils" -version = "0.1.0" -dependencies = [ - "base", - "disk", - "libc", -] - -[[package]] -name = "quote" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" - -[[package]] -name = "quote" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.8", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift", - "winapi", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.3.1", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom 0.2.7", -] - -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - -[[package]] -name = "remain" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06df529c0d271b27ac4a2c260f5ce2914b60bd44702cecec7b9f271adbdde23b" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "syn 1.0.99", -] - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "resources" -version = "0.1.0" -dependencies = [ - "base", - "libc", - "remain", - "serde", - "thiserror", -] - -[[package]] -name = "rutabaga_gfx" -version = "0.1.0" -dependencies = [ - "anyhow", - "base", - "data_model", - "libc", - "pkg-config", - "remain", - "serde", - "sync", - "thiserror", -] - -[[package]] -name = "ryu" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "scudo" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a043122e575636c0e47121917446b4f40803fc6defd8797369e7d2d47086d8e3" -dependencies = [ - "libc", - "scudo-sys", -] - -[[package]] -name = "scudo-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aedac72a22df5e73d23abf6b26a9b124a3e10f0e5cc74b9aa8121c7e14cf106" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "serde" -version = "1.0.143" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.143" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "syn 1.0.99", -] - -[[package]] -name = "serde_json" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_keyvalue" -version = "0.1.0" -dependencies = [ - "argh", - "num-traits", - "remain", - "serde", - "serde_keyvalue_derive", - "thiserror", -] - -[[package]] -name = "serde_keyvalue_derive" -version = "0.1.0" -dependencies = [ - "argh", - "proc-macro2", - "quote 1.0.21", - "syn 1.0.99", -] - -[[package]] -name = "slab" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "smallvec" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "syn" -version = "0.11.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" -dependencies = [ - "quote 0.3.15", - "synom", - "unicode-xid", -] - -[[package]] -name = "syn" -version = "1.0.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "unicode-ident", -] - -[[package]] -name = "sync" -version = "0.1.0" - -[[package]] -name = "synom" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "system_api" -version = "0.1.0" - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "syn 1.0.99", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "tpm2" -version = "0.1.0" -dependencies = [ - "tpm2-sys", -] - -[[package]] -name = "tpm2-sys" -version = "0.1.0" -dependencies = [ - "anyhow", - "pkg-config", -] - -[[package]] -name = "tube_transporter" -version = "0.1.0" -dependencies = [ - "base", - "data_model", - "rand 0.8.5", - "serde", - "serde_json", - "thiserror", - "win_util", - "winapi", -] - -[[package]] -name = "unicode-ident" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" - -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" - -[[package]] -name = "usb_sys" -version = "0.1.0" -dependencies = [ - "base", -] - -[[package]] -name = "usb_util" -version = "0.1.0" -dependencies = [ - "assertions", - "base", - "data_model", - "libc", - "remain", - "thiserror", - "usb_sys", -] - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.7", -] - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "vfio_sys" -version = "0.1.0" -dependencies = [ - "base", - "data_model", -] - -[[package]] -name = "vhost" -version = "0.1.0" -dependencies = [ - "assertions", - "base", - "libc", - "net_util", - "remain", - "thiserror", - "virtio_sys", - "vm_memory", -] - -[[package]] -name = "virtio_sys" -version = "0.1.0" -dependencies = [ - "base", - "data_model", -] - -[[package]] -name = "vm_control" -version = "0.1.0" -dependencies = [ - "balloon_control", - "base", - "data_model", - "gdbstub_arch", - "hypervisor", - "libc", - "remain", - "resources", - "rutabaga_gfx", - "serde", - "serde_json", - "sync", - "thiserror", - "vm_memory", -] - -[[package]] -name = "vm_memory" -version = "0.1.0" -dependencies = [ - "base", - "bitflags", - "cfg-if", - "cros_async", - "data_model", - "libc", - "remain", - "serde", - "thiserror", -] - -[[package]] -name = "vmm_vhost" -version = "0.1.0" -dependencies = [ - "anyhow", - "base", - "bitflags", - "cfg-if", - "data_model", - "libc", - "remain", - "serde", - "serde_json", - "tempfile", - "thiserror", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote 1.0.21", - "syn 1.0.99", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" -dependencies = [ - "quote 1.0.21", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "syn 1.0.99", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" - -[[package]] -name = "which" -version = "4.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" -dependencies = [ - "either", - "lazy_static", - "libc", -] - -[[package]] -name = "widestring" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" - -[[package]] -name = "win_util" -version = "0.1.0" -dependencies = [ - "anyhow", - "lazy_static", - "libc", - "winapi", - "windows", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a43e544233e20425d5a58e9671cf76d6aed9e6f211508c050facb29b188dc10f" -dependencies = [ - "const-sha1", - "windows_gen", - "windows_macros", -] - -[[package]] -name = "windows_gen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6283570a39b3594e31c64a498f48058758cc063eb087d972bb6476ad134a16" - -[[package]] -name = "windows_macros" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f757e7665f81f33ace9f89b0f0fc3a7c770e24ff4fa1475c6503bb35b4524893" -dependencies = [ - "syn 1.0.99", - "windows_gen", -] - -[[package]] -name = "wire_format_derive" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "syn 1.0.99", -] - -[[package]] -name = "wmi" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "757a458f9bfab0542c11feed99bd492cbe23add50515bd8eecf8c6973673d32d" -dependencies = [ - "chrono", - "log", - "serde", - "thiserror", - "widestring", - "winapi", -] - -[[package]] -name = "x86_64" -version = "0.1.0" -dependencies = [ - "acpi_tables", - "anyhow", - "arch", - "assertions", - "base", - "data_model", - "devices", - "gdbstub_arch", - "hypervisor", - "kernel_cmdline", - "kernel_loader", - "libc", - "minijail", - "once_cell", - "remain", - "resources", - "sync", - "thiserror", - "vm_control", - "vm_memory", -] diff --git a/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff b/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff deleted file mode 100644 index 0af27df9a192..000000000000 --- a/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git i/src/crosvm.rs w/src/crosvm.rs -index ab7c466b..636dc140 100644 ---- i/src/crosvm.rs -+++ w/src/crosvm.rs -@@ -345,7 +345,9 @@ impl Default for JailConfig { - fn default() -> Self { - JailConfig { - pivot_root: PathBuf::from(option_env!("DEFAULT_PIVOT_ROOT").unwrap_or("/var/empty")), -- seccomp_policy_dir: PathBuf::from(SECCOMP_POLICY_DIR), -+ seccomp_policy_dir: PathBuf::from( -+ option_env!("DEFAULT_SECCOMP_POLICY_DIR").unwrap_or(SECCOMP_POLICY_DIR), -+ ), - seccomp_log_failures: false, - } - } diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index ae216001c5e2..11d8f2223656 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,60 +1,56 @@ -{ stdenv, lib, rustPlatform, fetchgit -, minijail-tools, pkg-config, protobuf, wayland-scanner +{ stdenv, lib, rust, rustPlatform, fetchgit, fetchpatch +, clang, pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols }: rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "104.0"; + version = "107.1"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "265aab613b1eb31598ea0826f04810d9f010a2c6"; - sha256 = "OzbtPHs6BWK83RZ/6eCQHA61X6SY8FoBkaN70a37pvc="; + rev = "5a49a836e63aa6e9ae38b80daa09a013a57bfb7f"; + sha256 = "F+5i3R7Tbd9xF63Olnyavzg/hD+8HId1duWm8bvAmLA="; fetchSubmodules = true; }; separateDebugInfo = true; patches = [ - ./default-seccomp-policy-dir.diff + # Backport seccomp sandbox update for recent Glibc. + # fetchpatch is not currently gerrit/gitiles-compatible, so we + # have to use the mirror. + # https://github.com/NixOS/nixpkgs/pull/133604 + (fetchpatch { + url = "https://github.com/google/crosvm/commit/aae01416807e7c15270b3d44162610bcd73952ff.patch"; + sha256 = "nQuOMOwBu8QvfwDSuTz64SQhr2dF9qXt2NarbIU55tU="; + }) ]; - cargoLock.lockFile = ./Cargo.lock; + cargoSha256 = "1jg9x5adz1lbqdwnzld4xg4igzmh90nd9xm287cgkvh5fbmsjfjv"; - nativeBuildInputs = [ minijail-tools pkg-config protobuf wayland-scanner ]; + nativeBuildInputs = [ clang pkg-config protobuf python3 wayland-scanner ]; buildInputs = [ libcap libdrm libepoxy minijail virglrenderer wayland wayland-protocols ]; - arch = stdenv.hostPlatform.parsed.cpu.name; - - postPatch = '' - cp ${cargoLock.lockFile} Cargo.lock - sed -i "s|/usr/share/policy/crosvm/|$PWD/seccomp/$arch/|g" \ - seccomp/$arch/*.policy + preConfigure = '' + patchShebangs third_party/minijail/tools/*.py + substituteInPlace build.rs --replace '"clang"' '"${stdenv.cc.targetPrefix}clang"' ''; - preBuild = '' - export DEFAULT_SECCOMP_POLICY_DIR=$out/share/policy + "CARGO_TARGET_${lib.toUpper (builtins.replaceStrings ["-"] ["_"] (rust.toRustTarget stdenv.hostPlatform))}_LINKER" = + "${stdenv.cc.targetPrefix}cc"; - for policy in seccomp/$arch/*.policy; do - compile_seccomp_policy \ - --default-action trap $policy ''${policy%.policy}.bpf - done - - substituteInPlace seccomp/$arch/*.policy \ - --replace "@include $(pwd)/seccomp/$arch/" "@include $out/share/policy/" - ''; + # crosvm mistakenly expects the stable protocols to be in the root + # of the pkgdatadir path, rather than under the "stable" + # subdirectory. + PKG_CONFIG_WAYLAND_PROTOCOLS_PKGDATADIR = + "${wayland-protocols}/share/wayland-protocols/stable"; buildFeatures = [ "default" "virgl_renderer" "virgl_renderer_next" ]; - postInstall = '' - mkdir -p $out/share/policy/ - cp -v seccomp/$arch/*.{policy,bpf} $out/share/policy/ - ''; - passthru.updateScript = ./update.py; meta = with lib; { From 4c80e3665c019daaa91347fbcb4e5ae078cc39d3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 30 Sep 2022 21:09:01 +0000 Subject: [PATCH 369/797] crosvm.updateScript: don't vendor Cargo.lock This is no longer required as crosvm now includes a Cargo.lock in-tree again. --- .../virtualization/crosvm/generate-cargo.sh | 7 ------- pkgs/applications/virtualization/crosvm/update.py | 13 ------------- 2 files changed, 20 deletions(-) delete mode 100644 pkgs/applications/virtualization/crosvm/generate-cargo.sh diff --git a/pkgs/applications/virtualization/crosvm/generate-cargo.sh b/pkgs/applications/virtualization/crosvm/generate-cargo.sh deleted file mode 100644 index 216cafe367ca..000000000000 --- a/pkgs/applications/virtualization/crosvm/generate-cargo.sh +++ /dev/null @@ -1,7 +0,0 @@ -dir="$(mktemp -d)" && - cd "$dir" && - unpackPhase && - cd "${sourceRoot:-}" && - cargo generate-lockfile && - mv Cargo.lock "$1" -rm -rf "$dir" diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py index 64adec429575..7a94aedefdb6 100755 --- a/pkgs/applications/virtualization/crosvm/update.py +++ b/pkgs/applications/virtualization/crosvm/update.py @@ -50,16 +50,3 @@ with urlopen(f'https://chromium.googlesource.com/chromiumos/platform/crosvm/+log # Update the version, git revision, and hash in crosvm's default.nix. subprocess.run(['update-source-version', 'crosvm', f'--rev={rev}', version]) - -# Find the path to crosvm's default.nix, so Cargo.lock can be written -# into the same directory. -argv = ['nix-instantiate', '--eval', '--json', '-A', 'crosvm.meta.position'] -position = json.loads(subprocess.check_output(argv).decode('utf-8')) -filename = re.match(r'[^:]*', position)[0] - -# Generate a Cargo.lock -run = ['.', - dirname(abspath(__file__)) + '/generate-cargo.sh', - dirname(filename) + '/Cargo.lock'] -expr = '(import ./. {}).crosvm.overrideAttrs (_: { dontCargoSetupPostUnpack = true; })' -subprocess.run(['nix-shell', '-E', expr, '--run', shlex.join(run)]) From 35fcc584e48c0d6820b1c7a0c28ca85bc5cded50 Mon Sep 17 00:00:00 2001 From: Andrew Fontaine Date: Fri, 18 Nov 2022 13:26:53 -0500 Subject: [PATCH 370/797] muchsync: 5 -> 6 - Clarified that it's okay to link against OpenSSL libcrypto. - Update to format man page with recent versions of pandoc. - Improve some error handing and error messages. --- pkgs/applications/networking/mailreaders/notmuch/muchsync.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index fc8c83f216cb..81946353670c 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -2,14 +2,14 @@ , notmuch, openssl, pkg-config, sqlite, xapian, zlib }: stdenv.mkDerivation rec { - version = "5"; + version = "6"; pname = "muchsync"; passthru = { inherit version; }; src = fetchurl { url = "http://www.muchsync.org/src/${pname}-${version}.tar.gz"; - sha256 = "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb"; + sha256 = "Cz3jtNiF7bn4h6B9y8i1luf+8gOMYeaCz6VaE/pM6eg="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ notmuch openssl sqlite xapian zlib ]; From 7d0d2a8d041b63274f19d20679afcf5c73e0cefb Mon Sep 17 00:00:00 2001 From: Icy-Thought Date: Fri, 18 Nov 2022 19:48:15 +0100 Subject: [PATCH 371/797] whitesur-icon-theme: 2022-08-30 -> 2022-11-17 --- pkgs/data/icons/whitesur-icon-theme/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix index 6270d2a66429..80f6b5ce24ae 100644 --- a/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -9,8 +9,7 @@ , themeVariants ? [] }: -let - pname = "Whitesur-icon-theme"; +let pname = "Whitesur-icon-theme"; in lib.checkListOfEnum "${pname}: theme variants" [ "default" @@ -27,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-08-30"; + version = "2022-11-17"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "pcvRD4CUwUT46/kmMbnerj5mqPCcHIRreVIh9wz6Kfg="; + hash = "sha256-crZ6JQeXeSjTHGIBptioNiFZas7MksJcjaKGlMP4fo0="; }; nativeBuildInputs = [ gtk3 jdupes ]; From ee04235b28956b572a151d5f578b5ef618a972c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 18 Nov 2022 21:04:53 +0100 Subject: [PATCH 372/797] ceph*: fix build That's probably due to 017fd895276d or around (PR #196906). --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9b363da9b40..05a73c2e3e51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5277,8 +5277,6 @@ with pkgs; libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { lua = lua5_4; - # needs to be the same openssl version as python/pyopenssl - curl = (curl.override { openssl = openssl_1_1; }); }) ceph ceph-client; From dc179f87daff7f7430f9aeb52cadc8ccaffbdaef Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 18 Nov 2022 14:56:01 -0500 Subject: [PATCH 373/797] eureka-ideas: fix build on darwin --- pkgs/applications/misc/eureka-ideas/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/eureka-ideas/default.nix b/pkgs/applications/misc/eureka-ideas/default.nix index d9016bc341ae..ee15f31632cb 100644 --- a/pkgs/applications/misc/eureka-ideas/default.nix +++ b/pkgs/applications/misc/eureka-ideas/default.nix @@ -2,6 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config +, libgit2 , openssl , stdenv , Security @@ -22,13 +23,15 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - - checkFlags = lib.optionals stdenv.isLinux [ - # failing on linux for unknown reasons - "--skip=config_manager::tests" + buildInputs = [ + libgit2 + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security ]; + dontUseCargoParallelTests = true; + meta = with lib; { description = "CLI tool to input and store your ideas without leaving the terminal"; homepage = "https://github.com/simeg/eureka"; From de4bf0452228ce3693fade66a5752ab15f3ab4ef Mon Sep 17 00:00:00 2001 From: Wanja Hentze Date: Fri, 18 Nov 2022 21:27:28 +0100 Subject: [PATCH 374/797] terraria-server: 1.4.4.8.1 -> 1.4.4.9 --- pkgs/games/terraria-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 9a216cefdbce..2b63fcca45fc 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "terraria-server"; - version = "1.4.4.8.1"; + version = "1.4.4.9"; urlVersion = lib.replaceChars [ "." ] [ "" ] version; src = fetchurl { url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip"; - sha256 = "sha256-4mM9+iE2HJnzoW4mvet3sy0mngQ62dxhxa1eDJxBGBo="; + sha256 = "sha256-Mk+5s9OlkyTLXZYVT0+8Qcjy2Sb5uy2hcC8CML0biNY="; }; buildInputs = [ file ]; From dd1fc37d06e9deddfa02a9f1772d0837f3e2f090 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 18 Nov 2022 15:27:42 -0500 Subject: [PATCH 375/797] tree-sitter-grammars: update --- .../parsing/tree-sitter/grammars/tree-sitter-julia.json | 8 ++++---- .../tools/parsing/tree-sitter/grammars/tree-sitter-r.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-rego.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-sql.json | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json index 94d548e75919..2ffedc730ef1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-julia", - "rev": "bedd19f3c3d745c3da8451a35c7bfc5f48d07ee6", - "date": "2022-11-05T17:27:50-05:00", - "path": "/nix/store/ldklarlvv3jlxsfi7gnqmim7csnxp2qf-tree-sitter-julia", - "sha256": "0cnp0rff6igjfz9i8ckffj9r1fr2nzdw82hag6dml331z7nbjjkf", + "rev": "628713553c42f30595a3b0085bb587e9359b986a", + "date": "2022-11-15T18:14:44-05:00", + "path": "/nix/store/4d712q8sjvbh845cd2b0xbvlng1iasaj-tree-sitter-julia", + "sha256": "12xlv4gbqdw0mr1zgnzs74pxpdkq4vfvs77gnr49zsrycjflf7xw", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json index 468780ddc347..957fcc66b927 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json @@ -1,9 +1,9 @@ { "url": "https://github.com/r-lib/tree-sitter-r", - "rev": "0f4f66e5050037b759ea040dafd596bcdda1de94", - "date": "2022-10-12T16:08:16-07:00", - "path": "/nix/store/yffaihslg48mx67cy4gw8n8m3wrc9a7h-tree-sitter-r", - "sha256": "1qw2ngr9db3nv9bc74y2rlsvbk9np5djj1pxhb3ks5dkk7airf76", + "rev": "80efda55672d1293aa738f956c7ae384ecdc31b4", + "date": "2022-11-10T09:19:03-08:00", + "path": "/nix/store/x7rjhqp9qxh9xwq2l38jz5wbkbzz0vfl-tree-sitter-r", + "sha256": "1n7yxi2wf9xj8snw0b85a5w40vhf7x1pwirnwfk78ilr6hhz4ix9", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json index 3effe0bf62a5..ad605c788b37 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json @@ -1,9 +1,9 @@ { "url": "https://github.com/FallenAngel97/tree-sitter-rego", - "rev": "6d70da3a998fd0081efc5d1019c71e74cc1568e9", - "date": "2022-08-17T15:53:32+03:00", - "path": "/nix/store/r23jy7qfsl6snbp0z7p5lk9x0q9ssgzs-tree-sitter-rego", - "sha256": "1phjhrngv818mcwvbrfpi0hrzc05cjckds5ddmndc8h7wi0db9cb", + "rev": "b2667c975f07b33be3ceb83bea5cfbad88095866", + "date": "2022-11-18T14:07:12+02:00", + "path": "/nix/store/ky8xv5v5i273n0zqin0mnsx810382wfn-tree-sitter-rego", + "sha256": "18qw5ahx6qcfq9gs6gcakl178gnnryksv6gyamyd6vypz20kwz6b", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json index 5149a66fee35..395743a0b62b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json @@ -1,9 +1,9 @@ { "url": "https://github.com/derekstride/tree-sitter-sql", - "rev": "70c50264ae022193adb364ffa7a767d765ed9857", - "date": "2022-11-02T09:36:19-04:00", - "path": "/nix/store/f1pg3pf4fyfmls30l1ma1nlwq61fxxqs-tree-sitter-sql", - "sha256": "16s58bvll2r80zga63fjzjbkfxm3zdr3vljjk69cvjwnpy668yfh", + "rev": "4f1b91246b43190e34957d9de9a0f3625879ba33", + "date": "2022-11-18T10:16:02-05:00", + "path": "/nix/store/l84kfw631akx7v4k6c0s4hdvaanjh8a1-tree-sitter-sql", + "sha256": "03wbxfkwk5i31knf1hgqkb56r66vk18k5n4919hhnhy9vvrm0mw3", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From b4c771623fc9c573bb7b5cdc7efcf58907f8207f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 20:33:41 +0000 Subject: [PATCH 376/797] jackett: 0.20.2238 -> 0.20.2264 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 982169125a08..630d7b845b7b 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2238"; + version = "0.20.2264"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "3kYpx3s4gYBTrqSOt7eLOf8x4cPnlDVmesYBbFzRZVU="; + sha256 = "Y1m828STKL4ANuf11oCekvT2ctCRBlT7Blyvvoltdxc="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From bf9ffaa8b6af3d6a57810b96559a12d6b4a2c9a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 17 Nov 2022 20:36:43 -0800 Subject: [PATCH 377/797] python310Packages.pyrogram: 2.0.59 -> 2.0.62 --- pkgs/development/python-modules/pyrogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index a0ce4ea814d3..bd5433c7a5fb 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.59"; + version = "2.0.62"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-vGgtVXvi/zvbU8f+LBQJN8GSxyVqdv/fBYfsBR4BKf4="; + hash = "sha256-Kex9xIjcAYCzHeqWoDAIgTMuih0s42/O2zfTYxWEqbM="; }; propagatedBuildInputs = [ From 27e31f5879e652d4f26144b68fb8f7757d50aa69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 18 Nov 2022 12:40:44 -0800 Subject: [PATCH 378/797] metadata-cleaner: 2.2.5 -> 2.2.7 https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/v2.2.7/CHANGELOG.md --- pkgs/applications/misc/metadata-cleaner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 5afd0a615b59..35832b0dafb1 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.2.5"; + version = "2.2.7"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-Yb5tCvhVg9p4v7++MmoaeQDyP1qdfpHM+IGj8BoacVs="; + hash = "sha256-Kqvnw0cPPkqgJQdc6vkP4U96AQuyFSNMQTzTdIUghWw="; }; nativeBuildInputs = [ From ea8595a22dee1621ca7c3044fb19c8f86cdf1f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Fri, 18 Nov 2022 21:55:38 +0100 Subject: [PATCH 379/797] pulumi: 3.46.1 -> 3.47.0 --- pkgs/tools/admin/pulumi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 42daa857c163..027e4eac013c 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "pulumi"; - version = "3.46.1"; + version = "3.47.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-bEAggHGMhSSwEiYj+DdJRajR4DLunpidbd4DflkBrQ8="; + hash = "sha256-r0VPWVyyWGZ2v2yKKiJGJV+ah77zxFm7Zwm9yag3fxc="; }; - vendorSha256 = "sha256-+JKCCNkByqWuvAv8qUL3L9DlDhvIbMsDbsfn3KYolUo="; + vendorSha256 = "sha256-eipxqX2m425FnPkf+ao/k1dYwDHDmJf+eS3S0sEiXkk="; sourceRoot = "source/pkg"; From 3096720ecff97183f9f074b8d746d8921975583b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Nov 2022 22:18:13 +0100 Subject: [PATCH 380/797] python310Packages.neo4j: 5.2.0 -> 5.2.1 --- pkgs/development/python-modules/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 8ef5f4b8b858..38ad7832ee8f 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.2.0"; + version = "5.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-g5jeqE1eu+4iqXp57EF9xt8To2oyI3ey5URGRoPLs1Q="; + hash = "sha256-d4OkXj6mZjrdRG8UyxWeAh3rLywz2TUk2pZq+Ni1F3s="; }; propagatedBuildInputs = [ From 8fcfff7387d2b93337b3606f5162d0acd67b6285 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Nov 2022 22:16:38 +0100 Subject: [PATCH 381/797] dump_syms: 2.0.0 -> 2.1.0 https://github.com/mozilla/dump_syms/releases/tag/v2.1.0 --- pkgs/development/tools/dump_syms/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index 4aff90f830a3..1b4bbe573a5b 100644 --- a/pkgs/development/tools/dump_syms/default.nix +++ b/pkgs/development/tools/dump_syms/default.nix @@ -11,7 +11,7 @@ let pname = "dump_syms"; - version = "2.0.0"; + version = "2.1.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "mozilla"; repo = pname; rev = "v${version}"; - hash = "sha256-ei/ORKKoh9rQg4xZ5j76qaplw1PyEV7ABkyL7e8WIlQ="; + hash = "sha256-Q4opIGG1kOORECNB6al0oT4tjBe++ND6Eb4E86ED2+o="; }; - cargoSha256 = "sha256-t3AQW0j/L/qIUx6RJKqf+Fv/2BNWkWmTc0PDNFlZeaQ="; + cargoSha256 = "sha256-j3bZaHFJEn/LW032CaRBaLN3Pb5GiQv1MReD0LFI8y8="; nativeBuildInputs = [ pkg-config From 29eceb2273291308696f64f35a97366765158ca7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Nov 2022 22:25:52 +0100 Subject: [PATCH 382/797] dump_syms: Add consumers into passthru.tests --- pkgs/development/tools/dump_syms/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index 1b4bbe573a5b..19e16bd0da73 100644 --- a/pkgs/development/tools/dump_syms/default.nix +++ b/pkgs/development/tools/dump_syms/default.nix @@ -7,6 +7,11 @@ # darwin , Security + +# tests +, firefox-esr-unwrapped +, firefox-unwrapped +, thunderbird-unwrapped }: let @@ -42,6 +47,10 @@ rustPlatform.buildRustPackage { "--skip windows::pdb::tests::test_oleaut32" ]; + passthru.tests = { + inherit firefox-esr-unwrapped firefox-unwrapped thunderbird-unwrapped; + }; + meta = with lib; { changelog = "https://github.com/mozilla/dump_syms/releases/tag/v${version}"; description = "Command-line utility for parsing the debugging information the compiler provides in ELF or stand-alone PDB files"; From 3a7fd7a91019ab9cf9cafa4c9038434263526eb6 Mon Sep 17 00:00:00 2001 From: Louis Blin <45168934+lbpdt@users.noreply.github.com> Date: Fri, 18 Nov 2022 16:38:36 -0500 Subject: [PATCH 383/797] prometheus-artifactory-exporter: 1.9.4 -> 1.9.5 --- pkgs/servers/monitoring/prometheus/artifactory-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index 60027e1d02a9..47cf29f55fbe 100644 --- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "artifactory_exporter"; - version = "1.9.4"; + version = "1.9.5"; rev = "v${version}"; src = fetchFromGitHub { owner = "peimanja"; repo = pname; rev = rev; - sha256 = "sha256-vrbuKWoKfDrgJEOYsncwJZ8lyAfanbV8jKQDVCZY2Sg="; + sha256 = "sha256-QUluuxuOgeq5CnpmVh5uDC4SEWD97JbQCHiYjYUs/nI="; }; - vendorSha256 = "sha256-wKBSAZSE/lSUbkHkyBEkO0wvkrK6fKxXIjF6G+ILqHM="; + vendorSha256 = "sha256-5yzBKgjJCv4tgdBS6XmZUq1ebbka0LOuv6BARWO7kQg="; subPackages = [ "." ]; From 341e6fd558abde5b4f6609833ff503c8d1e9b379 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 18 Nov 2022 06:55:23 +0200 Subject: [PATCH 384/797] splice.nix: start deprecating nativeDrv and crossDrv --- doc/stdenv/cross-compilation.chapter.md | 2 +- lib/customisation.nix | 1 + pkgs/build-support/kernel/make-initrd-ng.nix | 2 +- .../node/build-npm-package/hooks/default.nix | 9 ++++----- pkgs/build-support/rust/hooks/default.nix | 4 +--- pkgs/development/libraries/qt-6/default.nix | 2 ++ pkgs/development/libraries/qt-6/qtModule.nix | 2 +- pkgs/stdenv/generic/make-derivation.nix | 8 ++++---- pkgs/top-level/splice.nix | 17 ++++++----------- 9 files changed, 21 insertions(+), 26 deletions(-) diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index 0eff70de5ca1..5f7ff513959a 100644 --- a/doc/stdenv/cross-compilation.chapter.md +++ b/doc/stdenv/cross-compilation.chapter.md @@ -250,5 +250,5 @@ Thirdly, it is because everything target-mentioning only exists to accommodate c ::: ::: {.note} -If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with “Cross” in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.nativeDrv` or `.crossDrv`. This ugliness will disappear soon. +If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with “Cross” in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.__spliced.buildHost` or `.__spliced.hostTarget`. ::: diff --git a/lib/customisation.nix b/lib/customisation.nix index de424b0d722b..bd7ee3c83b8c 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -38,6 +38,7 @@ rec { // (drv.passthru or {}) // + # TODO(@Artturin): remove before release 23.05 and only have __spliced. (lib.optionalAttrs (drv ? crossDrv && drv ? nativeDrv) { crossDrv = overrideDerivation drv.crossDrv f; nativeDrv = overrideDerivation drv.nativeDrv f; diff --git a/pkgs/build-support/kernel/make-initrd-ng.nix b/pkgs/build-support/kernel/make-initrd-ng.nix index e762464fc489..dc0e9b87db2a 100644 --- a/pkgs/build-support/kernel/make-initrd-ng.nix +++ b/pkgs/build-support/kernel/make-initrd-ng.nix @@ -76,7 +76,7 @@ in nativeBuildInputs = [makeInitrdNGTool cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils; - STRIP = if strip then "${(binutils.nativeDrv or binutils).targetPrefix}strip" else null; + STRIP = if strip then "${pkgsBuildHost.binutils.targetPrefix}strip" else null; }) '' mkdir ./root make-initrd-ng "$contentsPath" ./root diff --git a/pkgs/build-support/node/build-npm-package/hooks/default.nix b/pkgs/build-support/node/build-npm-package/hooks/default.nix index d2293ed42f79..4ac981af916c 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/default.nix +++ b/pkgs/build-support/node/build-npm-package/hooks/default.nix @@ -1,4 +1,4 @@ -{ lib, makeSetupHook, nodejs, srcOnly, diffutils, jq, makeWrapper }: +{ lib, makeSetupHook, nodejs, srcOnly, buildPackages, makeWrapper }: { npmConfigHook = makeSetupHook @@ -9,9 +9,8 @@ # Specify the stdenv's `diff` and `jq` by abspath to ensure that the user's build # inputs do not cause us to find the wrong binaries. - # The `.nativeDrv` stanza works like nativeBuildInputs and ensures cross-compiling has the right version available. - diff = "${diffutils.nativeDrv or diffutils}/bin/diff"; - jq = "${jq.nativeDrv or jq}/bin/jq"; + diff = "${buildPackages.diffutils}/bin/diff"; + jq = "${buildPackages.jq}/bin/jq"; nodeVersion = nodejs.version; nodeVersionMajor = lib.versions.major nodejs.version; @@ -29,7 +28,7 @@ deps = [ makeWrapper ]; substitutions = { hostNode = "${nodejs}/bin/node"; - jq = "${jq.nativeDrv or jq}/bin/jq"; + jq = "${buildPackages.jq}/bin/jq"; }; } ./npm-install-hook.sh; } diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 9d3fc9b126ef..6ee122adb52a 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -2,7 +2,6 @@ , callPackage , cargo , clang -, diffutils , lib , makeSetupHook , maturin @@ -65,8 +64,7 @@ in { # Specify the stdenv's `diff` by abspath to ensure that the user's build # inputs do not cause us to find the wrong `diff`. - # The `.nativeDrv` stanza works like nativeBuildInputs and ensures cross-compiling has the right version available. - diff = "${diffutils.nativeDrv or diffutils}/bin/diff"; + diff = "${lib.getBin buildPackages.diffutils}/bin/diff"; # We want to specify the correct crt-static flag for both # the build and host platforms. This is important when the wanted diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 5d17df8028d2..4c36e29f02f2 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -107,6 +107,8 @@ let } ./hooks/qmake-hook.sh; }; + # TODO(@Artturin): convert to makeScopeWithSplicing + # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01 self = lib.makeScope newScope addPackages; in self diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index 3ef0ea191a76..5f6d429edf58 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (args // { if [[ -z "$dontSyncQt" && -f sync.profile ]]; then # FIXME: this probably breaks crosscompiling as it's not from nativeBuildInputs # I don't know how to get /libexec from nativeBuildInputs to work, it's not under /bin - ${self.qtbase.dev.nativeDrv or self.qtbase.dev}/libexec/syncqt.pl -version "''${version%%-*}" + ${lib.getDev self.qtbase}/libexec/syncqt.pl -version "''${version%%-*}" fi ''; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 78cbad190a6e..510537aac9f3 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -209,7 +209,7 @@ else let dependencies = map (map lib.chooseDevOutputs) [ [ (map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuild" depsBuildBuild)) - (map (drv: drv.nativeDrv or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs + (map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs ++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh ++ lib.optionals doCheck checkInputs @@ -218,7 +218,7 @@ else let ] [ (map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHost" depsHostHost)) - (map (drv: drv.crossDrv or drv) (checkDependencyList "buildInputs" buildInputs)) + (map (drv: drv.__spliced.hostTarget or drv) (checkDependencyList "buildInputs" buildInputs)) ] [ (map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTarget" depsTargetTarget)) @@ -227,12 +227,12 @@ else let propagatedDependencies = map (map lib.chooseDevOutputs) [ [ (map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuildPropagated" depsBuildBuildPropagated)) - (map (drv: drv.nativeDrv or drv) (checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs)) + (map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs)) (map (drv: drv.__spliced.buildTarget or drv) (checkDependencyList "depsBuildTargetPropagated" depsBuildTargetPropagated)) ] [ (map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHostPropagated" depsHostHostPropagated)) - (map (drv: drv.crossDrv or drv) (checkDependencyList "propagatedBuildInputs" propagatedBuildInputs)) + (map (drv: drv.__spliced.hostTarget or drv) (checkDependencyList "propagatedBuildInputs" propagatedBuildInputs)) ] [ (map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTargetPropagated" depsTargetTargetPropagated)) diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 459baaca2e63..2bf15252f9ad 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -8,16 +8,9 @@ # The solution is to splice the package sets together as we do below, so every # `callPackage`d expression in fact gets both versions. Each# derivation (and # each derivation's outputs) consists of the run-time version, augmented with a -# `nativeDrv` field for the build-time version, and `crossDrv` field for the +# `__spliced.buildHost` field for the build-time version, and `__spliced.hostTarget` field for the # run-time version. # -# We could have used any names we want for the disambiguated versions, but -# `crossDrv` and `nativeDrv` were somewhat similarly used for the old -# cross-compiling infrastructure. The names are mostly invisible as -# `mkDerivation` knows how to pull out the right ones for `buildDepends` and -# friends, but a few packages use them directly, so it seemed efficient (to -# @Ericson2314) to reuse those names, at least initially, to minimize breakage. -# # For performance reasons, rather than uniformally splice in all cases, we only # do so when `pkgs` and `buildPackages` are distinct. The `actuallySplice` # parameter there the boolean value of that equality check. @@ -46,14 +39,16 @@ let valueHostTarget = pkgsHostTarget.${name} or {}; valueTargetTarget = pkgsTargetTarget.${name} or {}; augmentedValue = defaultValue - # TODO(@Ericson2314): Stop using old names after transition period - // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = valueBuildHost; }) - // (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = valueHostTarget; }) + # TODO(@Artturin): remove before release 23.05 and only have __spliced. + // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = lib.warn "use ${name}.__spliced.buildHost instead of ${name}.nativeDrv" valueBuildHost; }) + // (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = lib.warn "use ${name}.__spliced.hostTarget instead of ${name}.crossDrv" valueHostTarget; }) // { __spliced = (lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; }) + // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { buildHost = valueBuildHost; }) // (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; }) // (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; }) + // (lib.optionalAttrs (pkgsHostTarget ? ${name}) { hostTarget = valueHostTarget; }) // (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget; }); }; From 9b0e665ebb2bb7b623d14f00605a8d56a287aed9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Nov 2022 23:12:23 +0100 Subject: [PATCH 385/797] python310Packages.vt-py: 0.17.1 -> 0.17.3 --- pkgs/development/python-modules/vt-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index 1d0c7b4ffb71..1fbcf76a636b 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.17.1"; + version = "0.17.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-yG0bKBn3pQWtxjuxkhKMMJW1nzbsk5y/9h2OOCkdch8="; + hash = "sha256-nveMsebW828ATEW6vw+var+GxbJj2N0mNaQlkx+GH3w="; }; propagatedBuildInputs = [ From 68fd3bf17d04de4f81826fb871d57aa77e1221ab Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 18 Nov 2022 22:17:21 +0100 Subject: [PATCH 386/797] babeltrace: fix cross-compilation --- pkgs/development/tools/misc/babeltrace/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index 3dc424f106bf..014d926eea3d 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { pname = "babeltrace"; @@ -9,9 +9,18 @@ stdenv.mkDerivation rec { sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz"; }; - nativeBuildInputs = [ pkg-config ]; + # The pre-generated ./configure script uses an old autoconf version which + # breaks cross-compilation (replaces references to malloc with rpl_malloc). + # Re-generate with nixpkgs's autoconf. This requires glib to be present in + # nativeBuildInputs for its m4 macros to be present. + nativeBuildInputs = [ autoreconfHook glib pkg-config ]; buildInputs = [ glib libuuid popt elfutils ]; + # --enable-debug-info (default) requires the configure script to run host + # executables to determine the elfutils library version, which cannot be done + # while cross compiling. + configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-debug-info"; + meta = with lib; { description = "Command-line tool and library to read and convert LTTng tracefiles"; homepage = "https://www.efficios.com/babeltrace"; From 2b1d62a3caf6843847b5712b1484ed6c35e692f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Nov 2022 23:58:36 +0100 Subject: [PATCH 387/797] python310Packages.regenmaschine: 2022.10.1 -> 2022.11.0 --- pkgs/development/python-modules/regenmaschine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index ce962e7636a3..48505237ae4f 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.10.1"; + version = "2022.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-BOJ2dFZ4CFII6OXzQU3Q9Mah6kRZPC5+b6ekx8ueYc4="; + sha256 = "sha256-aCgMAaur2ljjiQ7tt/gXm/Vt+o6j/MsCOLN661CkFw4="; }; nativeBuildInputs = [ From 1cb6ce9869c13c52147a4569030c053d323dc811 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 18 Nov 2022 18:03:08 -0500 Subject: [PATCH 388/797] lollypop: 1.4.36 -> 1.4.35 The 1.4.36 release is broken for us: ``` Traceback (most recent call last): File "/nix/store/yqy14z7qhgr728k9myq7dilvk87nmsar-lollypop-1.4.36/bin/.lollypop-wrapped", line 46, in from lollypop.application import Application File "/nix/store/yqy14z7qhgr728k9myq7dilvk87nmsar-lollypop-1.4.36/lib/python3.10/site-packages/lollypop/application.py", line 33, in from lollypop.database import Database File "/nix/store/yqy14z7qhgr728k9myq7dilvk87nmsar-lollypop-1.4.36/lib/python3.10/site-packages/lollypop/database.py", line 21, in from lollypop.database_upgrade import DatabaseAlbumsUpgrade File "/nix/store/yqy14z7qhgr728k9myq7dilvk87nmsar-lollypop-1.4.36/lib/python3.10/site-packages/lollypop/database_upgrade.py", line 24, in from lollypop.helper_task import TaskHelper File "/nix/store/yqy14z7qhgr728k9myq7dilvk87nmsar-lollypop-1.4.36/lib/python3.10/site-packages/lollypop/helper_task.py", line 14, in gi.require_version("Soup", "3.0") File "/nix/store/i9g6imnzqrnysfqj54jrdqb4ds3jh1kh-python3.10-pygobject-3.42.2/lib/python3.10/site-packages/gi/__init__.py", line 129, in require_version raise ValueError('Namespace %s not available for version %s' % ValueError: Namespace Soup not available for version 3.0 ``` This doesn't revert #201181, but it does move the version to 1.4.35, up from the original 1.4.34, but dowgrading from 1.4.36. --- pkgs/applications/audio/lollypop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 019196d74eb7..0da23254aa81 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.4.36"; + version = "1.4.35"; format = "other"; doCheck = false; @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "sha256-Ka/rYgWGuCQTzguJiyQpY5SPC1iB5XOVy/Gezj+DYpk="; + sha256 = "sha256-Rdp0gZjdj2tXOWarsTpqgvSZVXAQsCLfk5oUyalE/ZA="; }; nativeBuildInputs = [ From 7cda9c28168d088ce864ebb1896a52efd59fbb8a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 00:07:26 +0100 Subject: [PATCH 389/797] python310Packages.types-colorama: 0.4.15.2 -> 0.4.15.3 --- pkgs/development/python-modules/types-colorama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix index 2a0e3a38fa59..9fa0baac88e6 100644 --- a/pkgs/development/python-modules/types-colorama/default.nix +++ b/pkgs/development/python-modules/types-colorama/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.2"; + version = "0.4.15.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-FXy+ZuFjllliWEZNONeMrojYEus9erKoc+Da9PR8bIk="; + hash = "sha256-k2L0kWdQX3EbvJpjUtrmZQSVswUzg4aPf3a/642SMAI="; }; # Module has no tests From ce50c16943eadc648832ae4f3b43368983364ee2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 00:07:50 +0100 Subject: [PATCH 390/797] python310Packages.types-python-dateutil: 2.8.19.3 -> 2.8.19.4 --- .../python-modules/types-python-dateutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix index c08117d2ad4a..acf092b8411c 100644 --- a/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.19.3"; + version = "2.8.19.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-oxMoTfXtP9B4MDJi7cDv3iiZjNCOUGHvHMwLtf700to="; + hash = "sha256-NRqMqa/UrqZi+HwXJNLhrln59fmWkb47OxHSOTzTqqE="; }; # Modules doesn't have tests From 5d62080af594463bbfe4dba6f20411a9498c6768 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 00:09:58 +0100 Subject: [PATCH 391/797] python310Packages.types-requests: 2.28.11.4 -> 2.28.11.5 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index f53c4a141a6a..730a0a591540 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.11.4"; + version = "2.28.11.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1PNCsN9DImLp4ybRdjjurpaliB5456aq5G0zhw1zlS4="; + sha256 = "sha256-p983zG+2GHqECX2pUfjiHTNUSKolAaawo5y9HXyp7io="; }; propagatedBuildInputs = [ From 3838aabd154ba7a679b5cd9f1c35552009f3abb7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 00:10:22 +0100 Subject: [PATCH 392/797] python310Packages.types-setuptools: 65.5.0.2 -> 65.5.0.3 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index c9ce9c92c4cd..c67524015ee1 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "65.5.0.2"; + version = "65.5.0.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mEfebXCH+x3UqIwqIVQ9G4amF5w2dE8IGXQwP+LzD1A="; + sha256 = "sha256-F3aRcfXyotxpslwNMQZVKlzadnu/azbLYhKyba5aqfw="; }; # Module doesn't have tests From e8d70b73ebfd6db858a5a62f21948a6db3bc7254 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 00:10:53 +0100 Subject: [PATCH 393/797] python310Packages.types-toml: 0.10.8 -> 0.10.8.1 --- pkgs/development/python-modules/types-toml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix index ec73535a9386..fff70bd611f7 100644 --- a/pkgs/development/python-modules/types-toml/default.nix +++ b/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.8"; + version = "0.10.8.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-t+fqVyMIsQMNyGw7qCXFIQgUwoJWEuxnnreBT43ZKVo="; + sha256 = "sha256-FxvbMWPXmlIFYPJLqRap/Jv/gWWcVEip/qiSQJI3Ir4="; }; # Module doesn't have tests From 2996749e4712fce593aee0185b4dfd864594ffb5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 00:11:20 +0100 Subject: [PATCH 394/797] python310Packages.types-urllib3: 1.26.25.3 -> 1.26.25.4 --- pkgs/development/python-modules/types-urllib3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 057ec581d0ab..55ab0f9ee1e5 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.25.3"; + version = "1.26.25.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-GAe4e47hrgImgTuixSMw7/IPsr9jWbHeJN8I6zCQ5EI="; + hash = "sha256-7sVVZCjuyGKxrFePtpqrOHeZWpn/7J5aEs9/vQzJ2u4="; }; # Module doesn't have tests From 18ab3f0e16bde0c3b03a2cf598e4c4bbb8587262 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 00:23:49 +0100 Subject: [PATCH 395/797] python310Packages.identify: 2.5.8 -> 2.5.9 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 4750b591f66e..86ac0542591e 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.8"; + version = "2.5.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QI4NtNPkR3mD/UVFeKimo5pgBmnRKaxQ6JiwPDbjh/0="; + sha256 = "sha256-5ISxzOTTlA1EcBO5N6YtBEah0SRehGeVIONj30zOKk0="; }; checkInputs = [ From 48b2a32b68fb23932c0031e8fd9f905ec146d49c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 00:27:45 +0100 Subject: [PATCH 396/797] python310Packages.lupa: 1.13 -> 1.14.1 --- pkgs/development/python-modules/lupa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix index b2099e162d20..70fed80b282f 100644 --- a/pkgs/development/python-modules/lupa/default.nix +++ b/pkgs/development/python-modules/lupa/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "lupa"; - version = "1.13"; + version = "1.14.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4dlKwqYw0nECfawsIdFCh3HZ6p1NiPFfIKd4E0DwKk4="; + sha256 = "sha256-0P1OYK0Un+JckFMOKg4DKkKm8EVfKcoO24Fw1ux1HG4="; }; nativeBuildInputs = [ cython ]; From ab47492f4a01dfb181c2e630a12b875ecfffc8a6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 00:31:58 +0100 Subject: [PATCH 397/797] python310Packages.twilio: 7.15.2 -> 7.15.3 --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 8936d0e58273..6cf44ee9dc7f 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.15.2"; + version = "7.15.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-Y7rQxoculQ2Dp02/sEowsEf677pDA7AQpWuEiiywvwo="; + hash = "sha256-c1UNqp8eYK9tkogpcDtTOTHa5ME+yOkop2UccXwOAqM="; }; propagatedBuildInputs = [ From 8d67c95c6f67844e4518f33c2c870ca4f054a871 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Fri, 18 Nov 2022 23:44:57 +0000 Subject: [PATCH 398/797] prometheus-kea-exporter: 0.5.0 -> 0.5.1 Fixes https://github.com/mweinelt/kea-exporter/issues/29 --- pkgs/servers/monitoring/prometheus/kea-exporter.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/kea-exporter.nix b/pkgs/servers/monitoring/prometheus/kea-exporter.nix index 5fe9c6baee70..003ea6c2af56 100644 --- a/pkgs/servers/monitoring/prometheus/kea-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/kea-exporter.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "kea-exporter"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; src = python3Packages.fetchPypi { inherit pname version; - hash = "sha256-RSW1HStfPV7yiuLgGIuMjS3vPXz8P3vmtfw6tDHXp6o="; + hash = "sha256-rNGA5XEx9xVUP1SeDPgXcaqgDhgX6JFhRX9GM454P5A="; }; nativeBuildInputs = with python3Packages; [ @@ -35,4 +35,3 @@ python3Packages.buildPythonApplication rec { maintainers = with maintainers; [ hexa ]; }; } - From 5510fa13036a59534728f8a93456045f073b0f53 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Tue, 23 Aug 2022 15:00:57 +0200 Subject: [PATCH 399/797] duckstation: unstable-2022-07-08 -> 2022-11-18 --- .../emulators/duckstation/default.nix | 19 +++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index d02e08ed6cd4..88deb6653a02 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -7,28 +7,27 @@ , makeDesktopItem , curl , extra-cmake-modules -, libevdev , libpulseaudio , libXrandr , mesa # for libgbm , ninja , pkg-config , qtbase +, qtsvg , qttools , vulkan-loader -#, wayland # Wayland doesn't work correctly this version +, wayland , wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "duckstation"; - version = "unstable-2022-07-08"; - + version = "unstable-2022-11-18"; src = fetchFromGitHub { owner = "stenzek"; repo = pname; - rev = "82965f741e81e4d2f7e1b2abdc011e1f266bfe7f"; - sha256 = "sha256-D8Ps/EQRcHLsps/KEUs56koeioOdE/GPA0QJSrbSdYs="; + rev = "8d7aea5e19859ed483699cc4a5dbd47165c7be8b"; + sha256 = "sha256-92Wn1ZEEZszmVK/KrJqjDuQf/lyD8/VScfTI/St5dY4="; }; nativeBuildInputs = [ @@ -44,18 +43,18 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 curl - libevdev libpulseaudio libXrandr mesa qtbase + qtsvg vulkan-loader - #wayland + wayland ]; cmakeFlags = [ "-DUSE_DRMKMS=ON" - #"-DUSE_WAYLAND=ON" + "-DUSE_WAYLAND=ON" ]; desktopItems = [ @@ -80,7 +79,7 @@ stdenv.mkDerivation rec { cp -r bin $out/share/duckstation ln -s $out/share/duckstation/duckstation-qt $out/bin/ - install -Dm644 ../extras/icons/icon-256px.png $out/share/pixmaps/duckstation.png + install -Dm644 bin/resources/images/duck.png $out/share/pixmaps/duckstation.png runHook postInstall ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41ff5fb69f59..5feee35eedb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1553,7 +1553,7 @@ with pkgs; dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; + duckstation = qt6Packages.callPackage ../applications/emulators/duckstation {}; dynamips = callPackage ../applications/emulators/dynamips { }; From c0350cbb2cabe49599069d1072b801db13c3bdea Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 18 Nov 2022 18:19:22 -0600 Subject: [PATCH 400/797] nncp: 8.8.1 -> 8.8.2 --- pkgs/tools/misc/nncp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/tools/misc/nncp/default.nix index 497910cd809d..d7dcc901666d 100644 --- a/pkgs/tools/misc/nncp/default.nix +++ b/pkgs/tools/misc/nncp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "nncp"; - version = "8.8.1"; + version = "8.8.2"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; - sha256 = "426463C97211AD88DF74DDDF61BDBB830BAE275668B2F23158D43146517469A6"; + sha256 = "02B98DC4654C46328A043209CD2DA28BF33A53BAF15574429C6C0747AE2FCF39"; }; nativeBuildInputs = [ go redo-apenwarr ]; From 9b11f79c3759529ce17b3c0c12465b47e6cc5b06 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Nov 2022 01:30:01 +0100 Subject: [PATCH 401/797] python3Packages.pytz-deprecation-shim: Disable tests Tests are flaky and upstream doesn't care, and neither do we. --- .../python-modules/pytz-deprecation-shim/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix index 76f0046a7e28..cce3c469cc22 100644 --- a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix +++ b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix @@ -41,11 +41,9 @@ buildPythonPackage rec { ]; # https://github.com/pganssle/pytz-deprecation-shim/issues/27 - doCheck = pythonAtLeast "3.9"; - - disabledTestPaths = [ - "tests/test_pytz_equivalent.py" - ]; + # https://github.com/pganssle/pytz-deprecation-shim/issues/30 + # The test suite is just very flaky and breaks all the time + doCheck = false; meta = with lib; { description = "Shims to make deprecation of pytz easier"; From 2b9244355981cdb1aa2eabbb78f7b7095b69465f Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 18 Nov 2022 19:51:41 -0500 Subject: [PATCH 402/797] ruff: 0.0.126 -> 0.0.127 (#201795) --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index ccd9d3744931..a90eac39bd84 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.126"; + version = "0.0.127"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Qcjj+WgNsdms2VNOT/Ax66TruigxrHmC+tyoe5fCgo4="; + sha256 = "sha256-K2IZtuSbzengPhrOEkDri3D3cy9TmlCgrWm27/bVtxA="; }; - cargoSha256 = "sha256-aIZ3ZBiUFMC/RmJQp/V0Rjq/+oLg61Ve0zZJSZpT7nw="; + cargoSha256 = "sha256-5QuA9/6OyERrR1YSwaeRab91yz4ugsz41JCAhYUwmcA="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 18dddc9bbd1ea26ec0e84d9a6ae307e171af8a70 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 18 Nov 2022 19:59:49 -0500 Subject: [PATCH 403/797] ruff: 0.0.127 -> 0.0.128 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index a90eac39bd84..baec7b093aa0 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.127"; + version = "0.0.128"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K2IZtuSbzengPhrOEkDri3D3cy9TmlCgrWm27/bVtxA="; + sha256 = "sha256-QJGlhwLXCj4lGI7VMu+1wHmy8K4wYnUFxwsut2q1MUs="; }; - cargoSha256 = "sha256-5QuA9/6OyERrR1YSwaeRab91yz4ugsz41JCAhYUwmcA="; + cargoSha256 = "sha256-vpfVXhJT65N18l/DZVi5ROgYKIi42rHW4Me+quqiG18="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 01ce03efa4c8e8592632501a362de69098e91f4a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 19 Nov 2022 02:01:36 +0100 Subject: [PATCH 404/797] haskellPackages.monad-bayes: remove stale jailbreak monad-bayes is now broken because it requires a too recent brick version. Removing this jailbreak will make the nature of the problem clearer at least. --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7b6776164bc2..55bf787c2f41 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2572,11 +2572,6 @@ self: super: { # Missing test files https://github.com/kephas/xdg-basedir-compliant/issues/1 xdg-basedir-compliant = dontCheck super.xdg-basedir-compliant; - # 2022-09-01: - # Restrictive upper bound on base. - # Remove once version 1.* is released - monad-bayes = doJailbreak super.monad-bayes; - # Test failure after libxcrypt migration, reported upstrem at # https://github.com/phadej/crypt-sha512/issues/13 crypt-sha512 = dontCheck super.crypt-sha512; From 123bd0f6d4d7960ddd2dd7a6220c6dbc7afd7fd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 01:56:49 +0000 Subject: [PATCH 405/797] gitoxide: 0.17.0 -> 0.18.0 --- pkgs/applications/version-management/gitoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 9e513fd9676a..2f207e8ee474 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "sha256-UtQ9LcGE9mLowttAAwR1ujD+BSCosFk+GHQvDwG/CAQ="; + sha256 = "sha256-VB7v51YW4aA5WHVD5ZWFzv9hQskjQeqMzm+pQ9glODg="; }; - cargoSha256 = "sha256-0cZy7hOaREtdFB0Ww1VSV4ILpB0utSBcKlC3t9fhum8="; + cargoSha256 = "sha256-uII6o/cJktpUFxROuu11dNSXx0p6phVVqszmbYK9Rd0="; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = if stdenv.isDarwin From d35e15d28dd4ffcdb20ed9867c796ab086861aa0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 02:12:00 +0000 Subject: [PATCH 406/797] go-toml: 2.0.5 -> 2.0.6 --- pkgs/development/tools/go-toml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 8cfa4c802992..2c1a78fec0fd 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-toml"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9m0g8hfJ+gazYHq2TzSN/0d2o789QBhbIpGxdXhNBGk="; + sha256 = "sha256-RXKJJseRrwSTReMAkFjShKvCWGMowruYwsCovHwq4ZQ="; }; - vendorSha256 = "sha256-yDPCfJtYty4aaoDrn3UWFcs1jHJHMJqzc5f06AWQmRc="; + vendorSha256 = "sha256-MMCyFKqsL9aSQqK9VtPzUbgfLTFpzD5g8QYx8qIwktg="; excludedPackages = [ "cmd/gotoml-test-decoder" "cmd/tomltestgen" ]; From 5700935dd0578fa963664c68f4c6f4bfb03e99f3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 18 Nov 2022 21:14:08 -0500 Subject: [PATCH 407/797] felix: 2.0.1 -> 2.1.0 --- .../file-managers/felix-fm/default.nix | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 4b234ed186b7..3e5a8c4cc98c 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -1,23 +1,46 @@ -{ lib, rustPlatform, fetchFromGitHub, zoxide }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, bzip2 +, zstd +, zoxide +}: rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HD6KsPI4ZeJxQ+jbv5bWzTGQBHa9wGzhZBLQedcL5WI="; + sha256 = "sha256-CLCzRnczItvnjXtS4BOc9FeBCPQm102U0bDIWAZPzYc="; }; - cargoSha256 = "sha256-Q24dyCJBy27B3aI7ZEQnjTgLIB7XhltYeGBpmfy0DwE="; + cargoSha256 = "sha256-H+uOo3Cm1nFPYyA0qOAcaD4mfSd4Uaq5U20t6V4mmcg="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + bzip2 + zstd + ]; checkInputs = [ zoxide ]; + buildFeatures = [ "zstd/pkg-config" ]; + + checkFlags = [ + # extra test files not shipped with the repository + "--skip=magic_image::tests::test_inspect_image" + "--skip=magic_packed::tests::test_inspect_signature" + ]; + meta = with lib; { description = "A tui file manager with vim-like key mapping"; homepage = "https://github.com/kyoheiu/felix"; + changelog = "https://github.com/kyoheiu/felix/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; mainProgram = "fx"; From 50ac7ccb092d3cb781121fc2a4b20e68f90868f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 02:31:26 +0000 Subject: [PATCH 408/797] grpc-gateway: 2.13.0 -> 2.14.0 --- pkgs/development/tools/grpc-gateway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix index 064448b6c6c4..3870e87dcb45 100644 --- a/pkgs/development/tools/grpc-gateway/default.nix +++ b/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-bJfqBXi77C0sa6ww0hNOwXYINp6q+KN02LdIHtlHp9Q="; + sha256 = "sha256-lnNdsDCpeSHtl2lC1IhUw11t3cnGF+37qSM7HDvKLls="; }; - vendorSha256 = "sha256-Rr7O5pQntuvHfBurPW8FfJQmBWZOmVx7jPCu8HOs0ac="; + vendorSha256 = "sha256-dGdnDuRbwg8fU7uB5GaHEWa/zI3w06onqjturvooJQA="; meta = with lib; { description = From b4250d2c23245e4b2287830a7ad0a6e199e022d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 05:37:34 +0000 Subject: [PATCH 409/797] wiki-tui: 0.5.1 -> 0.6.0 --- pkgs/misc/wiki-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index e5601095ebbc..ae249eb9292e 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kcVfqj5vRfPcF6lO1Ley3ctZajNA02jUqQRlpi3MkXc="; + sha256 = "sha256-sqkVi8w4QoktC1ZLUPHzfMUxIzCadcIj3dEYigz854U="; }; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-OW2kutjvQC9neiguixTdJx2hUFsnmQhR9DbniBr6V8w="; + cargoSha256 = "sha256-xRj0bF5VymvFVB0tSBndWA+OHBIEY2/ovRIBdDoOHA4="; # Tests fail with this error: `found argument --test-threads which was not expected` doCheck = false; From b8d004971f7916dc5892d8537b5d884a4e34ce12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Nov 2022 13:29:48 +0000 Subject: [PATCH 410/797] media-downloader: 2.6.0 -> 2.7.0 --- pkgs/applications/video/media-downloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index 3d76b524e442..76e26ba01766 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "media-downloader"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = pname; rev = "${version}"; - sha256 = "sha256-pDldAg4q6qGvRHuffKU49akDwwSTNCZPJ6AgauxgotI="; + sha256 = "sha256-uu/4S7cVWHOhBq52NF0AargE0nbPwjF0txSWL0DquQo="; }; nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ]; From 5b812c17015573c17ac4d075e4fb16fe3a99dde8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 18:47:56 +0000 Subject: [PATCH 411/797] gitRepo: 2.29.9 -> 2.30 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index ddbbc1d1e4f3..e47ea6b12dbe 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.29.9"; + version = "2.30"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-MJMVKdftA4PZ5vmrekcKAKX+0khHl3e83SXsn+P7VT8="; + sha256 = "sha256-Ck+Q7sHhMqUWu6WeA3DhY+svMxH2sU0WvmyvZ5qsW+E="; }; # Fix 'NameError: name 'ssl' is not defined' From e95b16a1a890594caadca1ff8db06798ad0a8027 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Nov 2022 19:17:02 +0000 Subject: [PATCH 412/797] praat: 6.2.23 -> 6.3 --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index d05a12ec30af..5dd17a74f491 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.2.23"; + version = "6.3"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-gl+kT8wXLCWnNmOBx6Vg+FbmJ8kJ8pJKsahpqcYw9Lk="; + sha256 = "sha256-/XSBUM6HkANATl1Y9vs8mQFgBTyVeCv8TxcaIdP/Nm8="; }; configurePhase = '' From 4c1a2d78f4ebde8d125e587b8d654e5e977226dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Nov 2022 16:26:01 +0000 Subject: [PATCH 413/797] cloud-init: 22.3.4 -> 22.4 --- pkgs/tools/virtualization/cloud-init/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 5e438d887211..4b5f335938bb 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -14,14 +14,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "22.3.4"; + version = "22.4"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = "refs/tags/${version}"; - hash = "sha256-agffkTEaURjw/Ro8znYRQLKhDP2Ey0LimuzqbW5xb28="; + hash = "sha256-MsT5t2da79Eb9FlTLPr2893JcF0ujNnToJTCQRT1QEo="; }; patches = [ ./0001-add-nixos-support.patch ]; From 4c265c59ef6c5e339862812b87323235f92e5214 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Nov 2022 08:57:55 +0000 Subject: [PATCH 414/797] ptcollab: 0.6.4.1 -> 0.6.4.5 --- pkgs/applications/audio/ptcollab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index 54d3fec5cabb..842b8f0aa070 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.6.4.1"; + version = "0.6.4.5"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "sha256-/Z0UDxZtVnGKVmscNCZAvTGMALq/uMd7/h3r/QvUs0M="; + sha256 = "sha256-O7CNPMS0eRcqt2xAtyEFyLSV8U2xbxuV1DpBxZAFwQs="; }; nativeBuildInputs = [ qmake pkg-config ]; From 7837e812d2eaed0f6648999a2cf505b69418428e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 12:19:31 +0000 Subject: [PATCH 415/797] btlejack: 2.0.0 -> 2.1.1 --- pkgs/applications/radio/btlejack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/btlejack/default.nix b/pkgs/applications/radio/btlejack/default.nix index 198c090b0ea1..c5eb8d5cfe4d 100644 --- a/pkgs/applications/radio/btlejack/default.nix +++ b/pkgs/applications/radio/btlejack/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "btlejack"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "virtualabs"; repo = "btlejack"; - rev = "v${version}"; - sha256 = "1r17079kx7dvsrbmw5sgvz3vj5m3pn2543gxj2xmw4s0lcihy378"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Q6y9murV1o2i1sluqTVB5+X3B7ywFsI0ZvlJjHrHSpo="; }; postPatch = '' From 33551a317e3f314afb3f7d5d73b2eb076cf59bbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 02:45:32 +0000 Subject: [PATCH 416/797] hiredis: 1.0.2 -> 1.1.0 --- pkgs/development/libraries/hiredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 2c19c4ae7d01..6431dc5a1718 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hiredis"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "redis"; repo = "hiredis"; rev = "v${version}"; - sha256 = "0a55zk3qrw9yl27i87h3brg2hskmmzbfda77dhq9a4if7y70xnfb"; + sha256 = "sha256-0ESRnZTL6/vMpek+2sb0YQU3ajXtzj14yvjfOSQYjf4="; }; PREFIX = "\${out}"; From fcb5f2c540b1fc0d721ad7d68eb861ed02a19a28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Nov 2022 07:21:10 +0000 Subject: [PATCH 417/797] bitwig-studio: 4.4.2 -> 4.4.3 --- pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 038a5277d2f5..8da04de579e6 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-nLXpf0Xi7yuz/Rm8Sfkr1PGLuazN+Lh6sIqkWFBmP3w="; + sha256 = "sha256-NP9cM1xIHblMdUFKIviPKDi6su6Nc3xsX2pnPeP7hdQ="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; From cda9ca9176bd61dfe9a2c8053e9c2f001714f79a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 19 Nov 2022 03:24:43 +0000 Subject: [PATCH 418/797] =?UTF-8?q?terraform-providers.github:=205.8.0=20?= =?UTF-8?q?=E2=86=92=205.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 403b8d5dfd6d..0358d4aa2a92 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -423,13 +423,13 @@ "version": "2.2.0" }, "github": { - "hash": "sha256-cLBBz5qPRY+TpcO0yfyTXOQLQYz58hB1l6ufThbBSuM=", + "hash": "sha256-3ivfHKoj7jXQ3WsoTNSCL1zD93Pr0pjtZ9LneW9My4o=", "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v5.8.0", + "rev": "v5.9.0", "vendorHash": null, - "version": "5.8.0" + "version": "5.9.0" }, "gitlab": { "hash": "sha256-1Ljf9kwpj96mzu/uHqitYCKIixNn/sZL21zOM8xQsU4=", From dd784ef5ff6c573674a3b4d3a1e006494f2a3065 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 19 Nov 2022 03:26:32 +0000 Subject: [PATCH 419/797] =?UTF-8?q?terraform-providers.kubernetes:=202.15.?= =?UTF-8?q?0=20=E2=86=92=202.16.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0358d4aa2a92..1a0ddbec2c3e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -642,13 +642,13 @@ "version": "1.14.0" }, "kubernetes": { - "hash": "sha256-93cGlfYUH4VTdDYbtGySOUw5Kak7hKs0gxLCT0Bxca4=", + "hash": "sha256-hWFC8VBbM3BRGrX1Y45Znd/W3klYy/7aS7JbbKN7EUg=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.15.0", + "rev": "v2.16.0", "vendorHash": null, - "version": "2.15.0" + "version": "2.16.0" }, "launchdarkly": { "hash": "sha256-AsFtlCIGvlG8c+PilhMhaMowaea/g1+IXYzEiIIbZ44=", From c4c1866143ec02016d30eabed22cd6d0de39a10b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 19 Nov 2022 03:27:39 +0000 Subject: [PATCH 420/797] =?UTF-8?q?terraform-providers.tfe:=200.38.0=20?= =?UTF-8?q?=E2=86=92=200.39.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1a0ddbec2c3e..bfc5e828cb27 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1121,13 +1121,13 @@ "version": "1.78.12" }, "tfe": { - "hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=", + "hash": "sha256-ikuLRGm9Z+tt0Zsx7DYKNBrS08rW4DOvVWYpl3wvaeU=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", - "rev": "v0.38.0", - "vendorHash": "sha256-reXq1MyAhHRet1WwDJZafdOg1r7J4sktQ/QhQUPhDak=", - "version": "0.38.0" + "rev": "v0.39.0", + "vendorHash": "sha256-Ws9IzlZQDDAdQ4JJ326jHXUe9oQphBXb/ZNO7Kl/A1w=", + "version": "0.39.0" }, "thunder": { "hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", From a9d9bc861d5fb80f9bd9b0fe74febe4d2e5a214d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 04:42:15 +0000 Subject: [PATCH 421/797] python310Packages.aioairzone: 0.4.9 -> 0.5.1 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 61b67cb32a31..98bb7a8c7bc3 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.4.9"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qG+EPZjH3I4TRGka7J21ukGpuJQfA/Nuy6DbIUnykcs="; + hash = "sha256-L2R4Qu72bvUjJyE/bBMeKufK/TAFw9u/oGowS1rCqP4="; }; propagatedBuildInputs = [ From 1c4a8e049f7198add95f723519678bcf461843bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 04:56:41 +0000 Subject: [PATCH 422/797] python310Packages.aioesphomeapi: 11.4.3 -> 11.5.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index c1fd962a41f3..87db5ad026a7 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "11.4.3"; + version = "11.5.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g901qWU6aiaV0kLmtWJffXZrOsKjvOGI0TOgQFzuuPA="; + hash = "sha256-z3ILdtxDU4xLBY5mVAKal2nBo2sdO5rlSQDyexwHUtI="; }; postPatch = '' From 8b2d34fa5eecb1303a3d73679cb6d4c2a43b4442 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Tue, 2 Aug 2022 12:34:37 -0700 Subject: [PATCH 423/797] test-driver: Allow configuring delay for send_{key,chars} --- nixos/lib/test-driver/test_driver/machine.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index e45c83086fb5..ffbc7c18e42b 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -684,10 +684,10 @@ class Machine: with self.nested("waiting for {} to appear on tty {}".format(regexp, tty)): retry(tty_matches) - def send_chars(self, chars: str) -> None: + def send_chars(self, chars: str, delay: Optional[float] = 0.01) -> None: with self.nested("sending keys ‘{}‘".format(chars)): for char in chars: - self.send_key(char) + self.send_key(char, delay) def wait_for_file(self, filename: str) -> None: """Waits until the file exists in machine's file system.""" @@ -860,10 +860,11 @@ class Machine: if matches is not None: return - def send_key(self, key: str) -> None: + def send_key(self, key: str, delay: Optional[float] = 0.01) -> None: key = CHAR_TO_KEY.get(key, key) self.send_monitor_command("sendkey {}".format(key)) - time.sleep(0.01) + if delay is not None: + time.sleep(delay) def send_console(self, chars: str) -> None: assert self.process From 3d185562b59e0a6cf7559fecf7edb4ef52fa1007 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Tue, 2 Aug 2022 12:34:37 -0700 Subject: [PATCH 424/797] nixos/tests/phosh: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/phosh.nix | 65 +++++++++++++++++++ .../window-managers/phosh/default.nix | 3 + 3 files changed, 69 insertions(+) create mode 100644 nixos/tests/phosh.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b238c4384951..6cb4eb9f5e49 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -491,6 +491,7 @@ in { pgadmin4-standalone = handleTest ./pgadmin4-standalone.nix {}; pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; + phosh = handleTest ./phosh.nix {}; php = handleTest ./php {}; php80 = handleTest ./php { php = pkgs.php80; }; php81 = handleTest ./php { php = pkgs.php81; }; diff --git a/nixos/tests/phosh.nix b/nixos/tests/phosh.nix new file mode 100644 index 000000000000..6c6357f58096 --- /dev/null +++ b/nixos/tests/phosh.nix @@ -0,0 +1,65 @@ +import ./make-test-python.nix ({ pkgs, ...}: let + pin = "1234"; +in { + name = "phosh"; + meta = with pkgs.lib.maintainers; { + maintainers = [ zhaofengli ]; + }; + + nodes = { + phone = { config, pkgs, ... }: { + users.users.nixos = { + isNormalUser = true; + password = pin; + }; + + services.xserver.desktopManager.phosh = { + enable = true; + user = "nixos"; + group = "users"; + + phocConfig = { + outputs.Virtual-1 = { + scale = 2; + }; + }; + }; + + systemd.services.phosh = { + environment = { + # Accelerated graphics fail on phoc 0.20 (wlroots 0.15) + "WLR_RENDERER" = "pixman"; + }; + }; + + virtualisation.resolution = { x = 720; y = 1440; }; + virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci,xres=720,yres=1440" ]; + }; + }; + + enableOCR = true; + + testScript = '' + import time + + start_all() + phone.wait_for_unit("phosh.service") + + with subtest("Check that we can see the lock screen info page"): + # Saturday, January 1 + phone.succeed("timedatectl set-time '2022-01-01 07:00'") + + phone.wait_for_text("Saturday") + phone.screenshot("01lockinfo") + + with subtest("Check that we can unlock the screen"): + phone.send_chars("${pin}", delay=0.2) + time.sleep(1) + phone.screenshot("02unlock") + + phone.send_chars("\n") + + phone.wait_for_text("All Apps") + phone.screenshot("03launcher") + ''; +}) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 332fd509e421..d71ff01362d2 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -28,6 +28,7 @@ , polkit , libsecret , evolution-data-server +, nixosTests }: stdenv.mkDerivation rec { @@ -122,6 +123,8 @@ stdenv.mkDerivation rec { providedSessions = [ "sm.puri.Phosh" ]; + + tests.phosh = nixosTests.phosh; }; meta = with lib; { From a04a4bbbeb5476687a5a1444a187c4b2877233ed Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 11 Nov 2022 21:07:58 +0100 Subject: [PATCH 425/797] =?UTF-8?q?ocamlPackages.iter:=201.4=20=E2=86=92?= =?UTF-8?q?=201.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/iter/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index 0154029b5504..3faa8244b6d7 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -1,25 +1,24 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml, dune-configurator -, mdx, qtest, result +, result, seq +, mdx, ounit2, qcheck-core }: buildDunePackage rec { pname = "iter"; - version = "1.4"; - - useDune2 = true; + version = "1.6"; src = fetchFromGitHub { owner = "c-cube"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kk92GM7IVXOSVBkeN6wj67Q3UGCyuOOVi2umpn1AZTo="; + sha256 = "sha256-FbM/Vk/h4wkrBjyf9/QXTvTOA0nNqsdHP1mDnVkg1is="; }; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ result ]; + propagatedBuildInputs = [ result seq ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ mdx.bin qtest ]; + checkInputs = [ mdx.bin ounit2 qcheck-core ]; meta = { homepage = "https://github.com/c-cube/sequence"; From 679b5bde4eb49cbf4d701038c8e2d96e5d561848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Sat, 19 Nov 2022 09:34:38 +0300 Subject: [PATCH 426/797] prismlauncher: add qtwayland to buildInputs --- pkgs/games/prismlauncher/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index 71b82d47964a..3fceefc2d98d 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -11,6 +11,7 @@ , libpulseaudio , qtbase , qtsvg +, qtwayland , libGL , quazip , glfw @@ -20,8 +21,8 @@ , ghc_filesystem , msaClientID ? "" , jdks ? [ jdk jdk8 ] -, }: + let libnbtplusplus = fetchFromGitHub { owner = "PrismLauncher"; @@ -30,6 +31,7 @@ let sha256 = "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4="; }; in + stdenv.mkDerivation rec { pname = "prismlauncher"; version = "5.2"; @@ -41,8 +43,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-sKAhcbDoRbWf/DuwcBmDjb+VSMM0K2C33gu1K9AlPoQ="; }; - nativeBuildInputs = [ extra-cmake-modules ghc_filesystem cmake file jdk wrapQtAppsHook ]; - buildInputs = [ qtbase qtsvg zlib quazip tomlplusplus ]; + nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ]; + buildInputs = [ + qtbase + qtsvg + zlib + quazip + ghc_filesystem + tomlplusplus + ] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=6" ]; From 3ae69bbba08609ed10c51679d411f1b157c5fa58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 07:17:10 +0000 Subject: [PATCH 427/797] krapslog: 0.4.1 -> 0.4.2 --- pkgs/tools/misc/krapslog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix index 4d6b3e016b43..02e783fa1e09 100644 --- a/pkgs/tools/misc/krapslog/default.nix +++ b/pkgs/tools/misc/krapslog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "krapslog"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "acj"; repo = "krapslog-rs"; rev = version; - sha256 = "sha256-MzO6fcBlrGeZoflyFXPVIdQ+y/GkQz3yEeEbXLoDZQY="; + sha256 = "sha256-P/MxIehxj+FE5hvWge7Q2EwL57ObV8ibRZtmko0mphY="; }; - cargoSha256 = "sha256-r5UGCEMAEVIdVeBPsgBf/CMYtBPS03Joje4sNQ8XfFA="; + cargoSha256 = "sha256-dQDfL5yN2ufFpQCXZ5Il0Qzhb/d7FETCVJg3DOMJPWQ="; buildInputs = lib.optional stdenv.isDarwin libiconv; From 7fc1aeb694578f97fa073663270ccb82360f3355 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 07:21:48 +0000 Subject: [PATCH 428/797] kubelogin: 0.0.20 -> 0.0.23 --- pkgs/applications/networking/cluster/kubelogin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 9785ebc3ca23..92899fdacf0f 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.20"; + version = "0.0.23"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZaAjXuECOmGIqye08/A41VQiO7avxqbaCOPFCPjaOjY="; + sha256 = "sha256-6aYa5C0RMCKrnBl3YNbdMUxGOJYwVZ303PLt5RRBjmw="; }; - vendorSha256 = "sha256-3TQm0xbgFDZ2XCie93g4fPXKCHDh/yw4vwpAEMBMQGI="; + vendorSha256 = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ="; ldflags = [ "-X main.version=${version}" From 3589f996627f8e8322374da193243e1cf822faa7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 07:28:33 +0000 Subject: [PATCH 429/797] kubeseal: 0.19.1 -> 0.19.2 --- pkgs/applications/networking/cluster/kubeseal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 6d30f4ba8785..6bcde313e9ad 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-+WwxYnVW6rdZ+A4L2qLtXXaMWLC4ulEoP+vtdtkLvlE="; + sha256 = "sha256-LluWV/GWBJ+dmn94GtqPNCIDTZk2zlNhrbcM2pALUpU="; }; - vendorSha256 = "sha256-505nUMuFteOfIurGYRGHqo9diTSEa56tmQZ3jIGtULQ="; + vendorSha256 = "sha256-f7rznlRKEkHsU72QvRpOtvhg5rp9PuEoADhQOeD16rU="; subPackages = [ "cmd/kubeseal" ]; From 46daf9675f0f79bcf2ccf1a49909b60818a72cf0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 07:34:34 +0000 Subject: [PATCH 430/797] lefthook: 1.2.0 -> 1.2.1 --- .../version-management/git-and-tools/lefthook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index f5cf94629e62..def387980d63 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-mkGyY50WBmVbZ9FEfZRWoGLeZy0HkBzYACbF2u8EN1o="; + sha256 = "sha256-ZMqqiPSNNJw9t3p5h/GUHa9cvl9LcJ4u0HMf1ag8qCc="; }; vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ="; From 63649d36868aa017e0e9e48558a6d00d08742909 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 09:06:37 +0100 Subject: [PATCH 431/797] python310Packages.boschshcpy: 0.2.35 -> 0.2.36 --- pkgs/development/python-modules/boschshcpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 9b824c33e7b2..daee50ffa832 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.35"; + version = "0.2.36"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-MzVv0HN87eDsz0mP/rqH6FZVRgq95iTuu8mikkofT30="; + sha256 = "sha256-X/nlu/hwdgmUOw7+hALRhyCG/vphnWAK22fSWuUAjs0="; }; propagatedBuildInputs = [ From 2209ba9ca0ea0f13fd6011ec7baedf2942cbb17a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 09:39:52 +0100 Subject: [PATCH 432/797] python310Packages.azure-mgmt-security: update disabled --- .../azure-mgmt-security/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index d309112964d5..f0c116a1bb68 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -1,18 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi , azure-common , azure-mgmt-core , msrest , msrestazure +, pythonOlder +, typing-extensions }: buildPythonPackage rec { - version = "3.0.0"; pname = "azure-mgmt-security"; - disabled = isPy27; + version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q="; + hash = "sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q="; extension = "zip"; }; @@ -21,12 +27,17 @@ buildPythonPackage rec { azure-mgmt-core msrest msrestazure + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; # no tests included doCheck = false; - pythonImportsCheck = [ "azure.common" "azure.mgmt.security" ]; + pythonImportsCheck = [ + "azure.common" + "azure.mgmt.security" + ]; meta = with lib; { description = "Microsoft Azure Security Center Management Client Library for Python"; From 3f451c5d26aef57c3b84e3e381d76cba0aa90944 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 09:48:15 +0100 Subject: [PATCH 433/797] python3Packages.versioningit: make tomli optional for < 3.11 --- pkgs/development/python-modules/versioningit/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index f78f2fbf4e55..5cfe9861f465 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -17,9 +17,10 @@ buildPythonPackage rec { pname = "versioningit"; version = "2.1.0"; - disabled = pythonOlder "3.8"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; hash = "sha256-c/KWXjDS6/1/+ra/JjaPIjdXBiLdKknH+8GZXenGdtY="; @@ -35,9 +36,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging setuptools - tomli ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; checkInputs = [ From 29d51a6baff3bc52b28cade0fbe60a9bf2d50e1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 10:07:18 +0100 Subject: [PATCH 434/797] python3Packages.pypandoc: add pythonImportsCheck --- .../python-modules/pypandoc/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 2b2793e535e8..87cfe2708dfd 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -1,11 +1,19 @@ -{ lib, substituteAll, buildPythonPackage, fetchFromGitHub -, pandoc, pandocfilters, texlive +{ lib +, buildPythonPackage +, fetchFromGitHub +, pandoc +, pandocfilters +, pythonOlder +, substituteAll +, texlive }: buildPythonPackage rec { pname = "pypandoc"; version = "1.10"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "JessicaTegner"; repo = pname; @@ -27,6 +35,10 @@ buildPythonPackage rec { pandocfilters ]; + pythonImportsCheck = [ + "pypandoc" + ]; + meta = with lib; { description = "Thin wrapper for pandoc"; homepage = "https://github.com/JessicaTegner/pypandoc"; From 493a08804262a38d5c381b138b37c3703cbd9a15 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 10:40:44 +0100 Subject: [PATCH 435/797] python310Packages.snakebite: add pythonImportsCheck --- pkgs/development/python-modules/snakebite/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snakebite/default.nix b/pkgs/development/python-modules/snakebite/default.nix index 3a83c47ff7d1..62e233aec314 100644 --- a/pkgs/development/python-modules/snakebite/default.nix +++ b/pkgs/development/python-modules/snakebite/default.nix @@ -22,13 +22,17 @@ buildPythonPackage rec { --replace "'argparse'" "" ''; - # tests require hadoop hdfs + # Tests require hadoop hdfs doCheck = false; + pythonImportsCheck = [ + "snakebite" + ]; + meta = with lib; { description = "Pure Python HDFS client"; homepage = "https://github.com/spotify/snakebite"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From 4bd1aa5006bef573fccde0e1f34e48a02f95d81e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 10:43:35 +0100 Subject: [PATCH 436/797] python310Packages.serpy: add pythonImportsCheck --- .../python-modules/serpy/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix index 759b71915add..9f086e4c86e5 100644 --- a/pkgs/development/python-modules/serpy/default.nix +++ b/pkgs/development/python-modules/serpy/default.nix @@ -1,19 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi, six }: +{ lib +, buildPythonPackage +, fetchPypi +, six +, pythonOlder +}: buildPythonPackage rec { pname = "serpy"; version = "0.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "3772b2a9923fbf674000ff51abebf6ea8f0fca0a2cfcbfa0d63ff118193d1ec5"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; # ImportError: No module named 'tests doCheck = false; + pythonImportsCheck = [ + "serpy" + ]; + meta = with lib; { description = "Ridiculously fast object serialization"; homepage = "https://github.com/clarkduvall/serpy"; From 61fc83558b13329e2d7edbfe79fe0a30f4bd343e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 10:55:14 +0100 Subject: [PATCH 437/797] python310Packages.django-webpack-loader: add pythonImportsCheck --- .../django-webpack-loader/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 22b6440c70f3..d1d5f926fdab 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -1,17 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "django-webpack-loader"; version = "1.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-agZTglc3cbr0AHVMTTnAkTsKKaRTqUHfuRIu6+0hVy8="; + hash = "sha256-agZTglc3cbr0AHVMTTnAkTsKKaRTqUHfuRIu6+0hVy8="; }; # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) doCheck = false; + pythonImportsCheck = [ + "webpack_loader" + ]; + meta = with lib; { description = "Use webpack to generate your static bundles"; homepage = "https://github.com/owais/django-webpack-loader"; From 9971f569a93799dd2dc917d54f7bbf96ec296360 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 02:16:24 +0000 Subject: [PATCH 438/797] goeland: 0.12.1 -> 0.12.3 --- pkgs/applications/networking/feedreaders/goeland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/applications/networking/feedreaders/goeland/default.nix index 016b77646f37..946e145a5707 100644 --- a/pkgs/applications/networking/feedreaders/goeland/default.nix +++ b/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goeland"; - version = "0.12.1"; + version = "0.12.3"; src = fetchFromGitHub { owner = "slurdge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7ZfZ5sf8vK51geWZ5iKFPwd/v26f7MTDmtKkxamKwRQ="; + sha256 = "sha256-R3ZkGTq0g90DkflLXr2MUBIv5Qspi3OM+sdDGqJYjyw="; }; vendorSha256 = "sha256-iljGBe8c6dqEHRpMN5cz7wmminejoiXXDKuQDazDztA="; From df109d0291d376e8edae58abd524bd219c65c1da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 02:09:44 +0000 Subject: [PATCH 439/797] go-graft: 0.2.14 -> 0.2.15 --- pkgs/applications/networking/go-graft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/applications/networking/go-graft/default.nix index 4fb3475c147c..7e268e27f1a0 100644 --- a/pkgs/applications/networking/go-graft/default.nix +++ b/pkgs/applications/networking/go-graft/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "go-graft"; - version = "0.2.14"; + version = "0.2.15"; src = fetchFromGitHub { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-XymtLguAHCtOrRADRcWsPYq9cZo+FVUPOceIj7SmH8k="; + sha256 = "sha256-INoJcb6XUMvT1E56hC3BGK3Ax+v4jSRpZV12zpjYfMA="; }; CGO_ENABLED = 0; ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ]; - vendorSha256 = "sha256-MJMOCUIosLT9XhRsahQMx4Kq6j/aqCjhPq0ZvJc/Soc="; + vendorSha256 = "sha256-kKIekANzLY2TYFyII1/BkKkqPYgmHB9xEfAVhJyI8FI="; subPackages = [ "." ]; meta = with lib; { From 5ea9b4531b1499a946d56a01ba15380956ad5315 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:04:39 +0100 Subject: [PATCH 440/797] python310Packages.dbus-fast: 1.73.0 -> 1.75.0 --- pkgs/development/python-modules/dbus-fast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index d8e4507ae8b7..2435155f3e3c 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.73.0"; + version = "1.75.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-JkhcDefz7SiZ+w6ijPAnKNyxTZ/5tmQUyOPnKb3EFGc="; + hash = "sha256-bmHUfRytUGlS0X1PEQHFocMZ4+FslA2rvzqHNE+3B3E="; }; nativeBuildInputs = [ From 92ada862b7a1346cb2aa86037e0a5848c7b6c1e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:10:23 +0100 Subject: [PATCH 441/797] python310Packages.peaqevcore: 7.3.3 -> 7.4.0 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index c3fe1c044708..a5220f018011 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "7.3.3"; + version = "7.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fg5/5x4vUsm0kvVJtvlgB3PZSmU4pXkU6V0+yEDqNRg="; + hash = "sha256-7b6fF6wVNo4kBJ+s1lxNSl1C2vZjnAmHOtVSmqoiY9Q="; }; postPatch = '' From 7ea97bf4afd8436ab958f7f3fbf32d601fd1f2df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:20:19 +0100 Subject: [PATCH 442/797] python310Packages.sigtools: add pythonImportsCheck - update meta --- .../python-modules/sigtools/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix index ac3417ca0c3d..a41bdbf184bd 100644 --- a/pkgs/development/python-modules/sigtools/default.nix +++ b/pkgs/development/python-modules/sigtools/default.nix @@ -1,13 +1,13 @@ { lib +, attrs , buildPythonPackage , fetchPypi -, pythonOlder -, sphinx , mock +, pythonOlder , repeated-test -, unittestCheckHook -, attrs , setuptools-scm +, sphinx +, unittestCheckHook }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-S44TWpzU0uoA2mcMCTNy105nK6OruH9MmNjnPepURFw="; + hash = "sha256-S44TWpzU0uoA2mcMCTNy105nK6OruH9MmNjnPepURFw="; }; nativeBuildInputs = [ @@ -37,10 +37,14 @@ buildPythonPackage rec { unittestCheckHook ]; - meta = with lib; { - description = "Utilities for working with 3.3's inspect.Signature objects."; - homepage = "https://pypi.python.org/pypi/sigtools"; - license = licenses.mit; - }; + pythonImportsCheck = [ + "sigtools" + ]; + meta = with lib; { + description = "Utilities for working with inspect.Signature objects"; + homepage = "https://sigtools.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; } From 19ec9f1d5f5c07c356abbbf6238c3ed28ee307eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:22:43 +0100 Subject: [PATCH 443/797] python310Packages.od: add pythonImportsCheck --- pkgs/development/python-modules/od/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/od/default.nix b/pkgs/development/python-modules/od/default.nix index c9be270f9340..805aec6c1e69 100644 --- a/pkgs/development/python-modules/od/default.nix +++ b/pkgs/development/python-modules/od/default.nix @@ -14,16 +14,21 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk="; + hash = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk="; }; checkInputs = [ repeated-test ]; + pythonImportsCheck = [ + "od" + ]; + meta = with lib; { description = "Shorthand syntax for building OrderedDicts"; homepage = "https://github.com/epsy/od"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 056796ea9bd879d04d1dcc090d19e93db2519cd1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:25:05 +0100 Subject: [PATCH 444/797] python310Packages.repeated-test: add pythonImportsCheck --- pkgs/development/python-modules/repeated-test/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/repeated-test/default.nix b/pkgs/development/python-modules/repeated-test/default.nix index 0b50cde1f0b1..bd8d8d765a09 100644 --- a/pkgs/development/python-modules/repeated-test/default.nix +++ b/pkgs/development/python-modules/repeated-test/default.nix @@ -32,9 +32,14 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "repeated_test" + ]; + meta = with lib; { - description = "A quick unittest-compatible framework for repeating a test function over many fixtures"; + description = "Unittest-compatible framework for repeating a test function over many fixtures"; homepage = "https://github.com/epsy/repeated_test"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From f08f8825fb0f688a990aa8bd23b73fa60fa766a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:27:49 +0100 Subject: [PATCH 445/797] python310Packages.smpplib: pythonImportsCheck --- .../python-modules/smpplib/default.nix | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix index 474120bcd872..a71d3d6bd3d4 100644 --- a/pkgs/development/python-modules/smpplib/default.nix +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -1,4 +1,11 @@ -{ buildPythonPackage, fetchPypi, lib, python, six, mock, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, python +, six +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "smpplib"; @@ -9,17 +16,27 @@ buildPythonPackage rec { sha256 = "c0b01947b47e404f42ccb59e906b6e4eb507963c971d59b44350db0f29c76166"; }; - propagatedBuildInputs = [ six ]; - checkInputs = [ mock pytestCheckHook ]; + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; postInstall = '' rm -rf $out/${python.sitePackages}/tests ''; + pythonImportsCheck = [ + "smpplib" + ]; + meta = with lib; { description = "SMPP library for Python"; homepage = "https://github.com/python-smpplib/python-smpplib"; license = licenses.lgpl3Plus; - maintainers = [ maintainers.globin ]; + maintainers = with maintainers; [ globin ]; }; } From 245f3913e32be3ef9dd62020ed39bd649b576cc4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:31:44 +0100 Subject: [PATCH 446/797] python310Packages.clickhouse-cityhash: disable on older Python releases --- .../python-modules/clickhouse-cityhash/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clickhouse-cityhash/default.nix b/pkgs/development/python-modules/clickhouse-cityhash/default.nix index c4444f3bc792..73be71e67e5b 100644 --- a/pkgs/development/python-modules/clickhouse-cityhash/default.nix +++ b/pkgs/development/python-modules/clickhouse-cityhash/default.nix @@ -2,21 +2,30 @@ , buildPythonPackage , fetchPypi , setuptools +, pythonOlder }: buildPythonPackage rec { pname = "clickhouse-cityhash"; version = "1.0.2.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "sha256-ezEl19CqE8LMTnWDqWWmv7CqlqEhMUdbRCVSustV9Pg="; }; - propagatedBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + setuptools + ]; doCheck = false; - pythonImportsCheck = [ "clickhouse_cityhash" ]; + + pythonImportsCheck = [ + "clickhouse_cityhash" + ]; meta = with lib; { description = "Python-bindings for CityHash, a fast non-cryptographic hash algorithm"; From a133aca6cc1942aa6aec4963e76c99daa4e7c209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 19 Nov 2022 11:30:52 +0100 Subject: [PATCH 447/797] pyside2: fixup build after qt5 update in commit 202fff431f9. I blame upstream: https://invent.kde.org/qt/qt/qtdeclarative/-/commit/7f067fa8a52e677e29eb5606125aa31bf442f495 (but I don't know these project, so can't know who's at fault) Build error: qtdeclarative-5.15.7-dev/include/QtQuickWidgets/qaccessiblequickwidget.h:46:10: fatal error: 'private/qaccessiblequickview_p.h' file not found --- pkgs/development/python-modules/pyside2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 81df3cbe94c6..5826ed7be160 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { "-DPYTHON_EXECUTABLE=${python.interpreter}" ]; + NIX_CFLAGS_COMPILE = "-I${qt5.qtdeclarative.dev}/include/QtQuick/${qt5.qtdeclarative.version}/QtQuick"; + nativeBuildInputs = [ cmake ninja qt5.qmake python ]; buildInputs = (with qt5; [ qtbase qtxmlpatterns qtmultimedia qttools qtx11extras qtlocation qtscript From 369318383ff288d7623ecbcabf135a0f46c7164a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:35:41 +0100 Subject: [PATCH 448/797] python310Packages.sqlalchemy-jsonfield: add pythonImportsCheck --- .../sqlalchemy-jsonfield/default.nix | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix index 0c6b7cab676f..8270834ab609 100644 --- a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix @@ -4,17 +4,20 @@ , sqlalchemy , setuptools-scm , setuptools -, tox , sphinx , pytestCheckHook , pytest-sugar , pymysql , psycopg2 +, pythonOlder }: buildPythonPackage rec { pname = "sqlalchemy-jsonfield"; version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "penguinolog"; @@ -25,11 +28,25 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ sqlalchemy setuptools ]; + propagatedBuildInputs = [ + sqlalchemy + setuptools + ]; - checkInputs = [ pytestCheckHook pytest-sugar pymysql psycopg2 ]; + checkInputs = [ + pytestCheckHook + pytest-sugar + pymysql + psycopg2 + ]; + + pythonImportsCheck = [ + "sqlalchemy_jsonfield" + ]; meta = with lib; { homepage = "https://github.com/penguinolog/sqlalchemy_jsonfield"; From aba2c391f1fb2784b77cc26756380d3733004e2a Mon Sep 17 00:00:00 2001 From: Mats Date: Sat, 5 Nov 2022 20:57:34 +0100 Subject: [PATCH 449/797] pythonPackages.pystray: fix two backends Adds support for pystray to load the appindicator and gtk backends --- .../python-modules/pystray/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix index c3cf0a9841fa..975f940da68d 100644 --- a/pkgs/development/python-modules/pystray/default.nix +++ b/pkgs/development/python-modules/pystray/default.nix @@ -1,5 +1,15 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pillow, xlib, six, xvfb-run, sphinx }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pillow +, xlib +, six +, xvfb-run +, sphinx +, gobject-introspection +, pygobject3 +, gtk3 +, libayatana-appindicator }: buildPythonPackage rec { pname = "pystray"; @@ -12,8 +22,8 @@ buildPythonPackage rec { sha256 = "sha256-8B178MSe4ujlnGBmQhIu+BoAh1doP9V5cL0ermLQTvs="; }; - nativeBuildInputs = [ sphinx ]; - propagatedBuildInputs = [ pillow xlib six ]; + nativeBuildInputs = [ gobject-introspection sphinx ]; + propagatedBuildInputs = [ pillow xlib six pygobject3 gtk3 libayatana-appindicator ]; checkInputs = [ xvfb-run ]; checkPhase = '' From 4814a3b3c76c634611a0201a18efbeb678c36739 Mon Sep 17 00:00:00 2001 From: Mats Date: Sat, 5 Nov 2022 21:03:16 +0100 Subject: [PATCH 450/797] jellyfin-mpv-shim: add gapps-wrapper for pystray Wraps jellyfin-mpv-shim using wrapGAppsHook to support more backends in pystray --- .../video/jellyfin-mpv-shim/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index da75adab7b51..69248dc75301 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication , fetchPypi +, gobject-introspection , jellyfin-apiclient-python , jinja2 , mpv @@ -9,6 +10,7 @@ , python-mpv-jsonipc , pywebview , tkinter +, wrapGAppsHook }: buildPythonApplication rec { @@ -20,6 +22,11 @@ buildPythonApplication rec { sha256 = "sha256-JiSC6WjrLsWk3/m/EHq7KNXaJ6rqT2fG9TT1jPvYlK0="; }; + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + ]; + propagatedBuildInputs = [ jellyfin-apiclient-python mpv @@ -52,6 +59,12 @@ buildPythonApplication rec { --replace "notify_updates: bool = True" "notify_updates: bool = False" ''; + # needed for pystray to access appindicator using GI + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + dontWrapGApps = true; + # no tests doCheck = false; pythonImportsCheck = [ "jellyfin_mpv_shim" ]; From b70b4d0d6262ddba15009a2e1c7c6ebab6a4a4fd Mon Sep 17 00:00:00 2001 From: Mats Date: Sun, 6 Nov 2022 00:32:34 +0100 Subject: [PATCH 451/797] plex-mpv-shim: add gapps-wrapper for pystray --- pkgs/applications/video/plex-mpv-shim/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index 2d0643c4ddb9..b7a5f2ce38c1 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -1,4 +1,5 @@ -{ lib, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc, pystray, tkinter }: +{ lib, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc, pystray, tkinter +, wrapGAppsHook, gobject-introspection }: buildPythonApplication rec { pname = "plex-mpv-shim"; @@ -11,8 +12,19 @@ buildPythonApplication rec { sha256 = "0hgv9g17dkrh3zbsx27n80yvkgix9j2x0rgg6d3qsf7hp5j3xw4r"; }; + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + ]; + propagatedBuildInputs = [ mpv requests python-mpv-jsonipc pystray tkinter ]; + # needed for pystray to access appindicator using GI + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + dontWrapGApps = true; + # does not contain tests doCheck = false; From f2ae4ab35d6524d9c07f4cdbbc7a3899c96fd94c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 11:10:41 +0000 Subject: [PATCH 452/797] llama: 1.1.0 -> 1.1.1 --- pkgs/applications/file-managers/llama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/file-managers/llama/default.nix b/pkgs/applications/file-managers/llama/default.nix index 3cd631d00bbb..b71ab1cdf0f3 100644 --- a/pkgs/applications/file-managers/llama/default.nix +++ b/pkgs/applications/file-managers/llama/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "llama"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "antonmedv"; repo = "llama"; rev = "v${version}"; - sha256 = "sha256-pfNOA8YtxkRnFYZh91A54HhUAK/wZa0y/bLDwMCvu4U="; + sha256 = "sha256-/YnaKodMkuHrB0xH1UNRq+a6VknKRqcbBIehaYM6Gyc="; }; vendorSha256 = "sha256-nngto104p/qJpWM1NlmEqcrJThXSeCfcoXCzV1CClYQ="; From 192f97496feb976ddbaa635fbe80c1c471ec88dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 11:22:01 +0000 Subject: [PATCH 453/797] lxd: 5.7 -> 5.8 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index c15861ed69d4..348760fb3e88 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -32,14 +32,14 @@ buildGoModule rec { pname = "lxd"; - version = "5.7"; + version = "5.8"; src = fetchurl { urls = [ "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" "https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" ]; - sha256 = "sha256-TZeF/VPrP4qRAVezJwQWtfypsxBJpnTrST0uDdw3WVI="; + sha256 = "sha256-mYyDYO8k4MVoNa8xfp1vH2nyuhNsDJ93s9F5hjaMftk="; }; vendorSha256 = null; From 030e5d8153175b6bc8a1eff0ed037d3b2d8b0f06 Mon Sep 17 00:00:00 2001 From: Krisztian Szabo Date: Sat, 19 Nov 2022 12:04:22 +0100 Subject: [PATCH 454/797] process-compose: init at 0.24.1 --- .../misc/process-compose/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/misc/process-compose/default.nix diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix new file mode 100644 index 000000000000..c52adbc4f0be --- /dev/null +++ b/pkgs/applications/misc/process-compose/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "process-compose"; + version = "0.24.1"; + + src = fetchFromGitHub { + owner = "F1bonacc1"; + repo = pname; + rev = "v${version}"; + sha256 = "TKLLq6I+Mcvdz51m8nydTWcslBcQlJCJFoJ10SgfVWU="; + }; + + ldflags = [ "-X main.version=v${version}" ]; + + nativeBuildInputs = [ installShellFiles ]; + + vendorSha256 = "IsO1B6z1/HoGQ8xdNKQqZ/eZd90WikDbU9XiP0z28mU="; + + doCheck = false; + + postInstall = '' + mv $out/bin/{src,process-compose} + + installShellCompletion --cmd process-compose \ + --bash <($out/bin/process-compose completion bash) \ + --zsh <($out/bin/process-compose completion zsh) \ + --fish <($out/bin/process-compose completion fish) + ''; + + meta = with lib; { + description = "A simple and flexible scheduler and orchestrator to manage non-containerized applications"; + homepage = "https://github.com/F1bonacc1/process-compose"; + license = licenses.asl20; + maintainers = with maintainers; [ thenonameguy ]; + mainProgram = "process-compose"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b406a4a68553..7d9a68f5075e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17583,6 +17583,8 @@ with pkgs; privacyidea = callPackage ../applications/misc/privacyidea { }; + process-compose = callPackage ../applications/misc/process-compose { }; + process-viewer = callPackage ../applications/misc/process-viewer { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; }; From c04b4b82a8de646b2d7293982c7e38a00f5a9415 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 19 Nov 2022 04:12:10 -0800 Subject: [PATCH 455/797] python310Packages.pywbem: remove unittest2 --- .../python-modules/pywbem/default.nix | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index d97855929008..f1b2b439ab37 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -1,12 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, libxml2 -, m2crypto, ply, pyyaml, six, pbr, pythonOlder, nocasedict, nocaselist, yamlloader, requests-mock -, httpretty, lxml, mock, pytest, requests, decorator, unittest2 -, FormEncode, testfixtures, pytz +{ lib +, buildPythonPackage +, fetchPypi +, libxml2 +, m2crypto +, ply +, pyyaml +, six +, pbr +, pythonOlder +, nocasedict +, nocaselist +, yamlloader +, requests-mock +, httpretty +, lxml +, mock +, pytest +, requests +, decorator +, FormEncode +, testfixtures +, pytz }: buildPythonPackage rec { pname = "pywbem"; version = "1.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -35,7 +55,6 @@ buildPythonPackage rec { requests requests-mock testfixtures - unittest2 ]; meta = with lib; { From 92c6ec817dc095baabb7fd469f76c49754b7fce2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 12:18:51 +0000 Subject: [PATCH 456/797] mmctl: 7.4.0 -> 7.5.1 --- pkgs/tools/misc/mmctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mmctl/default.nix b/pkgs/tools/misc/mmctl/default.nix index cecfc9fcc13b..459cc0d90a5d 100644 --- a/pkgs/tools/misc/mmctl/default.nix +++ b/pkgs/tools/misc/mmctl/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "mmctl"; - version = "7.4.0"; + version = "7.5.1"; src = fetchFromGitHub { owner = "mattermost"; repo = "mmctl"; rev = "v${version}"; - sha256 = "sha256-pMKyvma1ZUgjo2AZOKrne7+7LijJxS9Df4SZalJpnzY="; + sha256 = "sha256-pNO0FBL1NM4SoKPEjUETeQ/hwdhJj5XpUIXJJ0mfH5M="; }; vendorSha256 = null; From 50e33fac9d72a680f00d81cfc9d1c14800ae9618 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Nov 2022 13:21:38 +0100 Subject: [PATCH 457/797] home-assistant: pin aiohttp at 3.8.1 Newer versions break the pyatv and thereby the apple tv integration. --- pkgs/servers/home-assistant/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a91323534397..790f7a012570 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -31,6 +31,16 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (self: super: { + # https://github.com/postlund/pyatv/issues/1879 + aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { + pname = "aiohttp"; + version = "3.8.1"; + src = self.fetchPypi { + inherit pname version; + hash = "sha256-/FRx4aVN4V73HBvG6+gNTcaB6mAOaL/Ry85AQn8LdXg="; + }; + }); + backoff = super.backoff.overridePythonAttrs (oldAttrs: rec { version = "1.11.1"; src = fetchFromGitHub { From 07b103c2c6d03f800354695854376443cedb609f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 12:29:23 +0000 Subject: [PATCH 458/797] mold: 1.7.0 -> 1.7.1 --- pkgs/development/tools/mold/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index e63d338a6ff6..73aff70db333 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - hash = "sha256-hSDGVS3Q0LJ7HZPz6/kSRK+9XejETra5FloeEMrkdLg="; + hash = "sha256-sC8rJOyQB8mDCCmfpk2lVDPTWxBj7tZxVXQw8agl7t0="; }; nativeBuildInputs = [ cmake ninja ]; From 7304cc95b0aa1815a48240c154c89c66296bc693 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 13:31:32 +0100 Subject: [PATCH 459/797] python310Packages.sentry-sdk: 1.10.1 -> 1.11.0 https://github.com/getsentry/sentry-python/blob/1.11.0/CHANGELOG.md --- .../python-modules/sentry-sdk/default.nix | 43 ++++++++----------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index a3816d9b7dbf..5db4264507a4 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -1,52 +1,46 @@ { lib , stdenv -, buildPythonPackage -, fetchFromGitHub -, pythonOlder - -# runtime -, certifi -, urllib3 - -# optionals , aiohttp , apache-beam +, asttokens , blinker , botocore , bottle +, buildPythonPackage , celery +, certifi , chalice , django +, executing , falcon +, fetchFromGitHub , flask , flask-login +, gevent , httpx +, jsonschema +, mock , pure-eval , pyramid +, pyrsistent , pyspark +, pytest-forked +, pytest-localserver +, pytest-watch +, pytestCheckHook +, pythonOlder , rq , sanic , sqlalchemy , tornado , trytond +, urllib3 , werkzeug - -# tests -, asttokens -, executing -, gevent -, jsonschema -, mock -, pyrsistent -, pytest-forked -, pytest-localserver -, pytest-watch -, pytestCheckHook }: buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.10.1"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -54,8 +48,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; - rev = version; - hash = "sha256-wNI92LVGFN+7LPxnrezPeF7dSS5UgwCuF62/ux3rik4="; + rev = "refs/tags/${version}"; + hash = "sha256-PObYXwWYQ7cC//W3c+n/qceu2ShjFqMGAaLyNflwcL4="; }; propagatedBuildInputs = [ @@ -155,6 +149,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for Sentry.io"; homepage = "https://github.com/getsentry/sentry-python"; + changelog = "https://github.com/getsentry/sentry-python/blob/${version}/CHANGELOG.md"; license = licenses.bsd2; maintainers = with maintainers; [ fab gebner ]; }; From 19408d3093668e871e7d533a2480c0172ec56870 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Nov 2022 13:32:18 +0100 Subject: [PATCH 460/797] python3Packages.scikit-learn: disable failing test on darwin The darwin build of sklearn has been failing for a while on this error. --- pkgs/development/python-modules/scikit-learn/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index d9c4f07ccb8d..9739163cea50 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -65,6 +65,8 @@ buildPythonPackage rec { "check_regressors_train" "check_classifiers_train" "xfail_ignored_in_check_estimator" + ] ++ lib.optionals (stdenv.isDarwin) [ + "test_graphical_lasso" ]; pytestFlagsArray = [ From bdee2b94efd312c0b0ced874b21524c7b71a1443 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Nov 2022 13:35:32 +0100 Subject: [PATCH 461/797] python3Packages.watchdog: Disable failing test on x86_64-darwin --- pkgs/development/python-modules/watchdog/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index f38b732f9ebb..f42645940aac 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { "test_create_wrong_encoding" ] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ "test_delete" + "test_separate_consecutive_moves" ]; disabledTestPaths = [ From 0e1acfc749f63eb875ead9a67d3d8e5a93ec1556 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Nov 2022 13:40:03 +0100 Subject: [PATCH 462/797] python3Packages.qiskit-terra: mark broken The test suite segfaults the python interpreter. https://hydra.nixos.org/build/199001077 --- pkgs/development/python-modules/qiskit-terra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 71486b30bc8e..aa9ce69fa1a5 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -193,7 +193,7 @@ buildPythonPackage rec { meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = true; # tests segfault python description = "Provides the foundations for Qiskit."; longDescription = '' Allows the user to write quantum circuits easily, and takes care of the constraints of real hardware. From 8a293629709c2e9f7c33f6e3d9a145398a4e2d48 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 13:52:50 +0100 Subject: [PATCH 463/797] python310Packages.flux-led: add changelog to meta --- pkgs/development/python-modules/flux-led/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 65c6151fdf6d..6575a025ca54 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = "refs/tags/${version}"; - sha256 = "sha256-YZ0ox04xakpazOIAERM2EO5c4PzmaSwYWULSjp0MJbw="; + hash = "sha256-YZ0ox04xakpazOIAERM2EO5c4PzmaSwYWULSjp0MJbw="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to communicate with the flux_led smart bulbs"; homepage = "https://github.com/Danielhiversen/flux_led"; + changelog = "https://github.com/Danielhiversen/flux_led/releases/tag/${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ colemickens ]; platforms = platforms.linux; From 43f9bceb8d71e14800bb44184364955729d97ce1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 13:53:36 +0100 Subject: [PATCH 464/797] python310Packages.flux-led: 0.28.32 -> 0.28.34 https://github.com/Danielhiversen/flux_led/releases/tag/0.28.34 --- pkgs/development/python-modules/flux-led/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 6575a025ca54..21d1a51f8c41 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.32"; + version = "0.28.34"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = "refs/tags/${version}"; - hash = "sha256-YZ0ox04xakpazOIAERM2EO5c4PzmaSwYWULSjp0MJbw="; + hash = "sha256-bIL9ivjCLKeTLK3n0ytgGkXQggsuDiMCY7kAtE81qfY="; }; propagatedBuildInputs = [ From a2972fca8cd5828771ccead2a94a12c6ca6906cd Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 19 Nov 2022 04:52:17 -0800 Subject: [PATCH 465/797] python310Packages.filemagic: remove This package is inactive: the last PyPI release was in 2013 and the last GitHub activity was in 2014. It was introduced in 2019 for paperless, but it's no longer used after paperless was replaced by paperless-ngx. There is an actively maintained alternative called python-magic that is already available in nixpkgs. --- .../python-modules/filemagic/default.nix | 30 ------------------- .../poetry2nix/overrides/build-systems.json | 3 -- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/development/python-modules/filemagic/default.nix diff --git a/pkgs/development/python-modules/filemagic/default.nix b/pkgs/development/python-modules/filemagic/default.nix deleted file mode 100644 index 96ee0a95b283..000000000000 --- a/pkgs/development/python-modules/filemagic/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, file -, isPy3k, mock, unittest2 }: - -buildPythonPackage { - pname = "filemagic"; - version = "1.6"; - disabled = !isPy3k; # asserts on ResourceWarning - - # Don't use the PyPI source because it's missing files required for testing - src = fetchFromGitHub { - owner = "aliles"; - repo = "filemagic"; - rev = "138649062f769fb10c256e454a3e94ecfbf3017b"; - sha256 = "1jxf928jjl2v6zv8kdnfqvywdwql1zqkm1v5xn1d5w0qjcg38d4n"; - }; - - postPatch = '' - substituteInPlace magic/api.py --replace "ctypes.util.find_library('magic')" \ - "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; - - checkInputs = [ mock ] ++ lib.optionals (!isPy3k) [ unittest2 ]; - - meta = with lib; { - description = "File type identification using libmagic"; - homepage = "https://github.com/aliles/filemagic"; - license = licenses.asl20; - maintainers = with maintainers; [ erikarvstedt ]; - }; -} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index e2e674d967bd..e5d5c946a403 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -4816,9 +4816,6 @@ "setuptools", "setuptools-scm" ], - "filemagic": [ - "setuptools" - ], "filetype": [ "setuptools" ], diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index eb85a22c71e2..fd1f7cb50bf9 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -77,6 +77,7 @@ mapAliases ({ face_recognition_models = face-recognition-models; # added 2022-10-15 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 + filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19 flask_login = flask-login; # added 2022-10-17 flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 431d9a46cba7..18ebf402c3c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3228,8 +3228,6 @@ self: super: with self; { filelock = callPackage ../development/python-modules/filelock { }; - filemagic = callPackage ../development/python-modules/filemagic { }; - filetype = callPackage ../development/python-modules/filetype { }; filterpy = callPackage ../development/python-modules/filterpy { }; From 55ab131ee2a1099e7a41a76570365eba72b45159 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Oct 2022 20:33:19 +0200 Subject: [PATCH 466/797] nixos/manual: Don't recommend mkpasswd methods Instead rely on the default, which at this time is yescrypt. --- nixos/doc/manual/configuration/user-mgmt.chapter.md | 3 +-- nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/configuration/user-mgmt.chapter.md b/nixos/doc/manual/configuration/user-mgmt.chapter.md index 37990664a8f1..5c3aca3ef9e9 100644 --- a/nixos/doc/manual/configuration/user-mgmt.chapter.md +++ b/nixos/doc/manual/configuration/user-mgmt.chapter.md @@ -32,8 +32,7 @@ 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](#opt-users.users._name_.hashedPassword) option. A -hashed password can be generated using `mkpasswd -m - sha-512`. +hashed password can be generated using `mkpasswd`. A user ID (uid) is assigned automatically. You can also specify a uid manually by adding diff --git a/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml b/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml index 06492d5c2512..a2d7d2a9f115 100644 --- a/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml @@ -39,7 +39,7 @@ users.users.alice = { Passwords may still be assigned by setting the user's hashedPassword option. A hashed password can be generated using - mkpasswd -m sha-512. + mkpasswd. A user ID (uid) is assigned automatically. You can also specify a From f391e6dbccfb8289930a139f2afcfd032c60d89f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Oct 2022 20:35:01 +0200 Subject: [PATCH 467/797] nixos/user: Don't recommend mkpasswd methods Instead rely on the default, which at this time is yescrypt. --- nixos/modules/config/users-groups.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index b538a0119c06..de5e398dc46a 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -35,7 +35,7 @@ let ''; hashedPasswordDescription = '' - To generate a hashed password run `mkpasswd -m sha-512`. + To generate a hashed password run `mkpasswd`. If set to an empty string (`""`), this user will be able to log in without being asked for a password (but not via remote From 78155df21dbdb8bd4c471df69e9352ec3471bf45 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Oct 2022 04:19:06 +0200 Subject: [PATCH 468/797] nixos/users-groups: Warn about deprecated hashes at activation To allow for a reasonably fast deprecation of weak password hashing schemes we provide an activation script that checks existing hashes in /etc/shadow and issues a warning for user accounts that still rely on deprecated hashes. Co-Authored-By: oxalica --- nixos/modules/config/users-groups.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index de5e398dc46a..2660b0e6c938 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -592,6 +592,26 @@ in { ''; }; + # Warn about user accounts with deprecated password hashing schemes + system.activationScripts.hashes = { + deps = [ "users" ]; + text = '' + users=() + while IFS=: read -r user hash tail; do + if [[ "$hash" = "$"* && ! "$hash" =~ ^\$(y|gy|7|2b|2y|2a|6)\$ ]]; then + users+=("$user") + fi + done Date: Fri, 11 Mar 2022 20:03:57 +0800 Subject: [PATCH 469/797] keepmenu: init at 1.2.2 Update pkgs/applications/misc/keepmenu/default.nix Co-authored-by: Bruno Bigras Update pkgs/applications/misc/keepmenu/default.nix Co-authored-by: Sandro Update pkgs/applications/misc/keepmenu/default.nix Co-authored-by: Sandro add python imports check Update pkgs/applications/misc/keepmenu/default.nix Co-authored-by: Sandro Update pkgs/applications/misc/keepmenu/default.nix Co-authored-by: Sandro Update pkgs/applications/misc/keepmenu/default.nix Co-authored-by: Sandro Update pkgs/applications/misc/keepmenu/default.nix Co-authored-by: Sandro test --- pkgs/applications/misc/keepmenu/default.nix | 36 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/misc/keepmenu/default.nix diff --git a/pkgs/applications/misc/keepmenu/default.nix b/pkgs/applications/misc/keepmenu/default.nix new file mode 100644 index 000000000000..d169e19a19a5 --- /dev/null +++ b/pkgs/applications/misc/keepmenu/default.nix @@ -0,0 +1,36 @@ +{ lib, python3Packages, python3, xvfb-run }: + +python3Packages.buildPythonApplication rec { + pname = "keepmenu"; + version = "1.2.2"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "SeVNtONH1bn2hb2pBOVM3Oafrb+jARgfvRe7vUu6Gto="; + }; + + preConfigure = '' + export HOME=$TMPDIR + mkdir -p $HOME/.config/keepmenu + cp config.ini.example $HOME/.config/keepmenu/config.ini + ''; + + propagatedBuildInputs = with python3Packages; [ + pykeepass + pynput + ]; + + checkInputs = [ xvfb-run ]; + checkPhase = '' + xvfb-run python setup.py test + ''; + + pythonImportsCheck = [ "keepmenu" ]; + + meta = with lib; { + homepage = "https://github.com/firecat53/keepmenu"; + description = "Dmenu/Rofi frontend for Keepass databases"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ elliot ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed143bc5cfd2..bba8647ccfd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7885,6 +7885,8 @@ with pkgs; keepkey_agent = with python3Packages; toPythonApplication keepkey_agent; + keepmenu = callPackage ../applications/misc/keepmenu { }; + kent = callPackage ../applications/science/biology/kent { }; keybase = callPackage ../tools/security/keybase { From 1769484633a6e7b07fab61a78bf0e9894cea3670 Mon Sep 17 00:00:00 2001 From: Benjamin Isbarn Date: Sat, 19 Nov 2022 13:17:22 +0100 Subject: [PATCH 470/797] photoprism: add valid passthru test --- pkgs/servers/photoprism/default.nix | 4 +-- pkgs/servers/photoprism/libtensorflow.nix | 30 +++++++++++++---------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/servers/photoprism/default.nix index 4c5fb08c30df..678f30c372d0 100644 --- a/pkgs/servers/photoprism/default.nix +++ b/pkgs/servers/photoprism/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, nixosTests, makeWrapper }: +{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, makeWrapper, testers }: let version = "221102-905925b4d"; @@ -74,7 +74,7 @@ stdenv.mkDerivation { runHook postInstall ''; - passthru.tests.photoprism = nixosTests.photoprism; + passthru.tests.version = testers.testVersion { package = pkgs.photoprism; }; meta = with lib; { homepage = "https://photoprism.app"; diff --git a/pkgs/servers/photoprism/libtensorflow.nix b/pkgs/servers/photoprism/libtensorflow.nix index 869f9fc8da1c..e1c8f9338cc8 100644 --- a/pkgs/servers/photoprism/libtensorflow.nix +++ b/pkgs/servers/photoprism/libtensorflow.nix @@ -15,12 +15,14 @@ stdenv.mkDerivation rec { aarch64-linux = "sha256-qnj4vhSWgrk8SIjzIH1/4waMxMsxMUvqdYZPaSaUJRk="; }.${system}; - url = let - systemName = { - x86_64-linux = "amd64"; - aarch64-linux = "arm64"; - }.${system}; - in "https://dl.photoprism.app/tensorflow/${systemName}/libtensorflow-${systemName}-${version}.tar.gz"; + url = + let + systemName = { + x86_64-linux = "amd64"; + aarch64-linux = "arm64"; + }.${system}; + in + "https://dl.photoprism.app/tensorflow/${systemName}/libtensorflow-${systemName}-${version}.tar.gz"; }) # Upstream tensorflow tarball (with .h's photoprism's tarball is missing) (fetchurl { @@ -49,13 +51,15 @@ stdenv.mkDerivation rec { ''; # Patch library to use our libc, libstdc++ and others - patchPhase = let - rpath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc.lib ]; - in '' - chmod -R +w lib - patchelf --set-rpath "${rpath}:$out/lib" lib/libtensorflow.so - patchelf --set-rpath "${rpath}" lib/libtensorflow_framework.so - ''; + patchPhase = + let + rpath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc.lib ]; + in + '' + chmod -R +w lib + patchelf --set-rpath "${rpath}:$out/lib" lib/libtensorflow.so + patchelf --set-rpath "${rpath}" lib/libtensorflow_framework.so + ''; buildPhase = '' # Write pkg-config file. From c3f9bd947228fab3ac0d87a431f8dadb492bee02 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Nov 2022 14:02:16 +0100 Subject: [PATCH 471/797] go-neb: Mark broken on darwin --- .../networking/instant-messengers/go-neb/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/pkgs/applications/networking/instant-messengers/go-neb/default.nix index e554f631920b..4dc24073f5b5 100644 --- a/pkgs/applications/networking/instant-messengers/go-neb/default.nix +++ b/pkgs/applications/networking/instant-messengers/go-neb/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests, olm }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests, olm }: buildGoModule { pname = "go-neb"; @@ -21,6 +21,7 @@ buildGoModule { passthru.tests.go-neb = nixosTests.go-neb; meta = with lib; { + broken = stdenv.isDarwin; description = "Extensible matrix bot written in Go"; homepage = "https://github.com/matrix-org/go-neb"; license = licenses.asl20; From 7bce1df2fc4ed0f2a37a28958415ef753eff00f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 15:19:09 +0100 Subject: [PATCH 472/797] python310Packages.dbus-fast: update ordering --- pkgs/development/python-modules/dbus-fast/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 2435155f3e3c..b658eeefd77f 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -89,9 +89,9 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v${version}"; description = "Faster version of dbus-next"; homepage = "https://github.com/bluetooth-devices/dbus-fast"; + changelog = "https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 80a96e18c6cce88ab00d3fb1c66fc0e18a49aa6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 15:22:38 +0100 Subject: [PATCH 473/797] python310Packages.pysma: 0.7.2 -> 0.7.3 --- pkgs/development/python-modules/pysma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 96864141e054..de1bba50740c 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.7.2"; + version = "0.7.3"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hIrdT0b9XKw1UoPZtQQ7IaW+HV8wuA9Rwoo8XYdGyw8="; + sha256 = "sha256-8LwxRiYUhKYZkrjDNcnOkssvfw/tZ6dj1GKZQ6UkqsQ="; }; propagatedBuildInputs = [ From 32d0e073ff7f45ed8b9045ff343dd82b11c63e03 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 15:41:54 +0100 Subject: [PATCH 474/797] python310Packages.ssdeep: add changelog to meta --- pkgs/development/python-modules/ssdeep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index 6ad339a083f5..5e2ab7678c36 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DinoTools"; repo = "python-ssdeep"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-eAB4/HmPGj/ngHrqkOlY/kTdY5iUEBHxrsRYjR/RNyw="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { six ]; - checkInputs = [ pytestCheckHook ]; @@ -45,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for the ssdeep library"; homepage = "https://github.com/DinoTools/python-ssdeep"; + changelog = "https://github.com/DinoTools/python-ssdeep/blob/${version}/CHANGELOG.rst"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ fab ]; }; From 3ecd3175456abeade5c73b5eb9ac618efa4c32b1 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 19 Nov 2022 17:42:56 +0300 Subject: [PATCH 475/797] =?UTF-8?q?sile:=200.14.4=20=E2=86=92=200.14.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/sile-typesetter/sile/releases/tag/v0.14.5 --- pkgs/tools/typesetting/sile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 92baf044d3cc..9cc4941853d5 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.14.4"; + version = "0.14.5"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "091sy3k29q15ksqr650qmf9lz8j9lqbabfph4cf63plg4dnf9m98"; + sha256 = "01wf0rihksk2ldxgci5vzl3j575vnp6wgk12yd28mwzxkss6n39g"; }; configureFlags = [ From 6f4ec004f74d09653968e3807a5fdd66a3645b69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 15:44:39 +0100 Subject: [PATCH 476/797] python310Packages.ssdeep: 3.4 -> 3.4.1 https://github.com/DinoTools/python-ssdeep/blob/3.4.1/CHANGELOG.rst --- pkgs/development/python-modules/ssdeep/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index 5e2ab7678c36..48ca8b6b938e 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -5,18 +5,21 @@ , pytestCheckHook , six , ssdeep +, pythonOlder }: buildPythonPackage rec { pname = "ssdeep"; - version = "3.4"; + version = "3.4.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "DinoTools"; repo = "python-ssdeep"; rev = "refs/tags/${version}"; - hash = "sha256-eAB4/HmPGj/ngHrqkOlY/kTdY5iUEBHxrsRYjR/RNyw="; + hash = "sha256-I5ci5BS+B3OE0xdLSahu3HCh99jjhnRHJFz830SvFpg="; }; buildInputs = [ From 3c17d9f8cfbf1b2d5664e3c6ef031c22090ba66a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Sat, 19 Nov 2022 15:47:23 +0100 Subject: [PATCH 477/797] lbry: 0.52.5 -> 0.53.8 --- pkgs/applications/video/lbry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/applications/video/lbry/default.nix index ea69ea547df8..fa74f138608f 100644 --- a/pkgs/applications/video/lbry/default.nix +++ b/pkgs/applications/video/lbry/default.nix @@ -2,7 +2,7 @@ let pname = "lbry-desktop"; - version = "0.52.5"; + version = "0.53.8"; in appimageTools.wrapAppImage rec { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in appimageTools.wrapAppImage rec { src = fetchurl { url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage"; # Gotten from latest-linux.yml - sha512 = "i0t1Ygf3el7Brh6TA804V6n5r5UczvOPxAdhyJ7Gvvg9VqN1+QXB6hsqF4jYTW3jcKxvorVALwrFDVezBTPv5g=="; + sha512 = "WZB2pMzSuWGPj6uad+rIECOhuWEOxi0hVUQifOrhUrKj4SnBDws+oy7V2+NpDGkzbG+Kf3IO8rcWBD4wfFoo2Q=="; }; }; From 6957c60714625794fa0ca8e3ba80738944807b48 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Nov 2022 15:55:12 +0100 Subject: [PATCH 478/797] basiliskii: fix build on aarch64-linux --- pkgs/applications/emulators/basiliskii/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/basiliskii/default.nix b/pkgs/applications/emulators/basiliskii/default.nix index f32abac9a6b8..8a58dd24555f 100644 --- a/pkgs/applications/emulators/basiliskii/default.nix +++ b/pkgs/applications/emulators/basiliskii/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, pkg-config, SDL2, gtk2 }: +{ stdenv, lib, fetchFromGitHub, autoconf, automake, pkg-config, SDL2, gtk2, mpfr }: stdenv.mkDerivation { pname = "basiliskii"; version = "unstable-2022-09-30"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sourceRoot = "source/BasiliskII/src/Unix"; patches = [ ./remove-redhat-6-workaround-for-scsi-sg.h.patch ]; nativeBuildInputs = [ autoconf automake pkg-config ]; - buildInputs = [ SDL2 gtk2 ]; + buildInputs = [ SDL2 gtk2 mpfr ]; preConfigure = '' NO_CONFIGURE=1 ./autogen.sh ''; From b967e3289a71ce831d8cd6d9ee5dfb99ceb6e9fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 07:22:55 +0000 Subject: [PATCH 479/797] kubemq-community: 2.3.4 -> 2.3.5 --- pkgs/servers/kubemq-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/servers/kubemq-community/default.nix index 81e9e1b671fa..a3428a8db8a3 100644 --- a/pkgs/servers/kubemq-community/default.nix +++ b/pkgs/servers/kubemq-community/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "kubemq-community"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "kubemq-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+HJpjKMSndcV+xQJM+FesdtoUSGHnpILQFuf3sbxBY0="; + sha256 = "sha256-kR2/Is1fQqpRyQ8yKSEvXV5xzXcHldCqgnCRNRZ+Ekg="; }; CGO_ENABLED=0; From 764195c60f0e022af767f82143706ab3152e7ef7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 16:45:59 +0000 Subject: [PATCH 480/797] bob: 0.6.3 -> 0.7.0 --- pkgs/development/tools/build-managers/bob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bob/default.nix b/pkgs/development/tools/build-managers/bob/default.nix index d5b86139cb16..a647621d77d3 100644 --- a/pkgs/development/tools/build-managers/bob/default.nix +++ b/pkgs/development/tools/build-managers/bob/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bob"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "benchkram"; repo = pname; rev = version; - hash = "sha256-jZDyZVjo4Purt2tabJew5N4MZmLXli6gqBTejv5FGJM="; + hash = "sha256-37VhzYxVrt+w1XTDXzKAkJT43TQSyCmX9SAoNnk+o3w="; }; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; From e78d5f642619e660c54d30f5548a71b18b3ee5d0 Mon Sep 17 00:00:00 2001 From: roblabla Date: Sat, 19 Nov 2022 16:10:17 +0100 Subject: [PATCH 481/797] ghidra: 10.2.1 -> 10.2.2 --- pkgs/tools/security/ghidra/build.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 9f97e3ece315..2857019612d5 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -19,13 +19,13 @@ let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "10.2.1"; + version = "10.2.2"; src = fetchFromGitHub { owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - sha256 = "sha256-xK6rSvI3L5wVcTBxJJndAVQMxjpsA5jMq0GeWNmCodI="; + sha256 = "sha256-AiyY6mGM+jHu9n39t/cYj+I5CE+a3vA4P0THNEFoZrk="; }; desktopItem = makeDesktopItem { From 77393e800b3535158d43d63d79e7a22432f1db98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 15:14:19 +0000 Subject: [PATCH 482/797] nearcore: 1.29.0 -> 1.29.1 --- pkgs/applications/blockchains/nearcore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index a5c475308b32..058888d965da 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -4,7 +4,7 @@ }: rustPlatform.buildRustPackage rec { pname = "nearcore"; - version = "1.29.0"; + version = "1.29.1"; # https://github.com/near/nearcore/tags src = fetchFromGitHub { @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { # there is also a branch for this version number, so we need to be explicit rev = "refs/tags/${version}"; - sha256 = "sha256-TOZ6j4CaiOXmNn8kgVGP27SjvLDlGvabAA+PAEyFXIk="; + sha256 = "sha256-TmmGLrDpNOfadOIwmG7XRgI89XQjaqIavxCEE2plumc="; }; - cargoSha256 = "sha256-LjBgsQynHIfrQP4Z7j1J8+PLqRZWGAOQ5dJaGOqabVk="; + cargoSha256 = "sha256-4suoHP6AXhXlt7+sHMX5RW/LGZrbMhNNmzYvFBcnMTs="; cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ]; postPatch = '' From b8be00a1f8064f834046b9fbf77f95c75cc5e510 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 15:16:01 +0000 Subject: [PATCH 483/797] netbird: 0.10.8 -> 0.10.9 --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 2322940907a0..7cc169173004 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.10.8"; + version = "0.10.9"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hl2ZXfsgoZxGE/fWfkSwwIYIS/CvIZySeGjORY1Va3E="; + sha256 = "sha256-i9vbzb/FKaT8Aqqqb8Nlb24Mdu8epPprOiGlt1ER39I="; }; - vendorSha256 = "sha256-owksab5MgRomiBp5p48VILJj+CmgCLDkB1sOHRNA3uQ="; + vendorSha256 = "sha256-c4LyIEyFNseFuHIGZanzIYSBkDtV0XtEvohAkRCBDbo="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From f5110c71823355b7ec63f4bb171ebf4eba8bf4b9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 19 Nov 2022 00:00:00 -0300 Subject: [PATCH 484/797] duckstation: remove unneeded rec Also, adds a controlling flag enableWayland. --- .../emulators/duckstation/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 88deb6653a02..31869fa9fe36 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -4,11 +4,11 @@ , SDL2 , cmake , copyDesktopItems -, makeDesktopItem , curl , extra-cmake-modules -, libpulseaudio , libXrandr +, libpulseaudio +, makeDesktopItem , mesa # for libgbm , ninja , pkg-config @@ -18,14 +18,16 @@ , vulkan-loader , wayland , wrapQtAppsHook +, enableWayland ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "duckstation"; version = "unstable-2022-11-18"; + src = fetchFromGitHub { owner = "stenzek"; - repo = pname; + repo = "duckstation"; rev = "8d7aea5e19859ed483699cc4a5dbd47165c7be8b"; sha256 = "sha256-92Wn1ZEEZszmVK/KrJqjDuQf/lyD8/VScfTI/St5dY4="; }; @@ -49,13 +51,13 @@ stdenv.mkDerivation rec { qtbase qtsvg vulkan-loader - wayland - ]; + ] + ++ lib.optionals enableWayland [ wayland ]; cmakeFlags = [ "-DUSE_DRMKMS=ON" - "-DUSE_WAYLAND=ON" - ]; + ] + ++ lib.optionals enableWayland [ "-DUSE_WAYLAND=ON" ]; desktopItems = [ (makeDesktopItem { From b8bcebad11bf18f2c3e94b49d92ee638332885ae Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 20 Jul 2022 15:58:00 +0800 Subject: [PATCH 485/797] python3Packages.heatshrink2: init at 0.11.0 Co-Authored-By: Pavol Rusnak --- .../python-modules/heatshrink2/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/heatshrink2/default.nix diff --git a/pkgs/development/python-modules/heatshrink2/default.nix b/pkgs/development/python-modules/heatshrink2/default.nix new file mode 100644 index 000000000000..dccb27327c4a --- /dev/null +++ b/pkgs/development/python-modules/heatshrink2/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +}: + +buildPythonPackage rec { + pname = "heatshrink2"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "eerimoq"; + repo = "pyheatshrink"; + rev = version; + fetchSubmodules = true; + sha256 = "sha256-P3IofGbW4x+erGCyxIPvD9aNHIJ/GjjWgno4n95SQoQ="; + }; + + pythonImportsCheck = [ "heatshrink2" ]; + + meta = with lib; { + description = "Compression using the Heatshrink algorithm in Python 3."; + homepage = "https://github.com/eerimoq/pyheatshrink"; + license = licenses.isc; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb68425146ad..a21784d1476e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4151,6 +4151,8 @@ self: super: with self; { heapdict = callPackage ../development/python-modules/heapdict { }; + heatshrink2 = callPackage ../development/python-modules/heatshrink2 { }; + heatzypy = callPackage ../development/python-modules/heatzypy { }; helpdev = callPackage ../development/python-modules/helpdev { }; From b10c95f3c4ae83c3ffde49f4ea1aa1763156c415 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 15:28:06 +0000 Subject: [PATCH 486/797] nfpm: 2.22.0 -> 2.22.1 --- pkgs/tools/package-management/nfpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 11a192bbd318..c38f32fc997c 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nfpm"; - version = "2.22.0"; + version = "2.22.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Qb4jzn1UM/0B4ryk3cPVuhqVtJML+Vv5KtebBjirSuI="; + sha256 = "sha256-BdPY1DzF2zunhEp7Z13X3jOxhTPHHUejAe7HZSoexYk="; }; vendorSha256 = "sha256-fvSA0BQQKhXxyNu0/ilNcMmTBtLm/piA4rJu6p5+8GU="; From 56db2b08aeded6d10548c686f0977f4e9cbd05c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 15:40:18 +0000 Subject: [PATCH 487/797] nth: 1.10 -> 1.11.0 --- pkgs/development/python-modules/name-that-hash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/name-that-hash/default.nix b/pkgs/development/python-modules/name-that-hash/default.nix index de073e502dc8..e68764b13ff7 100644 --- a/pkgs/development/python-modules/name-that-hash/default.nix +++ b/pkgs/development/python-modules/name-that-hash/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "name-that-hash"; - version = "1.10"; + version = "1.11.0"; format = "pyproject"; src = fetchFromGitHub { owner = "HashPals"; repo = pname; rev = version; - hash = "sha256-3sddUPoC3NfKQzmNgqPf/uHaYN9VZBqsmV712uz1Phg="; + hash = "sha256-zOb4BS3zG1x8GLXAooqqvMOw0fNbw35JuRWOdGP26/8="; }; # TODO remove on next update which bumps rich From 2613b5f867b5e8945cdb67c0b7eca10f1ea337fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Nov 2022 13:59:08 +0100 Subject: [PATCH 488/797] python3Packages.token-bucket: Disable tests on darwin --- pkgs/development/python-modules/token-bucket/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index 508e38da4500..072b084db6dd 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pytest-runner @@ -25,6 +26,8 @@ buildPythonPackage rec { pytestCheckHook ]; + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Token Bucket Implementation for Python Web Apps"; homepage = "https://github.com/falconry/token-bucket"; From 0d10c31f2d8d4d0054d1f32e2bca31ceb642f70f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Nov 2022 14:12:40 +0100 Subject: [PATCH 489/797] matrix-synapse.tools.rust-synapse-compress-state: Mark broken on darwin --- .../matrix-synapse/tools/rust-synapse-compress-state.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix b/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix index fcf123d6e1db..fe1dc5f6b207 100644 --- a/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix +++ b/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, python3, fetchFromGitHub, pkg-config, openssl }: +{ lib, stdenv, rustPlatform, python3, fetchFromGitHub, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "rust-synapse-compress-state"; @@ -22,6 +22,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; meta = with lib; { + broken = stdenv.isDarwin; description = "A tool to compress some state in a Synapse instance's database"; homepage = "https://github.com/matrix-org/rust-synapse-compress-state"; license = licenses.asl20; From 412144dfcc1560f81ec92f144f9e5ebf694e089d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 16:48:47 +0100 Subject: [PATCH 490/797] metasploit: 6.2.26 -> 6.2.27 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 34 ++++++------- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 54 ++++++++++----------- 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 7959e18698d2..68cd26e5cc34 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.26" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.27" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index d635a1231580..2fef911c967a 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: ef8b26c32cbcf48e9ba6a4d6c01d587a1d45f6cc - ref: refs/tags/6.2.26 + revision: 1847611817b4dbea38ac13c83ac2c4abd92d7bc2 + ref: refs/tags/6.2.27 specs: - metasploit-framework (6.2.26) + metasploit-framework (6.2.27) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -32,7 +32,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.99) + metasploit-payloads (= 2.0.101) metasploit_data_models metasploit_payloads-mettle (= 1.0.20) mqtt @@ -129,13 +129,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.659.0) - aws-sdk-core (3.167.0) + aws-partitions (1.664.0) + aws-sdk-core (3.168.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.349.0) + aws-sdk-ec2 (1.351.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.73.0) @@ -176,10 +176,10 @@ GEM eventmachine (1.2.7) faker (3.0.0) i18n (>= 1.8.11, < 2) - faraday (2.6.0) + faraday (2.7.1) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.1) + faraday-net_http (3.0.2) faraday-retry (2.0.0) faraday (~> 2.0) faye-websocket (0.11.1) @@ -204,7 +204,7 @@ GEM i18n (1.12.0) concurrent-ruby (~> 1.0) io-console (0.5.11) - irb (1.4.2) + irb (1.4.3) reline (>= 0.3.0) jmespath (1.6.1) jsobfu (0.4.2) @@ -236,7 +236,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.99) + metasploit-payloads (2.0.101) metasploit_data_models (5.0.6) activerecord (~> 6.0) activesupport (~> 6.0) @@ -286,13 +286,13 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.4.4) + pg (1.4.5) public_suffix (5.0.0) puma (6.0.0) nio4r (~> 2.0) racc (1.6.0) rack (2.2.4) - rack-protection (3.0.2) + rack-protection (3.0.3) rack rack-test (2.0.2) rack (>= 1.3) @@ -367,7 +367,7 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.2.0) + ruby_smb (3.2.1) bindata openssl-ccm openssl-cmac @@ -380,12 +380,12 @@ GEM faraday (>= 0.17.3, < 3) simpleidn (0.2.1) unf (~> 0.1.4) - sinatra (3.0.2) + sinatra (3.0.3) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.2) + rack-protection (= 3.0.3) tilt (~> 2.0) - sqlite3 (1.5.3) + sqlite3 (1.5.4) mini_portile2 (~> 2.8.0) sshkey (2.0.0) swagger-blocks (3.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index cae6648f5ef9..8acd5d35d510 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.2.26"; + version = "6.2.27"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-qPhN+N0AFSrkdxtUPZwJMicDafKpuwaQg+sDA6ssHow="; + sha256 = "sha256-0wovO6Dt65vA5C2/XNfHf4fsc3GvWp4mnh9gsY3O8Is="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 8e9709c984e3..38f9f23b3344 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iwkwvx56rivfrqgsjap7bkn0zd9d5m712fx0b1mgcfalm6xjcpl"; + sha256 = "1h69kvk5nrjfznms3dy9xk552xzv4kbq7ks9wgj1fdbxzc3rszng"; type = "gem"; }; - version = "1.659.0"; + version = "1.664.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "095nj7sf8914y60m1grnpy7cm6ybnw4ywnc0j84gz2vgv1m8awfk"; + sha256 = "1vnnv9gk3dapng8siaqdimqkr4a99lfavx7lkwx2jiyy1p6c50rb"; type = "gem"; }; - version = "3.167.0"; + version = "3.168.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xk33r0q44ngsy9d6nh4isw9aa9rz31ajb69apk4b2wmc2gi1mcw"; + sha256 = "0fcisnrj46idp0gmzjba39w5ay7phs0q8lai5mdwgn790n3cxkqr"; type = "gem"; }; - version = "1.349.0"; + version = "1.351.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -344,20 +344,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mqv17hfmph4ylmb2bqyccy64gsgpmzapq5yrmf5yjsqkvw9rxbv"; + sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.1"; }; 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"; }; faraday-retry = { groups = ["default"]; @@ -504,10 +504,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g2xhrjjgbix2acss59kwzfzgcwf450j91paz7vqa578g95i32my"; + sha256 = "0s28igrsspxmhwmwalv9c7g6ld2glzns2vhlfqmc3jnvnr68yhf1"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; jmespath = { groups = ["default"]; @@ -604,12 +604,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "ef8b26c32cbcf48e9ba6a4d6c01d587a1d45f6cc"; - sha256 = "130y5jmh60zbhf80dfx9y9lh69rj16f3sm0vfzj2l580vpw4vy58"; + rev = "1847611817b4dbea38ac13c83ac2c4abd92d7bc2"; + sha256 = "12zhrs6v2q0zkqk9wnmgf5ryr1vzqzbmrgrdwk09pszdl0xjy2nk"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.2.26"; + version = "6.2.27"; }; metasploit-model = { groups = ["default"]; @@ -626,10 +626,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rfnxkg31ksylg1rjk05d9kk4af4rbw66ipwl3q0vl3qvnbymfm8"; + sha256 = "0m9w4yy5iwpbbjycpxyhfql2b4dnm4wgcn039aw43igjgfdrkmkz"; type = "gem"; }; - version = "2.0.99"; + version = "2.0.101"; }; metasploit_data_models = { groups = ["default"]; @@ -907,10 +907,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09a5z9qhxnybahx162q2q1cygdhxfp6cihdivvzh32jlwc37z1x3"; + sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.5"; }; public_suffix = { groups = ["default"]; @@ -957,10 +957,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jmixih0qrsdz60dhznkk29v50ks55cqq51jjf0yn3amqghh4bhk"; + sha256 = "1sfk4i52yijcggkzkwj3z6k2iv9fdacmcgcid1c8xjcldh93fhpg"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; rack-test = { groups = ["default"]; @@ -1287,10 +1287,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iyp4j0j2bd0barp7057mr7280921c05ij2ygr1715lj1p9j4h5x"; + sha256 = "0rsxb9bi3x4kxhhsaa4araxfz0zk573v0j4xv64d3p176kii6cmm"; type = "gem"; }; - version = "3.2.0"; + version = "3.2.1"; }; rubyntlm = { groups = ["default"]; @@ -1337,10 +1337,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2vmy0j5amy9fihs2gz2ssm4bdpqqh4llyjfl6qqqry7f87c6xz"; + sha256 = "0znx4qhvgah5k696crv954xkrh8z4gick2fx04xl67wng7nnwrrc"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; sqlite3 = { dependencies = ["mini_portile2"]; @@ -1348,10 +1348,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i95rgfxdj2rhxifps27dz7fjfdih5iyl7b01di9gdmh9m04ylk6"; + sha256 = "009124l2yw7csrq3mvzffjflgpqi3y30flazjqf6aad64gnnnksx"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.4"; }; sshkey = { groups = ["default"]; From 3c98122ee7d4036a0c2fa885dde63138d6ce8644 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 16:12:50 +0000 Subject: [PATCH 491/797] python310Packages.datasette: 0.63.1 -> 0.63.2 --- pkgs/development/python-modules/datasette/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 79f1f92a52bc..8394befc51e6 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.63.1"; + version = "0.63.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -37,8 +37,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; repo = pname; - rev = version; - sha256 = "sha256-KMD4dmflmBp0s4nueLyPpDnXngpftS9/h5M6RPYMGrk="; + rev = "refs/tags/${version}"; + sha256 = "sha256-VDmh2Q/ab5xaNbj0APuQ9pkZ+GHoNXW2crrJXi556Fk="; }; postPatch = '' From 96f6844718bf0e7177341a9eecbdd1de27f60f6f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 19 Nov 2022 17:27:30 +0100 Subject: [PATCH 492/797] python3Packages.ctfime: fix platform-dependant test failure --- .../python-modules/cftime/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 865282cfa650..c925381d00f1 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , cython , fetchPypi +, fetchpatch , numpy , pytestCheckHook , pythonOlder @@ -16,9 +17,22 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hhTAD7ilBG3jBP3Ybb0iT5lAgYXXskWsZijQJ2WW5tI="; + hash = "sha256-hhTAD7ilBG3jBP3Ybb0iT5lAgYXXskWsZijQJ2WW5tI="; }; + patches = [ + (fetchpatch { + # Fix test_num2date_precision by checking per platform precision + url = "https://github.com/Unidata/cftime/commit/221ff2195d588a43a7984597033b678f330fbc41.patch"; + hash = "sha256-3XTJuET20g9QElM/8WGnNzJBFZ0oUN4ikhWKppwcyNM="; + }) + ]; + + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + nativeBuildInputs = [ cython numpy @@ -32,10 +46,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - sed -i "/--cov/d" setup.cfg - ''; - pythonImportsCheck = [ "cftime" ]; From 71a161dbb78f6eef470a63729819c99a68755556 Mon Sep 17 00:00:00 2001 From: Quantenzitrone Date: Thu, 18 Aug 2022 11:22:48 +0200 Subject: [PATCH 493/797] maintainers: add quantenzitrone --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7a28c2527642..33d6bcd382f3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11330,6 +11330,13 @@ githubId = 35086; name = "Jonathan Wright"; }; + quantenzitrone = { + email = "quantenzitrone@protonmail.com"; + github = "Quantenzitrone"; + githubId = 74491719; + matrix = "@quantenzitrone:matrix.org"; + name = "quantenzitrone"; + }; queezle = { email = "git@queezle.net"; github = "queezle42"; From c0d10e2d1eab91e6258170825b6a0852afb45e11 Mon Sep 17 00:00:00 2001 From: Quantenzitrone Date: Thu, 10 Nov 2022 02:13:00 +0100 Subject: [PATCH 494/797] fishPlugins.sponge: init at 1.1.0 --- pkgs/shells/fish/plugins/default.nix | 2 ++ pkgs/shells/fish/plugins/sponge.nix | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/shells/fish/plugins/sponge.nix diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index cb2d73dacc5a..c67639a85a2f 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -31,4 +31,6 @@ lib.makeScope newScope (self: with self; { pure = callPackage ./pure.nix { }; + sponge = callPackage ./sponge.nix { }; + }) diff --git a/pkgs/shells/fish/plugins/sponge.nix b/pkgs/shells/fish/plugins/sponge.nix new file mode 100644 index 000000000000..2afc3ec61585 --- /dev/null +++ b/pkgs/shells/fish/plugins/sponge.nix @@ -0,0 +1,20 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +buildFishPlugin rec { + pname = "sponge"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "meaningful-ooo"; + repo = pname; + rev = "${version}"; + sha256 = "sha256-MdcZUDRtNJdiyo2l9o5ma7nAX84xEJbGFhAVhK+Zm1w="; + }; + + meta = with lib; { + description = "keeps your fish shell history clean from typos, incorrectly used commands and everything you don't want to store due to privacy reasons"; + homepage = "https://github.com/meaningful-ooo/sponge"; + license = licenses.mit; + maintainers = with maintainers; [ quantenzitrone ]; + }; +} From 067196dc65439f4b6b89f480cd3e228b3976ce7e Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Sat, 19 Nov 2022 09:35:52 -0700 Subject: [PATCH 495/797] vmm_clock: only build for x86 kernels ZHF:#199919 --- pkgs/os-specific/linux/vmm_clock/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/vmm_clock/default.nix b/pkgs/os-specific/linux/vmm_clock/default.nix index b630ed4749fa..853e7765ee23 100644 --- a/pkgs/os-specific/linux/vmm_clock/default.nix +++ b/pkgs/os-specific/linux/vmm_clock/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/voutilad/vmm_clock"; license = licenses.gpl2; maintainers = with maintainers; [ qbit ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; enableParallelBuilding = true; From ef945c5e88b435cdab34a9cbea7bdedfb92f5fd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Nov 2022 10:23:20 +0000 Subject: [PATCH 496/797] sameboy: 0.15.6 -> 0.15.8 --- pkgs/applications/emulators/sameboy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix index 26555acb61cb..035351885568 100644 --- a/pkgs/applications/emulators/sameboy/default.nix +++ b/pkgs/applications/emulators/sameboy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sameboy"; - version = "0.15.6"; + version = "0.15.8"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; rev = "v${version}"; - sha256 = "sha256-WsZuOKq/Dfk2zgYFXSwZPUuPrJQJ3y3mJHL6s61mTig="; + sha256 = "sha256-SBK+aYekEJreD0XBvYaU12eIKmm9JNYIpPt1XhUtH4c="; }; enableParallelBuilding = true; From c561c5493184eb74cc449c7a48ceff7a11fe2dba Mon Sep 17 00:00:00 2001 From: Jocelyn Thode Date: Thu, 17 Nov 2022 16:48:22 +0100 Subject: [PATCH 497/797] fishPlugins.tide: init at 5.5.1 --- pkgs/shells/fish/plugins/default.nix | 1 + pkgs/shells/fish/plugins/tide.nix | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/shells/fish/plugins/tide.nix diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index c67639a85a2f..bc3c39265710 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -33,4 +33,5 @@ lib.makeScope newScope (self: with self; { sponge = callPackage ./sponge.nix { }; + tide = callPackage ./tide.nix { }; }) diff --git a/pkgs/shells/fish/plugins/tide.nix b/pkgs/shells/fish/plugins/tide.nix new file mode 100644 index 000000000000..5c844212006a --- /dev/null +++ b/pkgs/shells/fish/plugins/tide.nix @@ -0,0 +1,28 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +# Due to a quirk in tide breaking wrapFish, we need to add additional commands in the config.fish +# Refer to the following comment to get you setup: https://github.com/NixOS/nixpkgs/pull/201646#issuecomment-1320893716 +buildFishPlugin rec { + pname = "tide"; + version = "5.5.1"; + + src = fetchFromGitHub { + owner = "IlanCosman"; + repo = "tide"; + rev = "v${version}"; + sha256 = "sha256-vi4sYoI366FkIonXDlf/eE2Pyjq7E/kOKBrQS+LtE+M="; + }; + + #buildFishplugin will only move the .fish files, but tide has a tide configure function + postInstall = '' + cp -R functions/tide $out/share/fish/vendor_functions.d/ + ''; + + meta = with lib; { + description = "The ultimate Fish prompt."; + homepage = "https://github.com/IlanCosman/tide"; + license = licenses.mit; + maintainers = [ maintainers.jocelynthode ]; + }; +} + From 4a3aa6ff98a08971135819d6ee145a63e1882840 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 18 Nov 2022 17:20:05 -0500 Subject: [PATCH 498/797] tremor-rs: module init --- nixos/modules/module-list.nix | 1 + .../modules/services/monitoring/tremor-rs.nix | 129 ++++++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 nixos/modules/services/monitoring/tremor-rs.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a886332e90b7..8fdf1f09cd18 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -718,6 +718,7 @@ ./services/monitoring/teamviewer.nix ./services/monitoring/telegraf.nix ./services/monitoring/thanos.nix + ./services/monitoring/tremor-rs.nix ./services/monitoring/tuptime.nix ./services/monitoring/unifi-poller.nix ./services/monitoring/ups.nix diff --git a/nixos/modules/services/monitoring/tremor-rs.nix b/nixos/modules/services/monitoring/tremor-rs.nix new file mode 100644 index 000000000000..213e8a474868 --- /dev/null +++ b/nixos/modules/services/monitoring/tremor-rs.nix @@ -0,0 +1,129 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + + cfg = config.services.tremor-rs; + + loggerSettingsFormat = pkgs.formats.yaml { }; + loggerConfigFile = loggerSettingsFormat.generate "logger.yaml" cfg.loggerSettings; +in { + + options = { + services.tremor-rs = { + enable = lib.mkEnableOption (lib.mdDoc "Tremor event- or stream-processing system"); + + troyFileList = mkOption { + type = types.listOf types.path; + default = []; + description = lib.mdDoc "List of troy files to load."; + }; + + tremorLibDir = mkOption { + type = types.path; + default = ""; + description = lib.mdDoc "Directory where to find /lib containing tremor script files"; + }; + + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = lib.mdDoc "The host tremor should be listening on"; + }; + + port = mkOption { + type = types.port; + default = 9898; + description = lib.mdDoc "the port tremor should be listening on"; + }; + + loggerSettings = mkOption { + description = lib.mdDoc "Tremor logger configuration"; + default = {}; + type = loggerSettingsFormat.type; + + example = { + refresh_rate = "30 seconds"; + appenders.stdout.kind = "console"; + root = { + level = "warn"; + appenders = [ "stdout" ]; + }; + loggers = { + tremor_runtime = { + level = "debug"; + appenders = [ "stdout" ]; + additive = false; + }; + tremor = { + level = "debug"; + appenders = [ "stdout" ]; + additive = false; + }; + }; + }; + + defaultText = literalExpression '' + { + refresh_rate = "30 seconds"; + appenders.stdout.kind = "console"; + root = { + level = "warn"; + appenders = [ "stdout" ]; + }; + loggers = { + tremor_runtime = { + level = "debug"; + appenders = [ "stdout" ]; + additive = false; + }; + tremor = { + level = "debug"; + appenders = [ "stdout" ]; + additive = false; + }; + }; + } + ''; + + }; + }; + }; + + config = mkIf (cfg.enable) { + + environment.systemPackages = [ pkgs.tremor-rs ] ; + + systemd.services.tremor-rs = { + description = "Tremor event- or stream-processing system"; + wantedBy = [ "multi-user.target" ]; + requires = [ "network-online.target" ]; + after = [ "network-online.target" ]; + + environment.TREMOR_PATH = "${pkgs.tremor-rs}/lib:${cfg.tremorLibDir}"; + + serviceConfig = { + ExecStart = "${pkgs.tremor-rs}/bin/tremor --logger-config ${loggerConfigFile} server run ${concatStringsSep " " cfg.troyFileList} --api-host ${cfg.host}:${toString cfg.port}"; + DynamicUser = true; + Restart = "always"; + NoNewPrivileges = true; + PrivateTmp = true; + ProtectHome = true; + ProtectClock = true; + ProtectProc = "noaccess"; + ProcSubset = "pid"; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectHostname = true; + RestrictSUIDSGID = true; + RestrictRealtime = true; + RestrictNamespaces = true; + LockPersonality = true; + RemoveIPC = true; + SystemCallFilter = [ "@system-service" "~@privileged" ]; + }; + }; + }; +} From fe7290fc4b2c0496dde324ad1929d4b6dcb6468b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 16:41:54 +0000 Subject: [PATCH 499/797] oh-my-posh: 12.13.3 -> 12.16.0 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index bd7d3effe1e9..7493176e3ac6 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "12.13.3"; + version = "12.16.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1H3BlKxTthyVXEaLISruZDFIeXEAaeZjGp597clPeLs="; + sha256 = "sha256-YrrOwTLVgxoriVgVDmn99ORSh04os0q/QnfBXtTtl5g="; }; vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU="; From 821479126a7415b1f33a1c6489a24570b6f641d4 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 4 Oct 2022 19:36:47 +0200 Subject: [PATCH 500/797] luakit: 2.3 -> 2.3.1 --- pkgs/applications/networking/browsers/luakit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 8656b4aaa276..4812f69f34e8 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "luakit"; - version = "2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "luakit"; repo = pname; rev = version; - hash = "sha256-5YeJkbWk1wHxWXqWOvhEDeScWPU/aRVhuOWRHLSHVZM="; + hash = "sha256-6baN3e5ZJ8hw6mhQ0AapyVIYFSdmXcfo45ReQNliIPw="; }; nativeBuildInputs = [ From b02ae769f4750b1c9714d8c2c7d49d94d6162316 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 17:57:06 +0000 Subject: [PATCH 501/797] python310Packages.django-taggit: 3.0.0 -> 3.1.0 --- pkgs/development/python-modules/django-taggit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-taggit/default.nix b/pkgs/development/python-modules/django-taggit/default.nix index 22f7f83decd8..3d679087490f 100644 --- a/pkgs/development/python-modules/django-taggit/default.nix +++ b/pkgs/development/python-modules/django-taggit/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5kW4491PhZidXvXFo9Xrvlut9dHlG1PkLQr3JiQLALk="; + sha256 = "sha256-yPLk6uOHk5CJs9ddHYZJ4AiICXDAaM6dDoL4f9XilQg="; }; propagatedBuildInputs = [ From 73c0cb7bc3e32ba34ba490c15105c3e384c9bbac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joel=20H=C3=B6ner?= Date: Sat, 19 Nov 2022 19:13:04 +0100 Subject: [PATCH 502/797] gitui: 0.21.0 -> 0.22.0 --- .../git-and-tools/gitui/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index ccbe59317832..3b383647c2c9 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B/RKPYq1U40NV3AM/cQi2eQaK5vxynP3JA0DReSBuCo="; + sha256 = "sha256-ZLGA0LHdGPqIoNG2k4nunVWYlOnwRT8nqTSwUWGkfCU="; }; - cargoSha256 = "sha256-r4kritS3v8GgFZfWeeyrsy6v3IlH3DByTU8Ir4FDngs="; + cargoSha256 = "sha256-ArJerq3gLzPm66RWDCvkpPFyh7ZyaoqLO/3zSjFTL04="; nativeBuildInputs = [ pkg-config ]; @@ -32,6 +32,11 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; + # The cargo config overrides linkers for some targets, breaking the build + # on e.g. `aarch64-linux`. These overrides are not required in the Nix + # environment: delete them. + postPatch = "rm .cargo/config"; + meta = with lib; { description = "Blazing fast terminal-ui for Git written in Rust"; homepage = "https://github.com/extrawurst/gitui"; From 50acf27ac741ae8d7640e0c6a4286851d6399b6f Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 19 Nov 2022 19:15:36 +0100 Subject: [PATCH 503/797] outline: move public files (logos) to derivation output --- pkgs/servers/web-apps/outline/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 03f8a0e45b7b..af0dd5eeff4b 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin $out/share/outline - mv node_modules build $out/share/outline/ + mv public node_modules build $out/share/outline/ node_modules=$out/share/outline/node_modules build=$out/share/outline/build From 1e64f5e60aa8b4a2a0cf0edb1510f086f722aeb5 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sat, 19 Nov 2022 18:49:40 +0100 Subject: [PATCH 504/797] alkimia: switch from qtwebkit to qtwebengine See PR #201028 and issue #53079 --- pkgs/development/libraries/alkimia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index b1c040a057ec..186c2878cdeb 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -1,5 +1,5 @@ { mkDerivation, fetchurl, lib -, extra-cmake-modules, doxygen, graphviz, qtbase, qtwebkit, mpir +, extra-cmake-modules, doxygen, graphviz, qtbase, qtwebengine, mpir , kdelibs4support, plasma-framework, knewstuff, kpackage }: @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; - buildInputs = [ qtbase qtwebkit kdelibs4support plasma-framework knewstuff kpackage ]; + buildInputs = [ qtbase qtwebengine kdelibs4support plasma-framework knewstuff kpackage ]; propagatedBuildInputs = [ mpir ]; meta = { From ca7d4c4d11bc6dfc82acc22553929c16b8ecf3b6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 19 Nov 2022 15:40:44 -0300 Subject: [PATCH 505/797] emacs/elisp-packages/manual-packages/tsc/update.py: fixup --- .../editors/emacs/elisp-packages/manual-packages/tsc/update.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py index ce2054f909ef..082602fcc4fd 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py @@ -80,7 +80,8 @@ def get_cargo_sha256(drv_path: str): if __name__ == "__main__": cwd = sys.argv[1] - nixpkgs = abspath(join(cwd, "../../../../../..")) + # This should point to the root default.nix of Nixpkgs tree + nixpkgs = abspath(join(cwd, "../../../../../../..")) tag_name = requests.get( "https://api.github.com/repos/emacs-tree-sitter/elisp-tree-sitter/releases/latest" From 51befefaa7d58a6c8d8a49a5214e6c631261da41 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 19 Nov 2022 15:45:21 -0300 Subject: [PATCH 506/797] elpa-generated.nix: updated 2022-11-19 --- .../emacs/elisp-packages/elpa-generated.nix | 84 +++++++++++++------ 1 file changed, 57 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 17eb1aedb866..f2acd4be8518 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -249,10 +249,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.1.5"; + version = "13.1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.1.5.tar"; - sha256 = "00g6js6089637w8alch4dvk140chjkyirsa8inh9ai6a6kkfvc3p"; + url = "https://elpa.gnu.org/packages/auctex-13.1.6.tar"; + sha256 = "0pdinnhkv7vqib01a6vxq1iixs7sw72r0sxzryv78c9hxn2k4552"; }; packageRequires = [ emacs ]; meta = { @@ -414,10 +414,10 @@ elpaBuild { pname = "boxy"; ename = "boxy"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-1.1.1.tar"; - sha256 = "08jb5v93l3y9cx48qhpv20i7kdxvl5dinxj3z0pxkx0ckvml7cvd"; + url = "https://elpa.gnu.org/packages/boxy-1.1.2.tar"; + sha256 = "0gqfs8rwqb3clwqgvv9wibl2mfx0njkdcpwl662p4bwnapl4hsi9"; }; packageRequires = [ emacs ]; meta = { @@ -429,10 +429,10 @@ elpaBuild { pname = "boxy-headings"; ename = "boxy-headings"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-headings-2.1.3.tar"; - sha256 = "09k5x123db19v2k49y8acyk5y3r0fxw0xz61qqqidrgrx8fs3mg9"; + url = "https://elpa.gnu.org/packages/boxy-headings-2.1.4.tar"; + sha256 = "101kiw10p0sd8j8px16zsw57my7h2f1anhnwj678z22hxhs8vla7"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -891,10 +891,10 @@ elpaBuild { pname = "crdt"; ename = "crdt"; - version = "0.3.4"; + version = "0.3.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/crdt-0.3.4.tar"; - sha256 = "1wha43mrllnpc2i7p91dns8iwaxf60mp20h234c07m9jcjvcxrmc"; + url = "https://elpa.gnu.org/packages/crdt-0.3.5.tar"; + sha256 = "0pir9ap8lryrw12slgg4v30bzjphc37r6p0fw36larlh9wp8jj5z"; }; packageRequires = []; meta = { @@ -2392,6 +2392,21 @@ license = lib.licenses.free; }; }) {}; + jarchive = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "jarchive"; + ename = "jarchive"; + version = "0.8.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/jarchive-0.8.0.tar"; + sha256 = "0xfl0gbfqjgbkd28r56j35kc8y6x8nd2zi8xqzxmqvcyv9sd731l"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/jarchive.html"; + license = lib.licenses.free; + }; + }) {}; javaimp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "javaimp"; @@ -3061,10 +3076,10 @@ elpaBuild { pname = "nano-theme"; ename = "nano-theme"; - version = "0.3.3"; + version = "0.3.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-theme-0.3.3.tar"; - sha256 = "0agdvl85ljiawa06x02zj78crq1y1vg0sr7dqxcl36zx8vhzc08v"; + url = "https://elpa.gnu.org/packages/nano-theme-0.3.4.tar"; + sha256 = "1hfw6zxnzm4x55iqk1pg6nlp79c86np856bbdac4nv65ff4dkiqq"; }; packageRequires = [ emacs ]; meta = { @@ -3350,10 +3365,10 @@ elpaBuild { pname = "org-real"; ename = "org-real"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-real-1.0.5.tar"; - sha256 = "0g70bzhr094fah86cyvd9ci8q28qi9c44g33i4lw7clklgdx7mxl"; + url = "https://elpa.gnu.org/packages/org-real-1.0.6.tar"; + sha256 = "1qfzmmv3c1yc14v502x0438pxh2bcwli1r3xmcxibhb7h6p9mr3k"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -3650,10 +3665,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.1.8"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.1.8.tar"; - sha256 = "0560f05c2rh6jkdba4yq9qbazfz6qbdrymqm5zcihvz7cy019dzm"; + url = "https://elpa.gnu.org/packages/posframe-1.2.0.tar"; + sha256 = "06xk6z3b5mqgcskjiwkl9viccvzriflr8y51aclyfdamh5qb6kqb"; }; packageRequires = [ emacs ]; meta = { @@ -3665,10 +3680,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.8.2"; + version = "0.8.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.8.2.tar"; - sha256 = "1l5yxw6xqml176vskd5fz2y2dbjh8925g3kyimda4gdprz4y7aci"; + url = "https://elpa.gnu.org/packages/project-0.8.3.tar"; + sha256 = "15x6nbvyy592fwn36syxi9719sknvrm4bwnpyc16z9jn2xm62q3p"; }; packageRequires = [ emacs xref ]; meta = { @@ -4495,10 +4510,10 @@ elpaBuild { pname = "srht"; ename = "srht"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/srht-0.1.tar"; - sha256 = "1cdylp2hma83iv062nf7qyz21a3r8562gwx2lk6cf45k2kh3hbv8"; + url = "https://elpa.gnu.org/packages/srht-0.2.tar"; + sha256 = "1qps9vdsiy5zkz88kh9kl1hnn1wlfz6n5brzcxi28fwx0hb3ksz2"; }; packageRequires = [ emacs plz ]; meta = { @@ -4999,6 +5014,21 @@ license = lib.licenses.free; }; }) {}; + use-package = callPackage ({ bind-key, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "use-package"; + ename = "use-package"; + version = "2.4.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/use-package-2.4.4.tar"; + sha256 = "1hw73006l1xh0padqxyr0l3sjnr3fxyz619csz8ds6am86fdxvfp"; + }; + packageRequires = [ bind-key emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/use-package.html"; + license = lib.licenses.free; + }; + }) {}; validate = callPackage ({ cl-lib ? null , elpaBuild , emacs From 3836d8cac921e439e8748305f0eb0fa477d4e442 Mon Sep 17 00:00:00 2001 From: Daniel Nilsson Date: Sat, 19 Nov 2022 20:09:08 +0100 Subject: [PATCH 507/797] liblxi: 1.13 -> 1.18 --- pkgs/development/libraries/liblxi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/development/libraries/liblxi/default.nix index 1ca4043a024d..b63f3d9df0d5 100644 --- a/pkgs/development/libraries/liblxi/default.nix +++ b/pkgs/development/libraries/liblxi/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchFromGitHub -, pkg-config, autoreconfHook +, meson, ninja, pkg-config, cmake , libtirpc, rpcsvc-proto, avahi, libxml2 }: stdenv.mkDerivation rec { pname = "liblxi"; - version = "1.13"; + version = "1.18"; src = fetchFromGitHub { owner = "lxi-tools"; repo = "liblxi"; rev = "v${version}"; - sha256 = "129m0k2wrlgs25qkskynljddqspasla1x8iq51vmg38nhnilpqf6"; + sha256 = "sha256-2tZWIN58J6zNHG3dahNfg5eNiS8ykWFQyRSyikuzdjE="; }; - nativeBuildInputs = [ autoreconfHook pkg-config rpcsvc-proto ]; + nativeBuildInputs = [ meson ninja cmake pkg-config rpcsvc-proto ]; buildInputs = [ libtirpc avahi libxml2 ]; From 8fa1580c14f8fef36f24fd190784def9fee06c9c Mon Sep 17 00:00:00 2001 From: Daniel Nilsson Date: Sat, 19 Nov 2022 20:09:28 +0100 Subject: [PATCH 508/797] lxi-tools: 1.21 -> 2.3 --- pkgs/tools/networking/lxi-tools/default.nix | 28 ++++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix index 92ef7f688a5a..85518a6db9f7 100644 --- a/pkgs/tools/networking/lxi-tools/default.nix +++ b/pkgs/tools/networking/lxi-tools/default.nix @@ -1,22 +1,38 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkg-config -, liblxi, readline, lua +, meson, ninja, cmake, pkg-config +, liblxi, readline, lua, bash-completion +, wrapGAppsHook +, glib, gtk4, gtksourceview5, libadwaita, json-glib +, desktop-file-utils, appstream-glib +, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "lxi-tools"; - version = "1.21"; + version = "2.3"; src = fetchFromGitHub { owner = "lxi-tools"; repo = "lxi-tools"; rev = "v${version}"; - sha256 = "0rkp6ywsw2zv7hpbr12kba79wkcwqin7xagxxhd968rbfkfdxlwc"; + sha256 = "sha256-c53Jn/9xKsxQDsRWU2LKtNWs28AuG4t5OwYOAMxpcPA="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + meson ninja cmake pkg-config + wrapGAppsHook + ]; - buildInputs = [ liblxi readline lua ]; + buildInputs = [ + liblxi readline lua bash-completion + glib gtk4 gtksourceview5 libadwaita json-glib + desktop-file-utils appstream-glib + gsettings-desktop-schemas + ]; + + postUnpack = "sed -i '/meson.add_install.*$/d' source/meson.build"; + + postInstall = "glib-compile-schemas $out/share/glib-2.0/schemas"; meta = with lib; { description = "Tool for communicating with LXI compatible instruments"; From b394f86dcb1a9d971e58642b19238024e6f0fba0 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 19 Nov 2022 15:18:07 +0100 Subject: [PATCH 509/797] chickenPackages*.eggDerivation: set meta.platforms if not provided This will ensure that Hydra attempts to build the eggs on all supported platforms instead of just the platform the evaluator is running on (currently x86_64-linux). --- pkgs/development/compilers/chicken/4/eggDerivation.nix | 6 +++++- pkgs/development/compilers/chicken/5/eggDerivation.nix | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/chicken/4/eggDerivation.nix b/pkgs/development/compilers/chicken/4/eggDerivation.nix index 10cf91579a40..96b3612b34ba 100644 --- a/pkgs/development/compilers/chicken/4/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/4/eggDerivation.nix @@ -42,4 +42,8 @@ stdenv.mkDerivation ({ runHook postInstall ''; -} // (builtins.removeAttrs args ["name" "buildInputs"]) // override) + + meta = { + inherit (chicken.meta) platforms; + } // args.meta or {}; +} // (builtins.removeAttrs args ["name" "buildInputs" "meta"]) // override) diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index a6d19eaeb137..d1c8fc9e4736 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -39,4 +39,8 @@ stdenv.mkDerivation ({ runHook postInstall ''; -} // (builtins.removeAttrs args ["name" "buildInputs"]) // override) + + meta = { + inherit (chicken.meta) platforms; + } // args.meta or {}; +} // (builtins.removeAttrs args ["name" "buildInputs" "meta"]) // override) From f931c547b05472e61515d47ad1b703ef8d5447e9 Mon Sep 17 00:00:00 2001 From: Daniel Nilsson Date: Sat, 19 Nov 2022 20:22:09 +0100 Subject: [PATCH 510/797] lxi-tools: make gui support optional --- pkgs/tools/networking/lxi-tools/default.nix | 10 +++++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix index 85518a6db9f7..c71376a5021b 100644 --- a/pkgs/tools/networking/lxi-tools/default.nix +++ b/pkgs/tools/networking/lxi-tools/default.nix @@ -5,6 +5,7 @@ , glib, gtk4, gtksourceview5, libadwaita, json-glib , desktop-file-utils, appstream-glib , gsettings-desktop-schemas +, withGui ? false }: stdenv.mkDerivation rec { @@ -20,11 +21,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja cmake pkg-config - wrapGAppsHook - ]; + ] ++ lib.optional withGui wrapGAppsHook; buildInputs = [ liblxi readline lua bash-completion + ] ++ lib.optionals withGui [ glib gtk4 gtksourceview5 libadwaita json-glib desktop-file-utils appstream-glib gsettings-desktop-schemas @@ -32,7 +33,10 @@ stdenv.mkDerivation rec { postUnpack = "sed -i '/meson.add_install.*$/d' source/meson.build"; - postInstall = "glib-compile-schemas $out/share/glib-2.0/schemas"; + mesonFlags = lib.optional (!withGui) "-Dgui=false"; + + postInstall = lib.optionalString withGui + "glib-compile-schemas $out/share/glib-2.0/schemas"; meta = with lib; { description = "Tool for communicating with LXI compatible instruments"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b406a4a68553..7ae1ba077738 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30204,6 +30204,7 @@ with pkgs; lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { }; lxi-tools = callPackage ../tools/networking/lxi-tools { }; + lxi-tools-gui = callPackage ../tools/networking/lxi-tools { withGui = true; }; lynx = callPackage ../applications/networking/browsers/lynx { }; From 7011353418bd66788092cf655cf250b0a5813a56 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 19 Nov 2022 16:55:38 -0300 Subject: [PATCH 511/797] nongnu-generated.nix: updated 2022-11-19 --- .../emacs/elisp-packages/nongnu-generated.nix | 69 ++++++++++++++----- 1 file changed, 51 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 49003e481c3b..58d425a82507 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -1208,10 +1208,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "3.8.9"; + version = "3.9.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-3.8.9.tar"; - sha256 = "0hikp6g5g7cy290qxd768vxy91gxj92cwrrzp8kicxy3qck1q39v"; + url = "https://elpa.nongnu.org/nongnu/helm-3.9.0.tar"; + sha256 = "00lln7g27iipa9lhd9hw3gl6s92d2di4nlfyjz0hgg32v39fnvjd"; }; packageRequires = [ helm-core popup ]; meta = { @@ -1223,10 +1223,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "3.8.9"; + version = "3.9.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.9.tar"; - sha256 = "03fzcc84gjslgsssbpjhdgnj7dn0pdfb5b2x79ss9vfvxamf2k94"; + url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.0.tar"; + sha256 = "1fvrxj64qc4976s6af2zc428dnx2p0skxdnkjikz8rpw8kmffcb9"; }; packageRequires = [ async emacs ]; meta = { @@ -1969,10 +1969,10 @@ elpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.1.tar"; - sha256 = "0ixm7z2bq4aacbwyzx53alfnqwbdn36i5ixdi3qjhr8rh5k48vg1"; + url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.2.tar"; + sha256 = "1v84b7mjilr6z1zmjfvwp4mwc68mb298fcn03xcaivnd91gvmvs2"; }; packageRequires = [ emacs ]; meta = { @@ -1984,10 +1984,10 @@ elpaBuild { pname = "popon"; ename = "popon"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/popon-0.11.tar"; - sha256 = "03xxh9w215kmlw6vr3cjs9afkj6vrcip7k954sssx77bs1bpnqhz"; + url = "https://elpa.nongnu.org/nongnu/popon-0.12.tar"; + sha256 = "06vsri7dka3qbiwfkl4ml8b99alah24zq8y4n1szh587xy3c7dj0"; }; packageRequires = [ emacs ]; meta = { @@ -2055,6 +2055,24 @@ license = lib.licenses.free; }; }) {}; + racket-mode = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "racket-mode"; + ename = "racket-mode"; + version = "1.0.20221118.122133"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20221118.122133.tar"; + sha256 = "0a2lpvkarcw5rlydm3va7ajjsyhfbj023h93n6n94pjvllhn2rp2"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/racket-mode.html"; + license = lib.licenses.free; + }; + }) {}; rainbow-delimiters = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "rainbow-delimiters"; @@ -2179,6 +2197,21 @@ license = lib.licenses.free; }; }) {}; + scad-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "scad-mode"; + ename = "scad-mode"; + version = "93.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/scad-mode-93.1.tar"; + sha256 = "0k9wqz2nd4j0wz2y300nn6rs8a9vpshnaa2hx6f8649k4y87bblp"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/scad-mode.html"; + license = lib.licenses.free; + }; + }) {}; scala-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "scala-mode"; @@ -2378,10 +2411,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.0.19"; + version = "1.0.24"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.0.19.tar"; - sha256 = "1wgicb0lvnghhr3a1xndkaxhs1c9gc1ac5xwvxcsc9zpgzrlmcda"; + url = "https://elpa.nongnu.org/nongnu/subed-1.0.24.tar"; + sha256 = "1x9w858pgyhd7hlvn85h379f8sfvf8ly3a9596q4jkqbcp9riymq"; }; packageRequires = [ emacs ]; meta = { @@ -2393,10 +2426,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.8.6"; + version = "0.8.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.8.6.tar"; - sha256 = "108hjh276xgl0xhn2f7h43725xi49zh6j2xrcc17xw2i0phhhswf"; + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.8.8.tar"; + sha256 = "0h9vn4kc1f1vxvzxv14hbv24skjmishg408s4d8g39bylhj5c5s4"; }; packageRequires = [ emacs ]; meta = { From 75519d54a012211db4c4978b4f2417cdfe8cb291 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 19 Nov 2022 16:58:06 -0300 Subject: [PATCH 512/797] recipes-archive-melpa.json: updated 2022-11-19 --- .../elisp-packages/recipes-archive-melpa.json | 1264 ++++++++++------- 1 file changed, 741 insertions(+), 523 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 99c329284c14..b7f0666e2005 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -4169,13 +4169,13 @@ "unstable": { "version": [ 20221112, - 48 + 2256 ], "deps": [ "yaml" ], - "commit": "374d9703afd2976736abe6a73c4d4561a3238211", - "sha256": "1lgy0yrvf5cx9cw95kg8w3xdy3fniagny9pv7an1lydhbfh8nn9w" + "commit": "0234a9fe3e4bea7717e857f516209fcc00cf85c0", + "sha256": "184v0773cxggidk06wnsziib3kxkdhfr1j8hizmi75hnsrn1g2ya" }, "stable": { "version": [ @@ -5136,11 +5136,11 @@ "repo": "LionyxML/auto-dark-emacs", "unstable": { "version": [ - 20221103, - 2344 + 20221114, + 343 ], - "commit": "a4bca75874e79ce62d2cd1dc3d97542e46fe0dfe", - "sha256": "0nx0ji1pz5r9yc9djzpd5d728yrsx3m4jchjxkjbb8484annnk6r" + "commit": "10a42b015e35e8c6a99a3fb5ceeb1db0f5893cee", + "sha256": "0gdmjmdzb1p21mrrsl6kv3fvzwmvmbkx9yydn7rylv19zfgj4iwh" } }, { @@ -6410,26 +6410,26 @@ "repo": "dykstrom/basic-mode", "unstable": { "version": [ - 20221105, - 1616 + 20221112, + 1533 ], "deps": [ "seq" ], - "commit": "3c4104b9789b62a505717e63b61bd0abee012f15", - "sha256": "1dqds5k05afs7ai6bk9zjcf0hp2ja5a417j4z35fbk62m7wb07mn" + "commit": "1d6cd9a3c400a3609ea2464103bb814b51d3d560", + "sha256": "177z5rmh4306zkadnpp0as3w51n972hnzsb15sxc4iccfb3zjap9" }, "stable": { "version": [ 0, 6, - 1 + 2 ], "deps": [ "seq" ], - "commit": "3c4104b9789b62a505717e63b61bd0abee012f15", - "sha256": "1dqds5k05afs7ai6bk9zjcf0hp2ja5a417j4z35fbk62m7wb07mn" + "commit": "1d6cd9a3c400a3609ea2464103bb814b51d3d560", + "sha256": "177z5rmh4306zkadnpp0as3w51n972hnzsb15sxc4iccfb3zjap9" } }, { @@ -6766,6 +6766,21 @@ "sha256": "0mypzfasclq7bmw0i8hfyp8c1ycd3kdgd5h1faygzh9r0phh7ciy" } }, + { + "ename": "beans", + "commit": "c458bd38ec9ec1de6717ea634b2d53f9083e3b23", + "sha256": "1sp43p1ajjh8zwrwkl09rhkkmxf01cw3i74ibqxn6m3hbdb3ry56", + "fetcher": "github", + "repo": "TheBlackBeans/emacs-beans", + "unstable": { + "version": [ + 20221114, + 1634 + ], + "commit": "0d04b79222812aa4978b6486a9ccac461850fe7a", + "sha256": "0b7yywa91saiijx6flsn1s1n5jbb7vqy3my2gxryyrqgrxcq1xx7" + } + }, { "ename": "bech32", "commit": "b66ddcba09e89d770ea5a828979474be76e7d1d5", @@ -7363,28 +7378,28 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20221026, - 1834 + 20221117, + 1610 ], "deps": [ "bind-key", "key-chord" ], - "commit": "5c95dcb1e8690ab5f15342dc9d4bedd599f1650f", - "sha256": "16986nlca7qnmk22sq5vn05pmfdhgcww21djyxh9xx7k4hkgwn9g" + "commit": "9090080b15486c3e337be254226efe7e5fde4c99", + "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" }, "stable": { "version": [ 2, 4, - 1 + 4 ], "deps": [ "bind-key", "key-chord" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "9090080b15486c3e337be254226efe7e5fde4c99", + "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" } }, { @@ -7395,20 +7410,20 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20221028, - 1858 + 20221117, + 1610 ], - "commit": "4095f1bdae7989981803d25a52384383116e6db6", - "sha256": "09xqc0gag3f84qa4p72ibmjxwy4c52nhkr3pjqpqkdpj82g9grj9" + "commit": "9090080b15486c3e337be254226efe7e5fde4c99", + "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" }, "stable": { "version": [ 2, 4, - 1 + 4 ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "9090080b15486c3e337be254226efe7e5fde4c99", + "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" } }, { @@ -8112,8 +8127,8 @@ "repo": "boogie-org/boogie-friends", "unstable": { "version": [ - 20221101, - 650 + 20221115, + 658 ], "deps": [ "cl-lib", @@ -8122,8 +8137,8 @@ "flycheck", "yasnippet" ], - "commit": "2f7c74ba87945e69d088df1d53249aeba5f0910d", - "sha256": "155n93hnbdb028a2dlqyl4sbkzfm6590v3dma0ksqh10d4fdx1p0" + "commit": "5b32e4859823ed7f5e70fd5d2eac5d813a8e3e51", + "sha256": "1gihjkxnq4mqlcgjhmfbf4i7v7zyqy01ls2ac10pa5k1db2g1nbc" } }, { @@ -13246,12 +13261,10 @@ "version": [ 3, 25, - 0, - -1, - 4 + 0 ], - "commit": "30c42dbbad245e54857b63faaa64c7bbec7da684", - "sha256": "09l3i94g8yycn3yscwc80k6qahx1zm2ph7csj439wh852a8i3rwf" + "commit": "13e46189c7f3b39a26e9ca689bc029b7061d26a7", + "sha256": "0h6fvq4xbb717p0n67afhiwih1zgjphl0wcl3y1wg8bg2cv8zvll" } }, { @@ -15488,15 +15501,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20220906, - 933 + 20221118, + 824 ], "deps": [ "company", "posframe" ], - "commit": "b67ec1fa83229187fdf1d3dc5576f81a37a2b369", - "sha256": "0ncvrj57w1wa4q6rjkzsd46wjixnqxmcfbm0vi78fcq8avqjry7y" + "commit": "ab58972c2cebc5ecf68c4cdd140c3aed2c68f42b", + "sha256": "0nqcqs3ngxmb946mg11b2im9sycwdykghzbv3sp4aans8q62ig6k" }, "stable": { "version": [ @@ -16465,14 +16478,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20221109, - 836 + 20221117, + 807 ], "deps": [ "compat" ], - "commit": "6d1342002bd82debe46ea88e9f49d15aa9a0bb49", - "sha256": "0bf3klk1cva3kii8fl15fi8rdskh36an26fg2z2n5hhzldznyp4q" + "commit": "35b57c1996b0887d4940960f1cd7deb7a5f4a2d9", + "sha256": "13i6r3910w9i6zaawhxwmkrnck43qxl8j6acrqn6qjd9cyh2j8n5" }, "stable": { "version": [ @@ -16810,15 +16823,15 @@ "repo": "jgru/consult-org-roam", "unstable": { "version": [ - 20221105, - 1202 + 20221119, + 811 ], "deps": [ "consult", "org-roam" ], - "commit": "b93cc856d1d2dd0719926e51c5a6309bbbf60b19", - "sha256": "1k0733kymkf8f3r4xi3fja561sybbkss3p54v7kf6pcz33v6gwc6" + "commit": "4f5e77d36fb8256818df9042ee699954566d81d5", + "sha256": "06xd014f03z8mzg2a7gln2bhv260rgq4zpcwxmkwn6kg5kcn5x0l" } }, { @@ -17235,6 +17248,25 @@ "sha256": "08ql4fi06w1v4f2xx24ajym513pi8pzxhd7y5zwrnk0kq2p8dr4p" } }, + { + "ename": "corfu-prescient", + "commit": "72a84587636e291bee48d7e9ad5723791ad02d7e", + "sha256": "1w7w88l43bpybgzdlp4b195y9y0mikp143wlki91s38m1hg0n0rd", + "fetcher": "github", + "repo": "radian-software/prescient.el", + "unstable": { + "version": [ + 20221118, + 1427 + ], + "deps": [ + "corfu", + "prescient" + ], + "commit": "680fefa4601586dd87d549d33f5ae6fda3212c35", + "sha256": "16k34jp07snzknyp2lg0g6vsb7pk96s0fplb9hdjq8w3n4kyirb1" + } + }, { "ename": "corral", "commit": "7b0d7e326f0401de0488b77d39af7bd7b8e8fdd4", @@ -19461,8 +19493,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20221111, - 1506 + 20221116, + 840 ], "deps": [ "company", @@ -19473,8 +19505,8 @@ "lcr", "s" ], - "commit": "cceb89bb218fb69371c41838c94a5c3270bf7448", - "sha256": "1jpi0bjh4pplpq3xfmwa61xvcs4km7n6mx9qb7syfd4hr3s5zqvh" + "commit": "914d4f21252a66fe526abedebe24703bc73397d9", + "sha256": "07qkd90babkdffpxsp2ha0q3ixwp21szyy7c1k8frqsv0gl0dm02" }, "stable": { "version": [ @@ -19502,8 +19534,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20221014, - 1942 + 20221118, + 1707 ], "deps": [ "bui", @@ -19516,8 +19548,8 @@ "posframe", "s" ], - "commit": "2879578abf72bf734675ce70e8dc977e1f43eca5", - "sha256": "0ixnzx2hkg129lxz6dgy6j97blj19zr24604449prwdw29100ha1" + "commit": "461f15f920c37ed06a53c1082287c5801a317b52", + "sha256": "1ny1agamc5iyh340gwrf59qyl9sp58nn62p6y8z6jsrxl08z4ipy" }, "stable": { "version": [ @@ -19852,11 +19884,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20220922, - 509 + 20221118, + 1318 ], - "commit": "554dc6fac1362dd6b66318c8250eea8bd63aa92f", - "sha256": "00jbjryi6m6ah7ylf1w965n4zndm5l54jkfkhjd2y3vxyr706hr8" + "commit": "92106c5a39e703bf18efa67a9c7dc92260845788", + "sha256": "0vfkm1x8x0azifyafnj7pg6lalvhrhhsizwm9vjb500fkjjhkazr" }, "stable": { "version": [ @@ -20904,11 +20936,11 @@ "repo": "niklaseklund/detached.el", "unstable": { "version": [ - 20221111, - 1152 + 20221118, + 1226 ], - "commit": "b4e3f1933c21878f34dd22efabb7ec2a76cd1096", - "sha256": "0aavqkgl8g3vx3941gzhjp2zd0pxpav7hmik9f6xskl2k8fqkgip" + "commit": "8c7a2e1129b254946d86a7b7ae1c8378afab7b69", + "sha256": "0fcvx4x9yzzl3qac8gh565jzb52w9j2xdbiw60xyqdxihljpqv6m" }, "stable": { "version": [ @@ -23777,14 +23809,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20220916, - 1056 + 20221112, + 2247 ], "deps": [ "cl-lib" ], - "commit": "535800fd6ca7f5af56f7aa3d0e8f46fef8b7999b", - "sha256": "1pqp46dk423j4iiiqx5ddijvinlyp1014amg2s7b57sqya1r19x9" + "commit": "b5ff201f4bea4286e9ed015a2043cf2394182232", + "sha256": "04xq0v50rhikwfkzhwx2rzismipb2b57niks7s1svfp4jl1sg5fm" }, "stable": { "version": [ @@ -24445,11 +24477,11 @@ "stable": { "version": [ 3, - 5, + 6, 0 ], - "commit": "77c1e6f8f27f57fe0c04ec1624a85069b02437cf", - "sha256": "10fpybiqqkmm7y9xmhy4qs451dydmffcjg13k7w8g2p9dd09jb6l" + "commit": "c3b75bdfd3763b39aaac8baa5104312ac701d501", + "sha256": "0kgg5a2y1zxc6av2vmlh4vy46lsgnq2xvxjpv3m5i8pzgv0angsg" } }, { @@ -24543,11 +24575,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20221104, - 734 + 20221115, + 2354 ], - "commit": "37ae27f55210f35684c1c83fc5a3eda7a0c68872", - "sha256": "19pwrm0qzw8i4q1g9s43jb8g7915k56jihcp6ylmhs6rl39lipgk" + "commit": "c6a84a93c687b6ada6ea297135125cff232520d9", + "sha256": "1krm1pn73wk1s3gvif4vk7q281nx0syh5dfai3lmkd6jwphwhzxj" } }, { @@ -25221,26 +25253,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20221107, - 2019 + 20221113, + 1408 ], "deps": [ "parsebib" ], - "commit": "6c09bc39b4a7ae70de5c1ce912d693e8b6f5f8d1", - "sha256": "1rd7jjr9wlj7b0d2386zvrlgz96316bg7h9zhk81xal5zvjksdmm" + "commit": "374400c99f600cfda703da4fb8d16898be48cb74", + "sha256": "1azgsjf5j8k6llq74brykidcb2mnq6fghk8jyq7qad5afh7n0mrc" }, "stable": { "version": [ 2, - 38, - 1 + 39, + 3 ], "deps": [ "parsebib" ], - "commit": "43f4e50d8e20c87f279da1a7317977297387bff1", - "sha256": "1a2pjnfk3yk7r13avjv4xcmq0ld1lw78ngifn9khpl28kd9fgv74" + "commit": "374400c99f600cfda703da4fb8d16898be48cb74", + "sha256": "1azgsjf5j8k6llq74brykidcb2mnq6fghk8jyq7qad5afh7n0mrc" } }, { @@ -26922,11 +26954,11 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20221111, - 1951 + 20221117, + 2048 ], - "commit": "00b29384e96c49375112613939e333d46565b310", - "sha256": "14d9a617qj6yrwfi5gg1prcd9ibmns21m08n78rsv61xg9c2f1iz" + "commit": "2ddf8cbe9bb4f973ecfa6012870af23b030ad6f6", + "sha256": "1f649vm59kkwiwc3pwzvw6phnc9id8vm6jfyg05j716k2pa4q0n4" }, "stable": { "version": [ @@ -26946,11 +26978,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20221008, - 2315 + 20221117, + 2216 ], - "commit": "5b893437c8594028653d676015bb580574d9f0e1", - "sha256": "0byzzbjg4lkma2yn22z2b5267irr4780k53hbhrk970gikxh8fll" + "commit": "3021dcd85764b6a918e1689bf649c16918c339da", + "sha256": "14blf7as7j6k7g8ry8a45c5zpgjca79axwr4b3yk3hcp9q9rvzfk" }, "stable": { "version": [ @@ -27345,8 +27377,8 @@ "repo": "remyhonig/elfeed-org", "unstable": { "version": [ - 20220529, - 1958 + 20221118, + 852 ], "deps": [ "cl-lib", @@ -27355,8 +27387,8 @@ "org", "s" ], - "commit": "d28c858303e60dcb3a6eb18ea85ee3cb9e3dd623", - "sha256": "189hr2pqpm9vpz06frkl6r3k6q6ispx97zj24lczcli44l7d8gsz" + "commit": "3242ec0519800a58f20480c8a6e3b3337d137084", + "sha256": "1qp5a7gmrf8hy9zvi237shnff2jcrs2s6iln4pd5l6hqb74akdrq" } }, { @@ -27429,15 +27461,15 @@ "repo": "SqrtMinusOne/elfeed-summary", "unstable": { "version": [ - 20220906, - 822 + 20221117, + 841 ], "deps": [ "elfeed", "magit-section" ], - "commit": "5006ef64325911785225dc37004f50d4ff51abb4", - "sha256": "0z485gf21qvk5k2xd056ja3fm96z8jazy4zf8hzp2hzwhi338vww" + "commit": "125e0f059d9f186efa2a04e317b59245963d6f11", + "sha256": "1lrzrf759qqa329yi7hx81b12lli530ih10p2jghxbhqgzqndssz" }, "stable": { "version": [ @@ -29825,15 +29857,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20221106, - 1133 + 20221118, + 1647 ], "deps": [ "inheritenv", "seq" ], - "commit": "d55ee22573c83ccbb55b8df6360ef3c62d1ce244", - "sha256": "0pr36nyyz8g9jmvv1h0qa6n51cjc69g0q6ihvxkxk0rqcvm390v5" + "commit": "c54bf9e6972c563d345e20571ffd44d7bfb56974", + "sha256": "0nfk85qai1nfr7ls2vhrwnvqfrvf69gsfj4py2rk503wgxabchbx" }, "stable": { "version": [ @@ -29970,15 +30002,15 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20221025, - 1206 + 20221118, + 2249 ], "deps": [ "closql", "compat" ], - "commit": "dbb2d6556b8d100633b8a8b71914df476279dc13", - "sha256": "0imi5fi5wnb0kqpv4j0xa8paldc7i541p9iyprwl7wz5lb5qsxp1" + "commit": "40bb1f5e0c4fe155d34dc6f7b002fd2560c51013", + "sha256": "1lrpg2xwk8rs8zk125fs78w5nfs210r1qq1gbmi0zvyy2xz4jfrv" }, "stable": { "version": [ @@ -32238,15 +32270,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20221109, - 2247 + 20221115, + 1255 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "7c3343cef739ae223eb3ca991897d97f2d017462", - "sha256": "1wcm5v6rfvql04jkwyc1r87kj0pf683yj10cb5kbg8ijwzyqca4j" + "commit": "5ce46a1fc175a8f13507ce2b6ec4c3618923f093", + "sha256": "19mkwjnsq04mldc70mimkl7bc9mqigc619rpzc9dl7z65z7fgk8c" }, "stable": { "version": [ @@ -34256,10 +34288,10 @@ }, { "ename": "ewal-evil-cursors", - "commit": "b95fa8694bd49595da9fb56454e6539e76feff97", - "sha256": "1xkjf31ba3ixv7nmxngba9pswpfr1nj4jni5y08rxfjxirwm0vbl", + "commit": "a85152f2fe8f4f6508001481615f9b9010fc8fa2", + "sha256": "0nsd4w1va85c3y9bch9vah72h9bdy4y5c6gdsqgrc28k7vscx4qq", "fetcher": "github", - "repo": "wurosh/ewal", + "repo": "cyruseuros/ewal", "unstable": { "version": [ 20190911, @@ -34286,10 +34318,10 @@ }, { "ename": "ewal-spacemacs-themes", - "commit": "b95fa8694bd49595da9fb56454e6539e76feff97", - "sha256": "1dliqwmlnl9bdw166xyadlgf3is22qn5bzrm0mv2gqi8p8ib5dl8", + "commit": "a85152f2fe8f4f6508001481615f9b9010fc8fa2", + "sha256": "0k1jlj1yb8dwdj65k5ck5qxgskmfwy892jqpqpfrnkb1bx519qmx", "fetcher": "github", - "repo": "wurosh/ewal", + "repo": "cyruseuros/ewal", "unstable": { "version": [ 20190911, @@ -34689,11 +34721,11 @@ "url": "https://repo.or.cz/external-dict.el.git", "unstable": { "version": [ - 20220816, - 2136 + 20221113, + 1021 ], - "commit": "680c37f01e5205805dffeef05be00e2196886a8c", - "sha256": "01rq6xw86q03br55njh51myzl2v1wfb2z6xpapwfs77rcismx616" + "commit": "c790489635a497cdb8f4277a982677c95479ffb0", + "sha256": "08sh4j4hd09r9ahrr19g1lky14s7sqqpyjhjwn3lv0mbs971zhgn" } }, { @@ -35334,14 +35366,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20220805, - 216 + 20221117, + 1821 ], "deps": [ "s" ], - "commit": "031c7ab7a16113bdca2b351781dc95aff9658c9a", - "sha256": "0d9v93ll884srr8f6di1iyp396wr0bklip6cv0xydw3mimv2rv3x" + "commit": "7181af0d848226ecdb9f517d8e4cf219d00f9000", + "sha256": "15i0j6r9wvzs96zys842akzdklrz2yrblc8zm5pcfs6rb56nnk7i" } }, { @@ -37074,8 +37106,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20221110, - 824 + 20221112, + 1552 ], "deps": [ "dash", @@ -37083,8 +37115,8 @@ "pkg-info", "seq" ], - "commit": "15559e8243b81d63c63f62a42d251f2db9e4995d", - "sha256": "1pn5mqjd76898n9d60ym1jklswnmficz9d1h5zcfjzs9hnq3np3x" + "commit": "ab93e2db1dd8333e86f8aeeafbf1e2a0e5f0be38", + "sha256": "10q5jlkbg0hvm96n2xr8k16ykwdvchb04h79bzhhm4x3zd99q4p7" }, "stable": { "version": [ @@ -38071,16 +38103,16 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20220704, - 625 + 20221116, + 1127 ], "deps": [ "flycheck", "grammarly", "s" ], - "commit": "ae6105c353e50aaf3d8056d19a8f9d55bae8e073", - "sha256": "1j816rxrzdibw30mhnkh4fqb3lby51203rc97nmcn8qr9vcy1hhg" + "commit": "c9ed648745cb94dc3420d622f84456decd0d0aeb", + "sha256": "0mggj1jma9r3sg6qc9zjbll7a9yklsyjf8kyg3g2vha7qchwaml3" }, "stable": { "version": [ @@ -39759,15 +39791,15 @@ "repo": "mohkale/flymake-collection", "unstable": { "version": [ - 20221111, - 1815 + 20221113, + 1 ], "deps": [ "flymake", "let-alist" ], - "commit": "976ac70153a0a18da22e068c740c3394bec28545", - "sha256": "1zxbks772vq4pj289n11fm79f7xk4iy69z99wvvmy4mv9mim5hrv" + "commit": "274e5ec3e614e73fd0d7c3e1ffc652461bf5b5f3", + "sha256": "18mwz6i84y1wdw8zq13rmx8jsax6fkiqvlbngix7sp2vy8mqgv5c" }, "stable": { "version": [ @@ -39895,6 +39927,30 @@ "sha256": "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c" } }, + { + "ename": "flymake-elisp-config", + "commit": "11cf3b5e38a99673f65a9bc410cd6faaa2889396", + "sha256": "019r9a30jdyjxk2rghbx7g16gpfdhq555s32cmbh9yxxvc7jz683", + "fetcher": "github", + "repo": "ROCKTAKEY/flymake-elisp-config", + "unstable": { + "version": [ + 20221110, + 1626 + ], + "commit": "e946d9a761a8427dfdd0ae634bcfce4d56111947", + "sha256": "1caclvx5k4x7pdd3pzm2kr1vkncwjgq9w15hbhr16y3sr2g8lh7k" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "commit": "1d6a7d82a89e265f22e0851f3c1d2e78ef74ce0d", + "sha256": "14a62l6c7ni5i4wnn18x0wswc0xvyf0lc6mcavdad8v3c9rip66l" + } + }, { "ename": "flymake-elixir", "commit": "05dae578f0dd6b5185f666431b3f36aad3aeffa1", @@ -40047,15 +40103,15 @@ "repo": "emacs-grammarly/flymake-grammarly", "unstable": { "version": [ - 20220704, - 626 + 20221116, + 1127 ], "deps": [ "grammarly", "s" ], - "commit": "4bbf93df6ca31a925417b656eec521f7b2c85681", - "sha256": "0vai15xyzyp9hc2pafaa8nwsqs56yvrf1fkkk7mdzr03pfg3qdc7" + "commit": "e3ed1a8bcb80a002a29fcc82e205d010bd9f3505", + "sha256": "0nf7y37livrhj3dapwzbpal5jclc0arr2hwvhhzyck5mg1q6vi5r" }, "stable": { "version": [ @@ -40310,14 +40366,14 @@ "repo": "emacs-languagetool/flymake-languagetool", "unstable": { "version": [ - 20220922, - 1914 + 20221116, + 1917 ], "deps": [ "s" ], - "commit": "f30d3ddb5b27bd700d3965709125940df32217af", - "sha256": "1xq4lsqvfwdhszgs7dzvm8rcdp0xpahk0ppjmx46xng3lqq885rv" + "commit": "b4b4d9f041dbc887f3adfb61600e9df4e51f9917", + "sha256": "0vyqh5h5rc12hk8w801wqi1nrcq5m6r5swak9vca7fh0rihjimz6" }, "stable": { "version": [ @@ -40813,11 +40869,11 @@ "repo": "erickgnavar/flymake-sqlfluff", "unstable": { "version": [ - 20220925, - 2144 + 20221116, + 729 ], - "commit": "b76f335555c9a94ffc3d7281f3dca345de474eed", - "sha256": "0snghmn59xcfqb90rgfph8fviapcwhh7d76hls54ixc6lc5za42p" + "commit": "8ce6b40ebcb3a90e23621e2e1b85e3d06bed5e76", + "sha256": "1jfhwr4a3imi1n8akarxakdxv90d4icx1r1yjfsjj9hvlgxads4s" } }, { @@ -42280,11 +42336,11 @@ "repo": "pdo/frimacs", "unstable": { "version": [ - 20220723, - 1902 + 20221113, + 1231 ], - "commit": "b35fdefb60ead4d7559131601c43761973762a9a", - "sha256": "034x3b471xfn1ih95az59h34ad2qvb9qpav29ng5z0ry2hqcq0za" + "commit": "ae3870ebced2fb92f7fac1aa0051f7e46b30d55b", + "sha256": "0r18cgi4hycif9r53vn1cakajkbrqpaziz240bq5yw2wnyvmkgfx" } }, { @@ -42334,16 +42390,16 @@ "repo": "waymondo/frog-jump-buffer", "unstable": { "version": [ - 20220414, - 1935 + 20221114, + 141 ], "deps": [ "avy", "dash", "frog-menu" ], - "commit": "ff0cfe9cb4a60d855f0754b741a9417ee413dee0", - "sha256": "0pp0z6zk6lni6pgkrh8is4c99v6npddaarsykwdxai0qxim9q4f3" + "commit": "ab830cb7a5af9429866ba88fb37589a0366d8bf2", + "sha256": "0996896n7135xzxxhh50phhb1y06rcycj2gxx7p26p7aa72ambc3" } }, { @@ -43100,14 +43156,14 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20221104, - 426 + 20221115, + 2228 ], "deps": [ "project" ], - "commit": "04dbdacfeca0190856abad859360da4bb873f9dd", - "sha256": "0dd20cq3nz4jjysaqx2aiqqaxvkfkbj2x4zm2mz3pd4rmydckj2y" + "commit": "15dfe0fceea4d3508cd22a05fee18b617f84df2f", + "sha256": "10f048rkcw0rnn03dq9v5bgg61zclznnsl6hl9sqjanb16vhs5lp" }, "stable": { "version": [ @@ -43272,15 +43328,15 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20221104, - 427 + 20221115, + 2230 ], "deps": [ "geiser", "transient" ], - "commit": "f5e82dc0f5a076335f201885a7edbefaa1ad435f", - "sha256": "13qxg1npm0pmnml5q268k5xk1clyqldp8v200ihrqwqlc3ga7f36" + "commit": "961c9630f90733f517a9124750e72da55b569f10", + "sha256": "1hhn4nrhwnkrks1kij27dza0zlj0z6jpw9k9nqqswb3h9qll3nvz" }, "stable": { "version": [ @@ -45367,6 +45423,21 @@ "sha256": "1drf4fvmak7brf16axkh4nfz8pg44i7pjhfjz3dbkycbpp8y5vig" } }, + { + "ename": "gitstatus", + "commit": "65871aadda4b9335f923eea4724b42367c57b5a4", + "sha256": "017cgcsiisiapvqvnh22k15m48id6bh2gpxqf6b3l0fps7lwhqib", + "fetcher": "github", + "repo": "igorepst/gitstatus-el", + "unstable": { + "version": [ + 20221113, + 1951 + ], + "commit": "c3e30341d0add9728010e566b9eb031c76414b47", + "sha256": "061wy9clb5w25r6g65wv4pdkp9cbhp2z8fv4v1np4gnwcvgjm26y" + } + }, { "ename": "gitter", "commit": "b8076c3b4d60e4c505bb6f4e426ecc4f69d74684", @@ -45498,6 +45569,21 @@ "sha256": "101y46bdxxgp58li66pwqn6c3skww72gkfmhxpps2v2ijxcvqkl9" } }, + { + "ename": "glue", + "commit": "2b15ab947b0fd53c0e425becc42b235a1954a0f8", + "sha256": "09y3qhjwv70d16yfb3rrds0k19f191v4790fglshx3gsgdac7mwc", + "fetcher": "sourcehut", + "repo": "hajovonta/glue", + "unstable": { + "version": [ + 20221114, + 1120 + ], + "commit": "abfad405f240d9a89f792aae36efb3c2af43021f", + "sha256": "08iyb35mpcdca9raq636m06gdis6p3n67wqhzq612p71gpx9l4bl" + } + }, { "ename": "gmail-message-mode", "commit": "1e6aed365c42987d64d0cd9a8a6178339b1b39e8", @@ -45739,11 +45825,11 @@ "repo": "emacs-gnuplot/gnuplot", "unstable": { "version": [ - 20221111, - 821 + 20221112, + 2049 ], - "commit": "72e70e309978f48cf4724cd99e78d09331f7acee", - "sha256": "0ms993dhrdnj1c4y3c02ls21myms43ndyrq3g2abzlr7n6jd60sn" + "commit": "fe7ce76d797b34214178ac8e470f2fa9a63b2520", + "sha256": "06avd1bpk6n8d3yc2427f6z24f3d6dlbfhw6gg39mja06n4a2jh3" }, "stable": { "version": [ @@ -46201,8 +46287,8 @@ }, { "ename": "go-gen-test", - "commit": "0861c126161a2674f0e115eac6f948490b142b44", - "sha256": "1pj8n8xj9ccq9ips4wy4v6hdxxgwv11pwi671l6jjrig38v13dzr", + "commit": "8948263cf6c99092690a0dc3650700aeba776aa6", + "sha256": "1hq7agbl1msdfa9cmmisvphzfdsw2dgkzw0qi6kkzs75c8q3c33s", "fetcher": "github", "repo": "s-kostyaev/go-gen-test", "unstable": { @@ -46584,11 +46670,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20221112, - 616 + 20221119, + 627 ], - "commit": "6fd5c0a32cfc90df950f6b6921e5de77eb1f0016", - "sha256": "1yhdw0qxg01gyw575flm23yhi3r9ixvsc0s32dz3nbggfxzhf0fb" + "commit": "8746d229474958dc4456ef9ba4b0a258acff8e56", + "sha256": "1znqj87xgb880aqqd10mxq5r3walhasvldmm3mvmvnywg91rrdyj" }, "stable": { "version": [ @@ -48998,11 +49084,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20221106, - 1352 + 20221113, + 1425 ], - "commit": "53d26263dbe2c607471048646d94788c0d232f98", - "sha256": "06q63zhms1ckbkryxg2534irrq014rbnwx1kmj92ldbinv4qr7qc" + "commit": "a34ccdc54be15043ff0d253c3c20087524255491", + "sha256": "1z2jcgdm5bc13zwl4y7fn5rxqqzs3i54qw32wb2hwpa42izwq159" }, "stable": { "version": [ @@ -49308,28 +49394,28 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20221111, - 1942 + 20221117, + 1800 ], "deps": [ "helm-core", "popup" ], - "commit": "dd72b3281afb38eaedd1e0015ab3c92d8ab7ef8f", - "sha256": "1gk4bq6ilbra85nlvr9hsj0h23bbrks6aryx5wsh8xkgaygw1plr" + "commit": "8de5444df2bafd1b3a91acd0e00cf1e0ee81682b", + "sha256": "09dk0dz8fkigi3zbinq76310nnnw29z4pca0ypsn2z6l0l3hg7zb" }, "stable": { "version": [ 3, - 8, - 9 + 9, + 0 ], "deps": [ "helm-core", "popup" ], - "commit": "dd72b3281afb38eaedd1e0015ab3c92d8ab7ef8f", - "sha256": "1gk4bq6ilbra85nlvr9hsj0h23bbrks6aryx5wsh8xkgaygw1plr" + "commit": "371df21b1e73be03b90028e2f5d8554f70a989b7", + "sha256": "1i253ani2bl665biha0f071pncr2jh7x5yxp8rg2013sdf4nr74c" } }, { @@ -49600,16 +49686,16 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20210725, - 1510 + 20221114, + 1204 ], "deps": [ "bibtex-completion", "cl-lib", "helm" ], - "commit": "63c108a5efc130f037bc1c36cb3ee7d963567c12", - "sha256": "0wbfyklpjvv7vlyljki0pi10l4jhgy95jlpmqzblh0lgd34ypr4s" + "commit": "8ebf50d5bd368082d0b7ab79d26a52f372cdef98", + "sha256": "1x6nfkprj95cp4ldb485v13hrkd7rvzp750d9xz80vk76gpvaw3l" }, "stable": { "version": [ @@ -50214,26 +50300,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20221111, - 1942 + 20221113, + 1706 ], "deps": [ "async" ], - "commit": "dd72b3281afb38eaedd1e0015ab3c92d8ab7ef8f", - "sha256": "1gk4bq6ilbra85nlvr9hsj0h23bbrks6aryx5wsh8xkgaygw1plr" + "commit": "51b28e8c5ba63aa891d5d05aca08ac2688701971", + "sha256": "10xicmc6h0qlxahnf7zd70jg40i2mcz9m7vr1b28wpjgi1rmf8ix" }, "stable": { "version": [ 3, - 8, - 9 + 9, + 0 ], "deps": [ "async" ], - "commit": "dd72b3281afb38eaedd1e0015ab3c92d8ab7ef8f", - "sha256": "1gk4bq6ilbra85nlvr9hsj0h23bbrks6aryx5wsh8xkgaygw1plr" + "commit": "371df21b1e73be03b90028e2f5d8554f70a989b7", + "sha256": "1i253ani2bl665biha0f071pncr2jh7x5yxp8rg2013sdf4nr74c" } }, { @@ -51844,14 +51930,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20221007, - 1113 + 20221118, + 503 ], "deps": [ "helm" ], - "commit": "dbee5c668c49e5b77907f1d9887e2a44f7b196a3", - "sha256": "06bghgrprbxk2svvh20lbi0lb29x8rc7zgm1j8s48zn9w1aqp4hh" + "commit": "c5893f0cd92b20dcdcd5dc89d9ba6200a95c3f80", + "sha256": "0lh7xm295z6fahymxa16jb49pnb8d4fklilbvza8ckbnh422ga31" }, "stable": { "version": [ @@ -53885,14 +53971,14 @@ "repo": "emacs-helm/helm-wikipedia", "unstable": { "version": [ - 20210525, - 717 + 20221113, + 824 ], "deps": [ "helm" ], - "commit": "c242c74efaeda2ffbafd281ee6bceae1a42507bb", - "sha256": "17210p61q6g1rx8a3gacbrv69c4n92h5ajh28yw5ya23c275dnkb" + "commit": "ab040154f2efab9b5eea36b3bd368a66f62efbfb", + "sha256": "091xsyvdsxkvg6rszgqymd8y7yp6v37x1k1022qbf9j66m46y9pj" } }, { @@ -55163,16 +55249,16 @@ "repo": "narendraj9/hledger-mode", "unstable": { "version": [ - 20220515, - 1225 + 20221116, + 2203 ], "deps": [ "async", "htmlize", "popup" ], - "commit": "400bde42a8d2712af80cd7c773c9cdfbb63a515a", - "sha256": "0xmcfpr3rxli1adwypg18npl8hb8ak5rg6a6i26inzzqja6vr897" + "commit": "07baa57017e1b7703560363a6e1948b630a5158d", + "sha256": "0ps6w2a060662c36nmjh0z9ln1gccgl9cvgynrw8m5811inxw4km" } }, { @@ -55239,16 +55325,16 @@ "repo": "thanhvg/emacs-hnreader", "unstable": { "version": [ - 20220928, - 423 + 20221117, + 650 ], "deps": [ "org", "promise", "request" ], - "commit": "8481681c9b2f3bd1ddab12a657f5f3827e288ad7", - "sha256": "0ls4q79s361bwa89g1iq3mk6a9d5q3f5sldip8ww42dafmd9smbi" + "commit": "8444e177035e236e991f9ea73074c053a45426ad", + "sha256": "0v49fvc3phvff2scwlvjdy98y91dmkywij9dl8j95i5iahksq2fp" } }, { @@ -57094,15 +57180,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20221111, - 1219 + 20221118, + 1026 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "ea83139b3981113f3b2115ea3c3efd3d7af6ca89", - "sha256": "0l2n0rypmi10i6vqc7v9m1wrlbxl6valjc9mk15mpf0isrv9x2bn" + "commit": "67e06eccbd063078df9671169c60ed5bb941d9cf", + "sha256": "1hc6f24l8z8nz0sg5dz14wrxsi40x5dzx9a4plldcfdh743lsvp6" }, "stable": { "version": [ @@ -57989,14 +58075,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20220807, - 2113 + 20221114, + 616 ], "deps": [ "clojure-mode" ], - "commit": "59a9f0695f3d97a593f8d5ea04b51ea5dcb2718a", - "sha256": "18kj3ds5sl4dmfqrsbvkd9hpwfyn5qh5nyx1bf7sljbcfjgildw2" + "commit": "e5ce3839835b9b561fca5810f43f413c96c197d9", + "sha256": "04ggx767a795scidy0f58d577pm7ipgpxpi43rlqc2g9gcgzk9sd" }, "stable": { "version": [ @@ -61116,11 +61202,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20220825, - 1612 + 20221117, + 1441 ], - "commit": "ed80b7d736b2f0909dfa9a40be2bba80ea513d7b", - "sha256": "1h4ciihwclvgmgw9z79a9rfxkqyp0p2jh58h6ddpynn4768b7lsk" + "commit": "be47c70024dff044322b281ebbcea38de6d5b50b", + "sha256": "0n1hhq7vmj9a7lww8vfwq96lmsdsj5hngb18gid2qav7kf32dlw3" } }, { @@ -61142,6 +61228,29 @@ "sha256": "0v4xiq3xf7c52rmyymw8a4ws85ij0xy7pr7625gf15359cs5chs9" } }, + { + "ename": "journalctl-mode", + "commit": "aa0b80e1ee16d20c38593650f148783d4f93c822", + "sha256": "126gj6rh6j0j6lbygx15lg5qxfaz4bpspbzd1hv3h05nvnnykv3h", + "fetcher": "github", + "repo": "SebastianMeisel/journalctl-mode", + "unstable": { + "version": [ + 20221119, + 901 + ], + "commit": "c902ad94c2d043f620a44e4c9b1bd7f4d6f22229", + "sha256": "0xp149ibvjxr04pnlfl75gfcjwa91wxvk59dr6fa6761j6phc98j" + }, + "stable": { + "version": [ + 0, + 8 + ], + "commit": "457e38af67427e92d6217abbb362ca9673b33ed5", + "sha256": "1lnjgpbvs3b7h1m1lnd4g3965pjn1sw4vyjd3f4106s10llmkd8x" + } + }, { "ename": "jpop", "commit": "2a52a3cf909d12201196b92685435f9fa338b7ba", @@ -61841,11 +61950,11 @@ "repo": "iwahbe/jsonian", "unstable": { "version": [ - 20220708, - 1813 + 20221119, + 518 ], - "commit": "7ad6d73aff49b346dc9f577ba8a450ac0a8d2aa5", - "sha256": "03q7d5mc0jlgmwxm0lmlrc5pcbpvdxmmbi8qm5wsk9xazdynn7fk" + "commit": "1e8103c281bf7781bf3246d2049165d8966710c6", + "sha256": "0xv5lsl21h0jg5iryg89j6qf4c97v2rw7rh5ja8bbch3s21bv69c" } }, { @@ -66039,8 +66148,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20221106, - 1304 + 20221114, + 2013 ], "deps": [ "ace-window", @@ -66049,8 +66158,8 @@ "swiper", "zoutline" ], - "commit": "1a1abcc233b7434bd615221fbcd27f7694bc5391", - "sha256": "1kghf5yxmdfz9fikva4a1wxm7yk2mv17y85mfskzganb758l3rfq" + "commit": "f35eadf8c1be43a395e196463314b17ea3b4e16f", + "sha256": "01k73h33njx01v0rylrrgxw5q4dzkiiygn68gilx1lkndcg17kyx" }, "stable": { "version": [ @@ -66499,11 +66608,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20220518, - 204 + 20221118, + 341 ], - "commit": "e509c806138cbe164c0d655cc7d662f94c386c9b", - "sha256": "1hc4zggmvizhbim37l61jk5xmnm0r3vn8d2vzmvzw70kiwiwss53" + "commit": "388cb12be5f1e225449cf34bf8c0b18b718d932c", + "sha256": "1fbkz6j545sy33xqkg9kgkr83147yg7g1f7brr796hmc474f5h1k" }, "stable": { "version": [ @@ -66830,19 +66939,19 @@ "repo": "dykstrom/log4j-mode", "unstable": { "version": [ - 20221105, - 1624 + 20221112, + 1509 ], - "commit": "c388b555dfea3c837075be769d771bd38656384a", - "sha256": "1x43f5qlzbsxv3bwsfk3s5j8b87yk0zzlsg3i73x7cxz47wq454g" + "commit": "a878589fbbd291d0aa27f56c582ab900a03ca063", + "sha256": "04jw2zfbzw8qblkmxg5c4dm31i5kk8d9r3l1bqa1bld8s7pdxnp4" }, "stable": { "version": [ 1, - 5 + 6 ], - "commit": "c388b555dfea3c837075be769d771bd38656384a", - "sha256": "1x43f5qlzbsxv3bwsfk3s5j8b87yk0zzlsg3i73x7cxz47wq454g" + "commit": "a878589fbbd291d0aa27f56c582ab900a03ca063", + "sha256": "04jw2zfbzw8qblkmxg5c4dm31i5kk8d9r3l1bqa1bld8s7pdxnp4" } }, { @@ -67135,11 +67244,11 @@ "repo": "0x60df/loophole", "unstable": { "version": [ - 20221110, - 1449 + 20221111, + 1517 ], - "commit": "5fdb2bf6fe04d8e121643638cfccfbe77761cace", - "sha256": "1mi15wwpq3v3j6yr6viy1f4x36p73k439qigxrm6039fpbfqsv3y" + "commit": "a4f161f9ab582ac7cd92e8621530f3a30a59372e", + "sha256": "0kxgkrw7bfk484qa3plh7y0acj8z8byrf2pfq7n8f0k1mcfd71wa" }, "stable": { "version": [ @@ -67734,8 +67843,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20221109, - 1221 + 20221118, + 815 ], "deps": [ "dash", @@ -67745,8 +67854,8 @@ "markdown-mode", "spinner" ], - "commit": "3195c4e0d06e77e9c0185a6251c71c29281c80a9", - "sha256": "0zwp38sjrf6ygsyzpzd2xqbyx6kgbfi87rz2z864w6kladq3zw2a" + "commit": "b4e8aac32d28dfe0f73e0981387c5b20249f385c", + "sha256": "0pim03m7czfy6jphzmw9y38jxhagmffy02d0q95glwxxiz7m6h6r" }, "stable": { "version": [ @@ -68193,6 +68302,21 @@ "sha256": "0rdsjmmi95agb859997qdhbk0dns2jyx2mlg8rync58wna70nmbn" } }, + { + "ename": "lurk-mode", + "commit": "8249b98a1b3239260f61e67002288803047cbaf6", + "sha256": "1pkhfryh00a6d3snmqj4c511bjf8lwydzzal7x0ysfgvaljldfab", + "fetcher": "github", + "repo": "lurk-lang/lurk-emacs", + "unstable": { + "version": [ + 20221114, + 2218 + ], + "commit": "568fdce7b80a3d71d09369318b18f86de2372105", + "sha256": "03d2xlyw9bqd9wpxxim63c43jpdnjnxi2xyp16359zhxs2np9src" + } + }, { "ename": "lush-theme", "commit": "8b29b2f36852e711ce3520d71e83921a1dcb9ccf", @@ -68471,14 +68595,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20221030, - 1214 + 20221113, + 1020 ], "deps": [ "transient" ], - "commit": "e4e703a8ec8310a42ae45eaf6513f04ba246c9e7", - "sha256": "0qimcs8l4hf9b761f4v9hcwz927d38dsvrxzashgwj3xbv2xz1nk" + "commit": "78898be20e3fffef67b3f1eb812347df89cd151f", + "sha256": "1312gd7f02frc26c899cpdbdsxafqgw459i1lwxnnssck48m30vz" } }, { @@ -68665,8 +68789,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20221101, - 2214 + 20221113, + 2221 ], "deps": [ "compat", @@ -68676,8 +68800,8 @@ "transient", "with-editor" ], - "commit": "a3d3758b268e40ecb6ee399833a8388dc59a94dd", - "sha256": "0zw5q97v5q0vpm56jk35wqhrhai4xllpkk01s7p8w99vcc97jv26" + "commit": "05b0d99d714350d51676b86da9f5daa2f6b7fa3e", + "sha256": "043y2fzvm7b9626qyaljab5zcgwflalw5vi9sln72q3pyx8zk8rw" }, "stable": { "version": [ @@ -70447,16 +70571,16 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20221110, - 1948 + 20221117, + 1357 ], "deps": [ "persist", "request", "ts" ], - "commit": "404d2fce2a5a975888a499aa224c81e862f60b82", - "sha256": "0mqah8jfi1v97ia408a9750zwhsh95k3vfh1p3fjs2v5lx900vb6" + "commit": "98276c45f29d4e45955ad7649758619453423cb4", + "sha256": "1sikn8jbq06k2z3qssrgh393hadrvmf667k6w3xd02sbas3zpk5d" }, "stable": { "version": [ @@ -71507,20 +71631,20 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20220919, - 2119 + 20221118, + 536 ], - "commit": "a87e5d665838478dc03416f078e7d6f2100604ea", - "sha256": "1zfkny44mvwdlgh0dx0kb7wrlcazfhasbm19yp604adn0nvi9vvm" + "commit": "0d435af91c237351f0880536cb3cf21a91041ba4", + "sha256": "1h2i63b7615kdn7d8bfhpn8c5ml17vf9lj7cyz4bhgrd8jdsrm71" }, "stable": { "version": [ 1, 1, - 15 + 16 ], - "commit": "a87e5d665838478dc03416f078e7d6f2100604ea", - "sha256": "1zfkny44mvwdlgh0dx0kb7wrlcazfhasbm19yp604adn0nvi9vvm" + "commit": "0d435af91c237351f0880536cb3cf21a91041ba4", + "sha256": "1h2i63b7615kdn7d8bfhpn8c5ml17vf9lj7cyz4bhgrd8jdsrm71" } }, { @@ -71564,11 +71688,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20210625, - 240 + 20221117, + 1310 ], - "commit": "fc4bca6d95d8b8d5e169ecf1433d968c2eec299d", - "sha256": "0lcy73df204ww4kmbkfz5cbpmdwbsn7z47j5by89izn14dczllvq" + "commit": "7e4dd83a1896f44e1b6c820263c850e3b33eec50", + "sha256": "0zjnqnrz4gy1rikrgg8smg62wy3m50w0gpsq644606s24hvf7kwc" }, "stable": { "version": [ @@ -72342,13 +72466,13 @@ "version": [ 0, 5, - 8 + 9 ], "deps": [ "cl-lib" ], - "commit": "8aed53f9aec4bcb9faf5f2b080e863f51d775905", - "sha256": "0ds48cfznxcakrfgyyw1valb7ia1sijwlmxs7mcq4787ck9l8hwr" + "commit": "8725cfc12bded653d52a6a223c4d34bec2b1d538", + "sha256": "12dn3zp17kw1cj3a883mn1g3dgdai5qy9p799zg752ishp3dqan8" } }, { @@ -72745,11 +72869,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20221101, - 424 + 20221117, + 1155 ], - "commit": "f1149c18005d31638b3701f9a89819b133b4360e", - "sha256": "1r1h1vb3yxd9k2m0fyk6rgy6vfaqkb0k6780wgqg6i21r552qi5p" + "commit": "30b622807601d3c1722347717f998d6d5a0146f3", + "sha256": "0iis4lc2sxbzf5syp23zqpy451avv7k1hwjc5d3y0lrnp4ivchln" }, "stable": { "version": [ @@ -74561,11 +74685,11 @@ "repo": "NinjaTrappeur/my-repo-pins", "unstable": { "version": [ - 20221111, - 1020 + 20221115, + 1729 ], - "commit": "98500ddde2d9c1e19ec319a7bab28bd2eb0dbcab", - "sha256": "0gnqb1n1cxrbr3cfgnnjrzkq9pmrnn2zbrpig63p9vgffs3xr2hd" + "commit": "e6d7d6c21c53d9120e54d5f68a6277f49acbe3bc", + "sha256": "0a1d5z8ma5b8mjkaiibblcf1x2rnlbr5zc0nxjnhv2lw569iv3ql" }, "stable": { "version": [ @@ -76336,14 +76460,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20221025, - 2346 + 20221027, + 346 ], "deps": [ "compat" ], - "commit": "8a556ddad8ff58db2d2e2fafd5a495815d23179b", - "sha256": "0h041nzdhzkm0bp5q4z0vfqvp808x5l4q0npk29j32yjj7yd2as3" + "commit": "cb277b8a84ca5857b607b3ff6132ee3663a57953", + "sha256": "1x6jcsndmlxvj9ncrg2nam5zqvcs0a5jjjm7ij3q929rdn5fl3kc" }, "stable": { "version": [ @@ -76679,11 +76803,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20221105, - 1730 + 20221115, + 1134 ], - "commit": "82aa1acc0c6a66eb3b771357e513eb4d16f9f276", - "sha256": "0q0zs4yqb6rdhzp7r8xz1291mwcxl36fvlcyg8x13b1mk43p2bbp" + "commit": "5ba7684445b9338ab289d502d4688d9aff3d8803", + "sha256": "15f6f4wm0k99ipzd7q3iv4w1ch534wyrnm0vhqa25k0sz2skzssr" }, "stable": { "version": [ @@ -77411,14 +77535,14 @@ "repo": "rocher/ob-ada-spark", "unstable": { "version": [ - 20220715, - 1824 + 20221114, + 2007 ], "deps": [ "f" ], - "commit": "e2c9b08b62d8cd480f274f548bd97f3a941ae707", - "sha256": "0s4w0dqyc9hgwf6xsrz4jwybfpn0bml1laq5bkr0n4w61cs8nf6f" + "commit": "92978410ca14aa4e84c229a0920ad40be91c35e1", + "sha256": "1ry81c9cqagfk35nrm1m5q3ph23fx9pawy03sldjvjgcy7pgimzw" }, "stable": { "version": [ @@ -77893,15 +78017,15 @@ "repo": "juergenhoetzel/ob-fsharp", "unstable": { "version": [ - 20221112, - 1135 + 20221113, + 1904 ], "deps": [ "fsharp-mode", "seq" ], - "commit": "fee0042f14edc32c33fb8bfc9599bb7b5c529c29", - "sha256": "1bv424y22lssmhv8l6zbibv1zcnasncyjkbhd3mg6x6znkq0c680" + "commit": "a5e893a88d47bd8ea01cf456331ce54910321b47", + "sha256": "0ag3jib93ncwnmxa90b74alrcqwrr3g8zsw2cc30gb2pgh1hikwb" } }, { @@ -78142,6 +78266,24 @@ "sha256": "1ricvb2wxsmsd4jr0301pk30mswx41msy07fjgwhsq8dimxzmngp" } }, + { + "ename": "ob-lurk", + "commit": "8249b98a1b3239260f61e67002288803047cbaf6", + "sha256": "1adw6aip92xmzcgl2zqnpw7pw8nsfjsn5kbpxdq8a70cx04k820m", + "fetcher": "github", + "repo": "lurk-lang/lurk-emacs", + "unstable": { + "version": [ + 20221107, + 1338 + ], + "deps": [ + "lurk-mode" + ], + "commit": "b341ffbf5959bbbc7dd33b35e207ce8b7bfbf565", + "sha256": "1hs4msdqi1m74ypgqrzag49x868i2vxf6wybb6kcc26kb9f36pwp" + } + }, { "ename": "ob-mermaid", "commit": "4df483806a4caaeb99fdac42f83bfe648d2e4165", @@ -78823,8 +78965,8 @@ "repo": "licht1stein/obsidian.el", "unstable": { "version": [ - 20221110, - 1824 + 20221115, + 1143 ], "deps": [ "dash", @@ -78833,14 +78975,14 @@ "s", "yaml" ], - "commit": "749583cf04c8e703ff1e1094792c0a52d493c8ed", - "sha256": "1574yz9jzs7q4mi0h748wra27i3h82vbsn24gl7nyvzkpiipj8ja" + "commit": "95bf7624e26adb29925e4609dd0aeacdb29c5bc5", + "sha256": "17ymp9z735cisb7bjdcmqmhv88n2vhzg3l7708jcj6a588i3sbf3" }, "stable": { "version": [ 1, 1, - 8 + 9 ], "deps": [ "dash", @@ -78849,8 +78991,8 @@ "s", "yaml" ], - "commit": "a8925d3674dd0928895f4dca824e7cba0f031c72", - "sha256": "0qzs8n3lp0ab0gfv874px4ki1mym557j81qbgxniw8n3qhcklqnx" + "commit": "95bf7624e26adb29925e4609dd0aeacdb29c5bc5", + "sha256": "17ymp9z735cisb7bjdcmqmhv88n2vhzg3l7708jcj6a588i3sbf3" } }, { @@ -79866,11 +80008,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20221023, - 1708 + 20221113, + 1719 ], - "commit": "b355ef6d386134f16eafe17051e9fafcfbea9cad", - "sha256": "1adkcr0s65a73kjgj7fsjks8hhg3w1zm7jiqicn7gj87jlc7nnjm" + "commit": "2debd96da6f75703ccbca6d852ad994ce84fa529", + "sha256": "0ppwlp6a105m5ic5k2xgxz4c5wwsq025vhclzgvbnk73lmmg2c0v" }, "stable": { "version": [ @@ -81142,32 +81284,38 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20220809, - 1955 + 20221119, + 0 ], "deps": [ + "aio", "alert", + "elnode", "org", "persist", "request", "request-deferred" ], - "commit": "40291bec0cd0bf8a2f5db656e4d3077b256092ae", - "sha256": "00ais9k2qc9ib7ihh38hwz3gmkn9zcb2x5n7x8cllhdq8zmy00a6" + "commit": "86faad251d3109a900661d40001f214cf51bc635", + "sha256": "1ygl4c6x7h1wlwhh92b75wiqf5hkmi3q5j4q9klvicn2hb1hfgaa" }, "stable": { "version": [ 0, - 2 + 4, + 0 ], "deps": [ + "aio", "alert", - "cl-lib", + "elnode", "org", + "persist", + "request", "request-deferred" ], - "commit": "badd3629e6243563c30ff1dd0452b7601f6cc036", - "sha256": "1pxfcyf447h18220izi8qlnwdr8rlwn5kds8gr5i1v90s6hpa498" + "commit": "86faad251d3109a900661d40001f214cf51bc635", + "sha256": "1ygl4c6x7h1wlwhh92b75wiqf5hkmi3q5j4q9klvicn2hb1hfgaa" } }, { @@ -81685,14 +81833,14 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20221021, - 859 + 20221117, + 1124 ], "deps": [ "all-the-icons" ], - "commit": "0e72581a26a23b1fafd4983904f0904496395cd1", - "sha256": "1gryqglrb7m3v0ynbjl8365rh2j1x8688dyd34c2xw3c26z87d00" + "commit": "f4d9c343c75dc0bbda5375d5315cdee8c819a61e", + "sha256": "0vxw5f8fcx6n6gkmzxh0vd0gmpzjaczsa3a9ig1hxz6zw46q1vzi" } }, { @@ -82638,6 +82786,21 @@ "sha256": "0zhf4yfs6a50b5lq4yp9cmm6sv1j94hak6c353df76nssg4vbil5" } }, + { + "ename": "org-rainbow-tags", + "commit": "157458f7bec9624418993723ec2a7931f9da2e25", + "sha256": "1ph8jrqpvdcv0s8i8n8a6pqnv3bf9jvarmddv1zsrfcf7hbrdhvg", + "fetcher": "github", + "repo": "KaratasFurkan/org-rainbow-tags", + "unstable": { + "version": [ + 20221114, + 1307 + ], + "commit": "6001ec9345bea4e60b2178940ef197c055d5a5d8", + "sha256": "1qlpszfvi1zngfi377pxkb9byhw0x8h4wsc70jn2slddq0jryjad" + } + }, { "ename": "org-random-todo", "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", @@ -82965,15 +83128,15 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20221101, - 1828 + 20221119, + 1134 ], "deps": [ "dash", "org" ], - "commit": "2b6d77f7c5e043b90435c604196d7a551e62bdc3", - "sha256": "0fxrd0pdbgw3d8im57s68shyag97raasfgjh3ap4nm2n3708j3gb" + "commit": "b6d6b7179019e87b13dfdfeef28037821ed4d01f", + "sha256": "0yibkc1mh8z15lpjws92d71d8vxr6svcbdnlxi9rpr1c108vqqkg" }, "stable": { "version": [ @@ -84385,8 +84548,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20221030, - 1910 + 20221118, + 536 ], "deps": [ "htmlize", @@ -84395,14 +84558,14 @@ "writegood-mode", "xml-rpc" ], - "commit": "a77a549de75e1f1c8c806b30f7fd2dd0b2ea8593", - "sha256": "1c6k3czh54hn3gm8f30l2hmszmpnazph3q0n2qkdf979334h9079" + "commit": "0d435af91c237351f0880536cb3cf21a91041ba4", + "sha256": "1h2i63b7615kdn7d8bfhpn8c5ml17vf9lj7cyz4bhgrd8jdsrm71" }, "stable": { "version": [ 1, 1, - 15 + 16 ], "deps": [ "htmlize", @@ -84411,8 +84574,8 @@ "writegood-mode", "xml-rpc" ], - "commit": "a87e5d665838478dc03416f078e7d6f2100604ea", - "sha256": "1zfkny44mvwdlgh0dx0kb7wrlcazfhasbm19yp604adn0nvi9vvm" + "commit": "0d435af91c237351f0880536cb3cf21a91041ba4", + "sha256": "1h2i63b7615kdn7d8bfhpn8c5ml17vf9lj7cyz4bhgrd8jdsrm71" } }, { @@ -86669,19 +86832,19 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20220830, - 1429 + 20221113, + 1600 ], - "commit": "c3c535e93d9dc92acd21ebc4b15016b5c3b90e7d", - "sha256": "17z0wbqdd6fspbj43yq8biff6wfggk74xgnaf1xx6ynsp1i74is5" + "commit": "9190f3d21b7cd1c0e7c26f4c1cf6b4a07f7ab8fa", + "sha256": "02r5bs5ifm95j0lcdkaqkn77wdwvdmd2f6r6b4b5ynyx3rlp9003" }, "stable": { "version": [ 3, - 1 + 2 ], - "commit": "1604b3a5f0040c6f487d38561388abab2f3d54c5", - "sha256": "1gkqav0ipfk5gsklxrbggqrbphr12qg1qr6dpdi4f0hs0i11fr23" + "commit": "b40825a1ff83fb1adfaa61ea91d99a85bc52ea85", + "sha256": "02ngllr9lilpjsgdpk4628kdp0nwdlrkxj78bvi4jlhnbk4chh1c" } }, { @@ -89256,20 +89419,20 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20221107, - 1615 + 20221112, + 1616 ], - "commit": "bbed922fa9b9ab36aeffcbdb85c434c4a6c41450", - "sha256": "195jfmv47hghg5dmzg0csssaiw829z2wcx2awnb3mvy6wiwbv01v" + "commit": "d01cfc9cd51706e076bf7e5cbf0cfa7ee885efb4", + "sha256": "13lkzvamr86409whr8as4721gx9xrlfkmxvv941775mryliqk6j6" }, "stable": { "version": [ 1, 24, - 1 + 2 ], - "commit": "2440330456e6b73ba3725d1bebddfe67cb6e6e5c", - "sha256": "06xgmlbvqhkrnk6390mdbpjij34msxxwzqmagi6zpwpsf38mn6qf" + "commit": "d01cfc9cd51706e076bf7e5cbf0cfa7ee885efb4", + "sha256": "13lkzvamr86409whr8as4721gx9xrlfkmxvv941775mryliqk6j6" } }, { @@ -91628,20 +91791,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20221015, - 727 + 20221118, + 614 ], - "commit": "3084cb6eb366d26b0f5a4aa9baffb297178be3b8", - "sha256": "0y8mm8wpylvnmpfvk56hfs550cd181fwwxpbqip7px1wc0wqfmhl" + "commit": "48b7130ca3b5c98bdb21bf99b64a3536acf2b0eb", + "sha256": "1v8jkrgfkj2a08m82dz7vrlyjw3wrk3nd33wi4c166agssznlmih" }, "stable": { "version": [ 1, - 1, - 8 + 2, + 0 ], - "commit": "0c5e57ac870735cb780936b1efc4bdd17fe87112", - "sha256": "15q7igq28z36v0fq31hhdp5xp0fl9cf864i4hhapvh295hf2n8xy" + "commit": "48b7130ca3b5c98bdb21bf99b64a3536acf2b0eb", + "sha256": "1v8jkrgfkj2a08m82dz7vrlyjw3wrk3nd33wi4c166agssznlmih" } }, { @@ -91991,11 +92154,11 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221112, - 344 + 20221118, + 307 ], - "commit": "c28bca2213efd2666b0328c29f2c26e9b603cc9a", - "sha256": "0156sbs4b535mcwm44qjr8lx48svmjvdqh8c8hr6d0l709f27yq3" + "commit": "a000de747515aa7e7ad1ea0eab711864a4be0ab5", + "sha256": "1d1d4msmkc0cvd6vva0pfq72i07p0my9wj2s8zvj60pvah620yl0" }, "stable": { "version": [ @@ -92754,11 +92917,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20221112, - 914 + 20221118, + 1035 ], - "commit": "1ca2303eaa60abc3fda94bd54572a2a5f1ce7c16", - "sha256": "0s1biz7wvb3rhfjkm87ga70fly4j7kp0q4n9mqpmmjnq1wnsjkfy" + "commit": "5703797bb2a400e962479e670086aca4241a77b7", + "sha256": "0xm6792q1z90mjmxrp54vw2yh34hzxisdxz5dl5df78ckkgbxsww" }, "stable": { "version": [ @@ -93534,6 +93697,21 @@ "sha256": "17jc7gjawbj7b5v2i2jfxwnjgi023xrr28dyigzv6yw72fzqcnlh" } }, + { + "ename": "ptree", + "commit": "37562efe28a6c4e1c72a57236f80aa734d7144ed", + "sha256": "1ycgj0gnl3xh5bjnadfwjlip6f51kbmsvdqykiy2mv7321lrghpc", + "fetcher": "github", + "repo": "alpha-catharsis/ptree", + "unstable": { + "version": [ + 20221106, + 1649 + ], + "commit": "23cb9093f99b9869606f8d54fa5c45ea35fcc789", + "sha256": "0vxji487f1yfffjs8vgi8f4l2ssj3n26lr2sx5xzdj70x2w5rz04" + } + }, { "ename": "pubmed", "commit": "ee84560c15e7389e902fb4a4c548c08be231de82", @@ -94365,11 +94543,11 @@ "repo": "it-is-wednesday/pyinspect.el", "unstable": { "version": [ - 20220805, - 918 + 20221118, + 1014 ], - "commit": "df5959e699157d757c16ce11efdf3045a5b58d23", - "sha256": "15xbs4g5agp700ajqrfcz6fgmridj55v8hhg1jmhqn1aacvh6zas" + "commit": "a6f9a47327b2465dde106307e5dd8e84cb3321d9", + "sha256": "1lqgv9xbl3fvgkz60rwq7awmzhkpfd70bhl1fbz8v4cl4fhbl1p7" } }, { @@ -94380,20 +94558,19 @@ "repo": "emacsorphanage/pylint", "unstable": { "version": [ - 20221111, - 2150 + 20221117, + 1303 ], - "commit": "8958821959b7380ba762a29f607cfcacf3a5ca1f", - "sha256": "0zl84fmvk7rm32ljcca70zcn3k2mq1mfl158lf6ypypb33sa4zbv" + "commit": "bddb91610b6b6aa1e7fee96b6be3be69dfe3695e", + "sha256": "0n7d70l9bjz210dazvn13mr7s0klinnqr36n59fzsrij6xp46kaq" }, "stable": { "version": [ - 2, - 15, - 5 + 1, + 3 ], - "commit": "bb17694867b1668db0cd3ae00c8a960d7f4b9868", - "sha256": "01p44qlwd3j1fsnkzma81ql7h9mlpn9k26m79rsp114lqv077j3m" + "commit": "bddb91610b6b6aa1e7fee96b6be3be69dfe3695e", + "sha256": "0n7d70l9bjz210dazvn13mr7s0klinnqr36n59fzsrij6xp46kaq" } }, { @@ -95416,11 +95593,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20221107, - 1846 + 20221118, + 1721 ], - "commit": "74999273195dfeed98bfbe63114df1002e53eee6", - "sha256": "0rsnyg8y5zzhmfpl4qk47jvcrddzxhg0s43d2jhf8x60fjzz17l7" + "commit": "28d19dee861354d92108692dd80d9f18b2db0c46", + "sha256": "08blxg2ibf9nr2m1hhrw9l232a1zly44sw8xrzbznipv6s9388w1" } }, { @@ -97505,11 +97682,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20221022, - 1122 + 20221115, + 1450 ], - "commit": "2c33e451879c4ea406a4a2e076636188eb4b9920", - "sha256": "0jmfjsgvbl0yc7fynppfwbxi0nf09057cr479biiw5an5pd0d8r1" + "commit": "eb66f05fe37f22228f470882b04a6362683975e1", + "sha256": "0g6n9bajgs7mgw9qlx0kin109br92wfn5py5zby674khxvppxdf8" }, "stable": { "version": [ @@ -98209,8 +98386,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20220620, - 951 + 20221112, + 1341 ], "deps": [ "cl-lib", @@ -98218,8 +98395,8 @@ "popup", "posframe" ], - "commit": "3eeef9c445fa056a4b32137f9ef72c27ced2d4ab", - "sha256": "1sk09z05xvg94pkf4181hvlg9q0m71kinzxv8223ls8df6ymc43k" + "commit": "74f3dff40e66c65388a9471eecbc1d9aca5612f7", + "sha256": "1bqhn6pvsgs1x882q7y5p372aify2jmyfmgmx99nzakxbfkb0yqp" }, "stable": { "version": [ @@ -98424,14 +98601,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20221108, - 40 + 20221115, + 149 ], "deps": [ "inf-ruby" ], - "commit": "9211e329c717a7c63ef1347e583274c1fd1e019a", - "sha256": "1d3psvi6x9pizchx39hfnfma9033blns6j06b32109798mqddk8n" + "commit": "c29b47f588715b911da4588a59f3a5245f844138", + "sha256": "05b60l9pn4hh3fdxlk0q98qi2w283a62x7jw02v958y33p030bqd" }, "stable": { "version": [ @@ -99355,8 +99532,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20221025, - 1131 + 20221119, + 1151 ], "deps": [ "dash", @@ -99370,8 +99547,8 @@ "spinner", "xterm-color" ], - "commit": "4879922524faff116535c9061af6e8a902609f65", - "sha256": "14gdgmxzxv31g0bgidqk7jdl1i38h0ybkndp04s8rvja92jzfpsi" + "commit": "1dfa9b5dfbab261bda7555e675ab2b6db13d0be2", + "sha256": "1lara2q3m2mxfxk8bjhal58gqwkaj1rmh9v2racydzp32hjwk6xg" }, "stable": { "version": [ @@ -99904,19 +100081,19 @@ "repo": "openscad/emacs-scad-mode", "unstable": { "version": [ - 20221111, - 1803 + 20221114, + 559 ], - "commit": "efc5f1cf1485b28ce77c9d83506d98bdca932659", - "sha256": "1bg1d42v0id406yqkggylmwfynsj0r0f5fh0f1w28qjiqx8mi0k6" + "commit": "188c9708e06f59c580866e4b9ead81513dc92df0", + "sha256": "08l9kxxzzm3apfrrwvkqsxyscal8357b7w87c3aagbbwvmxc3zfw" }, "stable": { "version": [ 93, - 0 + 1 ], - "commit": "61f306462ad97981ac8b952b4baba2e31f745a89", - "sha256": "1prdc1fdd7n9vgq20wk7q16px8yn6zr26nq8naw8d0ndinsly94m" + "commit": "efcc16b1af3c3e2262fe75e9eb0f2ed30547da3f", + "sha256": "1785fyahlqs7fshvcsa2vpvdi2q1qza03iii984xc260dc4wqv5v" } }, { @@ -100755,15 +100932,15 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221112, - 344 + 20221118, + 307 ], "deps": [ "prescient", "selectrum" ], - "commit": "c28bca2213efd2666b0328c29f2c26e9b603cc9a", - "sha256": "0156sbs4b535mcwm44qjr8lx48svmjvdqh8c8hr6d0l709f27yq3" + "commit": "a000de747515aa7e7ad1ea0eab711864a4be0ab5", + "sha256": "1d1d4msmkc0cvd6vva0pfq72i07p0my9wj2s8zvj60pvah620yl0" }, "stable": { "version": [ @@ -100972,28 +101149,28 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20221102, - 239 + 20221117, + 642 ], "deps": [ "dash", "edit-indirect" ], - "commit": "ba61a20b8406c925a9626a0ae7ee5466b00610a5", - "sha256": "06d69v78apkm5dg5bzy13x7zb2p5a35cw5wk85mv8yq4rhlngw2d" + "commit": "91a41ff8044e7cbeb82159f6c595393606e5e744", + "sha256": "0bl6wvw1z5bax4msmdahxi0y4cp85nb4s90j32r8vzn41s3pyabz" }, "stable": { "version": [ 0, 3, - 0 + 37 ], "deps": [ "dash", "edit-indirect" ], - "commit": "424b0f260a1bca20cd9359c42a0bc64a1a5e1928", - "sha256": "1i85mbnh6ijycsgxiknzvkimxag72cxg8asg3d1g4bakv3gp32rr" + "commit": "91a41ff8044e7cbeb82159f6c595393606e5e744", + "sha256": "0bl6wvw1z5bax4msmdahxi0y4cp85nb4s90j32r8vzn41s3pyabz" } }, { @@ -102660,15 +102837,15 @@ "repo": "semenInRussia/simple-indentation.el", "unstable": { "version": [ - 20221111, - 1848 + 20221113, + 1645 ], "deps": [ "dash", "s" ], - "commit": "06c3d16849f011ae492d190b5ddb0d7484967286", - "sha256": "1i93v5aq92q81a49rygw1s3vi9vl1f8s2z2ajkq1pc11plknplwk" + "commit": "77685b3dd802dade7d60817fc0e24e60c101776b", + "sha256": "0dsrqip19pjdbdg039pq56wqynx271h5f25wx13k0y08smgpylnm" } }, { @@ -105430,11 +105607,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20221112, - 139 + 20221117, + 127 ], - "commit": "73e7279bb95b2e9640b9dfbe3f6ffea366da90d1", - "sha256": "0w1q2bixa061ddgh7a7mlaai4hcazi02avs6blcanckcl4jy3xvc" + "commit": "9364053159df98809996f3dce622b192638e40ee", + "sha256": "046vfbz6capsymqniclbsyhx6zc1l25z6391709kchyl4as2qlp7" } }, { @@ -106163,11 +106340,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20221110, - 2251 + 20221116, + 52 ], - "commit": "d8b801b192debb72c22506e8391bc35ccca822ff", - "sha256": "09p9n0nr9464g5xw4kzwvvbyvw5m4pils34i295ca1vnw36r9y8x" + "commit": "689d27ed94254e3a3ce5a104057acc525e68a2ff", + "sha256": "0d14p5ijhs3aii7bzlbkaj7wwsbky2ar8mw55qqvz247b0zr4061" }, "stable": { "version": [ @@ -106608,10 +106785,10 @@ "version": [ 2, 0, - 1 + 2 ], - "commit": "d9e2ce90abd41260cabd99ed85b8b9ce604ec616", - "sha256": "01w18w5h5981bbrqh395zn41qzmr7c8a1yaihjxyn386cjqx5bbp" + "commit": "7c0fb7928fa691df68107a8473d1970cd6909945", + "sha256": "1pr4asqm2ql29jg3z5racp2z7nl56rj13bzy5jx5rd31gyaqi69f" } }, { @@ -107703,14 +107880,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20220924, - 648 + 20221119, + 910 ], "deps": [ "seq" ], - "commit": "f4529efa453f2f3051e2c8f772cd9da80147b93d", - "sha256": "01dw8azlwfs6x9arl4kd28s03pqvza79g7dhw54v2rg42g3hpdx5" + "commit": "6d7093fb4a0b81686ffeff7e39f76027d83b7eb2", + "sha256": "0x27wj5kc77qwnvzm905np37w8rn96i1d104pa882z6pd4bx46ps" }, "stable": { "version": [ @@ -108088,10 +108265,10 @@ }, { "ename": "symex", - "commit": "bbe4ff01aa8c06093cd0e4ad0cce253c3fb52816", - "sha256": "0nx03kl4bwdbidhvb7zba9gr6pc2gplh6zbnlxjb3zsvdm4injh1", + "commit": "8d14a6b06d97b36d5d76e418f800d6bc3156700f", + "sha256": "0y6nma82mxggp0724axy1fnvi3girnscjygdhl28dd3wx6kk268b", "fetcher": "github", - "repo": "countvajhula/symex.el", + "repo": "drym-org/symex.el", "unstable": { "version": [ 20221111, @@ -108326,14 +108503,14 @@ "repo": "enricoflor/syntree", "unstable": { "version": [ - 20221010, - 2122 + 20221114, + 1804 ], "deps": [ "org" ], - "commit": "2aba7298ab865e5242a013b3c7ecae240b5c811e", - "sha256": "0i8pdw8icw8gxqyzga8ywg26i288qirqpss3ahwyp77p7mqqs9f2" + "commit": "a36e5eeaeef2a179184883fc0a91b63d653d3cd9", + "sha256": "09mp6zw1lrzaf5sijq6h2qwcjavyk5zdngvl4jn1hh90l18rn6ld" }, "stable": { "version": [ @@ -108532,11 +108709,11 @@ "repo": "fritzgrabo/tab-bar-echo-area", "unstable": { "version": [ - 20211013, - 1942 + 20221115, + 1953 ], - "commit": "d0d51ecbc5929eb7752b387c5bdfe4d879e78224", - "sha256": "1p3ikc776mr18r5py0sw098ahsj9w45ikqns4wbgr2fsjmgcgksr" + "commit": "3ab62ca7db3c1d83f96b7971ea4b3b0101b51ae9", + "sha256": "0grapqwfqjbi9yzcirgd8gmkg4zkplagwvdyal4jd4aajnnx6sh8" } }, { @@ -108691,14 +108868,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20221110, - 133 + 20221114, + 1744 ], "deps": [ "project" ], - "commit": "0f9726ae80384eb51d506cd5bee4c40430bd0439", - "sha256": "01vfqkdb4y8gn0xcfic29asx4jzifq8dkgybg51sh53vrwkndhxp" + "commit": "f25bb670c0f7b3f7555634d19fcdd3eb979ac7c0", + "sha256": "0y32r7p4mh56zjhmd5pfkgic3gx0xlwabay690pxzl9sqjpnai4p" } }, { @@ -109716,15 +109893,15 @@ "repo": "emacsorphanage/terraform-mode", "unstable": { "version": [ - 20210621, - 1953 + 20221117, + 409 ], "deps": [ "dash", "hcl-mode" ], - "commit": "e560caaa9d9a11b0868adf6d9dcae5ebb5055730", - "sha256": "0r4zw6jwn5v1xzzbc1195jblhcg3ikbmz3wiwy462qzib56bj8d3" + "commit": "80f0433358b79ed4ba88c51829c7359baa1af8b1", + "sha256": "0gcxsd9zv47hzq1d5xqblyzgcf7vk215743s7x7ciiiwlg5xndnw" }, "stable": { "version": [ @@ -110262,7 +110439,7 @@ "version": [ 2022, 11, - 7, + 14, 0 ], "commit": "68ba6854cce62923446c15e7f638417a8d7da7c8", @@ -111480,14 +111657,14 @@ "repo": "magit/transient", "unstable": { "version": [ - 20221028, - 1430 + 20221118, + 1443 ], "deps": [ "compat" ], - "commit": "ad953cc3c5b8a066d3da11a8527c035744f1385f", - "sha256": "1mv0iaj8y2s617cvpv3jn3xzxkcqvn6hrqgl9f3062qsv8rzh8vi" + "commit": "804c27f1f585c05a777c288fbcfa1c16a3c0cd45", + "sha256": "1krw6rhgc6qvldb83zg021n13gg22l5afddnzpas5z7c0p154dm9" }, "stable": { "version": [ @@ -111902,26 +112079,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20220925, - 1020 + 20221114, + 1054 ], "deps": [ "tree-sitter" ], - "commit": "00738cb725785cbd42978f944f8661c33b5d3fe5", - "sha256": "1nr1k92c0k7q0x7mgm0x23jyysc09mf967bmhyw6m4pdy1myc38x" + "commit": "df7d7d1a46b5145d4101f6b313d22e815e4f42b4", + "sha256": "0a34032r6vdnyg4akvil559q1jx091sbmzaq5l59a20pz8jxw349" }, "stable": { "version": [ 0, 12, - 4 + 5 ], "deps": [ "tree-sitter" ], - "commit": "00738cb725785cbd42978f944f8661c33b5d3fe5", - "sha256": "1nr1k92c0k7q0x7mgm0x23jyysc09mf967bmhyw6m4pdy1myc38x" + "commit": "df7d7d1a46b5145d4101f6b313d22e815e4f42b4", + "sha256": "0a34032r6vdnyg4akvil559q1jx091sbmzaq5l59a20pz8jxw349" } }, { @@ -114077,26 +114254,26 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20221029, - 1857 + 20221117, + 1610 ], "deps": [ "bind-key" ], - "commit": "0be480ea77655304a4e6aa9d38d9d9a251b2bd32", - "sha256": "1d82j5awma5ckb8l9465i43yvi5ypc142q3r01wqryqj7an1yzky" + "commit": "9090080b15486c3e337be254226efe7e5fde4c99", + "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" }, "stable": { "version": [ 2, 4, - 1 + 4 ], "deps": [ "bind-key" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "9090080b15486c3e337be254226efe7e5fde4c99", + "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" } }, { @@ -114107,8 +114284,8 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20221026, - 1834 + 20221116, + 1928 ], "deps": [ "bind-chord", @@ -114116,14 +114293,14 @@ "key-chord", "use-package" ], - "commit": "5c95dcb1e8690ab5f15342dc9d4bedd599f1650f", - "sha256": "16986nlca7qnmk22sq5vn05pmfdhgcww21djyxh9xx7k4hkgwn9g" + "commit": "41bf2aaf8854973d06f79ef69a638d0ef3ccf2bc", + "sha256": "0jji4lydv80dl9brbjhf2vyrsf52564nkvlqdrf0xbgaxjh34bnk" }, "stable": { "version": [ 2, 4, - 1 + 4 ], "deps": [ "bind-chord", @@ -114131,8 +114308,8 @@ "key-chord", "use-package" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "9090080b15486c3e337be254226efe7e5fde4c99", + "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" } }, { @@ -114172,28 +114349,28 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20221026, - 1834 + 20221116, + 1928 ], "deps": [ "system-packages", "use-package" ], - "commit": "5c95dcb1e8690ab5f15342dc9d4bedd599f1650f", - "sha256": "16986nlca7qnmk22sq5vn05pmfdhgcww21djyxh9xx7k4hkgwn9g" + "commit": "41bf2aaf8854973d06f79ef69a638d0ef3ccf2bc", + "sha256": "0jji4lydv80dl9brbjhf2vyrsf52564nkvlqdrf0xbgaxjh34bnk" }, "stable": { "version": [ 2, 4, - 1 + 4 ], "deps": [ "system-packages", "use-package" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "9090080b15486c3e337be254226efe7e5fde4c99", + "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" } }, { @@ -115083,11 +115260,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20220915, - 2159 + 20221113, + 2327 ], - "commit": "f945690276fbf16e65ac97f53ba5da9f8b637546", - "sha256": "1zggkw47v3q7r8v66zvpkp60pgidwxypjc373956s0d09ifw3i2p" + "commit": "b8ff1a0bbf84920fe26c56b9658bd289f43ad100", + "sha256": "0vmrmjfkky17sj8qrvibbnv621dnfksm21wn2h7kn40qi5h5kxb4" }, "stable": { "version": [ @@ -115214,6 +115391,25 @@ "sha256": "1x04wrf3h6f4wsh4n2cl3n4byj9pxni918ri49hqxzm8h8hivigc" } }, + { + "ename": "vertico-prescient", + "commit": "72a84587636e291bee48d7e9ad5723791ad02d7e", + "sha256": "13hwp7264x0p2ffkfblx219a8idz351nxvc4y0fjyg9p5l3dswjl", + "fetcher": "github", + "repo": "radian-software/prescient.el", + "unstable": { + "version": [ + 20221118, + 1427 + ], + "deps": [ + "prescient", + "vertico" + ], + "commit": "680fefa4601586dd87d549d33f5ae6fda3212c35", + "sha256": "16k34jp07snzknyp2lg0g6vsb7pk96s0fplb9hdjq8w3n4kyirb1" + } + }, { "ename": "vertigo", "commit": "f1957e7fa03b6b8eb2f3250bd814d707bce3cfa3", @@ -115899,11 +116095,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20221102, - 1407 + 20221118, + 1354 ], - "commit": "5de2684d22d025a227b7d0d5bab89fa8fb6dbfda", - "sha256": "1an38rwg2q7iyrbn7ynfmx7jdb82m59lgm77ggwwq76ipncwvy2a" + "commit": "f14d113ee4618f052879509ec378feb9766b871b", + "sha256": "0alvh18agp815g5r2cwvyhfpspjfjz5gi84bg1xsi085g1wvgmbl" } }, { @@ -116157,11 +116353,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20221108, - 22 + 20221116, + 2331 ], - "commit": "1ee184aab337b662f9725378bd49bf3a29dd984c", - "sha256": "017fxa7agwvf0r29mm479f7pppb0rmfix3ynbrja6sr2gjp1mfaz" + "commit": "b1642c87fe83700a929aebb774c89071e23c84e0", + "sha256": "1qblbxv4zbyv2ax1m42wfh1nx6bpl7snixx0whg8jiiqmk9sy6rb" } }, { @@ -116422,16 +116618,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20220904, - 1506 + 20221117, + 1230 ], "deps": [ "apel", "flim", "semi" ], - "commit": "d99ffe08649aa2f7e781e701b39d7aba2bcdc183", - "sha256": "0141618ncs203d9009cdky5prnjm86nv9chkhiw8wycyc9dipvdv" + "commit": "f5cb2f0cf5e2c893acf2e669fd549836828dfdfc", + "sha256": "1ijs57wv1vrh33vn311hgkp42vlmjyi998nc4qdrqi7yy9j8hl1h" } }, { @@ -118325,14 +118521,14 @@ "repo": "martianh/wordreference.el", "unstable": { "version": [ - 20221109, - 1339 + 20221114, + 1300 ], "deps": [ "s" ], - "commit": "02d44e1ef05dc991fd964f70264a2fe362574843", - "sha256": "1q7b3w4fsi8hy37h67qfpfslfa3kfghk31ridh3lpl0z7fss7zdn" + "commit": "31d5c2c06f07a695d41212760726bd5036297405", + "sha256": "1q5g5j63z2j43zfiyr76gq12mkslp194mhnmljsnfv4c0gbgihwj" } }, { @@ -118444,11 +118640,14 @@ "repo": "akib/emacs-workroom", "unstable": { "version": [ - 20220608, - 1718 + 20221114, + 350 ], - "commit": "e1092127bdf93d8f1ae0c58ec595d0181f606f1e", - "sha256": "104ba079b0s63ac6702hx71hp4ky76krki246x55dansvypcsydq" + "deps": [ + "project" + ], + "commit": "b81e76e0a39937b7544bf77cbff16cc8c239b58f", + "sha256": "137nc6zm8fnj1ymvmrmkm7y41132cpfr6i8akzj7sj8jmvayzv98" } }, { @@ -118763,11 +118962,11 @@ "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20221104, - 1010 + 20221115, + 1401 ], - "commit": "297d12c00ccc2c4d0e9082d41d1dfa3b51f84daa", - "sha256": "1q7x908f5ga05ww22sn41ic72qqdj00r5j4655s1jsvs83ja5y8w" + "commit": "814114b3dfe44ac477831c8ca5da0050a9d0fdf1", + "sha256": "0p0l8q1m3mj9lfss2sjbglpcp4dxzf46zjl9c2vzqf2v7hxlps2a" } }, { @@ -120244,11 +120443,11 @@ "repo": "agzam/youtube-sub-extractor.el", "unstable": { "version": [ - 20221104, - 239 + 20221116, + 653 ], - "commit": "944519b75c9a0cc52bac375c74547c936d835cfa", - "sha256": "1c6h1bhwmszpk5mbwq8b5i1y9knhv0vhsmvz06kgs86c5v0xs9zg" + "commit": "d69f732299fdf256504e15767c1d7e5de771220e", + "sha256": "1wnr7inr5g6q9q11mgsnqchssg2dpnpk1wrynngf9m6z6sg9bjs8" } }, { @@ -120929,6 +121128,25 @@ "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6" } }, + { + "ename": "zk-desktop", + "commit": "70f0f206ab06b3587cb04aa3b11bfbb933d335e9", + "sha256": "0dpw4g891g43ajnw3958yn7q9zqwancz00vv4f3iz9rbnkc1wrl9", + "fetcher": "github", + "repo": "localauthor/zk", + "unstable": { + "version": [ + 20221107, + 1204 + ], + "deps": [ + "zk", + "zk-index" + ], + "commit": "8cc0ca548f8fc1930bbc14b273b8a30df0c6327c", + "sha256": "0akqvgvlkfv05dl2d11gkb3ym38l1apsdp3d7l8sli7jdwqrhiaf" + } + }, { "ename": "zk-index", "commit": "01d387bc059e5d81d59ab5705082c56971a80b34", From f3455c45cc62b588c9adf50f1ae384a5f9662884 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 20:01:10 +0000 Subject: [PATCH 513/797] prometheus-bind-exporter: 0.5.0 -> 0.6.0 --- pkgs/servers/monitoring/prometheus/bind-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index 4e0ef709496e..46c428c59e05 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bind_exporter"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus-community"; repo = "bind_exporter"; - sha256 = "sha256-ta+uy0FUEMcL4SW1K3v2j2bfDRmdAIz42MKPsNj4FbA="; + sha256 = "sha256-MZ+WjEtSTGsi+2iKSZ4Xy6gq+Zf7DZHolBiq3wop22A="; }; - vendorSha256 = "sha256-L0jZM83u423tiLf7kcqnXsQi7QBvNEXhuU+IwXXAhE0="; + vendorSha256 = "sha256-uTjY4Fx2GR6e/3nXKNcmjsWbDjnOnu/jOShXzMF+b3Q="; passthru.tests = { inherit (nixosTests.prometheus-exporters) bind; }; From 63601d26e92c423605d19623ed9bffa0a47296ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 20:02:54 +0000 Subject: [PATCH 514/797] prometheus-fastly-exporter: 7.2.5 -> 7.3.0 --- pkgs/servers/monitoring/prometheus/fastly-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix index a61466470ca5..5acecd40bb6a 100644 --- a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fastly-exporter"; - version = "7.2.5"; + version = "7.3.0"; src = fetchFromGitHub { owner = "peterbourgon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W/P4jUBNDR3t7FESNyUUnNWfGR0PI/dG03EVKYt8S2Y="; + sha256 = "sha256-oeRf/qjoe8ThzuyIGPOWO+5KTY318Fz3TGp5svXBGQU="; }; - vendorSha256 = "sha256-exoDUxcOXVn7wUqfLLtJpklPYFHjLodEYa3lF+qFD+A="; + vendorSha256 = "sha256-BBfI5SyTgaoXXHxhraH09YVi43v1mD6Ia8oyh+TYqvA="; meta = with lib; { description = "Prometheus exporter for the Fastly Real-time Analytics API"; From 3fd24c2ee8f9b2b7a78b4c41f41f2b74ebd6fe56 Mon Sep 17 00:00:00 2001 From: Mason Mackaman Date: Sat, 19 Nov 2022 15:06:14 -0500 Subject: [PATCH 515/797] maintainers: Add ursi --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 33d6bcd382f3..f50910047ecb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14271,6 +14271,12 @@ githubId = 32751441; name = "urlordjames"; }; + ursi = { + email = "masondeanm@aol.com"; + github = "ursi"; + githubId = 17836748; + name = "Mason Mackaman"; + }; uskudnik = { email = "urban.skudnik@gmail.com"; github = "uskudnik"; From cb0fc208b6febd743541206f7d73b1bb47806417 Mon Sep 17 00:00:00 2001 From: Mason Mackaman Date: Sat, 19 Nov 2022 15:07:56 -0500 Subject: [PATCH 516/797] hexgui: init at unstable-2022-5-30 --- pkgs/games/hexgui/default.nix | 36 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/games/hexgui/default.nix diff --git a/pkgs/games/hexgui/default.nix b/pkgs/games/hexgui/default.nix new file mode 100644 index 000000000000..1282f03a0eb4 --- /dev/null +++ b/pkgs/games/hexgui/default.nix @@ -0,0 +1,36 @@ +{ ant +, fetchFromGitHub +, jdk +, lib +, makeWrapper +, stdenv +}: +stdenv.mkDerivation { + pname = "hexgui"; + version = "unstable-2022-5-30"; + + src = fetchFromGitHub { + owner = "selinger"; + repo = "hexgui"; + rev = "d94ce1d35a22dad28d3e7def4d28e6bebd54da9d"; + hash = "sha256-1MroFH2JSEZHFigcsw1+xyHJWEnHTvHmRPVirUgwM6I="; + }; + + nativeBuildInputs = [ ant jdk makeWrapper ]; + buildPhase = '' + ant + ''; + + installPhase = '' + mkdir $out + mv bin lib $out + wrapProgram $out/bin/hexgui --prefix PATH : ${lib.makeBinPath [ jdk ]} + ''; + + meta = { + description = "GUI for the board game Hex (and Y)"; + homepage = "https://github.com/selinger/hexgui"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.ursi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24bbf58576b0..4b1e33dc899f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7811,6 +7811,8 @@ with pkgs; hexd = callPackage ../tools/misc/hexd { }; pixd = callPackage ../tools/misc/pixd { }; + hexgui = callPackage ../games/hexgui { }; + hey = callPackage ../tools/networking/hey { }; hhpc = callPackage ../tools/misc/hhpc { }; From f86d80320e1fe86e7daa306c521583f972e91151 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 12 Nov 2022 07:05:48 +0100 Subject: [PATCH 517/797] =?UTF-8?q?ocamlPackages.mlgmpidl:=201.2.12=20?= =?UTF-8?q?=E2=86=92=201.2.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mlgmpidl/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix index 33f9f2d8e6b0..7952f811e7be 100644 --- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -1,17 +1,18 @@ -{ stdenv, lib, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }: +{ stdenv, lib, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr, bigarray-compat }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-mlgmpidl"; - version = "1.2.12"; + version = "1.2.15"; src = fetchFromGitHub { owner = "nberth"; repo = "mlgmpidl"; rev = version; - sha256 = "17xqiclaqs4hmnb92p9z6z9a1xfr31vcn8nlnj8ykk57by31vfza"; + sha256 = "sha256-85wy5eVWb5qdaa2lLDcfqlUTIY7vnN3nGMdxoj5BslU="; }; nativeBuildInputs = [ perl ocaml findlib camlidl ]; buildInputs = [ gmp mpfr ]; + propagatedBuildInputs = [ bigarray-compat ]; strictDeps = true; @@ -19,6 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--gmp-prefix ${gmp.dev}" "--mpfr-prefix ${mpfr.dev}" + "-disable-profiling" ]; postConfigure = '' From d8508f380f6387e40a41c63dba50c8548e755a60 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 12 Nov 2022 07:05:58 +0100 Subject: [PATCH 518/797] =?UTF-8?q?ocamlPackages.camlidl:=201.05=20?= =?UTF-8?q?=E2=86=92=201.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/ocaml/camlidl/default.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 5c3153a88493..a97ce8499b2a 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -1,16 +1,17 @@ -{ lib, stdenv, fetchurl, ocaml, writeText }: +{ lib, stdenv, fetchFromGitHub, ocaml, writeText }: + +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.03") + "camlidl is not available for OCaml ${ocaml.version}" -let - pname = "camlidl"; - webpage = "https://caml.inria.fr/pub/old_caml_site/camlidl/"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "1.05"; + pname = "ocaml${ocaml.version}-camlidl"; + version = "1.11"; - src = fetchurl { - url = "http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/${pname}-${version}.tar.gz"; - sha256 = "0483cs66zsxsavcllpw1qqvyhxb39ddil3h72clcd69g7fyxazl5"; + src = fetchFromGitHub { + owner = "xavierleroy"; + repo = "camlidl"; + rev = "camlidl111"; + sha256 = "sha256-8m0zem/6nvpEJtjJNP/+vafeVLlMvNQGdl8lyf/OeBg="; }; nativeBuildInputs = [ ocaml ]; @@ -21,10 +22,10 @@ stdenv.mkDerivation rec { preBuild = '' mv config/Makefile.unix config/Makefile substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out - substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl - substituteInPlace config/Makefile --replace CPP=/lib/cpp CPP=${stdenv.cc}/bin/cpp - substituteInPlace config/Makefile --replace "OCAMLC=ocamlc -g" "OCAMLC=ocamlc -g -warn-error -31" + substituteInPlace config/Makefile --replace 'OCAMLLIB=$(shell $(OCAMLC) -where)' OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl + substituteInPlace config/Makefile --replace CPP=cpp CPP=${stdenv.cc}/bin/cpp mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/stublibs ''; postInstall = '' @@ -40,15 +41,14 @@ stdenv.mkDerivation rec { ''; setupHook = writeText "setupHook.sh" '' - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" export NIX_CFLAGS_COMPILE+=" -isystem $1/lib/ocaml/${ocaml.version}/site-lib/camlidl" export NIX_LDFLAGS+=" -L $1/lib/ocaml/${ocaml.version}/site-lib/camlidl" ''; meta = { description = "A stub code generator and COM binding for Objective Caml"; - homepage = webpage; - license = "LGPL"; + homepage = "https://xavierleroy.org/camlidl/"; + license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.roconnor ]; }; } From ee82feef516c4d60706da0c83997e74d85f20c07 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 18 Nov 2022 16:52:53 -0800 Subject: [PATCH 519/797] qimgv: 1.0.2 -> 1.0.3-alpha Fixes compatibility with recent mpv changes. --- pkgs/applications/graphics/qimgv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index 8e4c4805750b..560cf666d262 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "qimgv"; - version = "1.0.2"; + version = "1.0.3-alpha"; src = fetchFromGitHub { owner = "easymodo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YlV/ysm7bdPverpKpanrL+jPVvMtP1paoAm0PREMaww="; + sha256 = "sha256-fHMSo8zlOl9Lt8nYwClUzON4TPB9Ogwven+TidsesxY="; }; nativeBuildInputs = [ From d24d8b71d23796f9921530127efb17c673e0b46b Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 19 Nov 2022 11:35:27 -0800 Subject: [PATCH 520/797] qimgv: drop unused patch --- pkgs/applications/graphics/qimgv/qt5-12-compat.diff | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 pkgs/applications/graphics/qimgv/qt5-12-compat.diff diff --git a/pkgs/applications/graphics/qimgv/qt5-12-compat.diff b/pkgs/applications/graphics/qimgv/qt5-12-compat.diff deleted file mode 100644 index da64759e22d6..000000000000 --- a/pkgs/applications/graphics/qimgv/qt5-12-compat.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp -index 96ec9d3..6d95d08 100644 ---- a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp -+++ b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp -@@ -21,7 +21,7 @@ void LinuxWorker::setDescriptor(int desc) { - - void LinuxWorker::run() { - emit started(); -- isRunning.storeRelaxed(true); -+ isRunning.store(true); - - if (fd == -1) { - qDebug() << TAG << "File descriptor isn't set! Stopping"; From 207dda19db05f25474aa126402a914df230df15c Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 19 Nov 2022 15:26:28 -0500 Subject: [PATCH 521/797] rust-petname: 1.1.2 -> 1.1.3 --- pkgs/tools/text/rust-petname/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/rust-petname/default.nix b/pkgs/tools/text/rust-petname/default.nix index f20a9e519de9..fda0ebf90404 100644 --- a/pkgs/tools/text/rust-petname/default.nix +++ b/pkgs/tools/text/rust-petname/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "rust-petname"; - version = "1.1.2"; + version = "1.1.3"; src = fetchCrate { inherit version; crateName = "petname"; - sha256 = "sha256-DfRWGwnWVJBcbW7aPEzgPd+gfldP+ypZlk8FcPZzp8g="; + sha256 = "sha256-C6EJ8awdTV9TecMeYdbmleK8171+hvphjXJrWNJSXxo="; }; - cargoSha256 = "sha256-tCVJX8NcbT+6t2kDeCMfcSDaq3O89ycj08bxTmp3JHs="; + cargoSha256 = "sha256-mB4n1IxhNXrAsCz/jv5jgqyO9OgISZnI5E/vFu80+FE="; meta = with lib; { description = "Generate human readable random names"; From acd2a0301062af4ab6a09242212d79a23442c570 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 19 Nov 2022 21:50:49 +0100 Subject: [PATCH 522/797] gsl_1: drop --- pkgs/development/libraries/gsl/gsl-1_16.nix | 51 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 pkgs/development/libraries/gsl/gsl-1_16.nix diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix deleted file mode 100644 index 2cda6c7955c2..000000000000 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ fetchurl, fetchpatch, lib, stdenv }: - -stdenv.mkDerivation rec { - pname = "gsl"; - version = "1.16"; - - src = fetchurl { - url = "mirror://gnu/gsl/gsl-${version}.tar.gz"; - sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; - }; - - # 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"; - - patches = [ - (fetchpatch { - name = "bug-39055.patch"; - url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d"; - sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8"; - }) - - (fetchpatch { - name = "fix-parallel-test.patch"; - url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=12654373c3b60541230921aae81f93b484ec5eaf"; - sha256 = "1flzpbsfj7gjywv6v9qvm8wpdrkbpj7shryinfdpb40y7si9njdw"; - }) - ]; - - enableParallelBuilding = true; - doCheck = true; - - meta = { - description = "The GNU Scientific Library, a large numerical library"; - homepage = "https://www.gnu.org/software/gsl/"; - license = lib.licenses.gpl3Plus; - - longDescription = '' - The GNU Scientific Library (GSL) is a numerical library for C - and C++ programmers. It is free software under the GNU General - Public License. - - The library provides a wide range of mathematical routines such - as random number generators, special functions and least-squares - fitting. There are over 1000 functions in total with an - extensive test suite. - ''; - platforms = lib.platforms.unix; - # Failing "eigen" tests on aarch64. - badPlatforms = [ "aarch64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5086a129337a..222033d30e34 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -580,6 +580,7 @@ mapAliases ({ gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 grv = throw "grv has been dropped due to the lack of maintanence from upstream since 2019"; # Added 2022-06-01 gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22 + gsl_1 = throw "'gsl_1' has been renamed to/replaced by 'gsl'"; # Added 2022-11-19 gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22 gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01 gtmess = throw "gtmess has been removed, because it was a MSN client."; # add 2021-12-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e79424b0e308..7f85c30ca37a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19315,8 +19315,6 @@ with pkgs; gsl = callPackage ../development/libraries/gsl { }; - gsl_1 = callPackage ../development/libraries/gsl/gsl-1_16.nix { }; - gsl-lite = callPackage ../development/libraries/gsl-lite { }; gsm = callPackage ../development/libraries/gsm {}; From d1cd75e56c763f040135cf2661f111e9566b0980 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 19 Nov 2022 15:50:40 -0500 Subject: [PATCH 523/797] sagoin: 0.1.0 -> 0.2.0 --- pkgs/tools/misc/sagoin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/sagoin/default.nix b/pkgs/tools/misc/sagoin/default.nix index 7c6fb92b9d38..638acb962df6 100644 --- a/pkgs/tools/misc/sagoin/default.nix +++ b/pkgs/tools/misc/sagoin/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "sagoin"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - sha256 = "0cp3sdck48kz7ssv9q0glz1m0awxis2n3lw8f8kvqm42zxa50ixm"; + sha256 = "sha256-BCsNsBD+ZkxhIy1yC+N0AqbEsQ2ElfWLtnBOG+0hHXk="; }; - cargoSha256 = "sha256-hPj1sj64JoIGEoHMIm2bE+G+ivokckvChhrxNoaUTo8="; + cargoSha256 = "sha256-B8P92utlmZlxNfzBidNUaGw7BhgkOPwD0yahtKZ2yto="; nativeBuildInputs = [ installShellFiles ]; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { GEN_ARTIFACTS = "artifacts"; meta = with lib; { - description = "A command-line submission tool for the UMD CS Submission Server"; + description = "A command-line submission tool for the UMD CS Submit Server"; homepage = "https://github.com/figsoda/sagoin"; changelog = "https://github.com/figsoda/sagoin/blob/v${version}/CHANGELOG.md"; license = licenses.agpl3Plus; From 65feea294ffe5269c9de2b70ff2db909e4490fdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 20:57:38 +0000 Subject: [PATCH 524/797] python310Packages.fakeredis: 1.10.1 -> 2.0.0 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 2b42454805c8..317f3d406759 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.10.1"; + version = "2.0.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-Tqm1p3CNU61aHhiVyP5Gt6bMxni3wvEvR3HFv328Hk0="; + hash = "sha256-y9fuVg5Mu0ZT8hoja9V5mEfOz/hPH66Zbk5Rr/luPSc="; }; nativeBuildInputs = [ From d876d4383b8cffbbe8a76940e3ff0eb03aa7fc9c Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 19 Nov 2022 16:04:27 -0500 Subject: [PATCH 525/797] vtk_9: 9.1.0 -> 9.2.2 --- pkgs/development/libraries/vtk/9.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vtk/9.x.nix b/pkgs/development/libraries/vtk/9.x.nix index dea68ca153db..3a5032efdce3 100644 --- a/pkgs/development/libraries/vtk/9.x.nix +++ b/pkgs/development/libraries/vtk/9.x.nix @@ -1,5 +1,5 @@ import ./generic.nix { - majorVersion = "9.1"; - minorVersion = "0"; - sourceSha256 = "sha256-j+1C9Pjx64CDEHto6qmtcdoHEQFhoxFq2Af0PlylzpY="; + majorVersion = "9.2"; + minorVersion = "2"; + sourceSha256 = "sha256-HFsKK+cfrJb/SDGvaeNQ96DqMWiYH3kMAAcJ3PkSEHU="; } From be61554ca1d5ded32dc3947d4d64aee2078434a6 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 19 Nov 2022 16:12:13 -0500 Subject: [PATCH 526/797] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 268 +++++++++--------- 1 file changed, 134 insertions(+), 134 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e79797471a8b..a2e477c4a8fb 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-11-14"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "ead0478037b08da5adc6bdaff61de85cbfd93d60"; - sha256 = "0qrj65ij1mxpk7m9j2qpi5h991al6jypcy5xzszi1yzm64ddcvi7"; + rev = "e40635a03538f73e67e68a18c82c63fe1832e304"; + sha256 = "0d3d02fylm4ng67yx1k67hb9gfrj9msbwxn3sd5vikx1qhgsfzvv"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -437,12 +437,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-11-12"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "1702de03d551317a1bcd94ded2972857ebc16d74"; - sha256 = "03x3h95lhfqgfhdr2l0fbb8acyfymvixpv0x0sxvnlz70560zi0y"; + rev = "2d1de481a94a3be428c87ab0404c38e58b386813"; + sha256 = "0g780ykjiya6clc3yi8ky4lxhyj2ayc629wn5i2iq8siwm4ab07v"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -667,12 +667,12 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-11-12"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "4c1b475b07c022d423069eb3d7680bc8be63dfea"; - sha256 = "0a6spsgc5580d8w4f0sxhbs1kqz82igy5ghlkgkqakl2l0gc5rzn"; + rev = "6d5e981c56a9fec9e5b617eaaad3d302bfe18dd8"; + sha256 = "11qyggn16ghpa272nv9qflf0xbqn0n36qbmv8w4mmphpcf5mq6yz"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -751,12 +751,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-11-09"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "609c952a50ff1d415d79323364e934eba607fce0"; - sha256 = "1gv5h9zbjs83324sa0lm9xiy70yrvll3cgjdfmqnb51zvyx4anzx"; + rev = "04bae4b2b531f0420824acd8d411129712da96e3"; + sha256 = "044iwsa1c95354l470kakrd77bnp6xbl87bhxydmlzjfwpshs89i"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -799,24 +799,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-11-15"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "47d2d3f78e3fd011202bb2f68129ca94b42c354b"; - sha256 = "08ds5zmk4hdb6872gcwv431r5f057m6nm6amrcqmjmbqaqcwv0n2"; + rev = "36ed977ab56d3718c41f078d01db9b218d11250c"; + sha256 = "12b2ngkcgd89ky1dnqsfyv9x0qm7lw48wrf2pr6l1ddx2izlf7pq"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2022-11-16"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "ce386c58bfce6601ab23f83fe3737e9201443267"; - sha256 = "1ijybbpvjw3v2fqih8ldgs1ivhy84bbr59q4ipmph2rxxd4dwf8n"; + rev = "f13fad8217cabea67e4d06a82bba79fdcc56344b"; + sha256 = "103g4lzyd6amygksafhxb08ll74a33ahp66di9x7r0b7jqw53ym4"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1723,12 +1723,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-11-12"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "89cd42aea4cb91cac40fe96b756d43a34b442a64"; - sha256 = "1r7fyg53vhvsipnbg9w1a9mkyzm1zx7lszh3zxlh59apjaji4ncc"; + rev = "d227a0f0f15e1d9c7d3bb00628190ab153d13586"; + sha256 = "1zsy0i6i758g9bxjg6s0lf2zn7i42z0i7nk8fjs0vhn2wsi2nakz"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1807,12 +1807,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-10-14"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "ad7ffa8ed2279f1c8a90212c7d3851f9b783a3d6"; - sha256 = "1gy2caam9g1zhnplj6d943p62n4kqgasi4wwgq1ry7gzlm2gi5v0"; + rev = "5f01c1a89adafc52bf34e3bf690f80d9d726715d"; + sha256 = "0qgb1vx5ipzcgglphhk9wck55hdscx6bdh4lr2y7f7wfxg54r3d6"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -2011,24 +2011,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-11-18"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "b8a01364b727cdbc826005852ce69a36311f669e"; - sha256 = "11ma2b0pv7m1vc3ixmpwjnwng5q3ycysld95j2mh0fhknfls5jq6"; + rev = "3ba5d159c41915cb882781bd06f26f351338e54c"; + sha256 = "0kkkj677z3p89856hyhblx4zmzqyrllgfkv6glvj0cssyxs28h69"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-11-18"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "80b659a05f9317526d49a459b63cbcaf5dcca4a9"; - sha256 = "01w03w9f2hiw2q3j8gkwz5g0vl5wvasv2wfkv14hkl1v91pfrz66"; + rev = "a6a52bc30497222e95f81b99df5bc4b999f75ba0"; + sha256 = "0swxylqp3bn7abxfqs66pnhidxqzbngl14cv2373603xmbflkfj2"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2047,12 +2047,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-11-18"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "b9ff595175281277e3bdfa3ee059e87c4172f4c5"; - sha256 = "0i3cmf4cvqdsmyn9w69wglsii9xmynv3521pvfj1xphdg6y3bj22"; + rev = "07d1b5582e0b327becc9bfad7979699caf1da68a"; + sha256 = "109iddmkr5jw583jqs38vdskbsfm63ph489q6pyfvpf68a6jr1nc"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2625,12 +2625,12 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-11-09"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "8c1500069cafc9cfd93bf5521b17fde060008022"; - sha256 = "144zpfs26yhj7mnfdigql5mxl32caww46p8y504a98ls4kja7lp7"; + rev = "7894d5bc504deacf37f0a479a53fa4746fe30a45"; + sha256 = "1jw8y86lq7k9d1ss4dg3ch1ij8c3b196g8giz881jipdkjy9q7w1"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2674,12 +2674,12 @@ final: prev: editorconfig-nvim = buildVimPluginFrom2Nix { pname = "editorconfig.nvim"; - version = "2022-11-11"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "gpanders"; repo = "editorconfig.nvim"; - rev = "91db270a7f458866102f420b457d17a59b48e83e"; - sha256 = "10rrls4ixgcbd5hqjsjz5yfnf0z9w4r5n3gy57fy40rvk8wmr11j"; + rev = "2af880947129f1ab776b732a4eecb92528472ef5"; + sha256 = "1rv70658l6f047qyqyfb4fsgypzsf8bgl4h0wi1k29ac888qdkiw"; }; meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; @@ -3455,12 +3455,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2022-11-18"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "da59ded100703c510dd0878d125a2a2e5454d305"; - sha256 = "0asf0vljs9nsrdsfjqd9p5f7wibnjkz67ph2ilj15flrfgngf7x4"; + rev = "146a4427391df19001cc1d9f9db8f7f31fbce2a9"; + sha256 = "1306hq56lqf7cid3dhfcdbsl6chxw0dxqi70d3z2ifzakyy8anfn"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3503,11 +3503,11 @@ final: prev: himalaya-vim = buildVimPluginFrom2Nix { pname = "himalaya-vim"; - version = "2022-10-10"; + version = "2022-10-09"; src = fetchgit { url = "https://git.sr.ht/~soywod/himalaya-vim"; rev = "747ff2a6055839cb5b403b540883515af37b7117"; - sha256 = "sha256-0WP9JoKN/A5bmnRjQJnquk3mRC7NEflUAdqki7+zqBU="; + sha256 = "05d8nfzqp96s05agj4fd5r2fckdsxacl0qvlk9dhxz4dh8kgsqyi"; }; meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; }; @@ -3586,12 +3586,12 @@ final: prev: hydra-nvim = buildVimPluginFrom2Nix { pname = "hydra.nvim"; - version = "2022-11-15"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "anuvyklack"; repo = "hydra.nvim"; - rev = "aefadd3f61234d5ac51f59057965d44f63126778"; - sha256 = "1ak0ahda6a5265g823yykz1lr7kc9jxhd84ic6nbqg4xx05haf07"; + rev = "96119af8ebaf0f55567108638c662784d612eb97"; + sha256 = "0zix3lw4sm1j386vrbjfcxnmyj61g0qlz8y260gxhsc3vd2f5jdj"; }; meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; }; @@ -4031,12 +4031,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-11-08"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "c19e974cfd9d52dc5070ec7b68183da39702c877"; - sha256 = "1wdjmziq9910h51hvnmq27abqa8052fbpx5g065hbwk3jwsb5417"; + rev = "cd90202232806ec2dab9c76c7287bd2190a17459"; + sha256 = "0fk686d4hs7ld4a85gfhqmd4nk9f951bjjhkknbkkq0rijdrpysa"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4079,12 +4079,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2022-11-17"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "57dc3a09f91bc37aae7d3fc7bdc3a8411c8450d7"; - sha256 = "0d4fw65j4wbxywpmf3iwc8y5pq4p20bnq6gyb4d78dnk8ym6cpq2"; + rev = "984ea9552fce06d24afee3d9051813a7433e1439"; + sha256 = "0nb2ik2dx0akilfdfff3sjk2pfbrscih5rrr0dy0kxk1c86fdpqx"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -4967,12 +4967,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-11-16"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "95d286ef5c63e9d51d007822baefa29c1e23dd8b"; - sha256 = "0cfacdyqah6xf6f0pmb2a62p5ciwb9l0z2fkvb94b04zvzbwpkxc"; + rev = "071c8895bbff0e4d1d3d4c531adfe20e3a2a6e82"; + sha256 = "0qi0wl36m152ss2ca4hshyvf529xap19dhc0k5h98blq0h5ln0q9"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5051,12 +5051,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-11-12"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "cea50b7cf3ea3a8c6dc33881420cbe9926b26490"; - sha256 = "1p7w2ng1is3f4v4h8r5m6s8hpw77ajkwsknl80p0z1cgi5ym10id"; + rev = "0b46a9ae7e40037fced280131bef7fdc25a2041d"; + sha256 = "1klw05m8wicq1jn5qscy74nl16h50hr9pk8b3wbpy77jh7a0g753"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5111,12 +5111,12 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2022-11-17"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "36aa842f4f344929929110b8f22cbed2aeb4b83c"; - sha256 = "0n8lrsgqdfg0c8i4ffr05x4xrc4wvqjf51bxyxmkl8wk65ya1dzb"; + rev = "a11933e578e85dfd2defc4f83e0b83cf400e9e84"; + sha256 = "1b3kl97v9kvqbspk6pdv9fjzp5531a4bif14vjzp66ijsihg0az0"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -5255,12 +5255,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-11-17"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "c2a0494480c9ad44f0fb31885f320a37cc09dbdd"; - sha256 = "02vfabdm8anjbrccwpajqmb4ccxbxx56n5za438i7nf6c54shpgd"; + rev = "d9d2cda9ff999d3bf32164029c67444071323eb1"; + sha256 = "0mkfbafrsz6zy2zamg72figqxxy6w2iq24cj7h2qsz1crc81pi9r"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5459,12 +5459,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-11-16"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "5ce70db0d8e3ab5dd58e2fcdc4679bb2f6b53245"; - sha256 = "0l4vx73s15p6f2abmr3js0wwx2bzsh34xv6hizhdp5nywdfx9alw"; + rev = "324701806c681d43dc4d7a6a777037af4d5f5ce3"; + sha256 = "16kgzr0fzgl6mw11akzn6pg9sk1h8gvqh9rh9cvv4zh7g41nk77z"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5495,12 +5495,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-11-16"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "a188be8559d625049010e3b814ad30a2447095bd"; - sha256 = "0y0nnyyng2d39ma41al6vl39zws0dxdwdgx1w7qz9cabj0gpzp7p"; + rev = "8a9e8a89eec87f86b6245d77f313a040a94081c1"; + sha256 = "1gkm3pl06xvzxl5phk2g2hg8zqdpznn3jd5hjjspjfycgwscxbsx"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5639,12 +5639,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-11-14"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "a861906c8d1c457965c64ce6e83ea5e930bf8fd1"; - sha256 = "0k13dybk67d2mbw269qr7afxyvl53vl1ij2587w2jad3gdvqlqgn"; + rev = "aec0163784ac3c6d25c3735fbabdd5b294f21670"; + sha256 = "1if4ccvc1v0ljh9y8ivjxjxa22rrsfzxjiwhims8yk36r4jc3drg"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -5747,12 +5747,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-11-17"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "615999cf0102722da322375c6313d660b8b040d1"; - sha256 = "1nm3ynjydam8j7rqd534zbz0p6iff4v5c221ri3h7rp9pja2dr45"; + rev = "a48ddd710c6daf9a2e90646978c99e5db500dfd3"; + sha256 = "0lk3gc8kicrz6xs57mpy1znxwi6wlc7zm44cg8q0yz7ka0f4520v"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5831,12 +5831,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-11-04"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "9812a18621e00286cb82008b9407e561ed801b03"; - sha256 = "07dlk8s1lfa297ry2ybnipnibn3gr7akmkiryg6s1ysjpaddkdn3"; + rev = "666ed80fcb78cf6355f3d5b7ebdbacef6465578c"; + sha256 = "1zncna7k5k3ifr24wfjzbsby1g79cyr718lkq1vfyz798f9pkk03"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -5855,12 +5855,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-11-13"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "2b802ab1e94d595ca5cc7c55f9d1fb9b17f9754c"; - sha256 = "1k4nynkgq9wsx4302mqj3gkz07r0gi0kyzkn9bdczzz4yqr7aldi"; + rev = "0fd98b0d01bfc5603e56a959acb8e875e4039ac7"; + sha256 = "0xikn3mf5k7m9f79lfk8llvpp5ry7nc4bbznbxd2d1hxjd2iz604"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5927,12 +5927,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2022-11-02"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "2fad33454cd6e37527a2d41f310d77b552d8c1e0"; - sha256 = "1zdcnazqawkyab9gyfqi1mvnzzil9xvzj7mz7hjqd1w6g9r2c1ip"; + rev = "40c0ab2640a0e17c4fad7e17f260414d18852ce6"; + sha256 = "194r8p8nljvh5jb8i860qp8kr4i16s5q84nc6phqjygwacsq69s8"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6011,12 +6011,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2022-11-06"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "01876b4373b1764f45b4ea6036e144bef0e3721e"; - sha256 = "0qq7axd1yxa90xxsr218p21nrzm3469qrq93l178wvr5znwgzfyk"; + rev = "b10165f3727f519566d69382c4a4830f16375910"; + sha256 = "0ha1hdrw5cakgxnp0n5dzn0w7kbyxfw0y396rndp70mcqanqg34r"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -6035,12 +6035,12 @@ final: prev: nvim-solarized-lua = buildVimPluginFrom2Nix { pname = "nvim-solarized-lua"; - version = "2022-11-15"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "ishan9299"; repo = "nvim-solarized-lua"; - rev = "f8e4e60a2873b6f1a28c837ab217deb1bfdc723e"; - sha256 = "1v2bb9ckbhhp6jssbwcxzqlzvwifw5gk0mlrsjkvpvmvq1lgfiiy"; + rev = "7bd46fa036bde6b4483fb7403b0a7b0754faeeaa"; + sha256 = "0cpx916mbghxbpnkqs52y3n6h6dciaapj8bgas71w7qn4i6ygmhi"; }; meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; @@ -6059,12 +6059,12 @@ final: prev: nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-11-17"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "1d83fecd27c6b4b66cc529930552d205fbecb660"; - sha256 = "18hxq7xm1mf5rpbvj5sgm5ykzh5v4rf0sqhbk6k72mkrgphb61vb"; + rev = "93380716d94e451c340e653ce09d73e9cabe54c6"; + sha256 = "0xzx9iwdyz95l9bxsbb74bc35bvp5va5855c56qvimc4bcflgp5a"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6083,24 +6083,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-11-16"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "1837751efb5fcfc584cb0ee900f09ff911cd6c0b"; - sha256 = "15ff6lk6gc50qq003ipgaljagjbw3hlbsgsyw2ay0r1hxin10sks"; + rev = "e38e061710c593d9b88c8ebb2c48f2842c89dc31"; + sha256 = "1i3lb7j3nwflidkxzxwpi78ha50qvy45lsb8i4rql1hlb7ya15sd"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-11-16"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "dc27512e0019dcf4b6fbf0e0d5f285b4c9858308"; - sha256 = "0r4by55md53d5lrp86k0hv02pvzizy5hdjznywgghr008a3zd6l2"; + rev = "24caa23402247cf03cfcdd54de8cdb8ed00690ba"; + sha256 = "0f10bcszvd3wj62mv198389gcd48glqy2vii7ddks17lccf3g8xm"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6143,12 +6143,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-11-17"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "f456fc83a1024d795cb2a3e61b52ab3d5a213e8c"; - sha256 = "1m0i3chwz4pbyw4ny86h6r01yn3s5zc1mkvp2f2wwkd8v65z8s0q"; + rev = "1435ea532a3c9e6ea48ed3438fdf48bb37277578"; + sha256 = "1m3hfidjim2cy4x3np4rqcg67cq1kqz64yaqkcj7qlwlxd29gi6p"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6335,12 +6335,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-11-17"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "7f53486d04f389062bbdcf130e805e09e576a0d1"; - sha256 = "01y3klhjykrayyfvnfjn9cbpdw395qif1g1xsnkiq0aj6rx412hs"; + rev = "6de1c32d7b654e20a184ef93aa26930e1b699142"; + sha256 = "0fs3dfm10ki5q358217jcglrz730v07lnpry2gwa0ghjk0k0ar81"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6395,12 +6395,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-11-16"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "38fb73c39c95c2c598d7b26835909a0c133d4d0e"; - sha256 = "1v7w81g23ksb6lgpfxbn0k9gbycfpcy81qvjyqd67rykgpvm1yj6"; + rev = "b82cc5df76a766c0f585f4792db7339a73e25e77"; + sha256 = "16awk2x650aj56niwi9i87bwpqj572k1vzablchym0sbkaj3726a"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -7323,12 +7323,12 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2022-10-01"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "47685f0adb89928fc1b2a9b812418680f29aaf27"; - sha256 = "03l86sr766kpggxxk97rc3fy6j4igsprsh19wdq8mzk119nmww0i"; + rev = "53cac3fdb5f5e4e63e243232b6eccf3c764ae18a"; + sha256 = "0qp3b6jd6khp8wmc4s8n6sc518p6m44l7f7ln8pr91jz6qh5z30p"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; @@ -9223,12 +9223,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2022-11-13"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "2b9dd2f1fe5ed51ec9d03773227802fdecfe9f59"; - sha256 = "0bjw7ymi57mrmnidbcy7kqlnvg37hsci1hc4sxvqzfk6qlwvpcsc"; + rev = "3494825e8f3e78869d2da4551fb00814f8e3f285"; + sha256 = "04mdfxwdp7c0l9c1wxfhsrldy6p3nxr0zk2wa5bxwyhqzzajq7mn"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -12190,12 +12190,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-10-30"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "a1e294454128062236d758cdaefee66664051a6c"; - sha256 = "0n35b7v4j95nj1n1h1j6xnp785dqm4k9fm4cpb9lx9kaf3168a7q"; + rev = "1acb5fa4aa29a24c36d559474b672cda9b9a9b6d"; + sha256 = "1rvga45kgz5sh7yc5nqsxm6ndhdamvq8a67pw8ci1zi3n53j9xij"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -13056,12 +13056,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-11-16"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "a58ff49219416b0c3f3a8b7e20f695dbe6ccc407"; - sha256 = "1z0fjiia22yvv71v54j0ywi85b9g1w21hvqf08jjihaql9x0r5fc"; + rev = "b2a69e8f780709a4637f6e2fe809d6bd2a39af52"; + sha256 = "11h6bdndglq22y6w7fxzk43dia9kslgfc40l9z8r3cikd7w0pd0a"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13417,36 +13417,36 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-11-17"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "eb1daa495273039b0723496eb088b0566281bf83"; - sha256 = "198ivr25gwdi5jk9nd117qn0l1pnyidllrwiccfny7axsaysh91h"; + rev = "8d4b9ed1f9cb5a575a1fa25c506409416d347241"; + sha256 = "0q26mk92h1c6n0d9l6w3r6rpb6gka4iqd5as58p6bwxxbq23w6am"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; catppuccin-vim = buildVimPluginFrom2Nix { pname = "catppuccin-vim"; - version = "2022-09-27"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "c9bbe18d3f22351c99c98eb53339ca0b2a1a18b5"; - sha256 = "1dgqsg4jc10ycgz94mjbr3c2rpjr5k6mymnjr3b5xzln2z2c8d0d"; + rev = "a98a00617cc8f158eee2c100eb97113cac7e3204"; + sha256 = "0ci0ww6alb6j5x7dsg58bq4nq2km49pzk53d07fs1piad3z3hsvx"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-11-18"; + version = "2022-11-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "0cf23d38e29c7dbc8dde02d5384f0567494dccc8"; - sha256 = "04cr4dph2b1yizp7icmggsl2hj60sg0nx2z94f1d8wmv40c8rfvz"; + rev = "e95c1a8d8c2a849c3da63bbf7c98772b92fad7e9"; + sha256 = "1zhyiwasy207khr8dbgnl9xvay32b6wxl4plvarrpi263099z0yk"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -13477,12 +13477,12 @@ final: prev: gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2022-10-24"; + version = "2022-11-18"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "ec6ef450645eb6a1af843f57a40bcaf4e278e1ac"; - sha256 = "1p2klqkrrbky6jfj36px8ipg5dpb1iqz57gi9nmi1mpq9zpmm2nq"; + rev = "2b5b1f777f0583ffb39086d6c16f39e6e37459c0"; + sha256 = "1a5v9ccbkm8759m24a9y85y7d6g4yg7yr2bidjn6vqw04alwvjf6"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; From 26a33e9913c15e0f7baabe15de2442b16b6e4246 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 19 Nov 2022 16:12:21 -0500 Subject: [PATCH 527/797] vimPlugins: resolve github repository redirects --- .../editors/vim/plugins/generated.nix | 22 +++++++++---------- .../editors/vim/plugins/vim-plugin-names | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index a2e477c4a8fb..aba33862e8a2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3501,17 +3501,6 @@ final: prev: meta.homepage = "https://github.com/travitch/hasksyn/"; }; - himalaya-vim = buildVimPluginFrom2Nix { - pname = "himalaya-vim"; - version = "2022-10-09"; - src = fetchgit { - url = "https://git.sr.ht/~soywod/himalaya-vim"; - rev = "747ff2a6055839cb5b403b540883515af37b7117"; - sha256 = "05d8nfzqp96s05agj4fd5r2fckdsxacl0qvlk9dhxz4dh8kgsqyi"; - }; - meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; - }; - hiPairs = buildVimPluginFrom2Nix { pname = "hiPairs"; version = "2020-12-10"; @@ -3524,6 +3513,17 @@ final: prev: meta.homepage = "https://github.com/Yggdroot/hiPairs/"; }; + himalaya-vim = buildVimPluginFrom2Nix { + pname = "himalaya-vim"; + version = "2022-10-09"; + src = fetchgit { + url = "https://git.sr.ht/~soywod/himalaya-vim"; + rev = "747ff2a6055839cb5b403b540883515af37b7117"; + sha256 = "05d8nfzqp96s05agj4fd5r2fckdsxacl0qvlk9dhxz4dh8kgsqyi"; + }; + meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; + }; + hlint-refactor-vim = buildVimPluginFrom2Nix { pname = "hlint-refactor-vim"; version = "2015-12-05"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 8e9bb27161d1..cd04d9d42272 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -293,8 +293,8 @@ https://github.com/MrcJkb/haskell-tools.nvim/,HEAD, https://github.com/neovimhaskell/haskell-vim/,, https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, https://github.com/travitch/hasksyn/,, -https://git.sr.ht/~soywod/himalaya-vim,, https://github.com/Yggdroot/hiPairs/,, +https://git.sr.ht/~soywod/himalaya-vim,, https://github.com/mpickering/hlint-refactor-vim/,, https://github.com/edluffy/hologram.nvim/,, https://github.com/urbit/hoon.vim/,, From d074e6187671e032a9833ca4757723d682ab2357 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 19 Nov 2022 16:12:28 -0500 Subject: [PATCH 528/797] vimPlugins.zenbones-nvim: init at 2022-10-22 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index aba33862e8a2..9486403c9236 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -13343,6 +13343,18 @@ final: prev: meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; + zenbones-nvim = buildVimPluginFrom2Nix { + pname = "zenbones.nvim"; + version = "2022-10-22"; + src = fetchFromGitHub { + owner = "mcchrish"; + repo = "zenbones.nvim"; + rev = "0f7e9eb1ef309098e69e5e317508e9a7af299d94"; + sha256 = "03439c2z4p286mqncgii6gyg2pz7kk9mdfqbbfyg14ycwmfn949a"; + }; + meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; + }; + zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; version = "2022-08-13"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index cd04d9d42272..291038bb6eb7 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1119,6 +1119,7 @@ https://github.com/HerringtonDarkholme/yats.vim/,, https://github.com/elkowar/yuck.vim/,HEAD, https://github.com/KabbAmine/zeavim.vim/,, https://github.com/folke/zen-mode.nvim/,, +https://github.com/mcchrish/zenbones.nvim/,HEAD, https://github.com/jnurmine/zenburn/,, https://github.com/glepnir/zephyr-nvim/,, https://github.com/ziglang/zig.vim/,, From 797860ba47049e591fc692b260e77d4e9317cc74 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 19 Nov 2022 16:17:00 -0500 Subject: [PATCH 529/797] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 58 +++++++++++++------ 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 09b70ad0f982..14c265b92840 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -14,6 +14,17 @@ }; meta.homepage = "https://github.com/AusCyberman/tree-sitter-agda"; }; + arduino = buildGrammar { + language = "arduino"; + version = "c473c09"; + source = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-arduino"; + rev = "c473c09f23b13d9404ec5208fad3eddea89d70f8"; + hash = "sha256-aAw1ZgKuMWozQzmENUhkdkHV0BjSGmTdH4Bna7EfDaQ="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; + }; astro = buildGrammar { language = "astro"; version = "947e930"; @@ -27,12 +38,12 @@ }; awk = buildGrammar { language = "awk"; - version = "a799bc5"; + version = "e559793"; source = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "a799bc5da7c2a84bc9a06ba5f3540cf1191e4ee3"; - hash = "sha256-A/mvLYD9+Ms/nBdAebBF2edVkFUkWyz3TiEIt4G5iWc="; + rev = "e559793754c60c2cdf00cbb0409842d75f0a41dc"; + hash = "sha256-qLY8lpeP0jKqhNxoSLwBTOfulK79/0KOjgq/rKWUBSA="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; @@ -526,12 +537,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "bee6b49"; + version = "aee3725"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "bee6b49543e34c2967c6294a4b05e8bd2bf2da59"; - hash = "sha256-/6WsOONbKS/5xM5xKa5i8LuWWkWiXZiLnOpvayj1Nxk="; + rev = "aee3725d02cf3bca5f307b35dd3a96a97e109b4e"; + hash = "sha256-DmrrRht3g0hG+OsJCHRL+xW4jflLqtG57AuFf7zd26c="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -548,12 +559,12 @@ }; heex = buildGrammar { language = "heex"; - version = "52b804b"; + version = "2e1348c"; source = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-heex"; - rev = "52b804b1cb2d57e58d90090326d3ef9bd19cf16c"; - hash = "sha256-fuxvX0AM9FEXVdpXu9/H6y7N+S+q6X/QYuLqKdb8PGI="; + rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a"; + hash = "sha256-6LREyZhdTDt3YHVRPDyqCaDXqcsPlHOoMFDb2B3+3xM="; }; meta.homepage = "https://github.com/connorlay/tree-sitter-heex"; }; @@ -645,6 +656,17 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; + jq = buildGrammar { + language = "jq"; + version = "13990f5"; + source = fetchFromGitHub { + owner = "flurie"; + repo = "tree-sitter-jq"; + rev = "13990f530e8e6709b7978503da9bc8701d366791"; + hash = "sha256-pek2Vg1osMYAdx6DfVdZhuIDb26op3i2cfvMrf5v3xY="; + }; + meta.homepage = "https://github.com/flurie/tree-sitter-jq"; + }; jsdoc = buildGrammar { language = "jsdoc"; version = "189a6a4"; @@ -880,12 +902,12 @@ }; norg = buildGrammar { language = "norg"; - version = "dfac5ad"; + version = "8ad2005"; source = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; - rev = "dfac5ad2740a79b18ae849590a924e7bad3f1b23"; - hash = "sha256-nH9Y2mYXRehqvq0kp1DkoI2dIAaCidFAxlKos8wZmks="; + rev = "8ad20059c6f128861c4506fff866150ffee1d6f4"; + hash = "sha256-1cKH3k/nbZhZleINZ91M+glG1m2SlBJR/AP7mz/SAvI="; }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; @@ -1114,12 +1136,12 @@ }; rego = buildGrammar { language = "rego"; - version = "6174f05"; + version = "b2667c9"; source = fetchFromGitHub { owner = "FallenAngel97"; repo = "tree-sitter-rego"; - rev = "6174f05f58e8c35d8c82323dd8c599b90b3171b3"; - hash = "sha256-hO89IYKOHDLmuq+JrXJCi3tjxn3zMwjTnWxC6ld09YA="; + rev = "b2667c975f07b33be3ceb83bea5cfbad88095866"; + hash = "sha256-y3w+gfjXb9N8Vf6ZrafP1j50Ap2KPaNfwo5h06EqHKM="; }; meta.homepage = "https://github.com/FallenAngel97/tree-sitter-rego"; }; @@ -1235,12 +1257,12 @@ }; sql = buildGrammar { language = "sql"; - version = "70c5026"; + version = "4f1b912"; source = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "70c50264ae022193adb364ffa7a767d765ed9857"; - hash = "sha256-0HlkjL+Wy82SmVLSPXL7o3Y3l/zSDaPeBygLSvdCRZs="; + rev = "4f1b91246b43190e34957d9de9a0f3625879ba33"; + hash = "sha256-g1dQ897JQwthConYMlGY25hsypr4weDsDCOWyafriw8="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; From ecbaaf10b8b614d28d5a6aedbf6fe172c2d9b946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 19 Nov 2022 18:00:18 +0100 Subject: [PATCH 530/797] python310Packages.mastodon-py: 1.6.1 -> 1.6.3 --- pkgs/development/python-modules/mastodon-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index be1c3d6532ef..ada014a6b81d 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "mastodon-py"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "halcy"; repo = "Mastodon.py"; rev = "refs/tags/${version}"; - sha256 = "sha256-ip2TT5ISOS6HJOnTWajOR5Bajs8ba9QX1EIuPmdHLsE="; + sha256 = "sha256-bzacM5bJa936sBW+hgm9GOezW8cVY2oPaWApqjDYLSo="; }; postPatch = '' From 645456c2d523b0eeaf5f21de4b36f83b3ad18fd7 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sat, 19 Nov 2022 22:09:11 +0100 Subject: [PATCH 531/797] ncdu: 2.1.2 -> 2.2.1 Release notes: https://dev.yorhel.nl/ncdu/changes2 --- pkgs/tools/misc/ncdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 4844e81079a6..b8b5d93c3813 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ncdu"; - version = "2.1.2"; + version = "2.2.1"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-ng1u8DYYo8MWcmv0khe37+Rc7HWLLJF86JLe10Myxtw="; + sha256 = "sha256-Xkr49rzYz3rY/T15ANqxMgdFoEUxAenjdPmnf3Ku0UE="; }; XDG_CACHE_HOME="Cache"; # FIXME This should be set in stdenv From 0f3e279a7e8adf1b67838dc859e2d18c7e2d931d Mon Sep 17 00:00:00 2001 From: Max Zerzouri Date: Sun, 20 Nov 2022 11:03:56 +1300 Subject: [PATCH 532/797] polyphone: 2.2.0 -> 2.3.0 --- pkgs/applications/audio/polyphone/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix index 5e7c3f2b85ce..568f3b6ba151 100644 --- a/pkgs/applications/audio/polyphone/default.nix +++ b/pkgs/applications/audio/polyphone/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsa-lib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }: +{ stdenv, lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsa-lib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg, qttools }: mkDerivation rec { - version = "2.2.0"; + version = "2.3.0"; pname = "polyphone"; src = fetchFromGitHub { owner = "davy7125"; repo = "polyphone"; rev = version; - sha256 = "0w5pidzhpwpggjn5la384fvjzkvprvrnidb06068whci11kgpbp7"; + sha256 = "09habv51pw71wrb39shqi80i2w39dx5a39klzswsald5j9sia0ir"; }; buildInputs = [ @@ -22,7 +22,7 @@ mkDerivation rec { qtsvg ]; - nativeBuildInputs = [ qmake pkg-config ]; + nativeBuildInputs = [ qmake qttools pkg-config ]; preConfigure = '' cd ./sources/ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24bbf58576b0..ecbd99fb644b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30795,7 +30795,7 @@ with pkgs; yambar = callPackage ../applications/misc/yambar { }; - polyphone = libsForQt514.callPackage ../applications/audio/polyphone { }; + polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { jre = openjdk11; From 94322d05409ee7c65dbaccd28babe0a12b6eea28 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 20 Nov 2022 00:01:41 +0100 Subject: [PATCH 533/797] pythonPackages.domeneshop: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/domeneshop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/domeneshop/default.nix b/pkgs/development/python-modules/domeneshop/default.nix index 5c55f5adfc38..b266412219b4 100644 --- a/pkgs/development/python-modules/domeneshop/default.nix +++ b/pkgs/development/python-modules/domeneshop/default.nix @@ -11,20 +11,20 @@ buildPythonPackage rec { pname = "domeneshop"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "tr3wsrscIU66kTz3nlvDHj2EXoEHCH3grD0yD7BU3Fc="; + hash = "sha256-kL0X1mEsmVWqnq5NgsMBxeAu48zjmi3muhZYryTCOMo="; }; propagatedBuildInputs = [ certifi urllib3 - ] ++ urllib3.optional-dependencies.secure; + ]; # There are none doCheck = false; From e492d287b510dec60efc1a911de22e98a9383605 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 19 Nov 2022 20:08:11 -0300 Subject: [PATCH 534/797] emacs manual-packages.nix: remove redundant nano-theme --- .../emacs/elisp-packages/manual-packages.nix | 2 -- .../manual-packages/nano-theme/default.nix | 22 ------------------- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/nano-theme/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 98e1b37171fa..22f60c8fd88a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -50,8 +50,6 @@ self: with self; { _map = self.map; }; - nano-theme = callPackage ./manual-packages/nano-theme { }; - ott-mode = callPackage ./manual-packages/ott-mode { }; perl-completion = callPackage ./manual-packages/perl-completion { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/nano-theme/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/nano-theme/default.nix deleted file mode 100644 index 735e18f6b68a..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/nano-theme/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ trivialBuild -, fetchFromGitHub -, emacs -}: - -trivialBuild rec { - pname = "nano-theme"; - version = "0.pre+unstable=2021-06-29"; - - src = fetchFromGitHub { - owner = "rougier"; - repo = pname; - rev = "4a231787a32b3019f9f0abb3511a112fd54bf685"; - hash = "sha256-eco9BMKLhPuwFJb5QesbM6g3cZv3FdVvQ9fXq6D3Ifc="; - }; - - meta = { - homepage = "https://github.com/rougier/nano-theme"; - description = "GNU Emacs / N Λ N O Theme"; - inherit (emacs.meta) platforms; - }; -} From 25e04fc2b512f4462b85cd7ed4b9415028e6c982 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 19 Nov 2022 20:16:26 -0300 Subject: [PATCH 535/797] perl-completion: rewrite --- .../manual-packages/perl-completion/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix index 515254a42a98..ad12c606abb9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix @@ -1,6 +1,9 @@ -{ lib, stdenv, fetchurl }: +{ lib +, trivial-build +, fetchurl +}: -stdenv.mkDerivation { +trivial-build { name = "perl-completion"; src = fetchurl { @@ -10,14 +13,8 @@ stdenv.mkDerivation { dontUnpack = true; - installPhase = '' - install -d $out/share/emacs/site-lisp - install $src $out/share/emacs/site-lisp/perl-completion.el - ''; - meta = { description = "Minor mode provides useful features for editing perl codes"; homepage = "http://emacswiki.org/emacs/PerlCompletion"; - platforms = lib.platforms.all; }; } From 549e76f7a4ad370ef5a41f1b62ee79d08359bb44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sat, 19 Nov 2022 16:53:53 -0600 Subject: [PATCH 536/797] =?UTF-8?q?exempi:=202.5.1=20=E2=86=92=202.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/exempi/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 332de1595a06..3586a674904b 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "exempi"; - version = "2.5.1"; + version = "2.6.2"; src = fetchurl { url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2"; - sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0"; + sha256 = "sha256-TRfUyT3yqV2j4xcsRbelvzF90x2v0cejQBaXKMcInR0="; }; configureFlags = [ @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; doCheck = stdenv.isLinux && stdenv.is64bit; + dontDisableStatic = doCheck; meta = with lib; { description = "An implementation of XMP (Adobe's Extensible Metadata Platform)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 456e253c52c1..711df5243893 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6466,11 +6466,7 @@ with pkgs; exactaudiocopy = callPackage ../applications/audio/exact-audio-copy { }; - exempi = callPackage ../development/libraries/exempi { - stdenv = if stdenv.isDarwin then stdenv - else gcc9Stdenv; - boost = if stdenv.isDarwin then boost else boost15x; - }; + exempi = callPackage ../development/libraries/exempi { }; executor = with python3Packages; toPythonApplication executor; From f8fed401986a67cd56a6ef314eae8df007c88b85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 00:28:04 +0100 Subject: [PATCH 537/797] python310Packages.bthome-ble: add changelog to meta --- pkgs/development/python-modules/bthome-ble/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 4e53728642df..1b32d8ef47c2 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/${version}"; hash = "sha256-IaDnQCZJZipiPW6lOLrdxw7QfPx/zlwaizkBxv8I2V8="; }; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for BThome BLE devices"; homepage = "https://github.com/Bluetooth-Devices/bthome-ble"; + changelog = "https://github.com/bluetooth-devices/bthome-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 4a620712e2ad532467df6832531bf391d563cf66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 00:29:49 +0100 Subject: [PATCH 538/797] python310Packages.bthome-ble: 2.2.1 -> 2.3.1 https://github.com/bluetooth-devices/bthome-ble/blob/v2.3.1/CHANGELOG.md --- pkgs/development/python-modules/bthome-ble/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 1b32d8ef47c2..5831ea18ee33 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "2.2.1"; + version = "2.3.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-IaDnQCZJZipiPW6lOLrdxw7QfPx/zlwaizkBxv8I2V8="; + rev = "refs/tags/v${version}"; + hash = "sha256-4KsMYQQN/4A2sbk2Fj8CYOBf7/UAciJ4wTSFYZaCfdk="; }; nativeBuildInputs = [ From f20402f8e3d8bd4c9ccf3c36718c9922d5c4d82d Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Sun, 20 Nov 2022 00:35:59 +0100 Subject: [PATCH 539/797] nixos/tests/deluge: fix test deluge-console always exits with code 1. This is known in https://dev.deluge-torrent.org/ticket/3291 --- nixos/tests/deluge.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix index 0cd1d21870ad..e8945fdea003 100644 --- a/nixos/tests/deluge.nix +++ b/nixos/tests/deluge.nix @@ -54,8 +54,10 @@ import ./make-test-python.nix ({ pkgs, ...} : { declarative.wait_for_unit("deluged") declarative.wait_for_unit("delugeweb") declarative.wait_until_succeeds("curl --fail http://declarative:3142") + + # deluge-console always exits with 1. https://dev.deluge-torrent.org/ticket/3291 declarative.succeed( - "deluge-console 'connect 127.0.0.1:58846 andrew password; help' | grep -q 'rm.*Remove a torrent'" + "(deluge-console 'connect 127.0.0.1:58846 andrew password; help' || true) | grep -q 'rm.*Remove a torrent'" ) ''; }) From e31de6dc172758b565e789181bc8768103b7f2fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:03:13 +0100 Subject: [PATCH 540/797] python310Packages.bluetooth-adapters: 0.7.0 -> 0.8.0 https://github.com/bluetooth-devices/bluetooth-adapters/blob/main/CHANGELOG.md#v080-2022-11-16 --- .../development/python-modules/bluetooth-adapters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index 1ad12fffd505..18c1b645c698 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.7.0"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-c6blw0WD1V4bNZ5YaVjLbeCIug8l7PeKlrv+kzncK/s="; + hash = "sha256-K5EeDcGcjrZYQTbuYAzT7XhcAqpYW1w/jP5T0cOPsVU="; }; postPatch = '' From aa3771243ab6589d2f43aacd841204132211bdb0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:03:31 +0100 Subject: [PATCH 541/797] python310Packages.bluetooth-auto-recovery: 0.3.6 -> 0.4.0 https://github.com/bluetooth-devices/bluetooth-auto-recovery/blob/main/CHANGELOG.md#v040-2022-11-16 --- .../python-modules/bluetooth-auto-recovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 602f87584ef7..b8869f3a19ad 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "0.3.6"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-2GmBO67sUIjasF5MHrDkZ4D+dk3xN+HNpc7nSN+qTaQ="; + hash = "sha256-juGrrUqPgg1bJsMZP0iitp0NW/XrCxNq/+/fx5QNkQ4="; }; nativeBuildInputs = [ From 744635089aa329813434cb93ead04780fa503bae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:03:47 +0100 Subject: [PATCH 542/797] python310Packages.bluetooth-data-tools: 0.2.0 -> 0.3.0 https://github.com/Bluetooth-Devices/bluetooth-data-tools/blob/main/CHANGELOG.md#changelog --- .../python-modules/bluetooth-data-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 7a17d84a666c..a71efb26da35 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "0.2.0"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-5FOFN2B35dTYuZhO09HZ/sNkY5X16bICP+qWzmrua5o="; + hash = "sha256-bZ2kT9yIIHFd3/INIuJh3MdKzF8NCYNeVS/Egg5+S7I="; }; nativeBuildInputs = [ From c0ca69f7cfc081bf2837660a04b79a29ba21e51d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 00:47:07 +0100 Subject: [PATCH 543/797] python310Packages.bluetooth-adapters: update changelog entry --- pkgs/development/python-modules/bluetooth-adapters/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index 18c1b645c698..b696b6b9369e 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -58,9 +58,9 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/bluetooth-devices/bluetooth-adapters/blob/main/CHANGELOG.md"; description = "Tools to enumerate and find Bluetooth Adapters"; homepage = "https://bluetooth-adapters.readthedocs.io/"; + changelog = "https://github.com/bluetooth-devices/bluetooth-adapters/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.home-assistant.members; }; From 488dec359cd3d07161383a5bbfccb8a4fa8e09f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 00:48:49 +0100 Subject: [PATCH 544/797] python310Packages.bluetooth-auto-recovery: add changelog to meta --- .../python-modules/bluetooth-auto-recovery/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index b8869f3a19ad..32b9c16db880 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/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-juGrrUqPgg1bJsMZP0iitp0NW/XrCxNq/+/fx5QNkQ4="; }; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for recovering Bluetooth adapters"; homepage = "https://github.com/Bluetooth-Devices/bluetooth-auto-recovery"; + changelog = "https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From a32e171a627e57122cebab171498be55012fd3c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 00:50:38 +0100 Subject: [PATCH 545/797] python310Packages.bluetooth-data-tools: add changelog to meta --- .../python-modules/bluetooth-data-tools/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index a71efb26da35..42c6965302f6 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-bZ2kT9yIIHFd3/INIuJh3MdKzF8NCYNeVS/Egg5+S7I="; }; @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for converting bluetooth data and packets"; homepage = "https://github.com/Bluetooth-Devices/bluetooth-data-tools"; + changelog = "https://github.com/Bluetooth-Devices/bluetooth-data-tools/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 9f2103f390b25a3b13301009879dbe0a133ccd40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 00:55:20 +0100 Subject: [PATCH 546/797] python310Packages.python-homewizard-energy: add changelog to meta --- .../python-modules/python-homewizard-energy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index 0e2261e8fce1..68bb21fba45b 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to communicate with HomeWizard Energy devices"; homepage = "https://github.com/DCSBL/python-homewizard-energy"; + changelog = "https://github.com/DCSBL/python-homewizard-energy/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From bc3c333427720f6fbb9b951d83f8b6bf0d6940c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 00:56:53 +0100 Subject: [PATCH 547/797] python310Packages.python-homewizard-energy: 1.1.1 -> 1.2.0 https://github.com/DCSBL/python-homewizard-energy/releases/tag/v1.2.0 --- .../python-modules/python-homewizard-energy/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index 68bb21fba45b..a52535673a6c 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -1,6 +1,7 @@ { lib , aiohttp , aresponses +, awesomeversion , buildPythonPackage , fetchFromGitHub , poetry-core @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "1.1.1"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aaTxUx1eMM4Me4D0EkV5iDzs+yPt83/7PyPXTCTIgq8="; + hash = "sha256-tFIqlPeRMB0Q9XpA5zBBzjo0Dw2bhnYdJsXvl0A04vY="; }; nativeBuildInputs = [ @@ -29,6 +30,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + awesomeversion aiohttp ]; From 82ee824968003f2a440cb5cc319906fdafe2a4c9 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 19 Nov 2022 18:33:18 -0500 Subject: [PATCH 548/797] surrealdb: module init --- nixos/modules/module-list.nix | 1 + .../modules/services/databases/surrealdb.nix | 79 +++++++++++++++++++ pkgs/servers/nosql/surrealdb/default.nix | 2 + 3 files changed, 82 insertions(+) create mode 100644 nixos/modules/services/databases/surrealdb.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8fdf1f09cd18..2a23a32eaba6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -382,6 +382,7 @@ ./services/databases/pgmanage.nix ./services/databases/postgresql.nix ./services/databases/redis.nix + ./services/databases/surrealdb.nix ./services/databases/victoriametrics.nix ./services/desktops/accountsservice.nix ./services/desktops/bamf.nix diff --git a/nixos/modules/services/databases/surrealdb.nix b/nixos/modules/services/databases/surrealdb.nix new file mode 100644 index 000000000000..27269eb02f64 --- /dev/null +++ b/nixos/modules/services/databases/surrealdb.nix @@ -0,0 +1,79 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + + cfg = config.services.surrealdb; +in { + + options = { + services.surrealdb = { + enable = mkEnableOption (lib.mdDoc "A scalable, distributed, collaborative, document-graph database, for the realtime web "); + + dbPath = mkOption { + type = types.str; + description = lib.mdDoc '' + The path that surrealdb will write data to. Use null for in-memory. + Can be one of "memory", "file://:path", "tikv://:addr". + ''; + default = "file:///var/lib/surrealdb/"; + example = "memory"; + }; + + host = mkOption { + type = types.str; + description = lib.mdDoc '' + The host that surrealdb will connect to. + ''; + default = "127.0.0.1"; + example = "127.0.0.1"; + }; + + port = mkOption { + type = types.port; + description = lib.mdDoc '' + The port that surrealdb will connect to. + ''; + default = 8000; + example = 8000; + }; + }; + }; + + config = mkIf cfg.enable { + + # Used to connect to the running service + environment.systemPackages = [ pkgs.surrealdb ] ; + + systemd.services.surrealdb = { + description = "A scalable, distributed, collaborative, document-graph database, for the realtime web "; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.surrealdb}/bin/surreal start --bind ${cfg.host}:${toString cfg.port} ${optionalString (cfg.dbPath != null) "-- ${cfg.dbPath}"}"; + DynamicUser = true; + Restart = "on-failure"; + StateDirectory = "surrealdb"; + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + PrivateTmp = true; + ProtectHome = true; + ProtectClock = true; + ProtectProc = "noaccess"; + ProcSubset = "pid"; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectHostname = true; + RestrictSUIDSGID = true; + RestrictRealtime = true; + RestrictNamespaces = true; + LockPersonality = true; + RemoveIPC = true; + SystemCallFilter = [ "@system-service" "~@privileged" ]; + }; + }; + }; +} diff --git a/pkgs/servers/nosql/surrealdb/default.nix b/pkgs/servers/nosql/surrealdb/default.nix index 6e89e5ba03ad..f6bca761f23f 100644 --- a/pkgs/servers/nosql/surrealdb/default.nix +++ b/pkgs/servers/nosql/surrealdb/default.nix @@ -31,6 +31,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config + # needed on top of LIBCLANG_PATH to compile rquickjs + llvmPackages.clang ]; buildInputs = [ openssl ] From dee33b1edd02b4cd81b10d681aa97e2430a94708 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:00:42 +0100 Subject: [PATCH 549/797] python310Packages.shtab: add changelog to meta --- pkgs/development/python-modules/shtab/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index 24a29318170f..f7e2a0625f3b 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for shell tab completion of Python CLI applications"; homepage = "https://docs.iterative.ai/shtab/"; + changelog = "https://github.com/iterative/shtab/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 3d06bcf39994c2d810fc07b292036334612ac0fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:01:24 +0100 Subject: [PATCH 550/797] python310Packages.shtab: 1.5.7 -> 1.5.8 https://github.com/iterative/shtab/releases/tag/v1.5.8 --- pkgs/development/python-modules/shtab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index f7e2a0625f3b..41d5636d70f6 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.5.7"; + version = "1.5.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BIUUg+Y6bbgjnIWPU/bZO2axSLSzIsRJwyu7lBVQz/Q="; + hash = "sha256-FVV8AKe3PG387jarWYbXWxwVUAX6sM89KM8MuOr5cRw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 4fe9988b89eb9753543717ab0a460acff7043b05 Mon Sep 17 00:00:00 2001 From: Victor Fuentes Date: Sat, 19 Nov 2022 19:12:37 -0500 Subject: [PATCH 551/797] installation-cd: Remove libsForQt5.full --- .../installer/cd-dvd/installation-cd-graphical-calamares.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix index 288cbc94a321..3f3571d25382 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix @@ -14,8 +14,6 @@ in calamares-nixos calamares-nixos-autostart calamares-nixos-extensions - # Needed for calamares QML module packagechooserq - libsForQt5.full # Get list of locales glibcLocales ]; From e5cf903f02f76289e217e48ae55d6622f9384a25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:15:04 +0100 Subject: [PATCH 552/797] python310Packages.django-taggit: add changelog to meta --- pkgs/development/python-modules/django-taggit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-taggit/default.nix b/pkgs/development/python-modules/django-taggit/default.nix index 3d679087490f..6b52405fafb0 100644 --- a/pkgs/development/python-modules/django-taggit/default.nix +++ b/pkgs/development/python-modules/django-taggit/default.nix @@ -11,11 +11,12 @@ buildPythonPackage rec { pname = "django-taggit"; version = "3.1.0"; format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yPLk6uOHk5CJs9ddHYZJ4AiICXDAaM6dDoL4f9XilQg="; + hash = "sha256-yPLk6uOHk5CJs9ddHYZJ4AiICXDAaM6dDoL4f9XilQg="; }; propagatedBuildInputs = [ @@ -42,8 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "Simple tagging for django"; homepage = "https://github.com/jazzband/django-taggit"; + changelog = "https://github.com/jazzband/django-taggit/blob/${version}/CHANGELOG.rst" license = licenses.bsd3; maintainers = with maintainers; [ desiderius ]; }; - } From aaca09386b0c8bf0a81ef28df296cadf1fc3fb8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:19:25 +0100 Subject: [PATCH 553/797] python310Packages.django-webpack-loader: add missing input --- .../python-modules/django-webpack-loader/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index d1d5f926fdab..67d6035696ed 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, django , fetchPypi , pythonOlder }: @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-agZTglc3cbr0AHVMTTnAkTsKKaRTqUHfuRIu6+0hVy8="; }; + propagatedBuildInputs = [ + django + ]; + # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) doCheck = false; @@ -26,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Use webpack to generate your static bundles"; homepage = "https://github.com/owais/django-webpack-loader"; - maintainers = with maintainers; [ peterromfeldhk ]; license = with licenses; [ mit ]; + maintainers = with maintainers; [ peterromfeldhk ]; }; } From a1328909586493419ba1bce0be75dbdc8c904560 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:23:24 +0100 Subject: [PATCH 554/797] python310Packages.thermobeacon-ble: add changelog to meta --- pkgs/development/python-modules/thermobeacon-ble/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/thermobeacon-ble/default.nix b/pkgs/development/python-modules/thermobeacon-ble/default.nix index cce24dae6b5e..405ab5ba5fa6 100644 --- a/pkgs/development/python-modules/thermobeacon-ble/default.nix +++ b/pkgs/development/python-modules/thermobeacon-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-wzDujKJkUzbzZZ9FYTz78cYF06n8REF1TQiAbePDFJc="; }; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Thermobeacon BLE devices"; homepage = "https://github.com/bluetooth-devices/thermobeacon-ble"; + changelog = "https://github.com/Bluetooth-Devices/thermobeacon-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From df158fc990618c52e74cd75bd0f92ed15dd15f93 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:24:11 +0100 Subject: [PATCH 555/797] python310Packages.thermobeacon-ble: 0.3.2 -> 0.4.0 https://github.com/Bluetooth-Devices/thermobeacon-ble/releases/tag/v0.4.0 --- pkgs/development/python-modules/thermobeacon-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thermobeacon-ble/default.nix b/pkgs/development/python-modules/thermobeacon-ble/default.nix index 405ab5ba5fa6..b7f29f8ca8b9 100644 --- a/pkgs/development/python-modules/thermobeacon-ble/default.nix +++ b/pkgs/development/python-modules/thermobeacon-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thermobeacon-ble"; - version = "0.3.2"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wzDujKJkUzbzZZ9FYTz78cYF06n8REF1TQiAbePDFJc="; + hash = "sha256-t4l5K52Shaw/J4thcP0ken/u77ZX7BsMEEA6ZUpcRKY="; }; nativeBuildInputs = [ From 115139edd3bee7961ca0a13cf29181a5fea29d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Sun, 20 Nov 2022 00:33:27 +0100 Subject: [PATCH 556/797] python3Packages.awacs: init at 2.2.0 --- .../python-modules/awacs/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/awacs/default.nix diff --git a/pkgs/development/python-modules/awacs/default.nix b/pkgs/development/python-modules/awacs/default.nix new file mode 100644 index 000000000000..38ca2a11563c --- /dev/null +++ b/pkgs/development/python-modules/awacs/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, python + + # python dependencies +, typing-extensions +}: + +buildPythonPackage rec { + pname = "awacs"; + version = "2.2.0"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-zWRQHxjHogmSKSqnvQLJCdoilkOlJ07p00lN+U46WkU="; + }; + + propagatedBuildInputs = lib.lists.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + pythonImportsCheck = [ "awacs" ]; + + meta = with lib; { + description = "AWS Access Policy Language creation library"; + maintainers = with maintainers; [ jlesquembre ]; + license = licenses.bsd2; + homepage = "https://github.com/cloudtools/awacs"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a52782b78aeb..08c900f51bfc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -799,6 +799,8 @@ self: super: with self; { avro-python3 = callPackage ../development/python-modules/avro-python3 { }; + awacs = callPackage ../development/python-modules/awacs { }; + awesome-slugify = callPackage ../development/python-modules/awesome-slugify { }; awesomeversion = callPackage ../development/python-modules/awesomeversion { }; From 5608b9beb97165ff5ea15535c63e5af1989c4d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Sun, 20 Nov 2022 00:34:41 +0100 Subject: [PATCH 557/797] python3Packages.troposphere: init at 4.1.0 --- .../python-modules/troposphere/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/troposphere/default.nix diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix new file mode 100644 index 000000000000..93e09901e7d6 --- /dev/null +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, python + + # python dependencies +, awacs +, cfn-flip +, typing-extensions +}: + +buildPythonPackage rec { + pname = "troposphere"; + version = "4.1.0"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "cloudtools"; + repo = pname; + rev = version; + hash = "sha256-cAn4Hty5f/RsCnUA59CxtGrhRgzVyaHe5PuQOM6lwEQ="; + }; + + propagatedBuildInputs = [ + cfn-flip + ] ++ lib.lists.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + checkInputs = [ + awacs + ]; + + passthru.optional-dependencies = { + policy = [ awacs ]; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + pythonImportsCheck = [ "troposphere" ]; + + meta = with lib; { + description = "Library to create AWS CloudFormation descriptions"; + maintainers = with maintainers; [ jlesquembre ]; + license = licenses.bsd2; + homepage = "https://github.com/cloudtools/troposphere"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08c900f51bfc..e53cc1f64213 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11312,6 +11312,8 @@ self: super: with self; { trio-websocket = callPackage ../development/python-modules/trio-websocket { }; + troposphere = callPackage ../development/python-modules/troposphere { }; + trueskill = callPackage ../development/python-modules/trueskill { }; trustme = callPackage ../development/python-modules/trustme { }; From 3616fab0172586f6474557c69a601089e9ab035e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:36:31 +0100 Subject: [PATCH 558/797] python310Packages.django-taggit: fix lint issue --- pkgs/development/python-modules/django-taggit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-taggit/default.nix b/pkgs/development/python-modules/django-taggit/default.nix index 6b52405fafb0..dd5e025edd5c 100644 --- a/pkgs/development/python-modules/django-taggit/default.nix +++ b/pkgs/development/python-modules/django-taggit/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple tagging for django"; homepage = "https://github.com/jazzband/django-taggit"; - changelog = "https://github.com/jazzband/django-taggit/blob/${version}/CHANGELOG.rst" + changelog = "https://github.com/jazzband/django-taggit/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ desiderius ]; }; From 99f2e5281e2ad1f9dd23085a9e7e271dc902ddf5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:41:52 +0100 Subject: [PATCH 559/797] python310Packages.pyvicare: 2.17.0 -> 2.19.0 --- pkgs/development/python-modules/pyvicare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 7a919bf0ec49..d34ee0b932e1 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.17.0"; + version = "2.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-MlGohD9W1HNLz6ZPawt55127S3zPSA1tFLNs2gu7hLk="; + sha256 = "sha256-i1RXHrIkWqZw2LzVPEQSxgWa7PkUEsG6NO6H9egPWkk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 07b8a2a0eaf0a7bc25b5215093c0f54a9a9f3c7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:47:58 +0100 Subject: [PATCH 560/797] python310Packages.pyunifiprotect: add changelog to meta --- pkgs/development/python-modules/pyunifiprotect/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 2635a5484b64..5baf3f423d38 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -94,6 +94,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for interacting with the Unifi Protect API"; homepage = "https://github.com/briis/pyunifiprotect"; + changelog = "https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 2fedbbab9cc09897d1e95dd5272c3100f8a7ed6f Mon Sep 17 00:00:00 2001 From: "Andy Chun @noneucat" Date: Mon, 18 Jul 2022 08:46:32 -0700 Subject: [PATCH 561/797] nixos/gnome/at-spi2-core: force GTK_A11Y=none when disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GTK 4 applications use accessibility bus directly and will try to connect to it every time a widget is created: https://gitlab.gnome.org/GNOME/gtk/-/issues/4831 This will make GTK 4 apps (e.g. newly ported Nautilus) grind to a halt on systems that do not have AT-SPI service installed. Let’s explicitly disable accessibility support with an environment variable when the AT-SPI service is not enabled to avoid that. Just like we do for ATK-based applications with `NO_AT_BRIDGE`. Fixes: https://github.com/NixOS/nixpkgs/issues/197188 --- nixos/modules/services/desktops/gnome/at-spi2-core.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/desktops/gnome/at-spi2-core.nix b/nixos/modules/services/desktops/gnome/at-spi2-core.nix index 495ea5af9879..10a2f1f9eca0 100644 --- a/nixos/modules/services/desktops/gnome/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome/at-spi2-core.nix @@ -51,7 +51,10 @@ with lib; }) (mkIf (!config.services.gnome.at-spi2-core.enable) { - environment.variables.NO_AT_BRIDGE = "1"; + environment.variables = { + NO_AT_BRIDGE = "1"; + GTK_A11Y = "none"; + }; }) ]; } From 1d28826768518837140e2d8b6d7badb9abea7985 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:51:10 +0100 Subject: [PATCH 562/797] python310Packages.pyunifiprotect: 4.4.1 -> 4.4.2 https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v4.4.2 --- pkgs/development/python-modules/pyunifiprotect/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 5baf3f423d38..f8faa56b5a53 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.4.1"; + version = "4.4.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -38,13 +38,12 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lwgYvmig3yIQPcmX2suStcnzEYOXphHTRn40iJZICPs="; + hash = "sha256-30nQ02UUXJHvHC+hWTWHsUeU83G8cOJHK+Tgo6AE5jc="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov=pyunifiprotect --cov-append" "" \ - --replace "pydantic!=1.9.1" "pydantic" + --replace "--cov=pyunifiprotect --cov-append" "" ''; nativeBuildInputs = [ From a7a4375ed5faad9feb61816acf19a28d5de2f0aa Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 19 Nov 2022 20:23:50 -0500 Subject: [PATCH 563/797] ruff: 0.0.128 -> 0.0.129 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index baec7b093aa0..5f0d48d42033 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.128"; + version = "0.0.129"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QJGlhwLXCj4lGI7VMu+1wHmy8K4wYnUFxwsut2q1MUs="; + sha256 = "sha256-NjGNl92kQqEeKR1eR/ELwPVNdu/bxmEre80vINSsYTY="; }; - cargoSha256 = "sha256-vpfVXhJT65N18l/DZVi5ROgYKIi42rHW4Me+quqiG18="; + cargoSha256 = "sha256-Bg8sazATWnZXeWAf3lrFtraWkuAgugaMkmdzA8cPkW8="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From ca2679963460afe35ad9b88c9a40363778c8fad8 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sun, 6 Nov 2022 15:13:45 -0600 Subject: [PATCH 564/797] python3Packages.numba: 0.56.2 -> 0.56.4, fix tests and CUDA --- .../python-modules/numba/cuda_path.patch | 17 +++---- .../python-modules/numba/default.nix | 48 +++++++++++++++---- 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/numba/cuda_path.patch b/pkgs/development/python-modules/numba/cuda_path.patch index 275eeb1ccab6..1ad472ec424f 100644 --- a/pkgs/development/python-modules/numba/cuda_path.patch +++ b/pkgs/development/python-modules/numba/cuda_path.patch @@ -1,5 +1,5 @@ diff --git a/numba/cuda/cuda_paths.py b/numba/cuda/cuda_paths.py -index b9988bc..a642680 100644 +index 0da435d33..7b1fde087 100644 --- a/numba/cuda/cuda_paths.py +++ b/numba/cuda/cuda_paths.py @@ -24,10 +24,7 @@ def _find_valid_path(options): @@ -14,15 +14,12 @@ index b9988bc..a642680 100644 ] by, libdir = _find_valid_path(options) return by, libdir -@@ -35,18 +32,16 @@ def _get_libdevice_path_decision(): +@@ -35,16 +32,14 @@ def _get_libdevice_path_decision(): def _nvvm_lib_dir(): if IS_WIN32: - return 'nvvm', 'bin' + return 'bin', - elif IS_OSX: -- return 'nvvm', 'lib' -+ return 'lib', else: - return 'nvvm', 'lib64' + return 'lib64', @@ -33,13 +30,13 @@ index b9988bc..a642680 100644 - ('Conda environment', get_conda_ctk()), - ('CUDA_HOME', get_cuda_home(*_nvvm_lib_dir())), - ('System', get_system_ctk(*_nvvm_lib_dir())), -+ ('Nix store', get_nix_ctk(*_nvvm_lib_dir())), ++ ('Nix store', get_nix_ctk(*_nvvm_lib_dir())), ] by, path = _find_valid_path(options) return by, path -@@ -74,14 +69,12 @@ def _cudalib_path(): - elif IS_OSX: - return 'lib' +@@ -64,14 +59,12 @@ def _cudalib_path(): + if IS_WIN32: + return 'bin' else: - return 'lib64' + return 'lib' @@ -54,7 +51,7 @@ index b9988bc..a642680 100644 ] by, libdir = _find_valid_path(options) return by, libdir -@@ -92,6 +85,22 @@ def _get_cudalib_dir(): +@@ -82,6 +75,22 @@ def _get_cudalib_dir(): return _env_path_tuple(by, libdir) diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 965130658c44..35145189207a 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -11,6 +11,8 @@ , libcxx , importlib-metadata , substituteAll +, runCommand +, fetchpatch # CUDA-only dependencies: , addOpenGLRunpath ? null @@ -23,14 +25,14 @@ let inherit (cudaPackages) cudatoolkit; in buildPythonPackage rec { - version = "0.56.2"; + version = "0.56.4"; pname = "numba"; format = "setuptools"; disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-NJLwpdCeJX/FIfU3emxrkH7sGSDRRznwskWLnSmUalo="; + hash = "sha256-Mtn+9BLIFIPX7+DOts9NMxD96LYkqc7MoA95BXOslu4="; }; postPatch = '' @@ -55,7 +57,15 @@ in buildPythonPackage rec { cudatoolkit.lib ]; - patches = lib.optionals cudaSupport [ + patches = [ + # fix failure in test_cache_invalidate (numba.tests.test_caching.TestCache) + # remove when upgrading past version 0.56 + (fetchpatch { + name = "fix-test-cache-invalidate-readonly.patch"; + url = "https://github.com/numba/numba/commit/993e8c424055a7677b2755b184fc9e07549713b9.patch"; + hash = "sha256-IhIqRLmP8gazx+KWIyCxZrNLMT4jZT8CWD3KcH4KjOo="; + }) + ] ++ lib.optionals cudaSupport [ (substituteAll { src = ./cuda_path.patch; cuda_toolkit_path = cudatoolkit; @@ -70,18 +80,40 @@ in buildPythonPackage rec { done ''; - # Copy test script into $out and run the test suite. + # run a smoke test in a temporary directory so that + # a) Python picks up the installed library in $out instead of the build files + # b) we have somewhere to put $HOME so some caching tests work + # c) it doesn't take 6 CPU hours for the full suite checkPhase = '' - ${python.interpreter} -m numba.runtests - ''; + runHook preCheck - # ImportError: cannot import name '_typeconv' - doCheck = false; + pushd $(mktemp -d) + HOME=. ${python.interpreter} -m numba.runtests -m $NIX_BUILD_CORES numba.tests.test_usecases + popd + + runHook postCheck + ''; pythonImportsCheck = [ "numba" ]; + passthru.tests = { + # CONTRIBUTOR NOTE: numba also contains CUDA tests, though these cannot be run in + # this sandbox environment. Consider running similar commands to those below outside the + # sandbox manually if you have the appropriate hardware; support will be detected + # and the corresponding tests enabled automatically. + # Also, the full suite currently does not complete on anything but x86_64-linux. + fullSuite = runCommand "${pname}-test" {} '' + pushd $(mktemp -d) + # pip and python in $PATH is needed for the test suite to pass fully + PATH=${python.withPackages (p: [ p.numba p.pip ])}/bin:$PATH + HOME=$PWD python -m numba.runtests -m $NIX_BUILD_CORES + popd + touch $out # stop Nix from complaining no output was generated and failing the build + ''; + }; + meta = with lib; { description = "Compiling Python code using LLVM"; homepage = "https://numba.pydata.org/"; From 56721bd3878a4010eec853b3b535990de094465b Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 20 Nov 2022 02:09:14 +0000 Subject: [PATCH 565/797] =?UTF-8?q?krane:=203.0.0=20=E2=86=92=203.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/krane/Gemfile.lock | 8 ++++---- .../networking/cluster/krane/gemset.nix | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index bcaaac26f9f9..98ed810a2115 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -13,10 +13,10 @@ GEM domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) ejson (1.3.1) - faraday (2.6.0) + faraday (2.7.1) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.1) + faraday-net_http (3.0.2) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) @@ -44,7 +44,7 @@ GEM jsonpath (1.1.2) multi_json jwt (2.5.0) - krane (3.0.0) + krane (3.0.1) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -67,7 +67,7 @@ GEM minitest (5.16.3) multi_json (1.15.0) netrc (0.11.0) - oj (3.13.22) + oj (3.13.23) os (1.1.4) public_suffix (5.0.0) rake (13.0.6) diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index 267eef133136..b99238db86ca 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -68,20 +68,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mqv17hfmph4ylmb2bqyccy64gsgpmzapq5yrmf5yjsqkvw9rxbv"; + sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.1"; }; 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"]; @@ -206,10 +206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yg8ws7qygziqjc65ay5ahppf0j9jdli8nb2rnyh2iypfrjl4qiz"; + sha256 = "1j3hy00vqk58vf7djip7vhqqczb84pjqlp34h1w4jgbw05vfcbqx"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -288,10 +288,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fbya3d5dv14ny8d55c8vqh52lj82pkzqnx9my05mjawg8q5r8gn"; + sha256 = "0lggrhlihxyfgiqqr9b2fqdxc4d2zff2czq30m3rgn8a0b2gsv90"; type = "gem"; }; - version = "3.13.22"; + version = "3.13.23"; }; os = { groups = ["default"]; From ac31d8ef99304acb256c13909230b942c5177f79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 02:33:23 +0000 Subject: [PATCH 566/797] skaffold: 2.0.1 -> 2.0.2 --- pkgs/development/tools/skaffold/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 28e9010c4458..73763ce654d4 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "skaffold"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "sha256-6e5gfm6KhLvJTmD9+UESwkmM8o9FLL57krCnfvIFMH0="; + sha256 = "sha256-ldyGKey/s6FJLmxV25Q+blNjOOsASGqUsnqiXJme3+g="; }; - vendorSha256 = "sha256-TbHqnj/H5WCBnsk5zbMXPMaWpm5eRmaWWoxJH8YqOts="; + vendorSha256 = "sha256-yy1BVorjLEcZR6PqupBiZx2plwPJ6xlxripbyB6RLek="; subPackages = ["cmd/skaffold"]; From 7bc7b886df2fbbde604f6807f8f810f7dd40bc2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 14:51:45 +0000 Subject: [PATCH 567/797] nats-server: 2.9.6 -> 2.9.7 --- pkgs/servers/nats-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 8d2bca32dac0..52c26b780a20 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.6"; + version = "2.9.7"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HmjtMfSajz0vtbr48xSmY9/30u96Z6zyaTnMuSocIOg="; + sha256 = "sha256-HsVJ5F0vOWeJoIXwWQEiYDZdKVqUL5enH7LNEkC0DTM="; }; vendorSha256 = "sha256-ASLy0rPuCSYGyy5Pw9fj559nxO4vPPagDKAe8wM29lo="; From fece6776ae87abe82fc86c887ed1adacf223c8e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 02:49:14 +0000 Subject: [PATCH 568/797] snappymail: 2.21.0 -> 2.21.3 --- pkgs/servers/snappymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 3aae7b2d25c1..e8db05548070 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -2,11 +2,11 @@ , dataPath ? "/var/lib/snappymail" }: stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.21.0"; + version = "2.21.3"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-rJRNSlzGPNRFsvloTatB0o9uumbp18I15L5G6ms47EM="; + sha256 = "sha256-lDtbbovgPuXOgNKkHN2EiDltgzSQCVNvN/Qw4FOUVwo="; }; sourceRoot = "snappymail"; From 862277ac9d34273cd953f42061e23d488d6b7e8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 00:10:26 +0000 Subject: [PATCH 569/797] kstars: 3.6.0 -> 3.6.1 --- pkgs/applications/science/astronomy/kstars/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index 8212e6a2a9fa..d74ad2c4e878 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-wdv2TOOPIB3VRG3XMs58i/HvMDZ9wvERAhBQNslJ25E="; + sha256 = "sha256-WWbtfqvGd13+a41z8/MjlchllpuhLX08nu15OlYUeuI="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; From 03d0809f1a72154804ca98b7612188558f16e967 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 11:35:21 +0000 Subject: [PATCH 570/797] micronaut: 3.7.2 -> 3.7.4 --- pkgs/development/tools/micronaut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index b69eb0f69bc0..0e809bb32f76 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "3.7.2"; + version = "3.7.4"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-CzfS/6MugXhBeoFhRBsrupW8z/K+bl9k3Mm3Po63xhQ="; + sha256 = "sha256-VUavNwj5MCMZFV9WASF3olOdZb4JNBYbcQdgUfvPS8k="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 149ac1b96fbc17fdb276e63640f3650138cbc61e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Nov 2022 01:39:56 +0000 Subject: [PATCH 571/797] ergo: 4.0.104 -> 5.0.3 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 3c54844863ff..3d14ec40f238 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.104"; + version = "5.0.3"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-h6OVeDifYIKyIkwbN/pmJWge4/YGL6cnQQ/sI14LsHQ="; + sha256 = "sha256-IDAss4qX39qPyOsPpVg5zU6zq/QV/RTnbHTGVl9UmOA="; }; nativeBuildInputs = [ makeWrapper ]; From 5ec7d46d92bfc0267bfcf01ad1cb9054b218bf04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Nov 2022 10:44:27 +0000 Subject: [PATCH 572/797] leo-editor: 6.6.4 -> 6.7.1 --- pkgs/applications/editors/leo-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 10b2b0a54aef..9b248df95b66 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.6.4"; + version = "6.7.1"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-NwqvlDG37OpWaLJHb6NqkRYvWwDzICKqfgIJRTBDnkI="; + sha256 = "sha256-4sD/gN9cbgZ9Z5Xiyx2velX5q6J6vOQAeRor10Zamyw="; }; dontBuild = true; From 1f9973a1a2d56399f6984497987ebf25b880928a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Nov 2022 08:45:35 +0000 Subject: [PATCH 573/797] heimer: 3.6.1 -> 3.6.2 --- pkgs/applications/misc/heimer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index ec2d8d62d06d..792eee4d9e36 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "sha256-i4jgmqRvBX6g6IOitnBnQqWnFY5QoLk6/Cah0wCU8uc="; + sha256 = "sha256-NAjl7eRmMkRrVhlza87ErllEa1QfPZ8GRI1aljY6itI="; }; nativeBuildInputs = [ cmake ]; From 2a70e6321d040100998a34e4f809bda1b36c73c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Nov 2022 06:48:20 +0000 Subject: [PATCH 574/797] kubeaudit: 0.20.0 -> 0.21.0 --- pkgs/tools/security/kubeaudit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kubeaudit/default.nix b/pkgs/tools/security/kubeaudit/default.nix index d9091add090a..dab0586e7298 100644 --- a/pkgs/tools/security/kubeaudit/default.nix +++ b/pkgs/tools/security/kubeaudit/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kubeaudit"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - hash = "sha256-fdvlVORRREEwhBrOEAnspLJw7OPj3xymJEoJMdhN5n8="; + hash = "sha256-+aHJMCwV4en30BufqzSK0yBaJCzLBfOXWTkJCsBCfVA="; }; vendorSha256 = "sha256-DVXevOOQQjMhZ+9HLlQpKA1mD4FkIkGtq+Ur8uKTcwU="; From e2c5cc595887683b90f73c63c648fe08297fce85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Nov 2022 05:14:02 +0000 Subject: [PATCH 575/797] inadyn: 2.9.1 -> 2.10.0 --- pkgs/tools/networking/inadyn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 3d5a54c41f5c..c0bcb5fd0a2d 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "inadyn"; - version = "2.9.1"; + version = "2.10.0"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "sha256-mHqy/cBw+pwJwzMzAmqIQcLkpc87dtYD11TMRXeWdUg="; + sha256 = "sha256-PgG9ElIbJCr607ZrQcmuUcOwr8FSQW+cDytvaNLALnQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 313c4032fc9f3f7f5c43630345bc1366a4bceaca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Nov 2022 03:34:18 +0000 Subject: [PATCH 576/797] go-task: 3.17.0 -> 3.18.0 --- pkgs/development/tools/go-task/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index ba74387d4990..c428c8160ecc 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.17.0"; + version = "3.18.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-pbroxBHo+Y4mjcZVVth2zfDs/5sz9WDhdYMK5v5KeSg="; + sha256 = "sha256-b5YNiMnk1tBk7kO4YWAU8cyg5oHhKu95ogTtZ3N/6IY="; }; - vendorSha256 = "sha256-nOrzOSLIFZvEuFAfKOXXIVoSzumQHRRcQcOAPH5fCSU="; + vendorSha256 = "sha256-+DmnYd415FWgbY+gkDVWjnvbjTppfFV5NMpIE3Mm124="; doCheck = false; From b85bfd1186e269c9b57c1d35c27baa33f2eca392 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Nov 2022 20:19:04 +0000 Subject: [PATCH 577/797] chezmoi: 2.27.0 -> 2.27.1 --- pkgs/tools/misc/chezmoi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 82f656d22ee8..60d41cdf9c98 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.27.0"; + version = "2.27.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-NOU4rSV4DRk+auvhKjI9tWWL5E3N3w4x9z0wRKjNznw="; + sha256 = "sha256-FyudjneWKbvXraytx+vpm58cJpULiAhgY77W6tEOaw0="; }; vendorSha256 = "sha256-XY5D74fIgOCLtnUpQf+kGYARuAulhlQIG7G+GriDOSw="; From 03f59d7fa8d1ef4b1e7d193cbdc53ff8904e1bfb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Nov 2022 11:56:10 +0000 Subject: [PATCH 578/797] bore-cli: 0.4.0 -> 0.4.1 --- pkgs/tools/networking/bore-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix index ae39bfb6204f..9dfab71710bf 100644 --- a/pkgs/tools/networking/bore-cli/default.nix +++ b/pkgs/tools/networking/bore-cli/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "bore-cli"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "ekzhang"; repo = "bore"; rev = "v${version}"; - hash = "sha256-ywdJH39OYLaM4st/DIcvvtIUzExpbAucMMpqouJL1yI="; + hash = "sha256-h5Xwsr61h52zb5HNPySKVjfYW96Fff7nwZUAL6vK9ko="; }; - cargoSha256 = "sha256-ZnEVTFiPo3AFyo1BoV88X2nCqYzRK6PkcbawiR+QnV0="; + cargoSha256 = "sha256-QyaQM8z5v0LgskkmZ/8ekZwxNrt8sq91BbnjvIqa2nI="; buildInputs = lib.optionals stdenv.isDarwin [ Security From c9543015d02271ee41890f72d551a3872e8b4f8f Mon Sep 17 00:00:00 2001 From: David Wilemski Date: Sat, 19 Nov 2022 22:04:52 -0600 Subject: [PATCH 579/797] nixos/firewall: remove stray quote from package option This quote is not needed and shows up rendered in the manpage documenting this option. --- nixos/modules/services/networking/firewall.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 0242a3780ffc..27119dcc57c5 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -325,7 +325,7 @@ in example = literalExpression "pkgs.iptables-legacy"; description = lib.mdDoc '' - The iptables package to use for running the firewall service." + The iptables package to use for running the firewall service. ''; }; From 49e27d15c0cf5f60be16377fd88f4e6a9b48d89e Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sat, 19 Nov 2022 20:14:18 -0800 Subject: [PATCH 580/797] timg: 1.4.4 -> 1.4.5 Update timg, that also includes fix for CVE-2022-43151 Signed-off-by: Henner Zeller --- pkgs/tools/graphics/timg/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/tools/graphics/timg/default.nix index a8d808bb6370..bbeb4dc8398f 100644 --- a/pkgs/tools/graphics/timg/default.nix +++ b/pkgs/tools/graphics/timg/default.nix @@ -1,25 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, graphicsmagick, libjpeg +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, graphicsmagick, libjpeg , ffmpeg, zlib, libexif, openslide }: stdenv.mkDerivation rec { pname = "timg"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "hzeller"; repo = "timg"; rev = "v${version}"; - sha256 = "1gdwg15fywya6k6pajkx86kv2d8k85pmisnq53b02br5i01y4k41"; + sha256 = "sha256-YqcPTgStevUkl4grgaOLK8v1vbgFNgc7MfkMB07KDqo="; }; - patches = [ - (fetchpatch { - url = "https://github.com/hzeller/timg/commit/e9667ea2c811aa9eb399b631aef9bba0d3711834.patch"; - sha256 = "sha256-xvbOcnKqX52wYZlzm4Be9dz8Rq+n3s2kKPFr0Y0igAU="; - name = "CVE-2022-43151.patch"; - }) - ]; - buildInputs = [ graphicsmagick ffmpeg libexif libjpeg openslide zlib ]; nativeBuildInputs = [ cmake pkg-config ]; From fe5e9cea338818a24f1522fbeae055109fbb8def Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Nov 2022 03:11:29 +0000 Subject: [PATCH 581/797] fits-cloudctl: 0.11.1 -> 0.11.2 --- pkgs/tools/admin/fits-cloudctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index 0fdc7d59bd75..0d2612ccd7e5 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-QFmrBxNFzKrlvni2wbxM2tQP7z+QjLi9S7gqkVFWOmU="; + sha256 = "sha256-y3sgk3BDyfByWKIY4wG/Od4Q3OhmDuFhkKlTQHa3TdE="; }; - vendorSha256 = "sha256-aH1WGL7crF9VXHgcVxR0K3dNkV/J0wcBKgS9103dPes="; + vendorSha256 = "sha256-xTO7mxui9ydwjF3hudX2i8dP2xpsGM2X0cqq0oaK0HE="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; From 160f4ebc8f12cebbb495d55e38c78569b0793d41 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 20 Nov 2022 04:20:00 +0000 Subject: [PATCH 582/797] gallery-dl: 1.23.5 -> 1.24.0 https://github.com/mikf/gallery-dl/releases/tag/v1.24.0 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 602c5c0e47e9..0b7233e189c0 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.23.5"; + version = "1.24.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-NhnuW7rq5Dgrnkw/nUO/pFg/Sh2D/d9gFCIb+gQy5QE="; + sha256 = "sha256-LGZjPkiX252IRgRG1fxVS4IdnKA3RgVjOhZLxYScIJo="; }; propagatedBuildInputs = [ From ea76cad34d64ce213de5992154031bf0c9b75ace Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 04:47:33 +0000 Subject: [PATCH 583/797] unciv: 4.2.16 -> 4.2.20 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index f25f11461f43..37b6cd151de5 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.2.16"; + version = "4.2.20"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-AViMFK3MwDbd+N1ycqcMAzzCVudnU/kZWcsqr5Wx31k="; + sha256 = "sha256-SsEOewFbJqad8OCRiE1VHOx7kVFtF4DEInE3ETCGxDM="; }; dontUnpack = true; From 3c77bae4c3c7c2530ef82f4d31e2e14eca722c00 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 20 Nov 2022 12:30:25 +0800 Subject: [PATCH 584/797] entt: remove unused substituteInPlace substituteStream(): WARNING: pattern '${prefix}/@CMAKE_INSTALL_INCLUDEDIR@' doesn't match anything in file 'cmake/in/entt.pc.in' It looks like https://github.com/skypjack/entt/issues/890 has been resolved. --- pkgs/development/libraries/entt/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 306cdd52f476..6f8861086396 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -12,12 +12,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - # https://github.com/skypjack/entt/issues/890 - postPatch = '' - substituteInPlace cmake/in/entt.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - meta = with lib; { homepage = "https://github.com/skypjack/entt"; description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++"; From 613ab461ba974d43248e8835d51cb51af6d72a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Nov 2022 20:56:28 -0800 Subject: [PATCH 585/797] paperless-ngx: test channels in asyncio auto mode --- pkgs/applications/office/paperless-ngx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index f5de1d65184c..403e3d0d88a6 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -64,6 +64,7 @@ let sha256 = "sha256-bKrPLbD9zG7DwIYBst1cb+zkDsM8B02wh3D80iortpw="; }; propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ self.daphne ]; + pytestFlagsArray = [ "--asyncio-mode=auto" ]; }); daphne = super.daphne.overridePythonAttrs (oldAttrs: rec { From d1bd45165c58fafb6776ec069fff94f6b99b035b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 05:05:39 +0000 Subject: [PATCH 586/797] subfinder: 2.5.4 -> 2.5.5 --- pkgs/tools/networking/subfinder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 1cf81ab8263f..88c87eabe195 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I8VC/fwcDXqdT7U1WrptqVWufCLbk+3Zc2iXsBj6Fno="; + sha256 = "sha256-Wc/cm3vePIXBCcInsLZ3n/QV/3qHmGGrPr6coUqJPpE="; }; - vendorSha256 = "sha256-3K2jZRJksY/rzRiFjgU06fkXpySkJI0JTTGvvEDwS6s="; + vendorSha256 = "sha256-uynfhwCR13UZR/Bk/oPwMuifLGn33qVPEyrpOSgeafY="; modRoot = "./v2"; From 7ebbfa7b02d99043fc4fd7eb524050d7042c3376 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Nov 2022 00:17:51 +0000 Subject: [PATCH 587/797] imath: 3.1.5 -> 3.1.6 --- pkgs/development/libraries/imath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/development/libraries/imath/default.nix index d16bfbc466b9..1d5ec5abea6e 100644 --- a/pkgs/development/libraries/imath/default.nix +++ b/pkgs/development/libraries/imath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "sha256-pniIhpq2eXAZemq8LavXXv6+tGrBkqZ09Kjvi4aZdu8="; + sha256 = "sha256-FUruHlnFMSl+8r1VZnUQd2feLNGz+k0mLuyca9cgcbw="; }; nativeBuildInputs = [ cmake ]; From c2dde4bc46a035f7541d7d4885d197c486d68f7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Nov 2022 11:08:33 +0000 Subject: [PATCH 588/797] bluejeans-gui: 2.30.1.18 -> 2.31.0.83 --- .../networking/instant-messengers/bluejeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 3ea66e9d4304..477ff10de30c 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.30.1.18"; + version = "2.31.0.83"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-V/3nmindkuTmUsuAuc0UxldAQe7jfeXWSZWPTXTyLq8="; + sha256 = "sha256-dzT6S6124l70uYqkB6fGgCpqZBXS2irgwOfkmupN8HU="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; From 53e8108d3a5bd695f4703a4adc8524581b607025 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 05:32:09 +0000 Subject: [PATCH 589/797] syft: 0.60.3 -> 0.62.0 --- pkgs/tools/admin/syft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index c221ea38eaea..54d6f780a24f 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.60.3"; + version = "0.62.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-btPH92cLCAZFzlVoRxivBBhqzDK1bASrKbk3jvwDNo8="; + sha256 = "sha256-hed2ikV9xVDSSpLedAVcCJx/cQI5EPsb+fG2h63ij98="; # 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; - vendorSha256 = "sha256-gwj6Tj4JqZCCLOSw+K1DpwKhcWLtJ6YY5No20WbqQHU="; + vendorSha256 = "sha256-FJtyCUzp/osfXtNRWH/gK7PGoe4gd23YxBxbF4o1qos="; nativeBuildInputs = [ installShellFiles ]; From 212a3d80a544ef42e78b22157a8bfdca712753ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Nov 2022 07:43:46 +0000 Subject: [PATCH 590/797] pritunl-client: 1.3.3329.81 -> 1.3.3343.50 --- pkgs/tools/networking/pritunl-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix index bd9431bc0f70..9e183814572b 100644 --- a/pkgs/tools/networking/pritunl-client/default.nix +++ b/pkgs/tools/networking/pritunl-client/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pritunl-client"; - version = "1.3.3329.81"; + version = "1.3.3343.50"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-1V3mWnA418duWDBYqr8QqigWVvx1oNw0NAn+gFaxpsE="; + sha256 = "sha256-xooTPJFtCIIQG8cibfqxGDTIzF2vjvmo8zteVNiHsGQ="; }; modRoot = "cli"; From 1cd38dd6c7078aff5c3cb5950d97099f25768aa6 Mon Sep 17 00:00:00 2001 From: Peter Becich Date: Sat, 19 Nov 2022 21:35:27 -0800 Subject: [PATCH 591/797] buck: 2021.05.05.01 -> 2022.05.05.01 --- pkgs/development/tools/build-managers/buck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index 1602b8083414..d94dccf7fbc8 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "buck"; - version = "2021.05.05.01"; + version = "2022.05.05.01"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mASJCLxW7320MXYUUWYfaxs9AbSdltxlae8OQsPUZJc="; + sha256 = "15v4sk1l43pgd5jxr5lxnh0ks6vb3xk5253n66s7vvsnph48j14q"; }; patches = [ ./pex-mtime.patch ]; From 14066b1ce1be3287c3e6d1800c220ffcc0f32b0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Nov 2022 06:14:06 +0000 Subject: [PATCH 592/797] appstream-glib: 0.8.1 -> 0.8.2 --- pkgs/development/libraries/appstream-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 2e3a67af5ad8..7b3e4516bf6b 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -24,7 +24,7 @@ }: stdenv.mkDerivation rec { pname = "appstream-glib"; - version = "0.8.1"; + version = "0.8.2"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "appstream-glib"; rev = "${lib.replaceStrings ["-"] ["_"] pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "Qf0z9YTfjTiEr9OlK2BgOpVDtM2ozsiyjzO04O81zas="; + sha256 = "sha256-3QFiOJ38talA0GGL++n+DaA/AN7l4LOZQ7BJV6o8ius="; }; nativeBuildInputs = [ From d63fe42e911db769e5dbdbabdf8728647f789cd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Nov 2022 06:34:39 +0000 Subject: [PATCH 593/797] commonsCompress: 1.21 -> 1.22 --- pkgs/development/libraries/java/commons/compress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index ba17eb1532d5..d61938833492 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.21"; + version = "1.22"; pname = "commons-compress"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-sWF0K5MSOSXUxBLC9+1/RF5ST4tIzVKGnKQvStuVLvM="; + sha256 = "sha256-Bn3yxK1sw0U+iK6vXneVXNuRjBNzIugJAEBa+GEZSPc="; }; installPhase = '' From 6ba0d204871319a430b584fed30e9b0c605c66bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Nov 2022 06:37:02 +0000 Subject: [PATCH 594/797] igv: 2.14.1 -> 2.15.1 --- pkgs/applications/science/biology/igv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 09dc8daa4699..826271425663 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.14.1"; + version = "2.15.1"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; - sha256 = "sha256-IXUyMAhKyNMb7tINlr+9JmPlDRpHzgGS/SXo1Mz5o0Q="; + sha256 = "sha256-hwZ6Pl6BxoVbJI5e3b0s7jhQ/AADhVJVqM9Q8ppERuk="; }; installPhase = '' From 11adfafdee3c05a3b52781d63fc306f3d1fd8a72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Nov 2022 03:38:45 +0000 Subject: [PATCH 595/797] mycorrhiza: 1.12.1 -> 1.13.0 --- pkgs/servers/mycorrhiza/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mycorrhiza/default.nix b/pkgs/servers/mycorrhiza/default.nix index bbe136eb94c8..342d7a3ec555 100644 --- a/pkgs/servers/mycorrhiza/default.nix +++ b/pkgs/servers/mycorrhiza/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "mycorrhiza"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "bouncepaw"; repo = "mycorrhiza"; rev = "v${version}"; - sha256 = "sha256-Fh3BZTDBLaus5ytnHzvknFMrKVssc6+d85mGHv6EmLo="; + sha256 = "sha256-zRDMfHjR1obagRItdlmO1fJnutMM8MqcKNc3ZjtuvnY="; }; vendorSha256 = "sha256-Z6pQwUMMgHLMrRN4Fpu1QyG7WCHGWuvBc2UBTY6jncU="; From ad948687d5079f6116c0bd9d47bb1b46cf023e08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 17:58:39 +0000 Subject: [PATCH 596/797] helmsman: 3.15.0 -> 3.15.1 --- pkgs/applications/networking/cluster/helmsman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index aa3268435738..4915b2766ee7 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.15.0"; + version = "3.15.1"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-wKemvUk5UP4LweX9JxbsYlrjuVRgchkOvlHqRYvAB9A="; + sha256 = "sha256-LgfYcptC1fcINf80dbOZu8HD5oTrF0tTMQCWdsO3H5U="; }; - vendorSha256 = "sha256-swUZqrQ0nJS66oyqn0ONmFutLR2mEnDviC8siQB19c8="; + vendorSha256 = "sha256-iEsblhejczTFPL7LvEKHE/T1h2xAt7cdnoR8KIv3Wpo="; doCheck = false; From c85bc3d20b81bccb5d839455d6a0f002d5e40119 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 00:26:03 +0000 Subject: [PATCH 597/797] doppler: 3.45.0 -> 3.52.1 --- pkgs/tools/security/doppler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 0389ad3c52b0..630983842a46 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.45.0"; + version = "3.52.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-kQio3l50gjPfywUpeTEt4Xon1p07XpgStNSmICPboXQ="; + sha256 = "sha256-ppgFUO5WxraG83zX8tHahT/ixSJjrTmmiIrJPpbkZVs="; }; - vendorSha256 = "sha256-evG1M0ZHfn9hsMsSncwxF5Hr/VJ7y6Ir0D2gHJaunBo="; + vendorSha256 = "sha256-TwcEH+LD0E/JcptMCYb3UycO3HhZX3igzSlBW4hS784="; ldflags = [ "-s -w" From 8cfb8db3987e0347280695ec8fa4be49fbb216f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 06:12:29 +0000 Subject: [PATCH 598/797] terrascan: 1.16.0 -> 1.17.0 --- pkgs/tools/security/terrascan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 21abae88c7af..56f5d676a8b8 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J54x3t3tgo5CUnYEhduOGw23MhAiqq/XudGmSQ3ENbs="; + sha256 = "sha256-I7tA6FRsG3miIXibmBAFvanIyI8jgThrInQEzUCxvAs="; }; - vendorSha256 = "sha256-0ZwTE2FrBung7HAlklGIJlX76eRWa0ALNWjZpZijkzA="; + vendorSha256 = "sha256-ahj67MoS+VXNlh5dRA722tq27JRQGaC7TejOVIAH8ms="; # Tests want to download a vulnerable Terraform project doCheck = false; From d0c6333f1fee0413f68432ae563aba27474865a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 06:21:18 +0000 Subject: [PATCH 599/797] texstudio: 4.3.1 -> 4.4.0 --- pkgs/applications/editors/texstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 76762fd927cc..6a0f498fa554 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - hash = "sha256-CwfnRkG8GsRQuE0+l394gMdj5ao3SUKaDnYP2dfUEew="; + hash = "sha256-BaTfebLilUeDNtCJZmgAx+hN+L+4MtnuL6t3wQRX/Ns="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; From 6b3c6dc85f6632af10158f8a87cc725978689f9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 06:37:33 +0000 Subject: [PATCH 600/797] tippecanoe: 2.11.0 -> 2.13.0 --- pkgs/applications/misc/tippecanoe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index d3fa86aedcde..7eccdbcc8d48 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.11.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-WFvpq0g+P9gs0VudKB5mVTo/cvWMsaxf13ZORUTf/7c="; + hash = "sha256-YgmePs0GxygR0hvcnRngzW77QZTOygSYvRaYk6oCVls="; }; buildInputs = [ sqlite zlib ]; From 38d81f21326497c7f1833b7e7f395aa8f8c6ab17 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 20 Nov 2022 01:38:49 -0500 Subject: [PATCH 601/797] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 6 ++++++ .../transitive-broken.yaml | 7 ++++--- .../haskell-modules/hackage-packages.nix | 19 ++++++++++++++++--- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 152cfacf84f4..89a0bdf77fa1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -445,6 +445,7 @@ broken-packages: - boombox - boots-app - boring-window-switcher + - borsh - bot - botpp - bottom @@ -1354,6 +1355,7 @@ broken-packages: - etcd - ethereum-rlp - eurofxref + - evdev-streamly - eve - eved - event @@ -1953,6 +1955,7 @@ broken-packages: - HaPy - haquery - harchive + - harfbuzz-pure - HARM - HarmTrace-Base - haroonga @@ -3296,6 +3299,7 @@ broken-packages: - monadacme - monad-atom - monad-atom-simple + - monad-bayes - monad-branch - MonadCatchIO-transformers - monad-choice @@ -4954,6 +4958,7 @@ broken-packages: - supervisor - supervisors - supplemented + - supply-chain-core - surjective - sv-core - SVD2HS @@ -5109,6 +5114,7 @@ broken-packages: - text-and-plots - text-ascii - text-builder-linear + - text-compression - text-containers - text-display - text-format-heavy diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 2d37ceb24adc..64bfa3ad8721 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -641,6 +641,7 @@ dont-distribute-packages: - apiary-websockets - apis - apotiki + - appendful-persistent - approx-rand-test - arbor-monad-metric-datadog - archive-tar-bytestring @@ -1531,6 +1532,7 @@ dont-distribute-packages: - geni-util - geniconvert - geniserver + - genvalidity-appendful - genvalidity-network-uri - genvalidity-sydtest - genvalidity-sydtest-aeson @@ -2190,9 +2192,6 @@ dont-distribute-packages: - hsql-odbc - hsql-postgresql - hsql-sqlite3 - - hsqml-datamodel-vinyl - - hsqml-demo-morris - - hsqml-morris - hsreadability - hssqlppp-th - hstar @@ -3566,6 +3565,7 @@ dont-distribute-packages: - sql-simple-pool - sql-simple-postgresql - sql-simple-sqlite + - sqlite-easy - sqlite-simple-typed - sqsd-local - sscgi @@ -3629,6 +3629,7 @@ dont-distribute-packages: - supercollider-midi - superconstraints - supernova + - supply-chain - sv - sv-cassava - sv-svfactor diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c5b0978464b7..ccf23e9adb86 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -33301,6 +33301,7 @@ self: { ]; testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "appendmap" = callPackage @@ -47889,6 +47890,8 @@ self: { ]; description = "Implementation of BORSH serialisation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bot" = callPackage @@ -93336,6 +93339,8 @@ self: { description = "Bridge for working with evdev and streamly"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "eve" = callPackage @@ -108255,6 +108260,7 @@ self: { appendful base criterion genvalidity-criterion ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-bytestring" = callPackage @@ -127161,7 +127167,9 @@ self: { executableHaskellDepends = [ base bytestring parallel text ]; description = "Pure-functional Harfbuzz language bindings"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "shape-text"; + broken = true; }) {inherit (pkgs) harfbuzz;}; "harg" = callPackage @@ -151658,7 +151666,6 @@ self: { ]; description = "HsQML DataModel instances for Vinyl Rec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hsqml-demo-manic" = callPackage @@ -151695,7 +151702,6 @@ self: { ]; description = "HsQML-based implementation of Nine Men's Morris"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hsqml-morris"; }) {}; @@ -151749,7 +151755,6 @@ self: { ]; description = "HsQML-based implementation of Nine Men's Morris"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hsqml-morris"; }) {}; @@ -192919,7 +192924,9 @@ self: { ]; description = "A library for probabilistic programming"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "example"; + broken = true; }) {}; "monad-bool" = callPackage @@ -268279,6 +268286,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A primitive yet easy to use sqlite library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "sqlite-simple" = callPackage @@ -275446,6 +275454,7 @@ self: { libraryHaskellDepends = [ base supply-chain-core ]; description = "Composable request-response pipelines"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "supply-chain-core" = callPackage @@ -275458,6 +275467,8 @@ self: { testHaskellDepends = [ base tasty tasty-hedgehog tasty-hunit ]; description = "Composable request-response pipelines"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "surjective" = callPackage @@ -283741,6 +283752,8 @@ self: { ]; description = "A text compression library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "text-containers" = callPackage From 3827a60a7f48d4012fc515a3edff5f167d367182 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 20 Nov 2022 10:22:57 +0300 Subject: [PATCH 602/797] plasma-framework, kconfig: 5.100.0 -> 5.100.1 Hotfix for weird looking sliders. --- .../libraries/kde-frameworks/srcs.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 66853a1c3744..c6ae8457517c 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -132,11 +132,11 @@ }; }; kconfig = { - version = "5.100.0"; + version = "5.100.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kconfig-5.100.0.tar.xz"; - sha256 = "08f93na14s9zcwl6vfk9ix4jm1lwcmalh4yyf6m3p5ga5fd39vbs"; - name = "kconfig-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kconfig-5.100.1.tar.xz"; + sha256 = "1nl2ibqxgjd2zppiibnsvdpp5ci8ydz8i685gfgji3jfsx8pkfwb"; + name = "kconfig-5.100.1.tar.xz"; }; }; kconfigwidgets = { @@ -596,11 +596,11 @@ }; }; plasma-framework = { - version = "5.100.0"; + version = "5.100.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/plasma-framework-5.100.0.tar.xz"; - sha256 = "101jqybbzl6cnfh3w6gghd0916kbdwxqn1086q9i2fnvg503cxk4"; - name = "plasma-framework-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/plasma-framework-5.100.1.tar.xz"; + sha256 = "18ddniihbj26gz3lqh36xghwdszwgazkvpgr1bghb8bk0y90m52k"; + name = "plasma-framework-5.100.1.tar.xz"; }; }; prison = { From 06d3d727c5a8795484f36c7c79bc981638da95ef Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 20 Nov 2022 02:45:35 -0500 Subject: [PATCH 603/797] haskellPackages: stop evaluating hyper-haskell-server-with-packages in jobset --- pkgs/top-level/release-haskell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index efef4c769435..5f18d36f29f0 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -205,7 +205,7 @@ let hlint hpack # hyper-haskell # depends on electron-10.4.7 which is marked as insecure - hyper-haskell-server-with-packages + # hyper-haskell-server-with-packages # hyper-haskell-server is broken icepeak idris ihaskell From 6bd8620d06bc330870bd6150ae94c475a76438fc Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 20 Nov 2022 02:58:53 -0500 Subject: [PATCH 604/797] haskellPackages.hsqml: disable new packages --- .../haskell-modules/configuration-hackage2nix/main.yaml | 3 +++ pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 53f53d425c95..8e9df640f283 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -658,9 +658,12 @@ dont-distribute-packages: - gi-webkit - hsqml - hsqml-datamodel + - hsqml-datamodel-vinyl - hsqml-demo-manic + - hsqml-demo-morris - hsqml-demo-notes - hsqml-demo-samples + - hsqml-morris - hstorchat - jsaddle-webkitgtk - jsc diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ccf23e9adb86..b32900944af0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -151666,6 +151666,7 @@ self: { ]; description = "HsQML DataModel instances for Vinyl Rec"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hsqml-demo-manic" = callPackage @@ -151702,6 +151703,7 @@ self: { ]; description = "HsQML-based implementation of Nine Men's Morris"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hsqml-morris"; }) {}; @@ -151755,6 +151757,7 @@ self: { ]; description = "HsQML-based implementation of Nine Men's Morris"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hsqml-morris"; }) {}; From a71b35d986d4b344f5489a461e549e2f3438c13d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 20 Nov 2022 16:14:42 +0800 Subject: [PATCH 605/797] knot-dns: 3.2.2 -> 3.2.3 --- pkgs/servers/dns/knot-dns/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index d212c65cec72..eaa1d0658581 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring +{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , ngtcp2-gnutls , autoreconfHook @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "cea9c1988cdce7752f88fbe37378f65e83c4e54048978b94fb21a9c92f88788f"; + sha256 = "f736ef284358923e312f8e1e3c6ce7c97b20965b09eb65705e9f7e3d5e9a9d79"; }; outputs = [ "bin" "out" "dev" ]; @@ -27,11 +27,6 @@ stdenv.mkDerivation rec { # They are later created from NixOS itself. ./dont-create-run-time-dirs.patch ./runtime-deps.patch - # knsupdate: fix segfault due to NULL pointer access when sending an update - (fetchpatch { - url = "https://gitlab.nic.cz/knot/knot-dns/-/commit/8a6645dab63d8fa7932c7d8f747fe33e8cc97e84.patch"; - hash = "sha256-qzhSdRH5GqHqN9eLMWbDXmjO4JagsMRSZh3NWRFprao="; - }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 0a84f7879f8bd7922bef9822365997f2ebb376d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Nov 2022 22:03:06 +0000 Subject: [PATCH 606/797] prometheus-nats-exporter: 0.10.0 -> 0.10.1 --- pkgs/servers/monitoring/prometheus/nats-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nats-exporter.nix b/pkgs/servers/monitoring/prometheus/nats-exporter.nix index 4a7b3507730d..e77921a6e2b2 100644 --- a/pkgs/servers/monitoring/prometheus/nats-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nats-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "prometheus-nats-exporter"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qUnlPGniqStU5jVg+5SR8aYO7BLo7+d+UWPPm13ov0I="; + sha256 = "sha256-+qMhHmsvlUWjDhmSXv2TytuOPmJcXdSGBd7c5PdE9xI="; }; vendorSha256 = "sha256-hlC/s0pYhNHMv3i7Nmu4r6jnXGpc6raScv5dO32+tfQ="; From a8ab6540fdd68f426832e539c5141771e93656a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 09:53:19 +0000 Subject: [PATCH 607/797] tty-share: 2.2.1 -> 2.3.0 --- pkgs/applications/misc/tty-share/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix index a1adc152349b..92ff192c101a 100644 --- a/pkgs/applications/misc/tty-share/default.nix +++ b/pkgs/applications/misc/tty-share/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tty-share"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "elisescu"; repo = "tty-share"; rev = "v${version}"; - sha256 = "sha256-aAqKfi0ZX0UB07yGY6x0HcMspvq4rcJXKHSONxAwMlc="; + sha256 = "sha256-/oK2m2kxmF9HHYfTK6NlZxKKkDS7Oay+ed7jR/+szs0="; }; # Upstream has a `./vendor` directory with all deps which we rely upon. From 115a8853c4590dbdab22c7c34e35f0bd4b5ea558 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 20 Nov 2022 09:54:00 +0000 Subject: [PATCH 608/797] tty-share: enable on darwin --- pkgs/applications/misc/tty-share/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix index 92ff192c101a..37cc10c3823c 100644 --- a/pkgs/applications/misc/tty-share/default.nix +++ b/pkgs/applications/misc/tty-share/default.nix @@ -19,7 +19,6 @@ buildGoModule rec { meta = with lib; { homepage = "https://tty-share.com"; description = "Share terminal via browser for remote work or shared sessions"; - platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ andys8 ]; }; From 95eeff0043f01f799390b1ae86719870d6ba0aec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 10:14:24 +0000 Subject: [PATCH 609/797] unifi-poller: 2.1.3 -> 2.1.9 --- pkgs/servers/monitoring/unifi-poller/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/unifi-poller/default.nix b/pkgs/servers/monitoring/unifi-poller/default.nix index 83140c81f637..cd4ee333f5a6 100644 --- a/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/pkgs/servers/monitoring/unifi-poller/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unifi-poller"; - version = "2.1.3"; + version = "2.1.9"; src = fetchFromGitHub { owner = "unifi-poller"; repo = "unifi-poller"; rev = "v${version}"; - sha256 = "sha256-xh9s1xAhIeEmeDprl7iPdE6pxmxZjzgMvilobiIoJp0="; + sha256 = "sha256-eC+jEtSLWhiL3V+GKfRN5MVF18/2tnA1kI096j3XQB0="; }; - vendorSha256 = "sha256-HoYgBKTl9HIMVzzzNYtRrfmqb7HCpPHVPeR4gUXneWk="; + vendorSha256 = "sha256-WVYQ3cZOO+EyJRTFcMjziDHwqqinm1IvxvSLuHTaqT8="; ldflags = [ "-w" "-s" From f4994c862cf812303d23b6f30d925e0c4cb8c977 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 20 Nov 2022 11:39:29 +0100 Subject: [PATCH 610/797] newsflash: 2.1.2 -> 2.2.2 --- .../networking/feedreaders/newsflash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index e049e9c63504..7b53d2210feb 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "2.1.3"; + version = "2.2.2"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - sha256 = "sha256-bor1wyClLBU2uI9az3WcLvI2SldBmnZj2xhEaZj4Vg8="; + sha256 = "sha256-QEfbuTJ0spp0g/XPoS0ZaqudSkWZtXMd3ZTzAHiv45Q="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${finalAttrs.pname}-${finalAttrs.version}"; src = finalAttrs.src; - sha256 = "sha256-VkwPoh7A9sA27yU9PfD5KwL4gHKdX7Ip1hm53FuY5sE="; + sha256 = "sha256-AGsiB+xNSZzaG/PFgjKNKQopRUcyX27sLdyhT626Gcc="; }; patches = [ From d2068fdd5d425e0e724df7a13764672c597d8f6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 10:47:48 +0000 Subject: [PATCH 611/797] ventoy-bin: 1.0.81 -> 1.0.82 --- pkgs/tools/cd-dvd/ventoy-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 6a481e52139d..8f1571d1aee6 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -51,13 +51,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy-bin"; - version = "1.0.81"; + version = "1.0.82"; src = let inherit (finalAttrs) version; in fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - hash = "sha256-15y05g+F+oEFYUUy7SE57GZ1RSHqdZnk2iOPsy1L0GI="; + hash = "sha256-NN36gg2rUZgAxyMoYhMc7IbWgQLrPvuWERDF7JVsFfw="; }; patches = [ From c4dca7438cd60b69edd08e337b6a1fef535a3a27 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 20 Nov 2022 11:57:10 +0100 Subject: [PATCH 612/797] fatsort: fix build, cleanup, enable on darwin --- pkgs/tools/filesystems/fatsort/default.nix | 26 +++++++++++--- .../fatsort/fatsort-Makefiles.patch | 34 ------------------- 2 files changed, 21 insertions(+), 39 deletions(-) delete mode 100644 pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index 6db496242d24..d01ebce489c8 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -1,4 +1,9 @@ -{lib, stdenv, fetchurl, help2man}: +{ lib +, stdenv +, fetchurl +, help2man +, libiconv +}: stdenv.mkDerivation rec { version = "1.6.4.625"; @@ -9,17 +14,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-mm+JoGQLt4LYL/I6eAyfCuw9++RoLAqO2hV+CBBkLq0="; }; - patches = [ ./fatsort-Makefiles.patch ]; + buildInputs = [ help2man ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; - buildInputs = [ help2man ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "LD=${stdenv.cc.targetPrefix}cc" + ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + # make install target is broken (DESTDIR usage is insane) + # it's easier to just skip make and install manually + installPhase = '' + runHook preInstall + install -D -m 755 ./src/fatsort $out/bin/fatsort + install -D -m 644 ./man/fatsort.1 $out/man/man1/fatsort.1 + runHook postInstall + ''; meta = with lib; { homepage = "http://fatsort.sourceforge.net/"; description = "Sorts FAT partition table, for devices that don't do sorting of files"; maintainers = [ maintainers.kovirobi ]; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch b/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch deleted file mode 100644 index 51775edfb41d..000000000000 --- a/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -uNr fatsort-1.6.2.605.orig/Makefile fatsort-1.6.2.605.new/Makefile ---- fatsort-1.6.2.605.orig/Makefile 2019-11-16 16:40:27.000000000 +0100 -+++ fatsort-1.6.2.605.new/Makefile 2020-05-10 21:34:34.820874026 +0200 -@@ -1,4 +1,5 @@ --MANDIR=/usr/local/share/man/man1 -+PREFIX?=/usr/local -+MANDIR=$(PREFIX)/share/man/man1 - - INSTALL_FLAGS=-m 0755 -p -D - -diff -uNr fatsort-1.6.2.605.orig/src/Makefile fatsort-1.6.2.605.new/src/Makefile ---- fatsort-1.6.2.605.orig/src/Makefile 2018-11-17 00:40:59.000000000 +0100 -+++ fatsort-1.6.2.605.new/src/Makefile 2020-05-10 21:33:52.053391027 +0200 -@@ -30,7 +30,7 @@ - override CFLAGS += -D __CYGWIN__ - override CFLAGS += -D __LINUX__ - override LDFLAGS += -liconv -- SBINDIR=/usr/local/sbin -+ SBINDIR=$(PREFIX)/sbin - endif - else - ifdef MINGW -@@ -60,9 +60,9 @@ - # OS X's install does not support the '-D' flag. - INSTALL_FLAGS=-m 0755 -p - # Mac OS X does not have a "/usr/local/sbin" -- SBINDIR=/usr/local/bin -+ SBINDIR=$(PREFIX)/bin - else -- SBINDIR=/usr/local/sbin -+ SBINDIR=$(PREFIX)/sbin - endif - endif - endif From 991053d8a0e1543475d09cb8272c42e8ebe66755 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 10:34:17 +0000 Subject: [PATCH 613/797] v2ray-geoip: 202211100058 -> 202211170054 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 52183660ad04..66eb722ad91a 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202211100058"; + version = "202211170054"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "6fcf11f003829b16b534a710a26549b741e81311"; - sha256 = "sha256-XlqfXRJa4xnw8lqC94TfRcXVW/8L7hrqENfC7A7rTpI="; + rev = "e01c82114de0b2f3a2e8c80c78fc22e8fb71f68a"; + sha256 = "sha256-T94G1s3vTkh0pd2ByOpOwJDPn7geaHbnBB7w1K9qwps="; }; installPhase = '' From 6976207a6c58ecea03dfb62aa0b8f82039d977ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 20:11:21 +0000 Subject: [PATCH 614/797] pscale: 0.122.0 -> 0.124.0 --- pkgs/development/tools/pscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 49377c7cd598..d60aa24f9c0a 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.122.0"; + version = "0.124.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-gvz05VquRLKXMf45pxFAZCtyGWpn/DgOjRCHU6jTI/E="; + sha256 = "sha256-bNMUUohiMa/fSP1HjrB0UR3kWh+HNqqqpLcraw6UNjs="; }; - vendorSha256 = "sha256-HPlzro95wIYLwG1Sq5cgVFmUpEfKlhfWLfQTDS5c3bg="; + vendorSha256 = "sha256-cd4oAS81zUMImCkFsTIcgYJDB2pvMWYRnTPFkznSr+I="; ldflags = [ "-s" "-w" From 732f0048612f0341c51476e67acc59da31e48932 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 05:37:23 +0000 Subject: [PATCH 615/797] symfony-cli: 5.4.18 -> 5.4.19 --- pkgs/development/tools/symfony-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index e25d27591eed..0812e35a04e3 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.4.18"; - vendorSha256 = "sha256-hIi+WmLxCTFbu8E++CJkp4bOUrK81PkojRk60SljVik="; + version = "5.4.19"; + vendorSha256 = "sha256-P5KEliTqj9kGYffhl014QK6qPY9gLG+bViOz4dtsQwA="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-hRG21rXubS8K273qSjrY+U6n5bpa2kzOCqIXmapTAzs="; + sha256 = "sha256-GAsyI8I+tHFMV/LqwPx2ph+w3zaqKSn9vieVQcuO+y0="; }; postInstall = '' From 959df5f2b2519c5ae6c743a0b7a2dbf75b250da2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 17:18:58 +0000 Subject: [PATCH 616/797] openxr-loader: 1.0.25 -> 1.0.26 --- pkgs/development/libraries/openxr-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index b4b438e4a810..4cd1490fd4bf 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.25"; + version = "1.0.26"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-8fCz+t+PcZflq3sYdn+J6AdWHkG6UyDNcQmJ21b9p80="; + sha256 = "sha256-Ou6IwCvRJE4pB/69Sjmc5fZPMvjaDvPOs0Qgol9rTEA="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; From 83ac8be43cc87f2dc392335e9ab0829a402fcf94 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sun, 20 Nov 2022 11:46:47 +0100 Subject: [PATCH 617/797] github-runner: support `x86_64-darwin` --- .../github-runner/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index e460ffd2590a..2f4cb7c411f3 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -6,7 +6,6 @@ , fetchFromGitHub , fetchurl , git -, glibc , icu , libkrb5 , lib @@ -40,6 +39,7 @@ let runtimeIds = { "x86_64-linux" = "linux-x64"; "aarch64-linux" = "linux-arm64"; + "x86_64-darwin" = "osx-x64"; }; runtimeId = runtimeIds.${stdenv.system}; fakeSha1 = "0000000000000000000000000000000000000000"; @@ -61,16 +61,18 @@ stdenv.mkDerivation rec { dotnetSdk dotnetPackages.Nuget makeWrapper + ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; buildInputs = [ curl # libcurl.so.4 libkrb5 # libgssapi_krb5.so.2 - lttng-ust # liblttng-ust.so.0 stdenv.cc.cc.lib # libstdc++.so.6 zlib # libz.so.1 icu + ] ++ lib.optionals stdenv.isLinux [ + lttng-ust # liblttng-ust.so.0 ]; patches = [ @@ -104,6 +106,8 @@ stdenv.mkDerivation rec { --replace '/bin/ln' '${coreutils}/bin/ln' ''; + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = stdenv.isDarwin; + configurePhase = '' runHook preConfigure @@ -137,6 +141,8 @@ stdenv.mkDerivation rec { doCheck = true; + __darwinAllowLocalNetworking = true; + # Fully qualified name of disabled tests disabledTests = [ "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync" ] @@ -195,6 +201,13 @@ stdenv.mkDerivation rec { ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" + ] + ++ lib.optionals DOTNET_SYSTEM_GLOBALIZATION_INVARIANT [ + "GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv" + "GitHub.Runner.Common.Tests.Util.StringUtilL0.FormatUsesInvariantCulture" + "GitHub.Runner.Common.Tests.Worker.VariablesL0.Constructor_SetsOrdinalIgnoreCaseComparer" + "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchCancellation" + "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchRunNewJob" ]; checkInputs = [ git ]; @@ -269,7 +282,7 @@ stdenv.mkDerivation rec { # Stripping breaks the binaries dontStrip = true; - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so ''; @@ -277,17 +290,16 @@ stdenv.mkDerivation rec { fix_rpath() { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/$1 } - wrap() { makeWrapper $out/lib/$1 $out/bin/$1 \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (buildInputs ++ [ openssl ])} \ "''${@:2}" } - + '' + lib.optionalString stdenv.isLinux '' fix_rpath Runner.Listener fix_rpath Runner.PluginHost fix_rpath Runner.Worker - + '' + '' wrap Runner.Listener wrap Runner.PluginHost wrap Runner.Worker @@ -296,7 +308,7 @@ stdenv.mkDerivation rec { wrap config.sh --run 'export RUNNER_ROOT=''${RUNNER_ROOT:-$HOME/.github-runner}' \ --run 'mkdir -p $RUNNER_ROOT' \ - --prefix PATH : ${lib.makeBinPath [ glibc.bin ]} \ + --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} \ --chdir $out ''; @@ -308,7 +320,7 @@ stdenv.mkDerivation rec { # Inspired by passthru.fetch-deps in pkgs/build-support/build-dotnet-module/default.nix passthru.createDepsFile = writeShellApplication { name = "create-deps-file"; - runtimeInputs = [ dotnetSdk (nuget-to-nix.override { dotnet-sdk = dotnetSdk; }) ]; + runtimeInputs = [ coreutils dotnetSdk (nuget-to-nix.override { dotnet-sdk = dotnetSdk; }) ]; text = '' # Disable telemetry data export DOTNET_CLI_TELEMETRY_OPTOUT=1 From d14c42b9d410b6614641747130b508eb8035c039 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 02:46:09 +0000 Subject: [PATCH 618/797] sdrangel: 7.7.0 -> 7.8.3 --- pkgs/applications/radio/sdrangel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index fece0869a0bd..45f609c08f23 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -42,13 +42,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "7.7.0"; + version = "7.8.3"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-du5mNGMrXt6iFjb/QXQsW1DpGfIlVjqrbmsQZb4mMZQ="; + sha256 = "sha256-zP3Ic0mru0FcX7ZuE/IKGmHA596lq5Y1cWdBESzzU0U="; fetchSubmodules = false; }; From 8262b08df041b4284d5408d90af0834495af8c72 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sun, 20 Nov 2022 12:58:15 +0100 Subject: [PATCH 619/797] github-runner: support `aarch64-darwin` --- .../tools/continuous-integration/github-runner/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 2f4cb7c411f3..84c9c9268496 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -1,4 +1,5 @@ { autoPatchelfHook +, autoSignDarwinBinariesHook , coreutils , curl , dotnetCorePackages @@ -40,6 +41,7 @@ let "x86_64-linux" = "linux-x64"; "aarch64-linux" = "linux-arm64"; "x86_64-darwin" = "osx-x64"; + "aarch64-darwin" = "osx-arm64"; }; runtimeId = runtimeIds.${stdenv.system}; fakeSha1 = "0000000000000000000000000000000000000000"; @@ -63,6 +65,8 @@ stdenv.mkDerivation rec { makeWrapper ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 783bbd1ff696..274ec8a6c55f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7198,7 +7198,9 @@ with pkgs; github-backup = callPackage ../tools/misc/github-backup { }; - github-runner = callPackage ../development/tools/continuous-integration/github-runner { }; + github-runner = callPackage ../development/tools/continuous-integration/github-runner { + inherit (darwin) autoSignDarwinBinariesHook; + }; gitkraken = callPackage ../applications/version-management/gitkraken { }; From 89739b5f6adb3f22656c8ba30b7e6aca64ee9477 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sat, 19 Nov 2022 19:17:51 +0100 Subject: [PATCH 620/797] kmymoney: switch from kdewebkit to qtwebengine (to get rid of transitive dependency on qtwebkit) See PR #201028 and issue #53079 --- pkgs/applications/office/kmymoney/default.nix | 10 ++++++++-- pkgs/development/libraries/alkimia/default.nix | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 6a6ddc28449e..64167b84247c 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -3,7 +3,7 @@ , autoPatchelfHook , akonadi, alkimia, aqbanking, gmp, gwenhywfar, kactivities, karchive -, kcmutils, kcontacts, kdewebkit, kdiagram, kholidays, kidentitymanagement +, kcmutils, kcontacts, qtwebengine, kdiagram, kholidays, kidentitymanagement , kitemmodels, libical, libofx, qgpgme , sqlcipher @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-OTi4B4tzkboy4Su0I5di+uE0aDoMLsGnUQXDAso+Xj8="; }; + cmakeFlags = [ + # Remove this when upgrading to a KMyMoney release that includes + # https://invent.kde.org/office/kmymoney/-/merge_requests/118 + "-DENABLE_WEBENGINE=ON" + ]; + # Hidden dependency that wasn't included in CMakeLists.txt: NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; @@ -33,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ akonadi alkimia aqbanking gmp gwenhywfar kactivities karchive kcmutils - kcontacts kdewebkit kdiagram kholidays kidentitymanagement kitemmodels + kcontacts qtwebengine kdiagram kholidays kidentitymanagement kitemmodels libical libofx qgpgme sqlcipher diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index 186c2878cdeb..95f87ba58f6c 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -14,6 +14,9 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; + # qtwebengine is not a mandatory dependency, but it adds some features + # we might need for alkimia's dependents. See: + # https://github.com/KDE/alkimia/blob/v8.1.1/CMakeLists.txt#L124 buildInputs = [ qtbase qtwebengine kdelibs4support plasma-framework knewstuff kpackage ]; propagatedBuildInputs = [ mpir ]; From 8d9eab433a0c23f25a7bdeb9e56b6170b0eeb9fb Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sat, 19 Nov 2022 19:56:25 +0100 Subject: [PATCH 621/797] kdewebkit: remove kdewebkit doesn't seem to be used anymore and doesn't have any nixpkgs package maintainers. I'm not sure whether the entry at https://github.com/NixOS/nixpkgs/blob/6164b7bb61395b4488919ca4bbdf918d96a7d4ab/pkgs/development/libraries/kde-frameworks/srcs.nix#L230-L237 is also part of this, but that file has a DO NOT EDIT comment, so I'm leaving it as-is. --- .../libraries/kde-frameworks/default.nix | 1 - .../libraries/kde-frameworks/kdewebkit.nix | 14 -------------- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks/kdewebkit.nix diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 2014b00b1e54..516f1ea8850f 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -159,7 +159,6 @@ let kded = callPackage ./kded.nix {}; kdesignerplugin = callPackage ./kdesignerplugin.nix {}; kdesu = callPackage ./kdesu {}; - kdewebkit = callPackage ./kdewebkit.nix {}; kemoticons = callPackage ./kemoticons.nix {}; kglobalaccel = callPackage ./kglobalaccel.nix {}; kiconthemes = callPackage ./kiconthemes {}; diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix deleted file mode 100644 index b6d548cabfcd..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ mkDerivation, extra-cmake-modules -, kconfig, kcoreaddons, kio, kparts, qtwebkit -}: - -mkDerivation { - pname = "kdewebkit"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons kio kparts ]; - propagatedBuildInputs = [ qtwebkit ]; - outputs = [ "out" "dev" ]; - cmakeFlags = [ - "-DBUILD_DESIGNERPLUGIN=OFF" - ]; -} From 69dd2ae6faba2440312cde17684b504d54337a23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 13:06:01 +0000 Subject: [PATCH 622/797] wiki-js: 2.5.291 -> 2.5.292 --- pkgs/servers/web-apps/wiki-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 16c60fa8e73f..fd6ccfc8bdf3 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.291"; + version = "2.5.292"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-6calNW0IVjL484BssHAu+QwVUdQ7dTvcoSgk8jqckwk="; + sha256 = "sha256-45s/XvZx6WvxsxazwLpYjg6vlC07mBBxv6xNThpPFFA="; }; sourceRoot = "."; From 46ff0fbe6f92f59f71443b28080b7712011318ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 13:22:57 +0000 Subject: [PATCH 623/797] wvkbd: 0.11 -> 0.12 --- pkgs/applications/accessibility/wvkbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/applications/accessibility/wvkbd/default.nix index 44a602576136..ade7971a844a 100644 --- a/pkgs/applications/accessibility/wvkbd/default.nix +++ b/pkgs/applications/accessibility/wvkbd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "wvkbd"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "jjsullivan5196"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rMaJzePtT7K0X9o9/yT1hfKIo07W2CLEZKqHwfCLQBE="; + sha256 = "sha256-5m4aeuCqSJNgerQKyP9M6Qf7P4ijCtCY4Efew6E09Bc="; }; nativeBuildInputs = [ pkg-config ]; From 4f0a9675b3079748ebdb6ac313844e4355672bb0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 20 Nov 2022 14:52:06 +0100 Subject: [PATCH 624/797] rtl_433: 21.12 -> 22.11 --- pkgs/applications/radio/rtl_433/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 1dac6525ee63..44ecec312b3f 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -1,28 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, fetchpatch +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , libusb1, rtl-sdr, soapysdr-with-plugins }: stdenv.mkDerivation rec { - version = "21.12"; + version = "22.11"; pname = "rtl_433"; src = fetchFromGitHub { owner = "merbanan"; repo = "rtl_433"; rev = version; - sha256 = "sha256-KoDKyI7KDdGSe79ZTuL9ObKnOJsqTN4wrMq+/cvQ/Xk="; + sha256 = "sha256-qDY+prdf8O/dqmAgLU6lpsNIvL1R5V2AwsB+4CpOqGM="; }; - patches = [( fetchpatch { - name = "CVE-2022-27419"; - url = "https://github.com/merbanan/rtl_433/commit/37455483889bd1c641bdaafc493d1cc236b74904.patch"; - sha256 = "172jndh8x5nlcbx2jp5y8fgfxsawwfz95037pcjp170gf93ijy88"; - }) ( fetchpatch { - name = "CVE-2022-25051"; - url = "https://github.com/merbanan/rtl_433/commit/2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8.patch"; - sha256 = "sha256-IfxwdnuA7WbaVdxMTln069mA5hKNuPz+XYQaNA4YY24="; - })]; - nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libusb1 rtl-sdr soapysdr-with-plugins ]; @@ -36,5 +26,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ earldouglas markuskowa ]; platforms = platforms.all; }; - } From 623fd2cc57a23be02ab358e26749ac0450bbacaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 13:16:16 +0000 Subject: [PATCH 625/797] worker-build: 0.0.11 -> 0.0.12 --- pkgs/development/tools/worker-build/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/worker-build/default.nix b/pkgs/development/tools/worker-build/default.nix index dc6f2e9e9df5..b96a9fb605ec 100644 --- a/pkgs/development/tools/worker-build/default.nix +++ b/pkgs/development/tools/worker-build/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "worker-build"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-rs"; rev = "v${version}"; - sha256 = "sha256-oqnYWrytQ3hCf4T/PNIXTs3tW+W8HvuvIulRhdhzsDU="; + sha256 = "sha256-s5fcs1A31ePr2EvFdNvX55jMRkHZkR+LRkcy59brwXg="; }; - cargoSha256 = "sha256-t35LMyiQl2bsGjNIKqb8sKbrmCLZ0pmoo0qX0buGA+o="; + cargoSha256 = "sha256-2jLv3/mLLnSsSKEGaAd4jaM5FOdTvdJg2W1Nc4mVkqs="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 18ab6d062bbaa2af7b99e4493d4baff85b6c8f09 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Nov 2022 13:27:57 +0100 Subject: [PATCH 626/797] sphinxHook: inherit from python3Packages --- doc/languages-frameworks/python.section.md | 2 +- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 1723a1337e52..58be03c8de0b 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -789,7 +789,7 @@ documentation source root. ``` The hook is also available to packages outside the python ecosystem by -referencing it using `python3.pkgs.sphinxHook`. +referencing it using `sphinxHook` from top-level. ### Develop local package {#develop-local-package} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f69ba0f7d740..6a46330a7b41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22539,6 +22539,8 @@ with pkgs; sphinx-serve = with python3Packages; toPythonApplication sphinx-serve; + inherit (python3Packages) sphinxHook; + sphinxsearch = callPackage ../servers/search/sphinxsearch { }; spice = callPackage ../development/libraries/spice { }; From 7105c088a186e8f95d03b920cbd4eaa74b895522 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Nov 2022 12:37:10 +0100 Subject: [PATCH 627/797] openvswitch-lts: 2.5.12 -> 2.17.3 https://www.openvswitch.org/releases/NEWS-2.17.3.txt - Generate manpages into separate output - Enable test suite - Disables a test re bash arg completion that I can't get to work - Set up meta.changelog - Some reformatting --- pkgs/os-specific/linux/openvswitch/lts.nix | 105 ++++--- .../disable-bash-arg-completion-test.patch | 12 + .../linux/openvswitch/patches/lts-ssl.patch | 274 ------------------ 3 files changed, 83 insertions(+), 308 deletions(-) create mode 100644 pkgs/os-specific/linux/openvswitch/patches/disable-bash-arg-completion-test.patch delete mode 100644 pkgs/os-specific/linux/openvswitch/patches/lts-ssl.patch diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index 15c6c05b0613..fba63a338da1 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,26 +1,70 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which -, procps, libcap_ng, openssl, python2, perl -, automake, autoconf, libtool, kernel ? null }: - -with lib; +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, installShellFiles +, iproute2 +, kernel ? null +, libcap_ng +, libtool +, openssl +, perl +, pkg-config +, procps +, python3 +, sphinxHook +, util-linux +, which +}: let _kernel = kernel; in stdenv.mkDerivation rec { - version = "2.5.12"; + version = "2.17.3"; pname = "openvswitch"; + kernel = lib.optional (_kernel != null) _kernel.dev; + src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0a8wa1lj5p28x3vq0yaxjhqmppp4hvds6hhm0j3czpp8mc09fsfq"; + hash = "sha256-RGgR/JGuJFzDGQSmk3H7C/BEb3sk6yOaA320ADUwEcA="; }; - patches = [ ./patches/lts-ssl.patch ]; + outputs = [ + "out" + "man" + ]; - kernel = optional (_kernel != null) _kernel.dev; + patches = [ + # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664) + ./patches/disable-bash-arg-completion-test.patch + ]; - nativeBuildInputs = [ autoconf libtool automake pkg-config makeWrapper ]; - buildInputs = [ util-linux openssl libcap_ng python2 perl procps which ]; + nativeBuildInputs = [ + autoconf + automake + installShellFiles + libtool + pkg-config + sphinxHook + ]; + + sphinxBuilders = [ + "man" + ]; + + sphinxRoot = "./Documentation"; + + buildInputs = [ + libcap_ng + openssl + perl + procps + python3 + util-linux + which + ]; preConfigure = "./boot.sh"; @@ -28,7 +72,7 @@ in stdenv.mkDerivation rec { "--localstatedir=/var" "--sharedstatedir=/var" "--sbindir=$(out)/bin" - ] ++ (optionals (_kernel != null) ["--with-linux"]); + ] ++ (lib.optionals (_kernel != null) ["--with-linux"]); # Leave /var out of this! installFlags = [ @@ -37,34 +81,26 @@ in stdenv.mkDerivation rec { "PKIDIR=$(TMPDIR)/dummy" ]; - postBuild = '' - # fix tests - substituteInPlace xenserver/opt_xensource_libexec_interface-reconfigure --replace '/usr/bin/env python' '${python2.interpreter}' - substituteInPlace vtep/ovs-vtep --replace '/usr/bin/env python' '${python2.interpreter}' - ''; - enableParallelBuilding = true; - doCheck = false; # bash-completion test fails with "compgen: command not found" postInstall = '' - cp debian/ovs-monitor-ipsec $out/share/openvswitch/scripts - makeWrapper \ - $out/share/openvswitch/scripts/ovs-monitor-ipsec \ - $out/bin/ovs-monitor-ipsec \ - --prefix PYTHONPATH : "$out/share/openvswitch/python" - substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \ - --replace "UnixctlServer.create(None)" "UnixctlServer.create(os.environ['UNIXCTLPATH'])" - substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \ - --replace "self.psk_file" "root_prefix + self.psk_file" - substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \ - --replace "self.cert_dir" "root_prefix + self.cert_dir" + installShellCompletion --bash utilities/ovs-appctl-bashcomp.bash + installShellCompletion --bash utilities/ovs-vsctl-bashcomp.bash ''; + doCheck = true; + checkInputs = [ + iproute2 + ] ++ (with python3.pkgs; [ + netaddr + pyparsing + pytest + ]); + meta = with lib; { - platforms = platforms.linux; + changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; description = "A multilayer virtual switch"; - longDescription = - '' + longDescription = '' Open vSwitch is a production quality, multilayer virtual switch licensed under the open source Apache 2.0 license. It is designed to enable massive network automation through @@ -73,9 +109,10 @@ in stdenv.mkDerivation rec { RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to support distribution across multiple physical servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. - ''; + ''; homepage = "https://www.openvswitch.org/"; license = licenses.asl20; maintainers = with maintainers; [ netixx kmcopper ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/openvswitch/patches/disable-bash-arg-completion-test.patch b/pkgs/os-specific/linux/openvswitch/patches/disable-bash-arg-completion-test.patch new file mode 100644 index 000000000000..2b4542741763 --- /dev/null +++ b/pkgs/os-specific/linux/openvswitch/patches/disable-bash-arg-completion-test.patch @@ -0,0 +1,12 @@ +diff --git a/tests/completion.at b/tests/completion.at +index b6155af25..6367cb545 100644 +--- a/tests/completion.at ++++ b/tests/completion.at +@@ -425,6 +425,7 @@ AT_CLEANUP + + + AT_SETUP([vsctl-bashcomp - argument completion]) ++AT_SKIP_IF([true]) + AT_SKIP_IF([test -z ${BASH_VERSION+x}]) + AT_SKIP_IF([eval 'test ${BASH_VERSINFO[[0]]} -lt 4']) + OVS_VSWITCHD_START( diff --git a/pkgs/os-specific/linux/openvswitch/patches/lts-ssl.patch b/pkgs/os-specific/linux/openvswitch/patches/lts-ssl.patch deleted file mode 100644 index 0d8ff5b0d523..000000000000 --- a/pkgs/os-specific/linux/openvswitch/patches/lts-ssl.patch +++ /dev/null @@ -1,274 +0,0 @@ -diff --git a/build-aux/automake.mk b/build-aux/automake.mk -new file mode 100644 -index 000000000..5d2657fd6 ---- /dev/null -+++ b/build-aux/automake.mk -@@ -0,0 +1,2 @@ -+EXTRA_DIST += \ -+ build-aux/generate-dhparams-c -diff --git a/build-aux/generate-dhparams-c b/build-aux/generate-dhparams-c -new file mode 100755 -index 000000000..bcd25e2d8 ---- /dev/null -+++ b/build-aux/generate-dhparams-c -@@ -0,0 +1,33 @@ -+#! /bin/sh -e -+ -+cat <<'EOF' -+/* Generated automatically; do not modify! -*- buffer-read-only: t -*- -+ * -+ * If you do need to regenerate this file, run "make generate-dhparams-c". */ -+ -+#include -+#include "lib/dhparams.h" -+#include "lib/util.h" -+ -+static int -+my_DH_set0_pqg(DH *dh, BIGNUM *p, const BIGNUM **q OVS_UNUSED, BIGNUM *g) -+{ -+ ovs_assert(q == NULL); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+ dh->p = p; -+ dh->g = g; -+ return 1; -+#else -+ return DH_set0_pqg(dh, p, NULL, g); -+#endif -+} -+EOF -+(openssl dhparam -C -in lib/dh1024.pem -noout && -+openssl dhparam -C -in lib/dh2048.pem -noout && -+openssl dhparam -C -in lib/dh4096.pem -noout) | sed ' -+ s/^static DH/DH/ -+ s/\(get_dh[0-9]*\)()/\1(void)/ -+ s/\(DH_set0_pqg\)/my_\1/ -+ s/[ ]*$// -+ s/ / /g -+' -diff --git a/lib/automake.mk b/lib/automake.mk -index 5387d519a..804a8b7d7 100644 ---- a/lib/automake.mk -+++ b/lib/automake.mk -@@ -399,15 +399,16 @@ lib_libopenvswitch_la_SOURCES += \ - lib/route-table-bsd.c - endif - -+.PHONY: generate-dhparams-c - if HAVE_OPENSSL --lib_libopenvswitch_la_SOURCES += lib/stream-ssl.c --nodist_lib_libopenvswitch_la_SOURCES += lib/dhparams.c --lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem -- $(AM_V_GEN)(echo '#include "lib/dhparams.h"' && \ -- openssl dhparam -C -in $(srcdir)/lib/dh1024.pem -noout && \ -- openssl dhparam -C -in $(srcdir)/lib/dh2048.pem -noout && \ -- openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout) \ -- | sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp && \ -+lib_libopenvswitch_la_SOURCES += lib/stream-ssl.c lib/dhparams.c -+ -+# Manually regenerates lib/dhparams.c. Not normally necessary since -+# lib/dhparams.c is part of the repository and doesn't normally need -+# updates. -+generate-dhparams-c: -+ $(AM_V_GEN)cd $(srcdir) && \ -+ build-aux/generate-dhparams-c > lib/dhparams.c.tmp && \ - mv lib/dhparams.c.tmp lib/dhparams.c - else - lib_libopenvswitch_la_SOURCES += lib/stream-nossl.c -diff --git a/lib/dhparams.c b/lib/dhparams.c -new file mode 100644 -index 000000000..4e42efad2 ---- /dev/null -+++ b/lib/dhparams.c -@@ -0,0 +1,192 @@ -+/* Generated automatically; do not modify! -*- buffer-read-only: t -*- -+ * -+ * If you do need to regenerate this file, run "make generate-dhparams-c". */ -+ -+#include -+#include "lib/dhparams.h" -+#include "lib/util.h" -+ -+static int -+my_DH_set0_pqg(DH *dh, BIGNUM *p, const BIGNUM **q OVS_UNUSED, BIGNUM *g) -+{ -+ ovs_assert(q == NULL); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+ dh->p = p; -+ dh->g = g; -+ return 1; -+#else -+ return DH_set0_pqg(dh, p, NULL, g); -+#endif -+} -+#ifndef HEADER_DH_H -+# include -+#endif -+ -+DH *get_dh1024(void) -+{ -+ static unsigned char dhp_1024[] = { -+ 0xF4, 0x88, 0xFD, 0x58, 0x4E, 0x49, 0xDB, 0xCD, 0x20, 0xB4, -+ 0x9D, 0xE4, 0x91, 0x07, 0x36, 0x6B, 0x33, 0x6C, 0x38, 0x0D, -+ 0x45, 0x1D, 0x0F, 0x7C, 0x88, 0xB3, 0x1C, 0x7C, 0x5B, 0x2D, -+ 0x8E, 0xF6, 0xF3, 0xC9, 0x23, 0xC0, 0x43, 0xF0, 0xA5, 0x5B, -+ 0x18, 0x8D, 0x8E, 0xBB, 0x55, 0x8C, 0xB8, 0x5D, 0x38, 0xD3, -+ 0x34, 0xFD, 0x7C, 0x17, 0x57, 0x43, 0xA3, 0x1D, 0x18, 0x6C, -+ 0xDE, 0x33, 0x21, 0x2C, 0xB5, 0x2A, 0xFF, 0x3C, 0xE1, 0xB1, -+ 0x29, 0x40, 0x18, 0x11, 0x8D, 0x7C, 0x84, 0xA7, 0x0A, 0x72, -+ 0xD6, 0x86, 0xC4, 0x03, 0x19, 0xC8, 0x07, 0x29, 0x7A, 0xCA, -+ 0x95, 0x0C, 0xD9, 0x96, 0x9F, 0xAB, 0xD0, 0x0A, 0x50, 0x9B, -+ 0x02, 0x46, 0xD3, 0x08, 0x3D, 0x66, 0xA4, 0x5D, 0x41, 0x9F, -+ 0x9C, 0x7C, 0xBD, 0x89, 0x4B, 0x22, 0x19, 0x26, 0xBA, 0xAB, -+ 0xA2, 0x5E, 0xC3, 0x55, 0xE9, 0x2F, 0x78, 0xC7 -+ }; -+ static unsigned char dhg_1024[] = { -+ 0x02 -+ }; -+ DH *dh = DH_new(); -+ BIGNUM *dhp_bn, *dhg_bn; -+ -+ if (dh == NULL) -+ return NULL; -+ dhp_bn = BN_bin2bn(dhp_1024, sizeof (dhp_1024), NULL); -+ dhg_bn = BN_bin2bn(dhg_1024, sizeof (dhg_1024), NULL); -+ if (dhp_bn == NULL || dhg_bn == NULL -+ || !my_DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) { -+ DH_free(dh); -+ BN_free(dhp_bn); -+ BN_free(dhg_bn); -+ return NULL; -+ } -+ return dh; -+} -+#ifndef HEADER_DH_H -+# include -+#endif -+ -+DH *get_dh2048(void) -+{ -+ static unsigned char dhp_2048[] = { -+ 0xF6, 0x42, 0x57, 0xB7, 0x08, 0x7F, 0x08, 0x17, 0x72, 0xA2, -+ 0xBA, 0xD6, 0xA9, 0x42, 0xF3, 0x05, 0xE8, 0xF9, 0x53, 0x11, -+ 0x39, 0x4F, 0xB6, 0xF1, 0x6E, 0xB9, 0x4B, 0x38, 0x20, 0xDA, -+ 0x01, 0xA7, 0x56, 0xA3, 0x14, 0xE9, 0x8F, 0x40, 0x55, 0xF3, -+ 0xD0, 0x07, 0xC6, 0xCB, 0x43, 0xA9, 0x94, 0xAD, 0xF7, 0x4C, -+ 0x64, 0x86, 0x49, 0xF8, 0x0C, 0x83, 0xBD, 0x65, 0xE9, 0x17, -+ 0xD4, 0xA1, 0xD3, 0x50, 0xF8, 0xF5, 0x59, 0x5F, 0xDC, 0x76, -+ 0x52, 0x4F, 0x3D, 0x3D, 0x8D, 0xDB, 0xCE, 0x99, 0xE1, 0x57, -+ 0x92, 0x59, 0xCD, 0xFD, 0xB8, 0xAE, 0x74, 0x4F, 0xC5, 0xFC, -+ 0x76, 0xBC, 0x83, 0xC5, 0x47, 0x30, 0x61, 0xCE, 0x7C, 0xC9, -+ 0x66, 0xFF, 0x15, 0xF9, 0xBB, 0xFD, 0x91, 0x5E, 0xC7, 0x01, -+ 0xAA, 0xD3, 0x5B, 0x9E, 0x8D, 0xA0, 0xA5, 0x72, 0x3A, 0xD4, -+ 0x1A, 0xF0, 0xBF, 0x46, 0x00, 0x58, 0x2B, 0xE5, 0xF4, 0x88, -+ 0xFD, 0x58, 0x4E, 0x49, 0xDB, 0xCD, 0x20, 0xB4, 0x9D, 0xE4, -+ 0x91, 0x07, 0x36, 0x6B, 0x33, 0x6C, 0x38, 0x0D, 0x45, 0x1D, -+ 0x0F, 0x7C, 0x88, 0xB3, 0x1C, 0x7C, 0x5B, 0x2D, 0x8E, 0xF6, -+ 0xF3, 0xC9, 0x23, 0xC0, 0x43, 0xF0, 0xA5, 0x5B, 0x18, 0x8D, -+ 0x8E, 0xBB, 0x55, 0x8C, 0xB8, 0x5D, 0x38, 0xD3, 0x34, 0xFD, -+ 0x7C, 0x17, 0x57, 0x43, 0xA3, 0x1D, 0x18, 0x6C, 0xDE, 0x33, -+ 0x21, 0x2C, 0xB5, 0x2A, 0xFF, 0x3C, 0xE1, 0xB1, 0x29, 0x40, -+ 0x18, 0x11, 0x8D, 0x7C, 0x84, 0xA7, 0x0A, 0x72, 0xD6, 0x86, -+ 0xC4, 0x03, 0x19, 0xC8, 0x07, 0x29, 0x7A, 0xCA, 0x95, 0x0C, -+ 0xD9, 0x96, 0x9F, 0xAB, 0xD0, 0x0A, 0x50, 0x9B, 0x02, 0x46, -+ 0xD3, 0x08, 0x3D, 0x66, 0xA4, 0x5D, 0x41, 0x9F, 0x9C, 0x7C, -+ 0xBD, 0x89, 0x4B, 0x22, 0x19, 0x26, 0xBA, 0xAB, 0xA2, 0x5E, -+ 0xC3, 0x55, 0xE9, 0x32, 0x0B, 0x3B -+ }; -+ static unsigned char dhg_2048[] = { -+ 0x02 -+ }; -+ DH *dh = DH_new(); -+ BIGNUM *dhp_bn, *dhg_bn; -+ -+ if (dh == NULL) -+ return NULL; -+ dhp_bn = BN_bin2bn(dhp_2048, sizeof (dhp_2048), NULL); -+ dhg_bn = BN_bin2bn(dhg_2048, sizeof (dhg_2048), NULL); -+ if (dhp_bn == NULL || dhg_bn == NULL -+ || !my_DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) { -+ DH_free(dh); -+ BN_free(dhp_bn); -+ BN_free(dhg_bn); -+ return NULL; -+ } -+ return dh; -+} -+#ifndef HEADER_DH_H -+# include -+#endif -+ -+DH *get_dh4096(void) -+{ -+ static unsigned char dhp_4096[] = { -+ 0xFA, 0x14, 0x72, 0x52, 0xC1, 0x4D, 0xE1, 0x5A, 0x49, 0xD4, -+ 0xEF, 0x09, 0x2D, 0xC0, 0xA8, 0xFD, 0x55, 0xAB, 0xD7, 0xD9, -+ 0x37, 0x04, 0x28, 0x09, 0xE2, 0xE9, 0x3E, 0x77, 0xE2, 0xA1, -+ 0x7A, 0x18, 0xDD, 0x46, 0xA3, 0x43, 0x37, 0x23, 0x90, 0x97, -+ 0xF3, 0x0E, 0xC9, 0x03, 0x50, 0x7D, 0x65, 0xCF, 0x78, 0x62, -+ 0xA6, 0x3A, 0x62, 0x22, 0x83, 0xA1, 0x2F, 0xFE, 0x79, 0xBA, -+ 0x35, 0xFF, 0x59, 0xD8, 0x1D, 0x61, 0xDD, 0x1E, 0x21, 0x13, -+ 0x17, 0xFE, 0xCD, 0x38, 0x87, 0x9E, 0xF5, 0x4F, 0x79, 0x10, -+ 0x61, 0x8D, 0xD4, 0x22, 0xF3, 0x5A, 0xED, 0x5D, 0xEA, 0x21, -+ 0xE9, 0x33, 0x6B, 0x48, 0x12, 0x0A, 0x20, 0x77, 0xD4, 0x25, -+ 0x60, 0x61, 0xDE, 0xF6, 0xB4, 0x4F, 0x1C, 0x63, 0x40, 0x8B, -+ 0x3A, 0x21, 0x93, 0x8B, 0x79, 0x53, 0x51, 0x2C, 0xCA, 0xB3, -+ 0x7B, 0x29, 0x56, 0xA8, 0xC7, 0xF8, 0xF4, 0x7B, 0x08, 0x5E, -+ 0xA6, 0xDC, 0xA2, 0x45, 0x12, 0x56, 0xDD, 0x41, 0x92, 0xF2, -+ 0xDD, 0x5B, 0x8F, 0x23, 0xF0, 0xF3, 0xEF, 0xE4, 0x3B, 0x0A, -+ 0x44, 0xDD, 0xED, 0x96, 0x84, 0xF1, 0xA8, 0x32, 0x46, 0xA3, -+ 0xDB, 0x4A, 0xBE, 0x3D, 0x45, 0xBA, 0x4E, 0xF8, 0x03, 0xE5, -+ 0xDD, 0x6B, 0x59, 0x0D, 0x84, 0x1E, 0xCA, 0x16, 0x5A, 0x8C, -+ 0xC8, 0xDF, 0x7C, 0x54, 0x44, 0xC4, 0x27, 0xA7, 0x3B, 0x2A, -+ 0x97, 0xCE, 0xA3, 0x7D, 0x26, 0x9C, 0xAD, 0xF4, 0xC2, 0xAC, -+ 0x37, 0x4B, 0xC3, 0xAD, 0x68, 0x84, 0x7F, 0x99, 0xA6, 0x17, -+ 0xEF, 0x6B, 0x46, 0x3A, 0x7A, 0x36, 0x7A, 0x11, 0x43, 0x92, -+ 0xAD, 0xE9, 0x9C, 0xFB, 0x44, 0x6C, 0x3D, 0x82, 0x49, 0xCC, -+ 0x5C, 0x6A, 0x52, 0x42, 0xF8, 0x42, 0xFB, 0x44, 0xF9, 0x39, -+ 0x73, 0xFB, 0x60, 0x79, 0x3B, 0xC2, 0x9E, 0x0B, 0xDC, 0xD4, -+ 0xA6, 0x67, 0xF7, 0x66, 0x3F, 0xFC, 0x42, 0x3B, 0x1B, 0xDB, -+ 0x4F, 0x66, 0xDC, 0xA5, 0x8F, 0x66, 0xF9, 0xEA, 0xC1, 0xED, -+ 0x31, 0xFB, 0x48, 0xA1, 0x82, 0x7D, 0xF8, 0xE0, 0xCC, 0xB1, -+ 0xC7, 0x03, 0xE4, 0xF8, 0xB3, 0xFE, 0xB7, 0xA3, 0x13, 0x73, -+ 0xA6, 0x7B, 0xC1, 0x0E, 0x39, 0xC7, 0x94, 0x48, 0x26, 0x00, -+ 0x85, 0x79, 0xFC, 0x6F, 0x7A, 0xAF, 0xC5, 0x52, 0x35, 0x75, -+ 0xD7, 0x75, 0xA4, 0x40, 0xFA, 0x14, 0x74, 0x61, 0x16, 0xF2, -+ 0xEB, 0x67, 0x11, 0x6F, 0x04, 0x43, 0x3D, 0x11, 0x14, 0x4C, -+ 0xA7, 0x94, 0x2A, 0x39, 0xA1, 0xC9, 0x90, 0xCF, 0x83, 0xC6, -+ 0xFF, 0x02, 0x8F, 0xA3, 0x2A, 0xAC, 0x26, 0xDF, 0x0B, 0x8B, -+ 0xBE, 0x64, 0x4A, 0xF1, 0xA1, 0xDC, 0xEE, 0xBA, 0xC8, 0x03, -+ 0x82, 0xF6, 0x62, 0x2C, 0x5D, 0xB6, 0xBB, 0x13, 0x19, 0x6E, -+ 0x86, 0xC5, 0x5B, 0x2B, 0x5E, 0x3A, 0xF3, 0xB3, 0x28, 0x6B, -+ 0x70, 0x71, 0x3A, 0x8E, 0xFF, 0x5C, 0x15, 0xE6, 0x02, 0xA4, -+ 0xCE, 0xED, 0x59, 0x56, 0xCC, 0x15, 0x51, 0x07, 0x79, 0x1A, -+ 0x0F, 0x25, 0x26, 0x27, 0x30, 0xA9, 0x15, 0xB2, 0xC8, 0xD4, -+ 0x5C, 0xCC, 0x30, 0xE8, 0x1B, 0xD8, 0xD5, 0x0F, 0x19, 0xA8, -+ 0x80, 0xA4, 0xC7, 0x01, 0xAA, 0x8B, 0xBA, 0x53, 0xBB, 0x47, -+ 0xC2, 0x1F, 0x6B, 0x54, 0xB0, 0x17, 0x60, 0xED, 0x79, 0x21, -+ 0x95, 0xB6, 0x05, 0x84, 0x37, 0xC8, 0x03, 0xA4, 0xDD, 0xD1, -+ 0x06, 0x69, 0x8F, 0x4C, 0x39, 0xE0, 0xC8, 0x5D, 0x83, 0x1D, -+ 0xBE, 0x6A, 0x9A, 0x99, 0xF3, 0x9F, 0x0B, 0x45, 0x29, 0xD4, -+ 0xCB, 0x29, 0x66, 0xEE, 0x1E, 0x7E, 0x3D, 0xD7, 0x13, 0x4E, -+ 0xDB, 0x90, 0x90, 0x58, 0xCB, 0x5E, 0x9B, 0xCD, 0x2E, 0x2B, -+ 0x0F, 0xA9, 0x4E, 0x78, 0xAC, 0x05, 0x11, 0x7F, 0xE3, 0x9E, -+ 0x27, 0xD4, 0x99, 0xE1, 0xB9, 0xBD, 0x78, 0xE1, 0x84, 0x41, -+ 0xA0, 0xDF -+ }; -+ static unsigned char dhg_4096[] = { -+ 0x02 -+ }; -+ DH *dh = DH_new(); -+ BIGNUM *dhp_bn, *dhg_bn; -+ -+ if (dh == NULL) -+ return NULL; -+ dhp_bn = BN_bin2bn(dhp_4096, sizeof (dhp_4096), NULL); -+ dhg_bn = BN_bin2bn(dhg_4096, sizeof (dhg_4096), NULL); -+ if (dhp_bn == NULL || dhg_bn == NULL -+ || !my_DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) { -+ DH_free(dh); -+ BN_free(dhp_bn); -+ BN_free(dhg_bn); -+ return NULL; -+ } -+ return dh; -+} From 92097927de79f25e165e9e24a7a7a75b9206d18c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Nov 2022 13:29:21 +0100 Subject: [PATCH 628/797] openvswitch: 2.7.12 -> 3.0.1 https://www.openvswitch.org/releases/NEWS-3.0.1.txt - Generate manpages into separate output - Enable test suite - Disables a test re bash arg completion that I can't get to work - Set up meta.changelog - Some reformatting --- .../os-specific/linux/openvswitch/default.nix | 97 ++++++++++++++----- 1 file changed, 72 insertions(+), 25 deletions(-) diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 50cecbec3039..f5bc64168ce0 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,33 +1,72 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which -, procps, libcap_ng, openssl, python3 , perl -, kernel ? null }: - -with lib; +{ lib +, stdenv +, fetchurl +, installShellFiles +, iproute2 +, kernel ? null +, libcap_ng +, openssl +, perl +, pkg-config +, procps +, python3 +, sphinxHook +, util-linux +, which +}: let _kernel = kernel; - pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.17.2"; + version = "3.0.1"; pname = "openvswitch"; + kernel = lib.optional (_kernel != null) _kernel.dev; + src = fetchurl { - url = "https://www.openvswitch.org/releases/openvswitch-${version}.tar.gz"; - sha256 = "sha256-ai4NtCutuMvK9/O+vVtemicBMZ3x0EKU6aennpRQTWk="; + url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; + hash = "sha256-5KEXFtCRn1syOSKLMrrcEJtWGl/maLlUfhQ7CxlbvWg="; }; - kernel = optional (_kernel != null) _kernel.dev; - - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ - util-linux openssl libcap_ng pythonEnv perl procps which + outputs = [ + "out" + "man" ]; + patches = [ + # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664) + ./patches/disable-bash-arg-completion-test.patch + ]; + + nativeBuildInputs = [ + installShellFiles + pkg-config + sphinxHook + ]; + + sphinxBuilders = [ + "man" + ]; + + sphinxRoot = "./Documentation"; + + buildInputs = [ + libcap_ng + openssl + perl + procps + python3 + util-linux + which + ]; + + preConfigure = "./boot.sh"; + configureFlags = [ "--localstatedir=/var" "--sharedstatedir=/var" "--sbindir=$(out)/bin" - ] ++ (optionals (_kernel != null) ["--with-linux"]); + ] ++ (lib.optionals (_kernel != null) ["--with-linux"]); # Leave /var out of this! installFlags = [ @@ -36,20 +75,27 @@ in stdenv.mkDerivation rec { "PKIDIR=$(TMPDIR)/dummy" ]; - postBuild = '' - # fix tests - substituteInPlace xenserver/opt_xensource_libexec_interface-reconfigure --replace '/usr/bin/env python' '${pythonEnv.interpreter}' - substituteInPlace vtep/ovs-vtep --replace '/usr/bin/env python' '${pythonEnv.interpreter}' + enableParallelBuilding = true; + + postInstall = '' + installShellCompletion --bash utilities/ovs-appctl-bashcomp.bash + installShellCompletion --bash utilities/ovs-vsctl-bashcomp.bash ''; - enableParallelBuilding = true; - doCheck = false; # bash-completion test fails with "compgen: command not found" + doCheck = true; + + checkInputs = [ + iproute2 + ] ++ (with python3.pkgs; [ + netaddr + pyparsing + pytest + ]); meta = with lib; { - platforms = platforms.linux; + changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; description = "A multilayer virtual switch"; - longDescription = - '' + longDescription = '' Open vSwitch is a production quality, multilayer virtual switch licensed under the open source Apache 2.0 license. It is designed to enable massive network automation through @@ -58,9 +104,10 @@ in stdenv.mkDerivation rec { RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to support distribution across multiple physical servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. - ''; + ''; homepage = "https://www.openvswitch.org/"; license = licenses.asl20; maintainers = with maintainers; [ netixx kmcopper ]; + platforms = platforms.linux; }; } From 217cf995216ae8797079fdfd41e6398455d4a4ed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Nov 2022 13:42:11 +0100 Subject: [PATCH 629/797] openvswitch: generalize builder --- .../os-specific/linux/openvswitch/default.nix | 113 +--------------- .../os-specific/linux/openvswitch/generic.nix | 123 ++++++++++++++++++ pkgs/os-specific/linux/openvswitch/lts.nix | 118 +---------------- 3 files changed, 127 insertions(+), 227 deletions(-) create mode 100644 pkgs/os-specific/linux/openvswitch/generic.nix diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index f5bc64168ce0..9d902fe9b70f 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,113 +1,4 @@ -{ lib -, stdenv -, fetchurl -, installShellFiles -, iproute2 -, kernel ? null -, libcap_ng -, openssl -, perl -, pkg-config -, procps -, python3 -, sphinxHook -, util-linux -, which -}: - -let - _kernel = kernel; -in stdenv.mkDerivation rec { +import ./generic.nix { version = "3.0.1"; - pname = "openvswitch"; - - kernel = lib.optional (_kernel != null) _kernel.dev; - - src = fetchurl { - url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - hash = "sha256-5KEXFtCRn1syOSKLMrrcEJtWGl/maLlUfhQ7CxlbvWg="; - }; - - outputs = [ - "out" - "man" - ]; - - patches = [ - # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664) - ./patches/disable-bash-arg-completion-test.patch - ]; - - nativeBuildInputs = [ - installShellFiles - pkg-config - sphinxHook - ]; - - sphinxBuilders = [ - "man" - ]; - - sphinxRoot = "./Documentation"; - - buildInputs = [ - libcap_ng - openssl - perl - procps - python3 - util-linux - which - ]; - - preConfigure = "./boot.sh"; - - configureFlags = [ - "--localstatedir=/var" - "--sharedstatedir=/var" - "--sbindir=$(out)/bin" - ] ++ (lib.optionals (_kernel != null) ["--with-linux"]); - - # Leave /var out of this! - installFlags = [ - "LOGDIR=$(TMPDIR)/dummy" - "RUNDIR=$(TMPDIR)/dummy" - "PKIDIR=$(TMPDIR)/dummy" - ]; - - enableParallelBuilding = true; - - postInstall = '' - installShellCompletion --bash utilities/ovs-appctl-bashcomp.bash - installShellCompletion --bash utilities/ovs-vsctl-bashcomp.bash - ''; - - doCheck = true; - - checkInputs = [ - iproute2 - ] ++ (with python3.pkgs; [ - netaddr - pyparsing - pytest - ]); - - meta = with lib; { - changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; - description = "A multilayer virtual switch"; - longDescription = '' - Open vSwitch is a production quality, multilayer virtual switch - licensed under the open source Apache 2.0 license. It is - designed to enable massive network automation through - programmatic extension, while still supporting standard - management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, - RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to - support distribution across multiple physical servers similar - to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. - ''; - homepage = "https://www.openvswitch.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ netixx kmcopper ]; - platforms = platforms.linux; - }; + hash = "sha256-5KEXFtCRn1syOSKLMrrcEJtWGl/maLlUfhQ7CxlbvWg="; } diff --git a/pkgs/os-specific/linux/openvswitch/generic.nix b/pkgs/os-specific/linux/openvswitch/generic.nix new file mode 100644 index 000000000000..c3d180bcbb7f --- /dev/null +++ b/pkgs/os-specific/linux/openvswitch/generic.nix @@ -0,0 +1,123 @@ +{ version +, hash +}: + +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, installShellFiles +, iproute2 +, kernel ? null +, libcap_ng +, libtool +, openssl +, perl +, pkg-config +, procps +, python3 +, sphinxHook +, util-linux +, which +}: + +let + _kernel = kernel; +in stdenv.mkDerivation rec { + pname = "openvswitch"; + inherit version; + + kernel = lib.optional (_kernel != null) _kernel.dev; + + src = fetchurl { + url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; + inherit hash; + }; + + outputs = [ + "out" + "man" + ]; + + patches = [ + # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664) + ./patches/disable-bash-arg-completion-test.patch + ]; + + nativeBuildInputs = [ + autoconf + automake + installShellFiles + libtool + pkg-config + sphinxHook + ]; + + sphinxBuilders = [ + "man" + ]; + + sphinxRoot = "./Documentation"; + + buildInputs = [ + libcap_ng + openssl + perl + procps + python3 + util-linux + which + ]; + + preConfigure = "./boot.sh"; + + configureFlags = [ + "--localstatedir=/var" + "--sharedstatedir=/var" + "--sbindir=$(out)/bin" + ] ++ (lib.optionals (_kernel != null) ["--with-linux"]); + + # Leave /var out of this! + installFlags = [ + "LOGDIR=$(TMPDIR)/dummy" + "RUNDIR=$(TMPDIR)/dummy" + "PKIDIR=$(TMPDIR)/dummy" + ]; + + enableParallelBuilding = true; + + postInstall = '' + installShellCompletion --bash utilities/ovs-appctl-bashcomp.bash + installShellCompletion --bash utilities/ovs-vsctl-bashcomp.bash + ''; + + doCheck = true; + + checkInputs = [ + iproute2 + ] ++ (with python3.pkgs; [ + netaddr + pyparsing + pytest + ]); + + meta = with lib; { + changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; + description = "A multilayer virtual switch"; + longDescription = '' + Open vSwitch is a production quality, multilayer virtual switch + licensed under the open source Apache 2.0 license. It is + designed to enable massive network automation through + programmatic extension, while still supporting standard + management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, + RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to + support distribution across multiple physical servers similar + to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. + ''; + homepage = "https://www.openvswitch.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ netixx kmcopper ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index fba63a338da1..453d05a5afc1 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,118 +1,4 @@ -{ lib -, stdenv -, fetchurl -, autoconf -, automake -, installShellFiles -, iproute2 -, kernel ? null -, libcap_ng -, libtool -, openssl -, perl -, pkg-config -, procps -, python3 -, sphinxHook -, util-linux -, which -}: - -let - _kernel = kernel; -in stdenv.mkDerivation rec { +import ./generic.nix { version = "2.17.3"; - pname = "openvswitch"; - - kernel = lib.optional (_kernel != null) _kernel.dev; - - src = fetchurl { - url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - hash = "sha256-RGgR/JGuJFzDGQSmk3H7C/BEb3sk6yOaA320ADUwEcA="; - }; - - outputs = [ - "out" - "man" - ]; - - patches = [ - # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664) - ./patches/disable-bash-arg-completion-test.patch - ]; - - nativeBuildInputs = [ - autoconf - automake - installShellFiles - libtool - pkg-config - sphinxHook - ]; - - sphinxBuilders = [ - "man" - ]; - - sphinxRoot = "./Documentation"; - - buildInputs = [ - libcap_ng - openssl - perl - procps - python3 - util-linux - which - ]; - - preConfigure = "./boot.sh"; - - configureFlags = [ - "--localstatedir=/var" - "--sharedstatedir=/var" - "--sbindir=$(out)/bin" - ] ++ (lib.optionals (_kernel != null) ["--with-linux"]); - - # Leave /var out of this! - installFlags = [ - "LOGDIR=$(TMPDIR)/dummy" - "RUNDIR=$(TMPDIR)/dummy" - "PKIDIR=$(TMPDIR)/dummy" - ]; - - enableParallelBuilding = true; - - postInstall = '' - installShellCompletion --bash utilities/ovs-appctl-bashcomp.bash - installShellCompletion --bash utilities/ovs-vsctl-bashcomp.bash - ''; - - doCheck = true; - checkInputs = [ - iproute2 - ] ++ (with python3.pkgs; [ - netaddr - pyparsing - pytest - ]); - - meta = with lib; { - changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; - description = "A multilayer virtual switch"; - longDescription = '' - Open vSwitch is a production quality, multilayer virtual switch - licensed under the open source Apache 2.0 license. It is - designed to enable massive network automation through - programmatic extension, while still supporting standard - management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, - RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to - support distribution across multiple physical servers similar - to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. - ''; - homepage = "https://www.openvswitch.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ netixx kmcopper ]; - platforms = platforms.linux; - }; + hash = "sha256-RGgR/JGuJFzDGQSmk3H7C/BEb3sk6yOaA320ADUwEcA="; } From 22d2017050fc0683bbcff8b1ecd3a2514ab77f14 Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Sun, 20 Nov 2022 23:18:06 +0800 Subject: [PATCH 630/797] arch-install-scripts: 27 -> 28 --- pkgs/tools/misc/arch-install-scripts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/arch-install-scripts/default.nix b/pkgs/tools/misc/arch-install-scripts/default.nix index f8f2e10be85c..caaf298c2f94 100644 --- a/pkgs/tools/misc/arch-install-scripts/default.nix +++ b/pkgs/tools/misc/arch-install-scripts/default.nix @@ -22,13 +22,13 @@ resholve.mkDerivation rec { pname = "arch-install-scripts"; - version = "27"; + version = "28"; src = fetchFromGitHub { owner = "archlinux"; repo = "arch-install-scripts"; rev = "v${version}"; - hash = "sha256-owJImToG8GIk1TfkSKJyXCu9RTJ1qYlvQ6DTMSazaeQ="; + hash = "sha256-TytCeejhjWYDzWFjGubUl08OrsAQa9fFULoamDfbdDY="; }; nativeBuildInputs = [ asciidoc gnum4 ]; From 626e8b67fa595a4c1f0a466dce335f06c28fb357 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 20 Nov 2022 16:37:42 +0100 Subject: [PATCH 631/797] nixos/tests/acme/server: regenerate certs expired today --- .../common/acme/server/acme.test.cert.pem | 32 ++++++------ .../common/acme/server/acme.test.key.pem | 50 +++++++++---------- nixos/tests/common/acme/server/ca.cert.pem | 34 ++++++------- nixos/tests/common/acme/server/ca.key.pem | 50 +++++++++---------- 4 files changed, 83 insertions(+), 83 deletions(-) diff --git a/nixos/tests/common/acme/server/acme.test.cert.pem b/nixos/tests/common/acme/server/acme.test.cert.pem index 76b0d916a817..562e7a329b68 100644 --- a/nixos/tests/common/acme/server/acme.test.cert.pem +++ b/nixos/tests/common/acme/server/acme.test.cert.pem @@ -1,19 +1,19 @@ -----BEGIN CERTIFICATE----- -MIIDLDCCAhSgAwIBAgIIRDAN3FHH//IwDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE -AxMVbWluaWNhIHJvb3QgY2EgNzg3NDZmMB4XDTIwMTAyMTEzMjgzNloXDTIyMTEy -MDEzMjgzNlowFDESMBAGA1UEAxMJYWNtZS50ZXN0MIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEAo8XjMVUaljcaqQ5MFhfPuQgSwdyXEUbpSHz+5yPkE0h9 -Z4Xu5BJF1Oq7h5ggCtadVsIspiY6Jm6aWDOjlh4myzW5UNBNUG3OPEk50vmmHFeH -pImHO/d8yb33QoF9VRcTZs4tuJYg7l9bSs4jNG72vYvv2YiGAcmjJcsmAZIfniCN -Xf/LjIm+Cxykn+Vo3UuzO1w5/iuofdgWO/aZxMezmXUivlL3ih4cNzCJei8WlB/l -EnHrkcy3ogRmmynP5zcz7vmGIJX2ji6dhCa4Got5B7eZK76o2QglhQXqPatG0AOY -H+RfQfzKemqPG5om9MgJtwFtTOU1LoaiBw//jXKESQIDAQABo3YwdDAOBgNVHQ8B +MIIDLDCCAhSgAwIBAgIIHvJkPAdMFGAwDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE +AxMVbWluaWNhIHJvb3QgY2EgNDYwMjMxMB4XDTIyMTEyMDE1MzcwNFoXDTI0MTIy +MDE1MzcwNFowFDESMBAGA1UEAxMJYWNtZS50ZXN0MIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAs/Xad8Jn0YMI8nTjbVakGsFplxSKkgWs9Jv8tETC1FBV +KNo3yF6IElBhzKw3eF6piZqDwNFXobuMCZ3Ckaj+EOdSA0DhjwUSBmEok/0siIu4 +WbAS2iKwZGuJlJRYOmfXRPt2nNSPhuNHtZJoTWufN5K1XS+4v1dsVUWdWvkUuaC5 +/uoujcYd4D6XDhJCubDCE+WSYk0KBLtMQ8irbNu4FGoCn5T7kDq46XwVjulWxc5q +dZ/Z/zgKQkoLaHgWKLjvuu7/CZw6RXyBlwVJh36pljixRnpnLfMMykO9Sq7Z3cR2 +aVcMRjjeH0uScfFHIb3hvqyZLd+NHw3SqE8la/Nq1wIDAQABo3YwdDAOBgNVHQ8B Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB -/wQCMAAwHwYDVR0jBBgwFoAU+8IZlLV/Qp5CXqpXMLvtxWlxcJwwFAYDVR0RBA0w -C4IJYWNtZS50ZXN0MA0GCSqGSIb3DQEBCwUAA4IBAQB0pe8I5/VDkB5VMgQB2GJV -GKzyigfWbVez9uLmqMj9PPP/zzYKSYeq+91aMuOZrnH7NqBxSTwanULkmqAmhbJJ -YkXw+FlFekf9FyxcuArzwzzNZDSGcjcdXpN8S2K1qkBd00iSJF9kU7pdZYCIKR20 -QirdBrELEfsJ3GU62a6N3a2YsrisZUvq5TbjGJDcytAtt+WG3gmV7RInLdFfPwbw -bEHPCnx0uiV0nxLjd/aVT+RceVrFQVt4hR99jLoMlBitSKluZ1ljsrpIyroBhQT0 -pp/pVi6HJdijG0fsPrC325NEGAwcpotLUhczoeM/rffKJd54wLhDkfYxOyRZXivs +/wQCMAAwHwYDVR0jBBgwFoAUW4rxHHeasqLl7KMK+F3uVN0JGwYwFAYDVR0RBA0w +C4IJYWNtZS50ZXN0MA0GCSqGSIb3DQEBCwUAA4IBAQBDT8HY62N6YbG7Fp3gPD2L +Y0ZFHAAYM5l+Qn55aYkaTxpaRFPAeh0POmTIgSXfFSQYR00w3x2ni0K1ecBI814y +Mkgoki+jP6JhgV1fPTa5Wqm2x/Ufcr6LbTIDVqO5zFxTdkqZHfC7sMahDNULVrN2 +RVkTLppDfmQ+oFcwNvZSgK9SDJNMlsNllOyGGUuMSd1KjWU4/Wr0AmaS+V3Cjf14 +MsvgVhN66ECom1yyy3q9HZgAoZy6lnHOWHD4BVXOmbS2Y1lSVv/atmiGH7F9nvNN +Ggh/+RmkXGczV80wT2TnivEamJGHA4kwThL40SRKfaTTX7miImI25E6+390hBXyw -----END CERTIFICATE----- diff --git a/nixos/tests/common/acme/server/acme.test.key.pem b/nixos/tests/common/acme/server/acme.test.key.pem index 741df99a372e..fd3e9f7dbcf6 100644 --- a/nixos/tests/common/acme/server/acme.test.key.pem +++ b/nixos/tests/common/acme/server/acme.test.key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAo8XjMVUaljcaqQ5MFhfPuQgSwdyXEUbpSHz+5yPkE0h9Z4Xu -5BJF1Oq7h5ggCtadVsIspiY6Jm6aWDOjlh4myzW5UNBNUG3OPEk50vmmHFeHpImH -O/d8yb33QoF9VRcTZs4tuJYg7l9bSs4jNG72vYvv2YiGAcmjJcsmAZIfniCNXf/L -jIm+Cxykn+Vo3UuzO1w5/iuofdgWO/aZxMezmXUivlL3ih4cNzCJei8WlB/lEnHr -kcy3ogRmmynP5zcz7vmGIJX2ji6dhCa4Got5B7eZK76o2QglhQXqPatG0AOYH+Rf -QfzKemqPG5om9MgJtwFtTOU1LoaiBw//jXKESQIDAQABAoIBADox/2FwVFo8ioS4 -R+Ex5OZjMAcjU6sX/516jTmlT05q2+UFerYgqB/YqXqtW/V9/brulN8VhmRRuRbO -grq9TBu5o3hMDK0f18EkZB/MBnLbx594H033y6gEkPBZAyhRYtuNOEH3VwxdZhtW -1Lu1EoiYSUqLcNMBy6+KWJ8GRaXyacMYBlj2lMHmyzkA/t1+2mwTGC3lT6zN0F5Y -E5umXOxsn6Tb6q3KM9O5IvtmMMKpgj4HIHZLZ6j40nNgHwGRaAv4Sha/vx0DeBw3 -6VlNiTTPdShEkhESlM5/ocqTfI92VHJpM5gkqTYOWBi2aKIPfAopXoqoJdWl4pQ/ -NCFIu2ECgYEAzntNKIcQtf0ewe0/POo07SIFirvz6jVtYNMTzeQfL6CoEjYArJeu -Vzc4wEQfA4ZFVerBb1/O6M449gI3zex1PH4AX0h8q8DSjrppK1Jt2TnpVh97k7Gg -Tnat/M/yW3lWYkcMVJJ3AYurXLFTT1dYP0HvBwZN04yInrEcPNXKfmcCgYEAywyJ -51d4AE94PrANathKqSI/gk8sP+L1gzylZCcUEAiGk/1r45iYB4HN2gvWbS+CvSdp -F7ShlDWrTaNh2Bm1dgTjc4pWb4J+CPy/KN2sgLwIuM4+ZWIZmEDcio6khrM/gNqK -aR7xUsvWsqU26O84woY/xR8IHjSNF7cFWE1H2c8CgYEAt6SSi2kVQ8dMg84uYE8t -o3qO00U3OycpkOQqyQQLeKC62veMwfRl6swCfX4Y11mkcTXJtPTRYd2Ia8StPUkB -PDwUuKoPt/JXUvoYb59wc7M+BIsbrdBdc2u6cw+/zfutCNuH6/AYSBeg4WAVaIuW -wSwzG1xP+8cR+5IqOzEqWCECgYATweeVTCyQEyuHJghYMi2poXx+iIesu7/aAkex -pB/Oo5W8xrb90XZRnK7UHbzCqRHWqAQQ23Gxgztk9ZXqui2vCzC6qGZauV7cLwPG -zTMg36sVmHP314DYEM+k59ZYiQ6P0jQPoIQo407D2VGrfsOOIhQIcUmP7tsfyJ5L -hlGMfwKBgGq4VNnnuX8I5kl03NpaKfG+M8jEHmVwtI9RkPTCCX9bMjeG0cDxqPTF -TRkf3r8UWQTZ5QfAfAXYAOlZvmGhHjSembRbXMrMdi3rGsYRSrQL6n5NHnORUaMy -FCWo4gyAnniry7tx9dVNgmHmbjEHuQnf8AC1r3dibRCjvJWUiQ8H +MIIEowIBAAKCAQEAs/Xad8Jn0YMI8nTjbVakGsFplxSKkgWs9Jv8tETC1FBVKNo3 +yF6IElBhzKw3eF6piZqDwNFXobuMCZ3Ckaj+EOdSA0DhjwUSBmEok/0siIu4WbAS +2iKwZGuJlJRYOmfXRPt2nNSPhuNHtZJoTWufN5K1XS+4v1dsVUWdWvkUuaC5/uou +jcYd4D6XDhJCubDCE+WSYk0KBLtMQ8irbNu4FGoCn5T7kDq46XwVjulWxc5qdZ/Z +/zgKQkoLaHgWKLjvuu7/CZw6RXyBlwVJh36pljixRnpnLfMMykO9Sq7Z3cR2aVcM +RjjeH0uScfFHIb3hvqyZLd+NHw3SqE8la/Nq1wIDAQABAoIBAG2s50FXjLgmONyz +Giv3wrm/qF94GF+X7+l/64nd4jNM5imonJiT7C/lJ0V6q6/DWWXQcn2f191slJMD +v6HQMU8R+2yaLR1hxLN4oSdYA70QEgEvCr5Ap+n7k/SmWAL4aDzVWFuKPBLED178 +ZG7SqU1QLxIk1F5gpFhvvc/Ev7nE0KAzTJ3jGyWHZjJ1TKAWHx6oeKOw4OejRcGO ++rDBfQrV59fiCy8CFraGPDGie5Eb7ioXyt4cf4/odtLol7bSIwH4BLwfvKJbRobi +gSjvL5JJLjhjWzeoj+JC4o0sWQegytWpNCHSFETfHQ8rlcagTN8JaTcBg6+wrR2O +OPeoFqkCgYEA7o9jSk7i23SiKo3C+T9KFIL2OS7akwUqIQZehZJ6LXljYEDP1lcz +wjvWuLGVzlST3fmumHIMZLjjBU1cMYAPZrbUrEeayATD4jBxyiXbHqhB3DQ0W4CX +obUhcdsLGsKp0zXls8FeiQs6GOeEwSDU+1nAL9/hLK7w6cJ2zyj8HBUCgYEAwR3H +/ltIjD8tXNF05ayOguzrbivx2vaXusskZgn9QqntoGqqsXLOgsqcUH0dtiTyVOn+ +Nba7w+o5NfaAfE9uR+oeZSo1IJU8oEi/EZqXTcYf5p3oAjXXZ9wXX8kl91EjCzKl +0kDpSpsMhUzdB2i5I9Oh1fLaW4iMwyuY1CgnqjsCgYBHIJFmEmcpL3k6XtIHJoub +2gA3xHR+6UdKWW/NO4MaE9tBU5GkQpO4EcdPggM8ZZNA17Tq1vZDAa0OY6ZdS+VL +pq96Pk8z29fblL4Ym3jdhyU71oTV011iZXL3U2vYKrofsy4tjjX1fldwHXdDbdqS +povaulGU1QQXblemJH4mkQKBgC3IUq6Rk4x0OdvkaFM+6nZNlq8Cyg7AIU6OdG2g +dqNER+qc/yScdCr7v70xPEb/UVgiNTskvDUBJVkOvH08E4gHD/ep3vh/iOTy+iFB +RheRHeT9kJBdlVixC/WQaWjNmoJAGqHS87vVME214Dyubh35QUfIkE3c/IoUnuHF +N0obAoGBANJpPBF36H1nb+TcVerOBXI8oqeIyoq7f4W/wbIirnZq/XfBaaOL5R6v +6+p4LEcQ1Mf33Yfr5M4aR0q7fgNDg/g4LcMg6fI3+UwPC6lJY+K8zzF4fmGDhheC +D+LsZG0Funl9kT0yxPBQhCJmmkJNIHiSNuRLt9Infne2408+YV+T -----END RSA PRIVATE KEY----- diff --git a/nixos/tests/common/acme/server/ca.cert.pem b/nixos/tests/common/acme/server/ca.cert.pem index 5c33e879b675..8d52a0a8f462 100644 --- a/nixos/tests/common/acme/server/ca.cert.pem +++ b/nixos/tests/common/acme/server/ca.cert.pem @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDSzCCAjOgAwIBAgIIeHRvRrNvbGQwDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE -AxMVbWluaWNhIHJvb3QgY2EgNzg3NDZmMCAXDTIwMTAyMTEzMjgzNloYDzIxMjAx -MDIxMTMyODM2WjAgMR4wHAYDVQQDExVtaW5pY2Egcm9vdCBjYSA3ODc0NmYwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrNTzVLDJOKtGYGLU98EEcLKps -tXHCLC6G54LKbEcU80fn+ArX8qsPSHyhdXQkcYjq6Vh/EDJ1TctyRSnvAjwyG4Aa -1Zy1QFc/JnjMjvzimCkUc9lQ+wkLwHSM/KGwR1cGjmtQ/EMClZTA0NwulJsXMKVz -bd5asXbq/yJTQ5Ww25HtdNjwRQXTvB7r3IKcY+DsED9CvFvC9oG/ZhtZqZuyyRdC -kFUrrv8WNUDkWSN+lMR6xMx8v0583IN6f11IhX0b+svK98G81B2eswBdkzvVyv9M -unZBO0JuJG8sdM502KhWLmzBC1ZbvgUBF9BumDRpMFH4DCj7+qQ2taWeGyc7AgMB +MIIDSzCCAjOgAwIBAgIIRgIx/Q6DdK0wDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE +AxMVbWluaWNhIHJvb3QgY2EgNDYwMjMxMCAXDTIyMTEyMDE1MzcwNFoYDzIxMjIx +MTIwMTUzNzA0WjAgMR4wHAYDVQQDExVtaW5pY2Egcm9vdCBjYSA0NjAyMzEwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYxM/efiS7rNNzdu+AK+J57+om +QYsoteVpmwcU6Ul8Zr6pcsBSLetV2PCWGVKKfXdK1Ep+JdBoiuG8EY/wffYJy+So +WRRWX+bGIFly74urX2iOH/yimF8XMaHj4CzjMD1wM2rFLswL3VK2DM+wrCMO2zE2 +BAiUAJ++ws99Dl74DQ9lGne8hMjFgzakINCNd948/t2+LMVxqCgQ7fI+iHA1X7QF +1AT5c86wd/GxLzfl343DxLSeMRFbGUVSH6NBBnIQdFDq1GjNGPbn8ZlDXw5WWeR5 +ufnxcRRNpp3GnHG3/VOebFAr++5/0ze+QvF6XPXk9RZWvhh0dD14/8W/PMK1AgMB AAGjgYYwgYMwDgYDVR0PAQH/BAQDAgKEMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr -BgEFBQcDAjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBT7whmUtX9CnkJe -qlcwu+3FaXFwnDAfBgNVHSMEGDAWgBT7whmUtX9CnkJeqlcwu+3FaXFwnDANBgkq -hkiG9w0BAQsFAAOCAQEARMe1wKmF33GjEoLLw0oDDS4EdAv26BzCwtrlljsEtwQN -95oSzUNd6o4Js7WCG2o543OX6cxzM+yju8TES3+vJKDgsbNMU0bWCv//tdrb0/G8 -OkU3Kfi5q4fOauZ1pqGv/pXdfYhZ5ieB/zwis3ykANe5JfB0XqwCb1Vd0C3UCIS2 -NPKngRwNSzphIsbzfvxGDkdM1enuGl5CVyDhrwTMqGaJGDSOv6U5jKFxKRvigqTN -Ls9lPmT5NXYETduWLBR3yUIdH6kZXrcozZ02B9vjOB2Cv4RMDc+9eM30CLIWpf1I -097e7JkhzxFhfC/bMMt3P1FeQc+fwH91wdBmNi7tQw== +BgEFBQcDAjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBRbivEcd5qyouXs +owr4Xe5U3QkbBjAfBgNVHSMEGDAWgBRbivEcd5qyouXsowr4Xe5U3QkbBjANBgkq +hkiG9w0BAQsFAAOCAQEAdSudxwrpXf/nxXJ8THob63UEvvof0o7uENbNPjqt7VZZ +lQeKnZOrzjYbTcsbyDpm/zsniT9620ntVcL4/IG2eeuSPA9btHNiFM6R3Nby8Op4 +emqNzrS0DFqV/CAOAue+C44Vb9IS+ibFxEpI3GTH0FVWpEglLuesXKV+boy1aCNq +BYvk6lVplmnTtyfEUAQxyjJhTHu0+ZDwmw1+/NY9Wn2aeile+/G8ao+MBXARELmq +aoGKfFfrMGRT/KDSyODBEdJ1XkLr0TYjNvyctsaYBp9FhVQiuNMOyCku7EB8y+tZ +odYtLw6ecNnrjgQAnxSDg1ChrQ0wNSdPyjvycNgvjQ== -----END CERTIFICATE----- diff --git a/nixos/tests/common/acme/server/ca.key.pem b/nixos/tests/common/acme/server/ca.key.pem index ed46f5dccf46..cde4e8ac7c75 100644 --- a/nixos/tests/common/acme/server/ca.key.pem +++ b/nixos/tests/common/acme/server/ca.key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAqzU81SwyTirRmBi1PfBBHCyqbLVxwiwuhueCymxHFPNH5/gK -1/KrD0h8oXV0JHGI6ulYfxAydU3LckUp7wI8MhuAGtWctUBXPyZ4zI784pgpFHPZ -UPsJC8B0jPyhsEdXBo5rUPxDApWUwNDcLpSbFzClc23eWrF26v8iU0OVsNuR7XTY -8EUF07we69yCnGPg7BA/QrxbwvaBv2YbWambsskXQpBVK67/FjVA5FkjfpTEesTM -fL9OfNyDen9dSIV9G/rLyvfBvNQdnrMAXZM71cr/TLp2QTtCbiRvLHTOdNioVi5s -wQtWW74FARfQbpg0aTBR+Awo+/qkNrWlnhsnOwIDAQABAoIBAA3ykVkgd5ysmlSU -trcsCnHcJaojgff6l3PACoSpG4VWaGY6a8+54julgRm6MtMBONFCX0ZCsImj484U -Wl0xRmwil2YYPuL5MeJgJPktMObY1IfpBCw3tz3w2M3fiuCMf0d2dMGtO1xLiUnH -+hgFXTkfamsj6ThkOrbcQBSebeRxbKM5hqyCaQoieV+0IJnyxUVq/apib8N50VsH -SHd4oqLUuEZgg6N70+l5DpzedJUb4nrwS/KhUHUBgnoPItYBCiGPmrwLk7fUhPs6 -kTDqJDtc/xW/JbjmzhWEpVvtumcC/OEKULss7HLdeQqwVBrRQkznb0M9AnSra3d0 -X11/Y4ECgYEA3FC8SquLPFb2lHK4+YbJ4Ac6QVWeYFEHiZ0Rj+CmONmjcAvOGLPE -SblRLm3Nbrkxbm8FF6/AfXa/rviAKEVPs5xqGfSDw/3n1uInPcmShiBCLwM/jHH5 -NeVG+R5mTg5zyQ/pQMLWRcs+Ail+ZAnZuoGpW3Cdc8OtCUYFQ7XB6nsCgYEAxvBJ -zFxcTtsDzWbMWXejugQiUqJcEbKWwEfkRbf3J2rAVO2+EFr7LxdRfN2VwPiTQcWc -LnN2QN+ouOjqBMTh3qm5oQY+TLLHy86k9g1k0gXWkMRQgP2ZdfWH1HyrwjLUgLe1 -VezFN7N1azgy6xFkInAAvuA4loxElZNvkGBgekECgYA/Xw26ILvNIGqO6qzgQXAh -+5I7JsiGheg4IjDiBMlrQtbrLMoceuD0H9UFGNplhel9DXwWgxxIOncKejpK2x0A -2fX+/0FDh+4+9hA5ipiV8gN3iGSoHkSDxy5yC9d7jlapt+TtFt4Rd1OfxZWwatDw -/8jaH3t6yAcmyrhK8KYVrwKBgAE5KwsBqmOlvyE9N5Z5QN189wUREIXfVkP6bTHs -jq2EX4hmKdwJ4y+H8i1VY31bSfSGlY5HkXuWpH/2lrHO0CDBZG3UDwADvWzIaYVF -0c/kz0v2mRQh+xaZmus4lQnNrDbaalgL666LAPbW0qFVaws3KxoBYPe0BxvwWyhF -H3LBAoGBAKRRNsq2pWQ8Gqxc0rVoH0FlexU9U2ci3lsLmgEB0A/o/kQkSyAxaRM+ -VdKp3sWfO8o8lX5CVQslCNBSjDTNcat3Co4NEBLg6Xv1yKN/WN1GhusnchP9szsP -oU47gC89QhUyWSd6vvr2z2NG9C3cACxe4dhDSHQcE4nHSldzCKv2 +MIIEowIBAAKCAQEAmMTP3n4ku6zTc3bvgCviee/qJkGLKLXlaZsHFOlJfGa+qXLA +Ui3rVdjwlhlSin13StRKfiXQaIrhvBGP8H32CcvkqFkUVl/mxiBZcu+Lq19ojh/8 +ophfFzGh4+As4zA9cDNqxS7MC91StgzPsKwjDtsxNgQIlACfvsLPfQ5e+A0PZRp3 +vITIxYM2pCDQjXfePP7dvizFcagoEO3yPohwNV+0BdQE+XPOsHfxsS835d+Nw8S0 +njERWxlFUh+jQQZyEHRQ6tRozRj25/GZQ18OVlnkebn58XEUTaadxpxxt/1TnmxQ +K/vuf9M3vkLxelz15PUWVr4YdHQ9eP/FvzzCtQIDAQABAoIBAAMvJv4GNxHKWmXv +trI/N+s+uuytNQ9WKz/2QUGIU0XKhnLVt3h/CIazjOA0CupkDxZ6MktK0ns7WdUn +sI5cscImg8+We7wJJ7A9gF/K6mhaBr3foM5qyqCbIjqzs3vQx5cNG06c2RfuNwkg +XzvZeqmWnAH6N4uOL8Y0HUsH/6a/5rHEBTgUOnOidR8T1vdIN5vnpknef/H575ab +jTdDyb15Vns7nC4Q8lortkLsQzOt//LWpVuLZXGDm1Xi47ahNXM8Fo/MFK+xcBDF +onMFuclxImN3FqkyMH6PgJS392bZ1LLcmS4bqZ0oIwfUZ/kIEwAI2cTwEYfYmN7C +ekgvpsECgYEAxoJUcZW4iWvT8kznWKKT+YJAfTYmgwOxB1Dn3RxFA8cXocQQvwvM +mSl1AKOjWHFl/eW9s4zwy/fOnsN1m1tCTuWSNn5sudZSJfbd5CCiYaYTI66McCCm +5FGzqLM44Wm5y2qLa7l3in8Tza/645RpLXZyRfMInoW5In0XKbokLbkCgYEAxQM/ +p63V5KuZYsm9BWNcCvAbS6G9NHjbeRrkAd171SSdibdwLIBeyn7A5JCiVqhZZbsO +1q1okO4m4j+JHzntWi63yXwG49sEVNaFbExPE4tfJeHD0Po8MJffoLNVTE+INT0B +fl1elhMpE9qpizFIHF7L8KnUf5Igi+yp0d6Amt0CgYACAhmGmKQoR736KosAm4xx +rr6mRaD4HFZzI39k/j84fZAgo9IjjKQCPKghXIZvg54rhmJ36YoaFiSx+Ho9Gxw9 +nhbvlDHXY3KrTacLAsWBxWNWLhLfo4TstGLj5wRBS4eEpkxIx7SM4yI5J3mbScoS +mqsnSAEjUWkBD1DnrClniQKBgQCdfC9SNp+Yn6OJWIKE4Bwfkjf/iVbZrxKiCGDj +LM1kYFSeVciRijw72n8PNp7ObtyneZQu/4dq8zSZ/vf5wjB9uoKnyUEou1cHCkS1 +gXpkwTBZ89K4JpAeuAjHSROSYLEc/ZtIDBMkHETl3hFRdx+RriWQR/HZ2FG0CIbn +gNmE8QKBgDlFu+TcspI2R9mKbHrbPTXOAlmi2g7RZ3jF1m4S/aZqSL/bqPRBb0OU +dY7MX4GHhJYR7RnMMROZQI0H4ZwWSMfokBDa96MDY107atK8TqZmYKaZQsEB8B4r +fMmKnQljYj91d/reowLJrQRf5SjBvtDIEIsiC8UgjQImAsZ8huEX -----END RSA PRIVATE KEY----- From 7ce12e6fc0943eda8b7e04d778dd450966330ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 20 Nov 2022 10:14:45 -0600 Subject: [PATCH 632/797] pythonPackages.python-xmp-toolkit: disable some failing tests from unmaintained package --- .../python-modules/python-xmp-toolkit/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index 463ccb25b7dc..428bf73beb15 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -2,7 +2,6 @@ , exempi , fetchFromGitHub , mock -, pythonOlder , pytz , lib, stdenv }: @@ -26,8 +25,6 @@ buildPythonPackage { buildInputs = [ exempi ]; - checkInputs = lib.optionals (pythonOlder "3.3") [ mock ]; - propagatedBuildInputs = [ pytz ]; postPatch = '' @@ -38,6 +35,10 @@ buildPythonPackage { # hangs on darwin + sandbox doCheck = !stdenv.isDarwin; + preCheck = '' + rm test/{test_exempi,test_files}.py + ''; + meta = with lib; { homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit"; description = "Python XMP Toolkit for working with metadata"; From 72156f4e1fe65797e9c6a47b3762d58d6d132377 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 20 Nov 2022 16:16:59 +0000 Subject: [PATCH 633/797] libheif: add some key reverse dependencies to passthru.tests --- .../development/libraries/libheif/default.nix | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 1f9037dab75d..45c04b857f76 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -1,5 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, dav1d, rav1e, libde265, x265, libpng, - libjpeg, libaom }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, dav1d +, rav1e +, libde265 +, x265 +, libpng +, libjpeg +, libaom + +# for passthru.tests +, gimp +, imagemagick +, imlib2Full +, imv +, vips +}: stdenv.mkDerivation rec { pname = "libheif"; @@ -19,6 +37,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit gimp imagemagick imlib2Full imv vips; + }; + meta = { homepage = "http://www.libheif.org/"; description = "ISO/IEC 23008-12:2017 HEIF image file format decoder and encoder"; From db3f86f9203cf3b6a6cb73f269bc6eff4fe588a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 16:29:54 +0000 Subject: [PATCH 634/797] python310Packages.lsassy: 3.1.4 -> 3.1.6 --- pkgs/development/python-modules/lsassy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index 8a47fb08404c..56cb4cc6ae8f 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "lsassy"; - version = "3.1.4"; + version = "3.1.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Hackndo"; repo = pname; - rev = "v${version}"; - hash = "sha256-/YDBzH8Mji6PWBEIbsgZcTvoAWAsBbJV3cHfySY/gGA="; + rev = "refs/tags/v${version}"; + hash = "sha256-Rdgz9hU2un1CKX2dRI8tVzL2lG7Ufd5HwninOxOsxjM="; }; propagatedBuildInputs = [ From dde2c6235817ed8f97cedbadb7e6be116d0c53bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 16:54:19 +0000 Subject: [PATCH 635/797] python310Packages.manimpango: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/manimpango/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index f77aa81bbb60..cb618a8b5029 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "manimpango"; - version = "0.4.1"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; - rev = "v${version}"; - hash = "sha256-ourSUYBAFONdupdsjo/PtwRQpXS7HqLxrHj0Ejr/Wdw="; + rev = "refs/tags/v${version}"; + hash = "sha256-ftoESXUMc+jnKmEzhmwZc/R7vVX9idsezPFHRUzPbaU="; }; nativeBuildInputs = [ From 957e368f3d822a7892d18da9493a8c1d48ee8bef Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 2 Nov 2022 11:54:07 +0100 Subject: [PATCH 636/797] nixos/grafana: `provision.{datasources,dashboards}` can't be a list anymore The hack with `either` had the side-effect that the sub-options of the submodule didn't appear in the manual. I decided to remove this because the "migration" isn't that hard, you just need to fix some module declarations. However, `mkRenamedOptionModule` wouldn't work here because it'd create a "virtual" option for the deprecated path (i.e. `services.grafana.provision.{datasources,dashboards}`), but that's the already a new option, i.e. the submodule for the new stuff. To make sure that you still get errors, I implemented a small hack using `coercedTo` which throws an error if a list is specified (as it would be done on 22.05) which explains what to do instead to make the migration easier. Also, I linkified the options in the manual now to make it easier to navigate between those. --- nixos/modules/services/monitoring/grafana.nix | 111 ++++++++---------- nixos/tests/grafana/provision/default.nix | 70 +++-------- 2 files changed, 67 insertions(+), 114 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 52d5cab9f515..3ce52bc13e91 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -13,21 +13,9 @@ let settingsFormatIni = pkgs.formats.ini {}; configFile = settingsFormatIni.generate "config.ini" cfg.settings; - datasourceConfiguration = { - apiVersion = 1; - datasources = cfg.provision.datasources; - }; + datasourceFile = if (cfg.provision.datasources.path == null) then provisioningSettingsFormat.generate "datasource.yaml" cfg.provision.datasources.settings else cfg.provision.datasources.path; - datasourceFileNew = if (cfg.provision.datasources.path == null) then provisioningSettingsFormat.generate "datasource.yaml" cfg.provision.datasources.settings else cfg.provision.datasources.path; - datasourceFile = if (builtins.isList cfg.provision.datasources) then provisioningSettingsFormat.generate "datasource.yaml" datasourceConfiguration else datasourceFileNew; - - dashboardConfiguration = { - apiVersion = 1; - providers = cfg.provision.dashboards; - }; - - dashboardFileNew = if (cfg.provision.dashboards.path == null) then provisioningSettingsFormat.generate "dashboard.yaml" cfg.provision.dashboards.settings else cfg.provision.dashboards.path; - dashboardFile = if (builtins.isList cfg.provision.dashboards) then provisioningSettingsFormat.generate "dashboard.yaml" dashboardConfiguration else dashboardFileNew; + dashboardFile = if (cfg.provision.dashboards.path == null) then provisioningSettingsFormat.generate "dashboard.yaml" cfg.provision.dashboards.settings else cfg.provision.dashboards.path; notifierConfiguration = { apiVersion = 1; @@ -60,6 +48,26 @@ let # Get a submodule without any embedded metadata: _filter = x: filterAttrs (k: v: k != "_module") x; + # FIXME(@Ma27) remove before 23.05. This is just a helper-type + # because `mkRenamedOptionModule` doesn't work if `foo.bar` is renamed + # to `foo.bar.baz`. + submodule' = module: types.coercedTo + (mkOptionType { + name = "grafana-provision-submodule"; + description = "Wrapper-type for backwards compat of Grafana's declarative provisioning"; + check = x: + if builtins.isList x then + throw '' + Provisioning dashboards and datasources declaratively by + setting `dashboards` or `datasources` to a list is not supported + anymore. Use `services.grafana.provision.datasources.settings.datasources` + (or `services.grafana.provision.dashboards.settings.providers`) instead. + '' + else isAttrs x || isFunction x; + }) + id + (types.submodule module); + # http://docs.grafana.org/administration/provisioning/#datasources grafanaTypes.datasourceConfig = types.submodule { freeformType = provisioningSettingsFormat.type; @@ -564,17 +572,14 @@ in { datasources = mkOption { description = lib.mdDoc '' - Deprecated option for Grafana datasource configuration. Use either - `services.grafana.provision.datasources.settings` or - `services.grafana.provision.datasources.path` instead. + Declaratively provision Grafana's datasources. ''; - default = []; - apply = x: if (builtins.isList x) then map _filter x else x; - type = with types; either (listOf grafanaTypes.datasourceConfig) (submodule { + default = {}; + type = submodule' { options.settings = mkOption { description = lib.mdDoc '' Grafana datasource configuration in Nix. Can't be used with - `services.grafana.provision.datasources.path` simultaneously. See + [](#opt-services.grafana.provision.datasources.path) simultaneously. See for supported options. ''; @@ -630,28 +635,25 @@ in { options.path = mkOption { description = lib.mdDoc '' Path to YAML datasource configuration. Can't be used with - `services.grafana.provision.datasources.settings` simultaneously. + [](#opt-services.grafana.provision.datasources.settings) simultaneously. ''; default = null; type = types.nullOr types.path; }; - }); + }; }; dashboards = mkOption { description = lib.mdDoc '' - Deprecated option for Grafana dashboard configuration. Use either - `services.grafana.provision.dashboards.settings` or - `services.grafana.provision.dashboards.path` instead. + Declaratively provision Grafana's dashboards. ''; - default = []; - apply = x: if (builtins.isList x) then map _filter x else x; - type = with types; either (listOf grafanaTypes.dashboardConfig) (submodule { + default = {}; + type = submodule' { options.settings = mkOption { description = lib.mdDoc '' Grafana dashboard configuration in Nix. Can't be used with - `services.grafana.provision.dashboards.path` simultaneously. See + [](#opt-services.grafana.provision.dashboards.path) simultaneously. See for supported options. ''; @@ -684,12 +686,12 @@ in { options.path = mkOption { description = lib.mdDoc '' Path to YAML dashboard configuration. Can't be used with - `services.grafana.provision.dashboards.settings` simultaneously. + [](#opt-services.grafana.provision.dashboards.settings) simultaneously. ''; default = null; type = types.nullOr types.path; }; - }); + }; }; @@ -706,7 +708,7 @@ in { path = mkOption { description = lib.mdDoc '' Path to YAML rules configuration. Can't be used with - `services.grafana.provision.alerting.rules.settings` simultaneously. + [](#opt-services.grafana.provision.alerting.rules.settings) simultaneously. ''; default = null; type = types.nullOr types.path; @@ -715,7 +717,7 @@ in { settings = mkOption { description = lib.mdDoc '' Grafana rules configuration in Nix. Can't be used with - `services.grafana.provision.alerting.rules.path` simultaneously. See + [](#opt-services.grafana.provision.alerting.rules.path) simultaneously. See for supported options. ''; @@ -829,7 +831,7 @@ in { path = mkOption { description = lib.mdDoc '' Path to YAML contact points configuration. Can't be used with - `services.grafana.provision.alerting.contactPoints.settings` simultaneously. + [](#opt-services.grafana.provision.alerting.contactPoints.settings) simultaneously. ''; default = null; type = types.nullOr types.path; @@ -838,7 +840,7 @@ in { settings = mkOption { description = lib.mdDoc '' Grafana contact points configuration in Nix. Can't be used with - `services.grafana.provision.alerting.contactPoints.path` simultaneously. See + [](#opt-services.grafana.provision.alerting.contactPoints.path) simultaneously. See for supported options. ''; @@ -909,7 +911,7 @@ in { path = mkOption { description = lib.mdDoc '' Path to YAML notification policies configuration. Can't be used with - `services.grafana.provision.alerting.policies.settings` simultaneously. + [](#opt-services.grafana.provision.alerting.policies.settings) simultaneously. ''; default = null; type = types.nullOr types.path; @@ -918,7 +920,7 @@ in { settings = mkOption { description = lib.mdDoc '' Grafana notification policies configuration in Nix. Can't be used with - `services.grafana.provision.alerting.policies.path` simultaneously. See + [](#opt-services.grafana.provision.alerting.policies.path) simultaneously. See for supported options. ''; @@ -978,7 +980,7 @@ in { path = mkOption { description = lib.mdDoc '' Path to YAML templates configuration. Can't be used with - `services.grafana.provision.alerting.templates.settings` simultaneously. + [](#opt-services.grafana.provision.alerting.templates.settings) simultaneously. ''; default = null; type = types.nullOr types.path; @@ -987,7 +989,7 @@ in { settings = mkOption { description = lib.mdDoc '' Grafana templates configuration in Nix. Can't be used with - `services.grafana.provision.alerting.templates.path` simultaneously. See + [](#opt-services.grafana.provision.alerting.templates.path) simultaneously. See for supported options. ''; @@ -1059,7 +1061,7 @@ in { path = mkOption { description = lib.mdDoc '' Path to YAML mute timings configuration. Can't be used with - `services.grafana.provision.alerting.muteTimings.settings` simultaneously. + [](#opt-services.grafana.provision.alerting.muteTimings.settings) simultaneously. ''; default = null; type = types.nullOr types.path; @@ -1068,7 +1070,7 @@ in { settings = mkOption { description = lib.mdDoc '' Grafana mute timings configuration in Nix. Can't be used with - `services.grafana.provision.alerting.muteTimings.path` simultaneously. See + [](#opt-services.grafana.provision.alerting.muteTimings.path) simultaneously. See for supported options. ''; @@ -1168,8 +1170,8 @@ in { (optional ( let checkOpts = opt: any (x: x.password != null || x.basicAuthPassword != null || x.secureJsonData != null) opt; - datasourcesUsed = if (cfg.provision.datasources.settings == null) then [] else cfg.provision.datasources.settings.datasources; - in if (builtins.isList cfg.provision.datasources) then checkOpts cfg.provision.datasources else checkOpts datasourcesUsed + datasourcesUsed = optionals (cfg.provision.datasources.settings != null) cfg.provision.datasources.settings.datasources; + in checkOpts datasourcesUsed ) '' Datasource passwords will be stored as plaintext in the Nix store! It is not possible to use file provider in provisioning; please provision @@ -1178,20 +1180,6 @@ in { (optional ( any (x: x.secure_settings != null) cfg.provision.notifiers ) "Notifier secure settings will be stored as plaintext in the Nix store! Use file provider instead.") - (optional ( - builtins.isList cfg.provision.datasources && cfg.provision.datasources != [] - ) '' - Provisioning Grafana datasources with options has been deprecated. - Use `services.grafana.provision.datasources.settings` or - `services.grafana.provision.datasources.path` instead. - '') - (optional ( - builtins.isList cfg.provision.datasources && cfg.provision.dashboards != [] - ) '' - Provisioning Grafana dashboards with options has been deprecated. - Use `services.grafana.provision.dashboards.settings` or - `services.grafana.provision.dashboards.path` instead. - '') (optional ( cfg.provision.notifiers != [] ) '' @@ -1204,7 +1192,7 @@ in { assertions = [ { - assertion = if (builtins.isList cfg.provision.datasources) then true else cfg.provision.datasources.settings == null || cfg.provision.datasources.path == null; + assertion = cfg.provision.datasources.settings == null || cfg.provision.datasources.path == null; message = "Cannot set both datasources settings and datasources path"; } { @@ -1213,12 +1201,11 @@ in { ({ type, access, ... }: type == "prometheus" -> access != "direct") opt; in - if (builtins.isList cfg.provision.datasources) then prometheusIsNotDirect cfg.provision.datasources - else cfg.provision.datasources.settings == null || prometheusIsNotDirect cfg.provision.datasources.settings.datasources; + cfg.provision.datasources.settings == null || prometheusIsNotDirect cfg.provision.datasources.settings.datasources; message = "For datasources of type `prometheus`, the `direct` access mode is not supported anymore (since Grafana 9.2.0)"; } { - assertion = if (builtins.isList cfg.provision.dashboards) then true else cfg.provision.dashboards.settings == null || cfg.provision.dashboards.path == null; + assertion = cfg.provision.dashboards.settings == null || cfg.provision.dashboards.path == null; message = "Cannot set both dashboards settings and dashboards path"; } { diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 7a707ab9fed1..c4cb9a54daa5 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -28,29 +28,6 @@ let }; extraNodeConfs = { - provisionOld = { - services.grafana.provision = { - datasources = [{ - name = "Test Datasource"; - type = "testdata"; - access = "proxy"; - uid = "test_datasource"; - }]; - - dashboards = [{ options.path = "/var/lib/grafana/dashboards"; }]; - - notifiers = [{ - uid = "test_notifiers"; - name = "Test Notifiers"; - type = "email"; - settings = { - singleEmail = true; - addresses = "test@test.com"; - }; - }]; - }; - }; - provisionNix = { services.grafana.provision = { datasources.settings = { @@ -172,57 +149,46 @@ in { testScript = '' start_all() - nodeOld = ("Nix (old format)", provisionOld) nodeNix = ("Nix (new format)", provisionNix) nodeYaml = ("Nix (YAML)", provisionYaml) - for nodeInfo in [nodeOld, nodeNix, nodeYaml]: - with subtest(f"Should start provision node: {nodeInfo[0]}"): - nodeInfo[1].wait_for_unit("grafana.service") - nodeInfo[1].wait_for_open_port(3000) + for description, machine in [nodeNix, nodeYaml]: + with subtest(f"Should start provision node: {description}"): + machine.wait_for_unit("grafana.service") + machine.wait_for_open_port(3000) - with subtest(f"Successful datasource provision with {nodeInfo[0]}"): - nodeInfo[1].succeed( + with subtest(f"Successful datasource provision with {description}"): + machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/datasources/uid/test_datasource | grep Test\ Datasource" ) - with subtest(f"Successful dashboard provision with {nodeInfo[0]}"): - nodeInfo[1].succeed( + with subtest(f"Successful dashboard provision with {description}"): + machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/dashboards/uid/test_dashboard | grep Test\ Dashboard" ) - - - with subtest(f"Successful notifiers provision with {nodeOld[0]}"): - nodeOld[1].succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/alert-notifications/uid/test_notifiers | grep Test\ Notifiers" - ) - - - - for nodeInfo in [nodeNix, nodeYaml]: - with subtest(f"Successful rule provision with {nodeInfo[0]}"): - nodeInfo[1].succeed( + with subtest(f"Successful rule provision with {description}"): + machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/alert-rules/test_rule | grep Test\ Rule" ) - with subtest(f"Successful contact point provision with {nodeInfo[0]}"): - nodeInfo[1].succeed( + with subtest(f"Successful contact point provision with {description}"): + machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/contact-points | grep Test\ Contact\ Point" ) - with subtest(f"Successful policy provision with {nodeInfo[0]}"): - nodeInfo[1].succeed( + with subtest(f"Successful policy provision with {description}"): + machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/policies | grep Test\ Contact\ Point" ) - with subtest(f"Successful template provision with {nodeInfo[0]}"): - nodeInfo[1].succeed( + with subtest(f"Successful template provision with {description}"): + machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/templates | grep Test\ Template" ) - with subtest("Successful mute timings provision with {nodeInfo[0]}"): - nodeInfo[1].succeed( + with subtest("Successful mute timings provision with {description}"): + machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/mute-timings | grep Test\ Mute\ Timing" ) ''; From 252785fd9cce3474c6167d98b57e64509b1da37e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 2 Nov 2022 12:31:26 +0100 Subject: [PATCH 637/797] nixos/doc: improve release-notes for services.grafana --- .../from_md/release-notes/rl-2211.section.xml | 135 ++++++++++++++++-- .../manual/release-notes/rl-2211.section.md | 54 ++++++- 2 files changed, 173 insertions(+), 16 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index a1e01bd92921..caeeae1aefa8 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1189,22 +1189,129 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - The services.grafana options were converted - to a + The module services.grafana was refactored + to be compliant with RFC - 0042 configuration. - - - - - The services.grafana.provision.datasources - and services.grafana.provision.dashboards - options were converted to a - RFC - 0042 configuration. They also now support specifying - the provisioning YAML file with path - option. + 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 + + and + + expected lists of datasources or dashboards for the + declarative + provisioning. + + + To declare lists of + + + + + datasources, please + rename your declarations to + . + + + + + dashboards, please + rename your declarations to + . + + + + + This change was made to support more features for that: + + + + + It’s possible to declare the + apiVersion of your dashboards and + datasources by + + (or + ). + + + + + Instead of declaring datasources and dashboards in + pure Nix, it’s also possible to specify configuration + directories with YAML instead using + + (or + . + This is useful when having provisioning files from + non-NixOS Grafana instances that you also want to + deploy to NixOS. + + + + + diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 642009e9f44e..091377d74a6f 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -372,9 +372,59 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `services.matrix-synapse` systemd unit has been hardened. -- The `services.grafana` options were converted to a [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration. +- The module `services.grafana` was refactored to be compliant with [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md). To be precise, this means that the following things have changed: + - The newly introduced option [](#opt-services.grafana.settings) is an attribute-set that + will be converted into Grafana's INI format. This means that the configuration from + [Grafana's configuration reference](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/) + 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 -- The `services.grafana.provision.datasources` and `services.grafana.provision.dashboards` options were converted to a [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration. They also now support specifying the provisioning YAML file with `path` option. + ```nix + { + 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 + + ```nix + { + services.grafana.settings.security.admin_user = "foobar"; + } + ``` + + instead. + + The keys in `services.grafana.extraOptions` have the format `_`. + Further details are outlined in the [configuration reference](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#override-configuration-with-environment-variables). + + 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 [](#opt-services.grafana.provision.datasources) and + [](#opt-services.grafana.provision.dashboards) expected lists of datasources + or dashboards for the [declarative provisioning](https://grafana.com/docs/grafana/latest/administration/provisioning/). + + To declare lists of + - **datasources**, please rename your declarations to [](#opt-services.grafana.provision.datasources.settings.datasources). + - **dashboards**, please rename your declarations to [](#opt-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 [](#opt-services.grafana.provision.datasources.settings.apiVersion) (or + [](#opt-services.grafana.provision.dashboards.settings.apiVersion)). + + - Instead of declaring datasources and dashboards in pure Nix, it's also possible + to specify configuration directories with YAML instead using + [](#opt-services.grafana.provision.datasources.path) (or + [](#opt-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. - 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. From 25b582469606561ff47aeda84ca71ea572126a00 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 3 Nov 2022 11:01:42 +0100 Subject: [PATCH 638/797] nixos/grafana: mark `services.grafana.extraOptions` as removed --- nixos/modules/services/monitoring/grafana.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 3ce52bc13e91..dc4fab28e864 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -284,6 +284,10 @@ in { (mkRemovedOptionModule [ "services" "grafana" "auth" "google" "clientSecretFile" ] '' This option has been removed. Use 'services.grafana.settings.google.client_secret' with file provider instead. '') + (mkRemovedOptionModule [ "services" "grafana" "extraOptions" ] '' + This option has been removed. Use 'services.grafana.settings' instead. For a detailed migration guide, please + review the release notes of NixOS 22.11. + '') (mkRemovedOptionModule [ "services" "grafana" "auth" "azuread" "tenantId" ] "This option has been deprecated upstream.") ]; From afd6199cff2d5b50c1b9458b0f3dcf35f63d16ae Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 4 Nov 2022 11:40:07 +0100 Subject: [PATCH 639/797] nixos/grafana: re-add legacy notifiers test, mention notifiers in release notes --- .../from_md/release-notes/rl-2211.section.xml | 10 +++++ .../manual/release-notes/rl-2211.section.md | 4 ++ nixos/tests/grafana/provision/default.nix | 39 +++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index caeeae1aefa8..e308fb059cb4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1309,6 +1309,16 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ deploy to NixOS. + + + + is not affected by this change because this feature + will is deprecated by Grafana and will probably + removed in Grafana 10. It’s recommended to use + services.grafana.provision.alerting.contactPoints + instead. + + diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 091377d74a6f..3ae9e341ee30 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -426,6 +426,10 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). provisioning files from non-NixOS Grafana instances that you also want to deploy to NixOS. + - [](#opt-services.grafana.provision.notifiers) is not affected by this change because + this feature will is deprecated by Grafana and will probably 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. - Matrix 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. diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index c4cb9a54daa5..7ff7ed74a977 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -28,6 +28,35 @@ let }; extraNodeConfs = { + provisionLegacyNotifiers = { + services.grafana.provision = { + datasources.settings = { + apiVersion = 1; + datasources = [{ + name = "Test Datasource"; + type = "testdata"; + access = "proxy"; + uid = "test_datasource"; + }]; + }; + dashboards.settings = { + apiVersion = 1; + providers = [{ + name = "default"; + options.path = "/var/lib/grafana/dashboards"; + }]; + }; + notifiers = [{ + uid = "test_notifiers"; + name = "Test Notifiers"; + type = "email"; + settings = { + singleEmail = true; + addresses = "test@test.com"; + }; + }]; + }; + }; provisionNix = { services.grafana.provision = { datasources.settings = { @@ -191,5 +220,15 @@ in { machine.succeed( "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/v1/provisioning/mute-timings | grep Test\ Mute\ Timing" ) + + with subtest("Successful notifiers provision"): + provisionLegacyNotifiers.wait_for_unit("grafana.service") + provisionLegacyNotifiers.wait_for_open_port(3000) + print(provisionLegacyNotifiers.succeed( + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/alert-notifications/uid/test_notifiers" + )) + provisionLegacyNotifiers.succeed( + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/alert-notifications/uid/test_notifiers | grep Test\ Notifiers" + ) ''; }) From 45e1ce7e3a3a6c69762d1892382d2dabeec02726 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 4 Nov 2022 11:51:57 +0100 Subject: [PATCH 640/797] nixos/grafana: get rid of unnecessary `flatten` for warnings --- nixos/modules/services/monitoring/grafana.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index dc4fab28e864..6019fad3ae56 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -1166,12 +1166,12 @@ in { config = mkIf cfg.enable { warnings = let usesFileProvider = opt: defaultValue: builtins.match "^${defaultValue}$|^\\$__file\\{.*}$" opt != null; - in flatten [ + in (optional ( ! usesFileProvider cfg.settings.database.password "" || ! usesFileProvider cfg.settings.security.admin_password "admin" ) "Grafana passwords will be stored as plaintext in the Nix store! Use file provider instead.") - (optional ( + ++ (optional ( let checkOpts = opt: any (x: x.password != null || x.basicAuthPassword != null || x.secureJsonData != null) opt; datasourcesUsed = optionals (cfg.provision.datasources.settings != null) cfg.provision.datasources.settings.datasources; @@ -1181,16 +1181,15 @@ in { It is not possible to use file provider in provisioning; please provision datasources via `services.grafana.provision.datasources.path` instead. '') - (optional ( + ++ (optional ( any (x: x.secure_settings != null) cfg.provision.notifiers ) "Notifier secure settings will be stored as plaintext in the Nix store! Use file provider instead.") - (optional ( + ++ (optional ( cfg.provision.notifiers != [] ) '' Notifiers are deprecated upstream and will be removed in Grafana 10. Use `services.grafana.provision.alerting.contactPoints` instead. - '') - ]; + ''); environment.systemPackages = [ cfg.package ]; From 03b34e85d43249d6b990b28b99bf0e72e93302a4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 4 Nov 2022 12:02:53 +0100 Subject: [PATCH 641/797] nixos/grafana: we only support single YAML files for provisioning --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 2 +- nixos/doc/manual/release-notes/rl-2211.section.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index e308fb059cb4..dd3b974ff16d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1300,7 +1300,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ Instead of declaring datasources and dashboards in pure Nix, it’s also possible to specify configuration - directories with YAML instead using + files with YAML instead using (or . diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 3ae9e341ee30..11e1117c22f6 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -420,7 +420,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). [](#opt-services.grafana.provision.dashboards.settings.apiVersion)). - Instead of declaring datasources and dashboards in pure Nix, it's also possible - to specify configuration directories with YAML instead using + to specify configuration files with YAML instead using [](#opt-services.grafana.provision.datasources.path) (or [](#opt-services.grafana.provision.dashboards.path). This is useful when having provisioning files from non-NixOS Grafana instances that you also want to From febc8a43076c247beb3c868662a14cbb98b55f68 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Nov 2022 18:09:33 +0100 Subject: [PATCH 642/797] nixos/tests/grafana: demonstrate how to use the file provider Yes, it's still a store path, but it's only for demonstration purposes. Also we now have fewer warnings in the provision test. --- nixos/tests/grafana/provision/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 7ff7ed74a977..7ec1be6c4d1a 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -17,7 +17,7 @@ let security = { admin_user = "testadmin"; - admin_password = "snakeoilpwd"; + admin_password = "$__file{${pkgs.writeText "pwd" "snakeoilpwd"}}"; }; }; }; From b300ec349cf7ae63b3e2335cab673658b67c335e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Nov 2022 18:11:28 +0100 Subject: [PATCH 643/797] nixos/doc: wording fix --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 6 +++--- nixos/doc/manual/release-notes/rl-2211.section.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index dd3b974ff16d..4ee65193778d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1312,9 +1312,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - is not affected by this change because this feature - will is deprecated by Grafana and will probably - removed in Grafana 10. It’s recommended to use + is not affected by this change because this feature is + deprecated by Grafana and will probably removed in + Grafana 10. It’s recommended to use services.grafana.provision.alerting.contactPoints instead. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 11e1117c22f6..969d62c7af1b 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -427,7 +427,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). deploy to NixOS. - [](#opt-services.grafana.provision.notifiers) is not affected by this change because - this feature will is deprecated by Grafana and will probably removed in Grafana 10. + this feature is deprecated by Grafana and will probably 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. From 4ec456b7252a8afabff87fc40eab613c138f43d6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Nov 2022 19:37:45 +0100 Subject: [PATCH 644/797] nixos/grafana: fix secret-related warnings Closes #198646 * The options `password`/`basicAuthPassword` were removed for datasources in Grafana 9. The only option to declare them now is to use `secureJsonData`. * Fix description for contactPoints provisioning: when using file/env providers, nothing will be leaked into the store. * Fix regex in file-provider usage check: it's also possible to either use `$__env{FOO}` or `$FOO` to fetch secrets from the environment. * Fix warning for datasources: `password`/`basicAuthPassword` was removed, also check for each setting in `secureJsonData` if env/file-provider was used (then no warning is needed!). --- nixos/modules/services/monitoring/grafana.nix | 87 ++++++++++--------- 1 file changed, 45 insertions(+), 42 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 6019fad3ae56..69a25731f243 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -72,6 +72,17 @@ let grafanaTypes.datasourceConfig = types.submodule { freeformType = provisioningSettingsFormat.type; + imports = [ + (mkRemovedOptionModule [ "password" ] '' + `services.grafana.provision.datasources.settings.datasources..password` has been removed + in Grafana 9. Use `secureJsonData` instead. + '') + (mkRemovedOptionModule [ "basicAuthPassword" ] '' + `services.grafana.provision.datasources.settings.datasources..basicAuthPassword` has been removed + in Grafana 9. Use `secureJsonData` instead. + '') + ]; + options = { name = mkOption { type = types.str; @@ -101,28 +112,6 @@ let default = false; description = lib.mdDoc "Allow users to edit datasources from the UI."; }; - password = mkOption { - type = types.nullOr types.str; - default = null; - description = lib.mdDoc '' - Database password, if used. Please note that the contents of this option - will end up in a world-readable Nix store. Use the file provider - pointing at a reasonably secured file in the local filesystem - to work around that. Look at the documentation for details: - - ''; - }; - basicAuthPassword = mkOption { - type = types.nullOr types.str; - default = null; - description = lib.mdDoc '' - Basic auth password. Please note that the contents of this option - will end up in a world-readable Nix store. Use the file provider - pointing at a reasonably secured file in the local filesystem - to work around that. Look at the documentation for details: - - ''; - }; secureJsonData = mkOption { type = types.nullOr types.attrs; default = null; @@ -600,6 +589,7 @@ in { description = lib.mdDoc "List of datasources to insert/update."; default = []; type = types.listOf grafanaTypes.datasourceConfig; + apply = map (flip builtins.removeAttrs [ "password" "basicAuthPassword" ]); }; deleteDatasources = mkOption { @@ -858,7 +848,7 @@ in { }; contactPoints = mkOption { - description = lib.mdDoc "List of contact points to import or update. Please note that sensitive data will end up in world-readable Nix store."; + description = lib.mdDoc "List of contact points to import or update."; default = []; type = types.listOf (types.submodule { freeformType = provisioningSettingsFormat.type; @@ -1165,31 +1155,44 @@ in { config = mkIf cfg.enable { warnings = let - usesFileProvider = opt: defaultValue: builtins.match "^${defaultValue}$|^\\$__file\\{.*}$" opt != null; + doesntUseFileProvider = opt: defaultValue: + let + regex = "${optionalString (defaultValue != null) "^${defaultValue}$|"}^\\$__(file|env)\\{.*}$|^\\$[^_\\$][^ ]+$"; + in builtins.match regex opt == null; in + # Ensure that no custom credentials are leaked into the Nix store. Unless the default value + # is specified, this can be achieved by using the file/env provider: + # https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#variable-expansion (optional ( - ! usesFileProvider cfg.settings.database.password "" || - ! usesFileProvider cfg.settings.security.admin_password "admin" - ) "Grafana passwords will be stored as plaintext in the Nix store! Use file provider instead.") + doesntUseFileProvider cfg.settings.database.password "" || + doesntUseFileProvider cfg.settings.security.admin_password "admin" + ) '' + Grafana passwords will be stored as plaintext in the Nix store! + Use file/env provider or an env-var instead. + '') + # Warn about deprecated notifiers. + ++ (optional (cfg.provision.notifiers != []) '' + Notifiers are deprecated upstream and will be removed in Grafana 10. + Use `services.grafana.provision.alerting.contactPoints` instead. + '') + # Ensure that `secureJsonData` of datasources provisioned via `datasources.settings` + # only uses file/env providers. ++ (optional ( let - checkOpts = opt: any (x: x.password != null || x.basicAuthPassword != null || x.secureJsonData != null) opt; - datasourcesUsed = optionals (cfg.provision.datasources.settings != null) cfg.provision.datasources.settings.datasources; - in checkOpts datasourcesUsed - ) '' - Datasource passwords will be stored as plaintext in the Nix store! - It is not possible to use file provider in provisioning; please provision - datasources via `services.grafana.provision.datasources.path` instead. - '') + datasourcesToCheck = optionals + (cfg.provision.datasources.settings != null) + cfg.provision.datasources.settings.datasources; + declarationUnsafe = { secureJsonData, ... }: + secureJsonData != null + && any (flip doesntUseFileProvider null) (attrValues secureJsonData); + in any declarationUnsafe datasourcesToCheck + ) '' + Declarations in the `secureJsonData`-block of a datasource will be leaked to the + Nix store unless a file/env-provider or an env-var is used! + '') ++ (optional ( any (x: x.secure_settings != null) cfg.provision.notifiers - ) "Notifier secure settings will be stored as plaintext in the Nix store! Use file provider instead.") - ++ (optional ( - cfg.provision.notifiers != [] - ) '' - Notifiers are deprecated upstream and will be removed in Grafana 10. - Use `services.grafana.provision.alerting.contactPoints` instead. - ''); + ) "Notifier secure settings will be stored as plaintext in the Nix store! Use file provider instead."); environment.systemPackages = [ cfg.package ]; From 2f1dfb0db379c1bf13785a5c7d94ad31bd0eb46b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Nov 2022 20:04:23 +0100 Subject: [PATCH 645/797] nixos/grafana: fix w/o datasources or dashboard provisioning --- nixos/modules/services/monitoring/grafana.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 69a25731f243..8035abfc0044 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -13,9 +13,20 @@ let settingsFormatIni = pkgs.formats.ini {}; configFile = settingsFormatIni.generate "config.ini" cfg.settings; - datasourceFile = if (cfg.provision.datasources.path == null) then provisioningSettingsFormat.generate "datasource.yaml" cfg.provision.datasources.settings else cfg.provision.datasources.path; + mkProvisionCfg = name: attr: provisionCfg: + if provisionCfg.path != null + then provisionCfg.path + else + provisioningSettingsFormat.generate "${name}.yaml" + (if provisionCfg.settings != null + then provisionCfg.settings + else { + apiVersion = 1; + ${attr} = []; + }); - dashboardFile = if (cfg.provision.dashboards.path == null) then provisioningSettingsFormat.generate "dashboard.yaml" cfg.provision.dashboards.settings else cfg.provision.dashboards.path; + datasourceFile = mkProvisionCfg "datasource" "datasources" cfg.provision.datasources; + dashboardFile = mkProvisionCfg "dashboard" "providers" cfg.provision.dashboards; notifierConfiguration = { apiVersion = 1; From 9d7e9c5965c72f516285fe52af14ceeefb315fdc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Nov 2022 11:44:08 +0100 Subject: [PATCH 646/797] nixos/grafana: allow using both directories or single YAML files for non-Nix provisioning --- .../from_md/release-notes/rl-2211.section.xml | 2 +- .../manual/release-notes/rl-2211.section.md | 2 +- nixos/modules/services/monitoring/grafana.nix | 66 ++++++++++--------- nixos/tests/grafana/provision/default.nix | 19 +++++- 4 files changed, 55 insertions(+), 34 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 4ee65193778d..6044b70a200d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1300,7 +1300,7 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ Instead of declaring datasources and dashboards in pure Nix, it’s also possible to specify configuration - files with YAML instead using + files (or directories) with YAML instead using (or . diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 969d62c7af1b..2593b36912c0 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -420,7 +420,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). [](#opt-services.grafana.provision.dashboards.settings.apiVersion)). - Instead of declaring datasources and dashboards in pure Nix, it's also possible - to specify configuration files with YAML instead using + to specify configuration files (or directories) with YAML instead using [](#opt-services.grafana.provision.datasources.path) (or [](#opt-services.grafana.provision.dashboards.path). This is useful when having provisioning files from non-NixOS Grafana instances that you also want to diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 8035abfc0044..d8dc4d1124f1 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -25,42 +25,51 @@ let ${attr} = []; }); - datasourceFile = mkProvisionCfg "datasource" "datasources" cfg.provision.datasources; - dashboardFile = mkProvisionCfg "dashboard" "providers" cfg.provision.dashboards; + datasourceFileOrDir = mkProvisionCfg "datasource" "datasources" cfg.provision.datasources; + dashboardFileOrDir = mkProvisionCfg "dashboard" "providers" cfg.provision.dashboards; notifierConfiguration = { apiVersion = 1; notifiers = cfg.provision.notifiers; }; - notifierFile = pkgs.writeText "notifier.yaml" (builtins.toJSON notifierConfiguration); + notifierFileOrDir = pkgs.writeText "notifier.yaml" (builtins.toJSON notifierConfiguration); generateAlertingProvisioningYaml = x: if (cfg.provision.alerting."${x}".path == null) then provisioningSettingsFormat.generate "${x}.yaml" cfg.provision.alerting."${x}".settings else cfg.provision.alerting."${x}".path; - rulesFile = generateAlertingProvisioningYaml "rules"; - contactPointsFile = generateAlertingProvisioningYaml "contactPoints"; - policiesFile = generateAlertingProvisioningYaml "policies"; - templatesFile = generateAlertingProvisioningYaml "templates"; - muteTimingsFile = generateAlertingProvisioningYaml "muteTimings"; + rulesFileOrDir = generateAlertingProvisioningYaml "rules"; + contactPointsFileOrDir = generateAlertingProvisioningYaml "contactPoints"; + policiesFileOrDir = generateAlertingProvisioningYaml "policies"; + templatesFileOrDir = generateAlertingProvisioningYaml "templates"; + muteTimingsFileOrDir = generateAlertingProvisioningYaml "muteTimings"; - provisionConfDir = pkgs.runCommand "grafana-provisioning" { } '' + ln = { src, dir, filename }: '' + if [[ -d "${src}" ]]; then + pushd $out/${dir} &>/dev/null + lndir "${src}" + popd &>/dev/null + else + ln -sf ${src} $out/${dir}/${filename}.yaml + fi + ''; + provisionConfDir = pkgs.runCommand "grafana-provisioning" { nativeBuildInputs = [ pkgs.xorg.lndir ]; } '' mkdir -p $out/{datasources,dashboards,notifiers,alerting} - ln -sf ${datasourceFile} $out/datasources/datasource.yaml - ln -sf ${dashboardFile} $out/dashboards/dashboard.yaml - ln -sf ${notifierFile} $out/notifiers/notifier.yaml - ln -sf ${rulesFile} $out/alerting/rules.yaml - ln -sf ${contactPointsFile} $out/alerting/contactPoints.yaml - ln -sf ${policiesFile} $out/alerting/policies.yaml - ln -sf ${templatesFile} $out/alerting/templates.yaml - ln -sf ${muteTimingsFile} $out/alerting/muteTimings.yaml + ${ln { src = datasourceFileOrDir; dir = "datasources"; filename = "datasource"; }} + ${ln { src = dashboardFileOrDir; dir = "dashboards"; filename = "dashbaord"; }} + ${ln { src = notifierFileOrDir; dir = "notifiers"; filename = "notifier"; }} + ${ln { src = rulesFileOrDir; dir = "alerting"; filename = "rules"; }} + ${ln { src = contactPointsFileOrDir; dir = "alerting"; filename = "contactPoints"; }} + ${ln { src = policiesFileOrDir; dir = "alerting"; filename = "policies"; }} + ${ln { src = templatesFileOrDir; dir = "alerting"; filename = "templates"; }} + ${ln { src = muteTimingsFileOrDir; dir = "alerting"; filename = "muteTimings"; }} ''; # Get a submodule without any embedded metadata: _filter = x: filterAttrs (k: v: k != "_module") x; # FIXME(@Ma27) remove before 23.05. This is just a helper-type - # because `mkRenamedOptionModule` doesn't work if `foo.bar` is renamed + # because `mkRenamedOptionMthere's there's odule` doesn't work if `foo.bar` is renamed # to `foo.bar.baz`. submodule' = module: types.coercedTo (mkOptionType { @@ -342,19 +351,7 @@ in { Don't change the value of this option if you are planning to use `services.grafana.provision` options. ''; default = provisionConfDir; - defaultText = literalExpression '' - pkgs.runCommand "grafana-provisioning" { } \'\' - mkdir -p $out/{datasources,dashboards,notifiers,alerting} - ln -sf ''${datasourceFile} $out/datasources/datasource.yaml - ln -sf ''${dashboardFile} $out/dashboards/dashboard.yaml - ln -sf ''${notifierFile} $out/notifiers/notifier.yaml - ln -sf ''${rulesFile} $out/alerting/rules.yaml - ln -sf ''${contactPointsFile} $out/alerting/contactPoints.yaml - ln -sf ''${policiesFile} $out/alerting/policies.yaml - ln -sf ''${templatesFile} $out/alerting/templates.yaml - ln -sf ''${muteTimingsFile} $out/alerting/muteTimings.yaml - \'\' - ''; + defaultText = "directory with all provisioning files linked together"; type = types.path; }; }; @@ -641,6 +638,7 @@ in { description = lib.mdDoc '' Path to YAML datasource configuration. Can't be used with [](#opt-services.grafana.provision.datasources.settings) simultaneously. + Can be either a directory or a single YAML file. Will end up in the store. ''; default = null; type = types.nullOr types.path; @@ -692,6 +690,7 @@ in { description = lib.mdDoc '' Path to YAML dashboard configuration. Can't be used with [](#opt-services.grafana.provision.dashboards.settings) simultaneously. + Can be either a directory or a single YAML file. Will end up in the store. ''; default = null; type = types.nullOr types.path; @@ -714,6 +713,7 @@ in { description = lib.mdDoc '' Path to YAML rules configuration. Can't be used with [](#opt-services.grafana.provision.alerting.rules.settings) simultaneously. + Can be either a directory or a single YAML file. Will end up in the store. ''; default = null; type = types.nullOr types.path; @@ -837,6 +837,7 @@ in { description = lib.mdDoc '' Path to YAML contact points configuration. Can't be used with [](#opt-services.grafana.provision.alerting.contactPoints.settings) simultaneously. + Can be either a directory or a single YAML file. Will end up in the store. ''; default = null; type = types.nullOr types.path; @@ -917,6 +918,7 @@ in { description = lib.mdDoc '' Path to YAML notification policies configuration. Can't be used with [](#opt-services.grafana.provision.alerting.policies.settings) simultaneously. + Can be either a directory or a single YAML file. Will end up in the store. ''; default = null; type = types.nullOr types.path; @@ -986,6 +988,7 @@ in { description = lib.mdDoc '' Path to YAML templates configuration. Can't be used with [](#opt-services.grafana.provision.alerting.templates.settings) simultaneously. + Can be either a directory or a single YAML file. Will end up in the store. ''; default = null; type = types.nullOr types.path; @@ -1067,6 +1070,7 @@ in { description = lib.mdDoc '' Path to YAML mute timings configuration. Can't be used with [](#opt-services.grafana.provision.alerting.muteTimings.settings) simultaneously. + Can be either a directory or a single YAML file. Will end up in the store. ''; default = null; type = types.nullOr types.path; diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 7ec1be6c4d1a..1eb927632eb7 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -163,6 +163,22 @@ let }; }; }; + + provisionYamlDirs = let + mkdir = p: pkgs.writeTextDir (baseNameOf p) (builtins.readFile p); + in { + services.grafana.provision = { + datasources.path = mkdir ./datasources.yaml; + dashboards.path = mkdir ./dashboards.yaml; + alerting = { + rules.path = mkdir ./rules.yaml; + contactPoints.path = mkdir ./contact-points.yaml; + policies.path = mkdir ./policies.yaml; + templates.path = mkdir ./templates.yaml; + muteTimings.path = mkdir ./mute-timings.yaml; + }; + }; + }; }; nodes = builtins.mapAttrs (_: val: mkMerge [ val baseGrafanaConf ]) extraNodeConfs; @@ -180,8 +196,9 @@ in { nodeNix = ("Nix (new format)", provisionNix) nodeYaml = ("Nix (YAML)", provisionYaml) + nodeYamlDir = ("Nix (YAML in dirs)", provisionYamlDirs) - for description, machine in [nodeNix, nodeYaml]: + for description, machine in [nodeNix, nodeYaml, nodeYamlDir]: with subtest(f"Should start provision node: {description}"): machine.wait_for_unit("grafana.service") machine.wait_for_open_port(3000) From 6ee5ae3e48512344e4ebed043cb62ce17417a33a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 14 Nov 2022 11:49:04 +0100 Subject: [PATCH 647/797] nixos/grafana: make warning more clear --- nixos/modules/services/monitoring/grafana.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index d8dc4d1124f1..2d25ce93c4fc 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -1183,7 +1183,7 @@ in { doesntUseFileProvider cfg.settings.security.admin_password "admin" ) '' Grafana passwords will be stored as plaintext in the Nix store! - Use file/env provider or an env-var instead. + Use file provider or an env-var instead. '') # Warn about deprecated notifiers. ++ (optional (cfg.provision.notifiers != []) '' @@ -1203,7 +1203,7 @@ in { in any declarationUnsafe datasourcesToCheck ) '' Declarations in the `secureJsonData`-block of a datasource will be leaked to the - Nix store unless a file/env-provider or an env-var is used! + Nix store unless a file-provider or an env-var is used! '') ++ (optional ( any (x: x.secure_settings != null) cfg.provision.notifiers From a17ea3aa437f8b934ff399f2fb542b7e4603f4ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 17:22:32 +0000 Subject: [PATCH 648/797] python310Packages.mautrix: 0.18.7 -> 0.18.8 --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 61569abe30a2..68669248aacd 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.18.7"; + version = "0.18.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fxDkHSlfiyxDdCvz3CyAWeip08ozH+lqEzmM26a4/Xg="; + sha256 = "sha256-DRJhqHpeGbDzqhym6z9wCmzTz3VpnwJMdDKFT5vMVUE="; }; propagatedBuildInputs = [ From 404ef7091b064592eeceb4cb7fa9e418e0eedfb9 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 20 Nov 2022 18:14:16 +0100 Subject: [PATCH 649/797] ddh: init at 0.13.0 --- pkgs/tools/system/ddh/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/system/ddh/default.nix diff --git a/pkgs/tools/system/ddh/default.nix b/pkgs/tools/system/ddh/default.nix new file mode 100644 index 000000000000..cba8ade1f428 --- /dev/null +++ b/pkgs/tools/system/ddh/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, rustPlatform, ... }: +rustPlatform.buildRustPackage rec { + pname = "ddh"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "darakian"; + repo = pname; + rev = version; + sha256 = "XFfTpX4c821pcTAJZFUjdqM940fRoBwkJC6KTknXtCw="; + }; + + cargoSha256 = "6yPDkbag81TZ4k72rbmGT6HWKdGK4yfKxjGNFKEWXPI="; + + meta = with lib; { + description = "A fast duplicate file finder"; + longDescription = '' + DDH traverses input directories and their subdirectories. + It also hashes files as needed and reports findings. + ''; + homepage = "https://github.com/darakian/ddh"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ h7x4 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1ccb4d98efd..0e65f1de85ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5841,6 +5841,8 @@ with pkgs; dd_rescue = callPackage ../tools/system/dd_rescue { }; + ddh = callPackage ../tools/system/ddh { }; + ddrescue = callPackage ../tools/system/ddrescue { }; ddrescueview = callPackage ../tools/system/ddrescueview { }; From de997f4d0c0378d571dcbcdd19c558a2a6b4f133 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Tue, 15 Nov 2022 22:45:01 +0100 Subject: [PATCH 650/797] rocminfo: mark broken on aarch64 --- pkgs/development/tools/rocminfo/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index 078c4aa71d91..d89c90aa88d2 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault Flakebi ]; platforms = platforms.linux; + broken = stdenv.isAarch64; }; } From 9959b6bba05ee0a0df268db48fb8f8c3203fd24e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 17:53:37 +0000 Subject: [PATCH 651/797] aliyun-cli: 3.0.134 -> 3.0.135 --- pkgs/tools/admin/aliyun-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 94a6a1fc3120..aac2804ffb18 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.134"; + version = "3.0.135"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-popi+eF0nIA0C9QHbV4cu1vKfv9QUUq8oOJW/XkEabg="; + sha256 = "sha256-iWowsrceAiWQih8hZoq1t3Q9a8TrKDUGMYfzdfkSU7Y="; }; - vendorSha256 = "sha256-rUYlFM9OlPXGzxXyOxweUs6md7HhjocC56F+OtT/IXo="; + vendorSha256 = "sha256-XKPpO+xpiceyucbuDt/camBtvP6Bk4MAJYBm00ngtjg="; subPackages = [ "main" ]; From 72e8f024d81840de6219e09b78a0747df055f2a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 18:29:20 +0000 Subject: [PATCH 652/797] appthreat-depscan: 3.0.0 -> 3.0.2 --- pkgs/development/tools/appthreat-depscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index f37e71387346..4afac4780de4 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-S86EfPWA3mZV/SLQJEdwzz5hZ1qK+WQ6k2xCs+J0jPk="; + hash = "sha256-AxdtphC9dVd/o52hW8L+5gaEDeP9wvR0vSZS3XY9sAw="; }; propagatedBuildInputs = with python3.pkgs; [ From 15f5602de83c2a6c9be3a4f51932572c41ab88cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 18:37:38 +0000 Subject: [PATCH 653/797] argocd-autopilot: 0.4.7 -> 0.4.8 --- .../networking/cluster/argocd-autopilot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index 8aef3f81af51..e446773233c8 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-aC3U9Qeahji3xSuJWuMlf2TzKEqPDAOuB52A4Om/fRU="; + sha256 = "sha256-U1gvDv364x7FxuqXIeaiMZMl0324rGjiqs8vtlENAlY="; }; - vendorSha256 = "sha256-waEvrIEXQMyzSyHpPo7H0OwfD5Zo/rwWTpeWvipZXv8="; + vendorSha256 = "sha256-4ylOLnpvz/aQIoxVz2z69Rq/x2UG91yMmtSHyquvNq0="; proxyVendor = true; From 47c235956b564c0f304dcc27ba3945bbc1205c6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 19:40:10 +0100 Subject: [PATCH 654/797] python310Packages.lsassy: add changelog to meta --- pkgs/development/python-modules/lsassy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index 56cb4cc6ae8f..ab422f709dab 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to extract data from Local Security Authority Subsystem Service (LSASS)"; homepage = "https://github.com/Hackndo/lsassy"; + changelog = "https://github.com/Hackndo/lsassy/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 2073ee4b6e962656bc3475e9fa3de71a3afc2729 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 19:42:05 +0100 Subject: [PATCH 655/797] appthreat-depscan: add changelog to meta --- pkgs/development/tools/appthreat-depscan/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index 4afac4780de4..c4ba4b27939f 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -46,6 +46,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool to audit dependencies based on known vulnerabilities and advisories"; homepage = "https://github.com/AppThreat/dep-scan"; + changelog = "https://github.com/AppThreat/dep-scan/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 7a68a5d617dba0c75d16edc07ae2883d32c37715 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 19:48:04 +0100 Subject: [PATCH 656/797] python310Packages.mautrix: add changelog to meta --- .../python-modules/mautrix/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 68669248aacd..abf52ceae1d6 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -1,14 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, pythonOlder -, sqlalchemy, ruamel-yaml, CommonMark, lxml, aiosqlite +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, pythonOlder +, sqlalchemy +, ruamel-yaml +, CommonMark +, lxml +, aiosqlite }: buildPythonPackage rec { pname = "mautrix"; version = "0.18.8"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DRJhqHpeGbDzqhym6z9wCmzTz3VpnwJMdDKFT5vMVUE="; + hash = "sha256-DRJhqHpeGbDzqhym6z9wCmzTz3VpnwJMdDKFT5vMVUE="; }; propagatedBuildInputs = [ @@ -22,16 +33,17 @@ buildPythonPackage rec { lxml ]; - disabled = pythonOlder "3.8"; - # no tests available doCheck = false; - pythonImportsCheck = [ "mautrix" ]; + pythonImportsCheck = [ + "mautrix" + ]; meta = with lib; { + description = "Asyncio Matrix framework"; homepage = "https://github.com/tulir/mautrix-python"; - description = "A Python 3 asyncio Matrix framework."; + changelog = "https://github.com/mautrix/python/releases/tag/v${version}"; license = licenses.mpl20; maintainers = with maintainers; [ nyanloutre ma27 sumnerevans ]; }; From 996b3332419fe68dbacd6448caac4ce15e9f120a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 19:49:34 +0100 Subject: [PATCH 657/797] python310Packages.manimpango: add changelog to meta --- pkgs/development/python-modules/manimpango/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index cb618a8b5029..48487af1bc47 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Binding for Pango"; homepage = "https://github.com/ManimCommunity/ManimPango"; + changelog = "https://github.com/ManimCommunity/ManimPango/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ emilytrau ]; }; From 7852ff5b9a664394f5343ed92fce1dad23cf21c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Nov 2022 16:55:33 -0800 Subject: [PATCH 658/797] python310Packages.johnnycanencrypt: 0.6.0 -> 0.11.0 https://github.com/kushaldas/johnnycanencrypt/blob/v0.11.0/changelog.md --- .../johnnycanencrypt/Cargo.lock.patch | 1152 ++++++++++------- .../johnnycanencrypt/default.nix | 25 +- 2 files changed, 715 insertions(+), 462 deletions(-) diff --git a/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch b/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch index b70f9304c728..57e53bb6f573 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch +++ b/pkgs/development/python-modules/johnnycanencrypt/Cargo.lock.patch @@ -1,67 +1,48 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..84c37bc +index 0000000..ae65889 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,1188 @@ +@@ -0,0 +1,1450 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. -+[[package]] -+name = "addr2line" -+version = "0.14.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" -+dependencies = [ -+ "gimli", -+] ++version = 3 + +[[package]] +name = "adler" -+version = "0.2.3" ++version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" -+ -+[[package]] -+name = "aead" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" -+dependencies = [ -+ "generic-array", -+] ++checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" -+version = "0.7.15" ++version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" ++checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] ++name = "android_system_properties" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] +name = "anyhow" -+version = "1.0.37" ++version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86" -+ -+[[package]] -+name = "arrayref" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" -+ -+[[package]] -+name = "arrayvec" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" ++checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" + +[[package]] +name = "ascii-canvas" -+version = "2.0.0" ++version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ff8eb72df928aafb99fe5d37b383f2fe25bd2a765e3e5f7c365916b6f2463a29" ++checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] @@ -79,41 +60,33 @@ index 0000000..84c37bc + +[[package]] +name = "autocfg" -+version = "1.0.1" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -+ -+[[package]] -+name = "backtrace" -+version = "0.3.55" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" -+dependencies = [ -+ "addr2line", -+ "cfg-if 1.0.0", -+ "libc", -+ "miniz_oxide", -+ "object", -+ "rustc-demangle", -+] ++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" -+version = "0.13.0" ++version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" ++ ++[[package]] ++name = "base64" ++version = "0.13.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bindgen" -+version = "0.51.1" ++version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75" ++checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d" +dependencies = [ + "bitflags", + "cexpr", -+ "cfg-if 0.1.10", + "clang-sys", + "lazy_static", ++ "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", @@ -124,9 +97,9 @@ index 0000000..84c37bc + +[[package]] +name = "bit-set" -+version = "0.5.2" ++version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" ++checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] @@ -139,26 +112,36 @@ index 0000000..84c37bc + +[[package]] +name = "bitflags" -+version = "1.2.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] -+name = "blake2b_simd" -+version = "0.5.11" ++name = "block-buffer" ++version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" ++checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +dependencies = [ -+ "arrayref", -+ "arrayvec", -+ "constant_time_eq", ++ "block-padding", ++ "byte-tools", ++ "byteorder", ++ "generic-array 0.12.4", ++] ++ ++[[package]] ++name = "block-padding" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" ++dependencies = [ ++ "byte-tools", +] + +[[package]] +name = "buffered-reader" -+version = "1.0.0" ++version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f5711ccfa79a8167779ad2176d3334078f03b1579ddf8f42aa556196eba60a42" ++checksum = "e9f82920285502602088677aeb65df0909b39c347b38565e553ba0363c242f65" +dependencies = [ + "bzip2", + "flate2", @@ -166,16 +149,28 @@ index 0000000..84c37bc +] + +[[package]] -+name = "byteorder" -+version = "1.3.4" ++name = "bumpalo" ++version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" ++checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" ++ ++[[package]] ++name = "byte-tools" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" ++ ++[[package]] ++name = "byteorder" ++version = "1.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bzip2" -+version = "0.4.1" ++version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "275d84fe348b838dc49477d39770682839b3e73e21a3eadc07b12924f1a9fcbe" ++checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +dependencies = [ + "bzip2-sys", + "libc", @@ -183,9 +178,9 @@ index 0000000..84c37bc + +[[package]] +name = "bzip2-sys" -+version = "0.1.9+1.0.8" ++version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ad3b39a260062fca31f7b0b12f207e8f2590a67d32ec7d59c20484b07ea7285e" ++checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", @@ -194,58 +189,45 @@ index 0000000..84c37bc + +[[package]] +name = "cc" -+version = "1.0.66" ++version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" ++checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" + +[[package]] +name = "cexpr" -+version = "0.3.6" ++version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d" ++checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+ -+[[package]] -+name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" -+version = "0.4.19" ++version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" ++checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ -+ "libc", ++ "iana-time-zone", ++ "js-sys", + "num-integer", + "num-traits", + "time", ++ "wasm-bindgen", + "winapi", +] + +[[package]] -+name = "cipher" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" -+dependencies = [ -+ "generic-array", -+] -+ -+[[package]] +name = "clang-sys" -+version = "0.28.1" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853" ++checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +dependencies = [ + "glob", + "libc", @@ -253,39 +235,28 @@ index 0000000..84c37bc +] + +[[package]] -+name = "cmac" -+version = "0.5.1" ++name = "codespan-reporting" ++version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "73d4de4f7724e5fe70addfb2bd37c2abd2f95084a429d7773b0b9645499b4272" ++checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ -+ "crypto-mac", -+ "dbl", ++ "termcolor", ++ "unicode-width", +] + +[[package]] -+name = "constant_time_eq" -+version = "0.1.5" ++name = "core-foundation-sys" ++version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" ++checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "crc32fast" -+version = "1.2.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" ++checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ -+ "cfg-if 1.0.0", -+] -+ -+[[package]] -+name = "crossbeam-utils" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" -+dependencies = [ -+ "autocfg", -+ "cfg-if 1.0.0", -+ "lazy_static", ++ "cfg-if", +] + +[[package]] @@ -295,49 +266,63 @@ index 0000000..84c37bc +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] -+name = "crypto-mac" -+version = "0.10.0" ++name = "cxx" ++version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" ++checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" +dependencies = [ -+ "cipher", -+ "generic-array", -+ "subtle", ++ "cc", ++ "cxxbridge-flags", ++ "cxxbridge-macro", ++ "link-cplusplus", +] + +[[package]] -+name = "ctor" -+version = "0.1.17" ++name = "cxx-build" ++version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "373c88d9506e2e9230f6107701b7d8425f4cb3f6df108ec3042a26e936666da5" ++checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" +dependencies = [ ++ "cc", ++ "codespan-reporting", ++ "once_cell", ++ "proc-macro2", ++ "quote", ++ "scratch", ++ "syn", ++] ++ ++[[package]] ++name = "cxxbridge-flags" ++version = "1.0.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" ++ ++[[package]] ++name = "cxxbridge-macro" ++version = "1.0.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" ++dependencies = [ ++ "proc-macro2", + "quote", + "syn", +] + +[[package]] -+name = "ctr" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" -+dependencies = [ -+ "cipher", -+] -+ -+[[package]] -+name = "dbl" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2735145c3b9ba15f2d7a3ae8cdafcbc8c98a7bef7f62afe9d08bd99fbf7130de" -+dependencies = [ -+ "generic-array", -+] -+ -+[[package]] +name = "diff" -+version = "0.1.12" ++version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" ++checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" ++ ++[[package]] ++name = "digest" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" ++dependencies = [ ++ "generic-array 0.12.4", ++] + +[[package]] +name = "digest" @@ -345,14 +330,24 @@ index 0000000..84c37bc +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ -+ "generic-array", ++ "generic-array 0.14.6", +] + +[[package]] -+name = "dirs" -+version = "1.0.5" ++name = "dirs-next" ++version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" ++checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" ++dependencies = [ ++ "cfg-if", ++ "dirs-sys-next", ++] ++ ++[[package]] ++name = "dirs-sys-next" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", @@ -361,28 +356,15 @@ index 0000000..84c37bc + +[[package]] +name = "dyn-clone" -+version = "1.0.4" ++version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" -+ -+[[package]] -+name = "eax" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e1f76e7a5e594b299a0fa9a99de627530725e341df41376aa342aecb2c5eb76e" -+dependencies = [ -+ "aead", -+ "cipher", -+ "cmac", -+ "ctr", -+ "subtle", -+] ++checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" + +[[package]] +name = "either" -+version = "1.6.1" ++version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "ena" @@ -394,31 +376,53 @@ index 0000000..84c37bc +] + +[[package]] -+name = "fixedbitset" -+version = "0.2.0" ++name = "fake-simd" ++version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" ++checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" ++ ++[[package]] ++name = "fastrand" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" ++dependencies = [ ++ "instant", ++] ++ ++[[package]] ++name = "fixedbitset" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" -+version = "1.0.19" ++version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" ++checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +dependencies = [ -+ "cfg-if 1.0.0", + "crc32fast", -+ "libc", + "miniz_oxide", +] + +[[package]] +name = "generic-array" -+version = "0.14.4" ++version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" ++checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +dependencies = [ + "typenum", -+ "version_check 0.9.2", ++] ++ ++[[package]] ++name = "generic-array" ++version = "0.14.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" ++dependencies = [ ++ "typenum", ++ "version_check", +] + +[[package]] @@ -427,29 +431,27 @@ index 0000000..84c37bc +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ -+ "cfg-if 1.0.0", ++ "cfg-if", ++ "js-sys", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", ++ "wasm-bindgen", +] + +[[package]] -+name = "ghost" -+version = "0.1.2" ++name = "getrandom" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" ++checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", ++ "cfg-if", ++ "js-sys", ++ "libc", ++ "wasi 0.11.0+wasi-snapshot-preview1", ++ "wasm-bindgen", +] + +[[package]] -+name = "gimli" -+version = "0.23.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" -+ -+[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -457,35 +459,58 @@ index 0000000..84c37bc + +[[package]] +name = "hashbrown" -+version = "0.9.1" ++version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" ++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hermit-abi" -+version = "0.1.17" ++version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] -+name = "idna" -+version = "0.2.0" ++name = "iana-time-zone" ++version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" ++checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" ++dependencies = [ ++ "android_system_properties", ++ "core-foundation-sys", ++ "iana-time-zone-haiku", ++ "js-sys", ++ "wasm-bindgen", ++ "winapi", ++] ++ ++[[package]] ++name = "iana-time-zone-haiku" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" ++dependencies = [ ++ "cxx", ++ "cxx-build", ++] ++ ++[[package]] ++name = "idna" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ -+ "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" -+version = "1.6.1" ++version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" ++checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", @@ -493,69 +518,55 @@ index 0000000..84c37bc + +[[package]] +name = "indoc" -+version = "1.0.3" ++version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136" -+dependencies = [ -+ "unindent", -+] ++checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3" + +[[package]] +name = "instant" -+version = "0.1.9" ++version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" ++checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ -+ "cfg-if 1.0.0", -+] -+ -+[[package]] -+name = "inventory" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f" -+dependencies = [ -+ "ctor", -+ "ghost", -+ "inventory-impl", -+] -+ -+[[package]] -+name = "inventory-impl" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", ++ "cfg-if", +] + +[[package]] +name = "itertools" -+version = "0.9.0" ++version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" ++checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "johnnycanencrypt" -+version = "0.5.0" ++version = "0.11.0" +dependencies = [ + "anyhow", + "chrono", + "pyo3", + "sequoia-openpgp", ++ "sshkeys", + "talktosc", ++ "tempfile", ++] ++ ++[[package]] ++name = "js-sys" ++version = "0.3.60" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" ++dependencies = [ ++ "wasm-bindgen", +] + +[[package]] +name = "lalrpop" -+version = "0.19.3" ++version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c64e04d8ea9c95c2135dfc4298088eafaf956bc90ba372eb1bea4f715634587" ++checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823" +dependencies = [ + "ascii-canvas", + "atty", @@ -565,7 +576,6 @@ index 0000000..84c37bc + "itertools", + "lalrpop-util", + "petgraph", -+ "pico-args", + "regex", + "regex-syntax", + "string_cache", @@ -576,12 +586,9 @@ index 0000000..84c37bc + +[[package]] +name = "lalrpop-util" -+version = "0.19.3" ++version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f9de203e2fa3e883364fcc778a1293ab4d936f6cff400433013c20105df178c5" -+dependencies = [ -+ "regex", -+] ++checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4" + +[[package]] +name = "lazy_static" @@ -590,74 +597,92 @@ index 0000000..84c37bc +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] -+name = "libc" -+version = "0.2.81" ++name = "lazycell" ++version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" ++checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" ++ ++[[package]] ++name = "libc" ++version = "0.2.137" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" + +[[package]] +name = "libloading" -+version = "0.5.2" ++version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" ++checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ -+ "cc", ++ "cfg-if", + "winapi", +] + +[[package]] -+name = "lock_api" -+version = "0.4.2" ++name = "link-cplusplus" ++version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" ++checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +dependencies = [ ++ "cc", ++] ++ ++[[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.11" ++version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" ++checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ -+ "cfg-if 0.1.10", ++ "cfg-if", +] + +[[package]] -+name = "matches" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -+ -+[[package]] +name = "memchr" -+version = "2.3.4" ++version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] -+name = "memsec" -+version = "0.6.0" ++name = "memoffset" ++version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2af4f95d8737f4ffafbd1fb3c703cdc898868a244a59786793cba0520ebdcbdd" -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" ++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ -+ "adler", + "autocfg", +] + +[[package]] -+name = "nettle" -+version = "7.0.0" ++name = "memsec" ++version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b1afae85450b829ad720f2827e3b07d78e06b5521cfe5ed72808a9f593e7cdd8" ++checksum = "9ac78937f19a0c7807e45a931eac41f766f210173ec664ec046d58e6d388a5cb" ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +dependencies = [ -+ "getrandom", ++ "adler", ++] ++ ++[[package]] ++name = "nettle" ++version = "7.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f5d193a809310369c5d16e45bc0a88cb27935edd5d3375bcfc2371b167694035" ++dependencies = [ ++ "getrandom 0.2.8", + "libc", + "nettle-sys", + "thiserror", @@ -665,12 +690,16 @@ index 0000000..84c37bc + +[[package]] +name = "nettle-sys" -+version = "2.0.4" ++version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8629333ff5f3b74d251dae253e383cda9242410fac4244a4fe855469be101fb" ++checksum = "b13b685c7883e3a32196ccf3ce594947ec37ace43d74e157de7ca03d3fe62d17" +dependencies = [ + "bindgen", ++ "cc", ++ "libc", + "pkg-config", ++ "tempfile", ++ "vcpkg", +] + +[[package]] @@ -681,19 +710,19 @@ index 0000000..84c37bc + +[[package]] +name = "nom" -+version = "4.2.3" ++version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" ++checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "memchr", -+ "version_check 0.1.5", ++ "version_check", +] + +[[package]] +name = "num-integer" -+version = "0.1.44" ++version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" ++checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", @@ -701,55 +730,53 @@ index 0000000..84c37bc + +[[package]] +name = "num-traits" -+version = "0.2.14" ++version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] -+name = "object" -+version = "0.22.0" ++name = "once_cell" ++version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" ++checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" ++ ++[[package]] ++name = "opaque-debug" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" + +[[package]] +name = "parking_lot" -+version = "0.11.1" ++version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" ++checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ -+ "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" -+version = "0.8.2" ++version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272" ++checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +dependencies = [ -+ "cfg-if 1.0.0", -+ "instant", ++ "cfg-if", + "libc", + "redox_syscall", + "smallvec", -+ "winapi", ++ "windows-sys", +] + +[[package]] -+name = "paste" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1" -+ -+[[package]] +name = "pcsc" -+version = "2.4.0" ++version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "88e09a8d8705a2c9b1ffe1f9dd9580efe3f8e80c19fc9f99038fe99b7bb56c83" ++checksum = "7e29e4de78a433aeecd06fb5bd55a0f9fde11dc85a14c22d482972c7edc4fdc4" +dependencies = [ + "bitflags", + "pcsc-sys", @@ -772,9 +799,9 @@ index 0000000..84c37bc + +[[package]] +name = "petgraph" -+version = "0.5.1" ++version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" ++checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +dependencies = [ + "fixedbitset", + "indexmap", @@ -782,24 +809,24 @@ index 0000000..84c37bc + +[[package]] +name = "phf_shared" -+version = "0.8.0" ++version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" ++checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] -+name = "pico-args" -+version = "0.3.4" ++name = "pkg-config" ++version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28b9b4df73455c861d7cbf8be42f01d3b373ed7f02e378d55fa84eafc6f638b1" ++checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] -+name = "pkg-config" -+version = "0.3.19" ++name = "ppv-lite86" ++version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" ++checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" @@ -809,36 +836,57 @@ index 0000000..84c37bc + +[[package]] +name = "proc-macro2" -+version = "1.0.24" ++version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" ++checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +dependencies = [ -+ "unicode-xid", ++ "unicode-ident", +] + +[[package]] +name = "pyo3" -+version = "0.13.0" ++version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5cdd01a4c2719dd1f3ceab0875fa1a2c2cd3c619477349d78f43cd716b345436" ++checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" +dependencies = [ -+ "cfg-if 1.0.0", -+ "ctor", ++ "cfg-if", + "indoc", -+ "inventory", + "libc", ++ "memoffset", + "parking_lot", -+ "paste", ++ "pyo3-build-config", ++ "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] -+name = "pyo3-macros" -+version = "0.13.0" ++name = "pyo3-build-config" ++version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f8218769d13e354f841d559a19b0cf22cfd55959c7046ef594e5f34dbe46d16" ++checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" +dependencies = [ ++ "once_cell", ++ "target-lexicon", ++] ++ ++[[package]] ++name = "pyo3-ffi" ++version = "0.17.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" ++dependencies = [ ++ "libc", ++ "pyo3-build-config", ++] ++ ++[[package]] ++name = "pyo3-macros" ++version = "0.17.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" ++dependencies = [ ++ "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", @@ -846,9 +894,9 @@ index 0000000..84c37bc + +[[package]] +name = "pyo3-macros-backend" -+version = "0.13.0" ++version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc4da0bfdf76f0a5971c698f2cb6b3f832a6f80f16dedeeb3f123eb0431ecce2" ++checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" +dependencies = [ + "proc-macro2", + "quote", @@ -857,103 +905,138 @@ index 0000000..84c37bc + +[[package]] +name = "quote" -+version = "1.0.8" ++version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" ++checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] -+name = "redox_syscall" -+version = "0.1.57" ++name = "rand" ++version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++dependencies = [ ++ "getrandom 0.1.16", ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++dependencies = [ ++ "getrandom 0.1.16", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" ++dependencies = [ ++ "bitflags", ++] + +[[package]] +name = "redox_users" -+version = "0.3.5" ++version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" ++checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ -+ "getrandom", ++ "getrandom 0.2.8", + "redox_syscall", -+ "rust-argon2", ++ "thiserror", +] + +[[package]] +name = "regex" -+version = "1.4.2" ++version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" ++checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", -+ "thread_local", +] + +[[package]] +name = "regex-syntax" -+version = "0.6.21" ++version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" ++checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] -+name = "rpassword" -+version = "5.0.0" ++name = "remove_dir_all" ++version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d755237fc0f99d98641540e66abac8bc46a0652f19148ac9e21de2da06b326c9" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ -+ "libc", + "winapi", +] + +[[package]] -+name = "rust-argon2" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -+dependencies = [ -+ "base64", -+ "blake2b_simd", -+ "constant_time_eq", -+ "crossbeam-utils", -+] -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" -+ -+[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] ++name = "rustversion" ++version = "1.0.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" ++ ++[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] -+name = "sequoia-openpgp" -+version = "1.0.0" ++name = "scratch" ++version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "664de0a9388e38d0f350547056f18fcc03f78d85e5a49fa4fa8927ca6aea1424" ++checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" ++ ++[[package]] ++name = "sequoia-openpgp" ++version = "1.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50d9033c24b1d41fdfab2bbde66005d324625b4abee2af2aea6135bdd9543ff7" +dependencies = [ + "anyhow", -+ "backtrace", -+ "base64", ++ "base64 0.13.1", + "buffered-reader", + "bzip2", + "chrono", + "dyn-clone", -+ "eax", + "flate2", ++ "getrandom 0.2.8", + "idna", + "lalrpop", + "lalrpop-util", @@ -961,21 +1044,34 @@ index 0000000..84c37bc + "libc", + "memsec", + "nettle", ++ "rand", + "regex", ++ "regex-syntax", + "sha1collisiondetection", + "thiserror", -+ "unicode-normalization", ++ "xxhash-rust", +] + +[[package]] +name = "sha1collisiondetection" -+version = "0.2.3" ++version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7a6cf187c4059b3e63de2358b7e2f9a2261b6f3fd8ef4e7342308d0863ed082" ++checksum = "c66558a774ef5044cb4a834db5f5c7f95e139d2341d7f502fe6034afa7082461" +dependencies = [ -+ "digest", -+ "generic-array", -+ "libc", ++ "digest 0.9.0", ++ "generic-array 0.14.6", ++] ++ ++[[package]] ++name = "sha2" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" ++dependencies = [ ++ "block-buffer", ++ "digest 0.8.1", ++ "fake-simd", ++ "opaque-debug", +] + +[[package]] @@ -986,81 +1082,115 @@ index 0000000..84c37bc + +[[package]] +name = "siphasher" -+version = "0.3.3" ++version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7" ++checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "smallvec" -+version = "1.6.0" ++version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1a55ca5f3b68e41c979bf8c46a6f1da892ca4db8f94023ce0bd32407573b1ac0" ++checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" ++ ++[[package]] ++name = "sshkeys" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c926cb006a77964474a13a86aa0135ea82c9fd43e6793a1151cc54143db6637c" ++dependencies = [ ++ "base64 0.12.3", ++ "byteorder", ++ "sha2", ++] + +[[package]] +name = "string_cache" -+version = "0.8.1" ++version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a" ++checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" +dependencies = [ -+ "lazy_static", + "new_debug_unreachable", ++ "once_cell", ++ "parking_lot", + "phf_shared", + "precomputed-hash", +] + +[[package]] -+name = "subtle" -+version = "2.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" -+ -+[[package]] +name = "syn" -+version = "1.0.57" ++version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6" ++checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +dependencies = [ + "proc-macro2", + "quote", -+ "unicode-xid", ++ "unicode-ident", +] + +[[package]] +name = "talktosc" -+version = "0.1.1" ++version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eda5fee425f91e5a4083946f4468948f59cc16412cdcd659554e474c647a5645" ++checksum = "d165e1d4852d6a986a400f085b39c2786f9647aa7af53aabe168caa11629c28f" +dependencies = [ + "pcsc", -+ "rpassword", + "thiserror", +] + +[[package]] -+name = "term" -+version = "0.5.2" ++name = "target-lexicon" ++version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" ++checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" ++ ++[[package]] ++name = "tempfile" ++version = "3.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ -+ "byteorder", -+ "dirs", ++ "cfg-if", ++ "fastrand", ++ "libc", ++ "redox_syscall", ++ "remove_dir_all", + "winapi", +] + +[[package]] -+name = "thiserror" -+version = "1.0.23" ++name = "term" ++version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" ++checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" ++dependencies = [ ++ "dirs-next", ++ "rustversion", ++ "winapi", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.23" ++version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" ++checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", @@ -1068,15 +1198,6 @@ index 0000000..84c37bc +] + +[[package]] -+name = "thread_local" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -+dependencies = [ -+ "lazy_static", -+] -+ -+[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1098,9 +1219,9 @@ index 0000000..84c37bc + +[[package]] +name = "tinyvec" -+version = "1.1.0" ++version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" ++checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] @@ -1113,51 +1234,60 @@ index 0000000..84c37bc + +[[package]] +name = "typenum" -+version = "1.12.0" ++version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" ++checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "unicode-bidi" -+version = "0.3.4" ++version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+dependencies = [ -+ "matches", -+] ++checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-normalization" -+version = "0.1.16" ++version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" ++checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] -+name = "unicode-xid" -+version = "0.2.1" ++name = "unicode-width" ++version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unindent" -+version = "0.1.7" ++version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" ++checksum = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112" ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" -+version = "0.1.5" ++version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -+ -+[[package]] -+name = "version_check" -+version = "0.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" ++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" @@ -1172,6 +1302,66 @@ index 0000000..84c37bc +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] ++name = "wasi" ++version = "0.11.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" ++dependencies = [ ++ "cfg-if", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" ++dependencies = [ ++ "bumpalo", ++ "log", ++ "once_cell", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" ++ ++[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1188,7 +1378,79 @@ index 0000000..84c37bc +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] ++name = "winapi-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "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.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.42.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.42.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.42.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.42.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" ++ ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.42.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.42.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" ++ ++[[package]] ++name = "xxhash-rust" ++version = "0.8.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "735a71d46c4d68d71d4b24d03fdc2b98e38cea81730595801db779c04fe80d70" diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index 6fcdd5aeb354..7432cf20622e 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -7,8 +7,7 @@ , pkg-config , pcsclite , nettle -, requests -, vcrpy +, httpx , numpy , pytestCheckHook , pythonOlder @@ -18,31 +17,31 @@ buildPythonPackage rec { pname = "johnnycanencrypt"; - version = "0.6.0"; + version = "0.11.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kushaldas"; repo = "johnnycanencrypt"; rev = "v${version}"; - sha256 = "0b1yfddf38dicmjgnw9mk5g0iisa5yq6l9cj6kfskhyrznasvz3g"; + hash = "sha256-YhuYejxuKZEv1xQ1fQcXSkt9I80iJOJ6MecG622JJJo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit patches src; name = "${pname}-${version}"; - hash = "sha256-1dRFC59GY7M99LvQWy2eXPesmLX5k46rN8l4suLYkQY="; + hash = "sha256-r2NU1e3yeZDLOBy9pndGYM3JoH6BBKQkXMLsJR6PTRs="; }; format = "pyproject"; + # https://github.com/kushaldas/johnnycanencrypt/issues/125 patches = [ ./Cargo.lock.patch ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; propagatedBuildInputs = [ - requests - vcrpy + httpx ]; nativeBuildInputs = [ @@ -54,8 +53,9 @@ buildPythonPackage rec { ]); buildInputs = [ - pcsclite nettle + ] ++ lib.optionals stdenv.isLinux [ + pcsclite ] ++ lib.optionals stdenv.isDarwin [ PCSC libiconv @@ -70,14 +70,6 @@ buildPythonPackage rec { numpy ]; - # Remove with the next release after 0.5.0. This change is required - # for compatibility with maturin 0.9.0. - postPatch = '' - sed '/project-url = /d' -i Cargo.toml - substituteInPlace pyproject.toml \ - --replace 'manylinux = "off"' 'skip-auditwheel = true' - ''; - preCheck = '' export TESTDIR=$(mktemp -d) cp -r tests/ $TESTDIR @@ -91,7 +83,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "johnnycanencrypt" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; homepage = "https://github.com/kushaldas/johnnycanencrypt"; description = "Python module for OpenPGP written in Rust"; license = licenses.gpl3Plus; From ae959406820bafddf96cd2445f98137043c5a67e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Nov 2022 21:48:33 -0800 Subject: [PATCH 659/797] tumpa: remove from pythonPackages --- .../misc}/tumpa/default.nix | 11 +++-------- pkgs/top-level/all-packages.nix | 4 ++++ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ---- 4 files changed, 8 insertions(+), 12 deletions(-) rename pkgs/{development/python-modules => applications/misc}/tumpa/default.nix (81%) diff --git a/pkgs/development/python-modules/tumpa/default.nix b/pkgs/applications/misc/tumpa/default.nix similarity index 81% rename from pkgs/development/python-modules/tumpa/default.nix rename to pkgs/applications/misc/tumpa/default.nix index 6309e8937a36..4ea7a0f52299 100644 --- a/pkgs/development/python-modules/tumpa/default.nix +++ b/pkgs/applications/misc/tumpa/default.nix @@ -1,17 +1,12 @@ { lib -, buildPythonPackage +, python3 , fetchFromGitHub -, setuptools -, pyside2 -, johnnycanencrypt -, pythonOlder , wrapQtAppsHook }: -buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "tumpa"; version = "0.1.2"; - disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kushaldas"; @@ -20,7 +15,7 @@ buildPythonPackage rec { sha256 = "17nhdildapgic5l05f3q1wf5jvz3qqdjv543c8gij1x9rdm8hgxi"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ setuptools johnnycanencrypt pyside2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24bbf58576b0..9513ca745ca5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32529,6 +32529,10 @@ with pkgs; tudu = callPackage ../applications/office/tudu { }; + tumpa = callPackage ../applications/misc/tumpa { + inherit (pkgs.libsForQt5) wrapQtAppsHook; + }; + tuna = python3Packages.callPackage ../os-specific/linux/tuna { }; tunefish = callPackage ../applications/audio/tunefish { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index fd1f7cb50bf9..1fdbd7b14c35 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -206,6 +206,7 @@ mapAliases ({ tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 tensorflow-tensorboard = tensorboard; # added 2022-03-06 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 + tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e53cc1f64213..60e2975a34f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11332,10 +11332,6 @@ self: super: with self; { tubeup = callPackage ../development/python-modules/tubeup { }; - tumpa = callPackage ../development/python-modules/tumpa { - inherit (pkgs.libsForQt5) wrapQtAppsHook; - }; - turnt = callPackage ../development/python-modules/turnt { }; tuya-iot-py-sdk = callPackage ../development/python-modules/tuya-iot-py-sdk { }; From 98cadbcf7004fb103e7e8701c4f496f3b3d6564e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 20 Nov 2022 18:25:03 +0100 Subject: [PATCH 660/797] nixos/grafana: review fixes --- nixos/modules/services/monitoring/grafana.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 2d25ce93c4fc..9b3068796d8e 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -69,7 +69,7 @@ let _filter = x: filterAttrs (k: v: k != "_module") x; # FIXME(@Ma27) remove before 23.05. This is just a helper-type - # because `mkRenamedOptionMthere's there's odule` doesn't work if `foo.bar` is renamed + # because `mkRenamedOptionModule` doesn't work if `foo.bar` is renamed # to `foo.bar.baz`. submodule' = module: types.coercedTo (mkOptionType { @@ -351,7 +351,7 @@ in { Don't change the value of this option if you are planning to use `services.grafana.provision` options. ''; default = provisionConfDir; - defaultText = "directory with all provisioning files linked together"; + defaultText = "directory with links to files generated from services.grafana.provision"; type = types.path; }; }; From bdc11efaf2f6321350bcc20620f3036f9423c039 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 20 Nov 2022 13:38:53 -0500 Subject: [PATCH 661/797] ruff: 0.0.129 -> 0.0.131 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 5f0d48d42033..a5a10ee33ca6 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.129"; + version = "0.0.131"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NjGNl92kQqEeKR1eR/ELwPVNdu/bxmEre80vINSsYTY="; + sha256 = "sha256-botqrFWfW0+hu0oi6UhDcz8jO5TCKWwgN+u6oaWB7pE="; }; - cargoSha256 = "sha256-Bg8sazATWnZXeWAf3lrFtraWkuAgugaMkmdzA8cPkW8="; + cargoSha256 = "sha256-5fDhwcdLOGDqtWcCR9C1BOonb1CIxfwlcMFZ3spvfGU="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 4a73fad5155245e66323d422a373e3377da747aa Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 20 Nov 2022 20:03:38 +0100 Subject: [PATCH 662/797] nixos/doc: also note that external YAML files for grafana will end up in the store --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 3 +++ 2 files changed, 10 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 6044b70a200d..65b3129da7c1 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1308,6 +1308,13 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ 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! + diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 2593b36912c0..b4b52c0e873b 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -426,6 +426,9 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). 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](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#file-provider) for secrets! + - [](#opt-services.grafana.provision.notifiers) is not affected by this change because this feature is deprecated by Grafana and will probably removed in Grafana 10. It's recommended to use `services.grafana.provision.alerting.contactPoints` instead. From 797e763ef19b0b0d94c727791784beaab4a805a3 Mon Sep 17 00:00:00 2001 From: Kris La Date: Sun, 20 Nov 2022 16:40:30 +0100 Subject: [PATCH 663/797] remove sleepyhead --- pkgs/applications/misc/sleepyhead/default.nix | 45 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 -- 3 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 pkgs/applications/misc/sleepyhead/default.nix diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix deleted file mode 100644 index 63a45758d932..000000000000 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, mkDerivation, fetchgit, zlib, libGLU, libX11, qtbase, qtwebkit, qtserialport, wrapQtAppsHook }: - -mkDerivation { - pname = "sleepyhead"; - version = "1.0.0-beta-git"; - - src = fetchgit { - url = "https://gitlab.com/sleepyhead/sleepyhead-code.git"; - rev = "9e2329d8bca45693231b5e3dae80063717c24578"; - sha256 = "0448z8gyaxpgpnksg34lzmffj36jdpm0ir4xxa5gvzagkx0wk07h"; - }; - - buildInputs = [ - qtbase qtwebkit qtserialport - zlib - libGLU - libX11 - ]; - - nativeBuildInputs = [ wrapQtAppsHook ]; - - patchPhase = '' - patchShebangs configure - ''; - - installPhase = if stdenv.isDarwin then '' - mkdir -p $out/Applications - cp -r sleepyhead/SleepyHead.app $out/Applications - '' else '' - mkdir -p $out/bin - cp sleepyhead/SleepyHead $out/bin - ''; - - meta = with lib; { - homepage = "https://sleepyhead.jedimark.net/"; - description = "Review and explore data produced by CPAP and related machines"; - longDescription = '' - SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data, which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea. - ''; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = [ maintainers.krav ]; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a1a21ac97e2a..239794471469 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1355,6 +1355,7 @@ mapAliases ({ skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired"; # Added 2021-07-14 skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired"; # Added 2020-10-31 slack-dark = slack; # Added 2020-03-27 + sleepyhead = throw "'sleepyhead' has been renamed to/replaced by 'OSCAR'"; # Added 2022-11-20 slic3r-prusa3d = throw "'slic3r-prusa3d' has been renamed to/replaced by 'prusa-slicer'"; # Converted to throw 2022-02-22 slurm-full = throw "'slurm-full' has been renamed to/replaced by 'slurm'"; # Converted to throw 2022-02-22 slurm-llnl = slurm; # renamed July 2017 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3af1f7983fe6..db5056e8a66e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11456,9 +11456,6 @@ with pkgs; sleuthkit = callPackage ../tools/system/sleuthkit {}; - # Not updated upstream since 2018, doesn't support qt newer than 5.12 - sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {}; - slides = callPackage ../applications/misc/slides { }; slirp4netns = callPackage ../tools/networking/slirp4netns { }; From 973bd58a62b50fd4af8ba52bec12630cb90ac819 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 20:35:13 +0100 Subject: [PATCH 664/797] python310Packages.teslajsonpy: add changelog to meta --- pkgs/development/python-modules/teslajsonpy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index b1afb348c346..10657cec000f 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to work with Tesla API"; homepage = "https://github.com/zabuldon/teslajsonpy"; + changelog = "https://github.com/zabuldon/teslajsonpy/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 46f309cf2741bcc6297e8ea82b6b2f79597c56f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 20:36:25 +0100 Subject: [PATCH 665/797] python310Packages.teslajsonpy: 3.1.0 -> 3.2.0 https://github.com/zabuldon/teslajsonpy/releases/tag/v3.2.0 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 10657cec000f..5461306622ad 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-y0HaHpdJdEUTVo/1xoCJdOtAohE4eaBGHdjMfbyGE2w="; + hash = "sha256-6xYMaKYKQkxbdm/vPOvKUxU8vnB+/cSiA6U7g9YPosQ="; }; nativeBuildInputs = [ From ee147f3665004ea17762bc2a4372bfa75e4c9858 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 20:41:36 +0100 Subject: [PATCH 666/797] unifi-poller: add changelog to meta --- pkgs/servers/monitoring/unifi-poller/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/unifi-poller/default.nix b/pkgs/servers/monitoring/unifi-poller/default.nix index cd4ee333f5a6..c0aa3dd7f7db 100644 --- a/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/pkgs/servers/monitoring/unifi-poller/default.nix @@ -1,4 +1,7 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "unifi-poller"; @@ -8,10 +11,10 @@ buildGoModule rec { owner = "unifi-poller"; repo = "unifi-poller"; rev = "v${version}"; - sha256 = "sha256-eC+jEtSLWhiL3V+GKfRN5MVF18/2tnA1kI096j3XQB0="; + hash = "sha256-eC+jEtSLWhiL3V+GKfRN5MVF18/2tnA1kI096j3XQB0="; }; - vendorSha256 = "sha256-WVYQ3cZOO+EyJRTFcMjziDHwqqinm1IvxvSLuHTaqT8="; + vendorHash = "sha256-WVYQ3cZOO+EyJRTFcMjziDHwqqinm1IvxvSLuHTaqT8="; ldflags = [ "-w" "-s" @@ -24,6 +27,7 @@ buildGoModule rec { meta = with lib; { description = "Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus"; homepage = "https://github.com/unifi-poller/unifi-poller"; + changelog = "https://github.com/unpoller/unpoller/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From ffa2351fb4d4e7c810bae894cc135a826856df01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 20:43:52 +0100 Subject: [PATCH 667/797] ruff: add changelog to meta --- pkgs/development/tools/ruff/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index a5a10ee33ca6..7bbb333e48b8 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -27,6 +27,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An extremely fast Python linter"; homepage = "https://github.com/charliermarsh/ruff"; + changelog = "https://github.com/charliermarsh/ruff/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; From 0cd2e8f533fb719b6779545c90aebb4a63c0cd5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 20 Nov 2022 14:18:25 -0600 Subject: [PATCH 668/797] =?UTF-8?q?qt6:=206.4.0=20=E2=86=92=206.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Release Notes: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.1/release-note.md --- pkgs/development/libraries/qt-6/fetch.sh | 2 +- pkgs/development/libraries/qt-6/srcs.nix | 280 +++++++++++------------ 2 files changed, 141 insertions(+), 141 deletions(-) diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index c0cf16c9806b..139eeeb5aa62 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.4/6.4.1/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index 30fed682cc4f..a9d5239dd0b8 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -4,283 +4,283 @@ { qt3d = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qt3d-everywhere-src-6.4.0.tar.xz"; - sha256 = "1sxxxa6gaiy573j7x2k06dr4jsxbr9r1brcjfkn0zjgl46sbbgba"; - name = "qt3d-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qt3d-everywhere-src-6.4.1.tar.xz"; + sha256 = "1654hx04k6vdifjp5kr4sj6jm8qy8m8vna7yalmb3l55pr1k5dg4"; + name = "qt3d-everywhere-src-6.4.1.tar.xz"; }; }; qt5compat = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qt5compat-everywhere-src-6.4.0.tar.xz"; - sha256 = "1h54jiqkiipbb3i3sjznrinc67y76ld237qr17ald0pp6w45sivk"; - name = "qt5compat-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qt5compat-everywhere-src-6.4.1.tar.xz"; + sha256 = "0cfh5z0kw75k2p3sca9d5gdfxvh93719prh2njg1nd6n8pp379fl"; + name = "qt5compat-everywhere-src-6.4.1.tar.xz"; }; }; qtactiveqt = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtactiveqt-everywhere-src-6.4.0.tar.xz"; - sha256 = "1pdam1ggxanrxr0pz8rap2ya59zyd4j56b9kfqbxm5kpkps345ar"; - name = "qtactiveqt-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtactiveqt-everywhere-src-6.4.1.tar.xz"; + sha256 = "118ivyzh6xk92ak2qf0294n1fzziy2mxp2xgkblh801d3nbg7kql"; + name = "qtactiveqt-everywhere-src-6.4.1.tar.xz"; }; }; qtbase = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtbase-everywhere-src-6.4.0.tar.xz"; - sha256 = "0zdkv7m98axjfpdmbv8v2xqndvhnanh75c7vgygw8rw5pnh7ar6b"; - name = "qtbase-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtbase-everywhere-src-6.4.1.tar.xz"; + sha256 = "1bjgy9x75y82702xkv3bhxh3q9i37ny4fv3njb5zgj7rq0fdfajk"; + name = "qtbase-everywhere-src-6.4.1.tar.xz"; }; }; qtcharts = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtcharts-everywhere-src-6.4.0.tar.xz"; - sha256 = "1ls077dhvkb4v7g2wwnb6v0rgg5fh4i2fx11fvzdlnsi4k7cmhr8"; - name = "qtcharts-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtcharts-everywhere-src-6.4.1.tar.xz"; + sha256 = "0rwglk5g0k1x0vjb8j5r4fqaa7m31aykh42f18svkjpz3kbbrs6y"; + name = "qtcharts-everywhere-src-6.4.1.tar.xz"; }; }; qtconnectivity = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtconnectivity-everywhere-src-6.4.0.tar.xz"; - sha256 = "0kn52xibbp7a0021x6jznp9jxlf57fk85zba0z3lqqzanmyigp2s"; - name = "qtconnectivity-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtconnectivity-everywhere-src-6.4.1.tar.xz"; + sha256 = "1qxvixv95wkb7h6ch1q39pxs7cidph6kyddz91qgxr2gznz5s3wv"; + name = "qtconnectivity-everywhere-src-6.4.1.tar.xz"; }; }; qtdatavis3d = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtdatavis3d-everywhere-src-6.4.0.tar.xz"; - sha256 = "038591l0s9mkzxxxxm3knvyrk1vdimbp0gi5m26n79bx8lw01d0d"; - name = "qtdatavis3d-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtdatavis3d-everywhere-src-6.4.1.tar.xz"; + sha256 = "00ddsv4inbsqbgc7lc163j8fqx9r156xzsrilh9papidfm7yvrm9"; + name = "qtdatavis3d-everywhere-src-6.4.1.tar.xz"; }; }; qtdeclarative = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtdeclarative-everywhere-src-6.4.0.tar.xz"; - sha256 = "10s35iivmafprw2spca6fw3gamf10lyp54376af9437srhpyfd1l"; - name = "qtdeclarative-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtdeclarative-everywhere-src-6.4.1.tar.xz"; + sha256 = "1zjdd2ndaywl7wgl9q94a1qwin5p45l2838lqhkdm3ckvdgli35g"; + name = "qtdeclarative-everywhere-src-6.4.1.tar.xz"; }; }; qtdoc = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtdoc-everywhere-src-6.4.0.tar.xz"; - sha256 = "11j2vp2k3liz7388702ccy7fjb5ickhxnsc0iyiyirdmll187zgf"; - name = "qtdoc-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtdoc-everywhere-src-6.4.1.tar.xz"; + sha256 = "198gl45c6m1gxn13aic65xgy94in1b1hy255jq6pi44m36brspbn"; + name = "qtdoc-everywhere-src-6.4.1.tar.xz"; }; }; qthttpserver = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qthttpserver-everywhere-src-6.4.0.tar.xz"; - sha256 = "10rlmpcj36qfr4465prpb515imrcfa6b2kiz16qyr8m4c86wb51i"; - name = "qthttpserver-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qthttpserver-everywhere-src-6.4.1.tar.xz"; + sha256 = "1xib6q8ji64kq2r5y6qqig0090irjwi25vzpy8528wv5a3i0yxah"; + name = "qthttpserver-everywhere-src-6.4.1.tar.xz"; }; }; qtimageformats = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtimageformats-everywhere-src-6.4.0.tar.xz"; - sha256 = "0g2zjipayhzh0lwn6xgxw5mx6f5dpak75xszm2cg1h83bnvsf68l"; - name = "qtimageformats-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtimageformats-everywhere-src-6.4.1.tar.xz"; + sha256 = "1rjd8mi8z864gqaa849kc4xppbjjr2yddcgahx16z3psn8zfg1ay"; + name = "qtimageformats-everywhere-src-6.4.1.tar.xz"; }; }; qtlanguageserver = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtlanguageserver-everywhere-src-6.4.0.tar.xz"; - sha256 = "09bhg3cm27d8imih1s7rk00zqwf863183znbzhhr3nkl6mqscy0q"; - name = "qtlanguageserver-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtlanguageserver-everywhere-src-6.4.1.tar.xz"; + sha256 = "1j2xd4r9ngdi5nq35bycxx9jc7bngjlrxa0cs8cjgl7zkj3wsmg3"; + name = "qtlanguageserver-everywhere-src-6.4.1.tar.xz"; }; }; qtlottie = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtlottie-everywhere-src-6.4.0.tar.xz"; - sha256 = "1d66fr2my8wcbalikppiykqwisflxahcl86zgqqy2s2wkv5bzz0w"; - name = "qtlottie-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtlottie-everywhere-src-6.4.1.tar.xz"; + sha256 = "0b59xd5nx4c2mhdl79fzbyz25n8bkdbh8h43l8lp3an15y08bdya"; + name = "qtlottie-everywhere-src-6.4.1.tar.xz"; }; }; qtmultimedia = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtmultimedia-everywhere-src-6.4.0.tar.xz"; - sha256 = "0vvrgqcvvr6ch5vnmq3j3lx1xci21b8vc1fv24d9aamfgj28wbp8"; - name = "qtmultimedia-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtmultimedia-everywhere-src-6.4.1.tar.xz"; + sha256 = "1bxs1n22yplds2f60h2j25aw9ibhhgprg9np3ybr0q3f08xd91n0"; + name = "qtmultimedia-everywhere-src-6.4.1.tar.xz"; }; }; qtnetworkauth = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtnetworkauth-everywhere-src-6.4.0.tar.xz"; - sha256 = "1cqp1z73d1kgnz5l5vvgxa58mfx61kdsr9xg1wgwrwbpzpw7g6v0"; - name = "qtnetworkauth-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtnetworkauth-everywhere-src-6.4.1.tar.xz"; + sha256 = "08kmkpjm34bkbiz54zm4p9mjr9fjzx2kjf0fkhay0lz3iljp0sl3"; + name = "qtnetworkauth-everywhere-src-6.4.1.tar.xz"; }; }; qtpositioning = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtpositioning-everywhere-src-6.4.0.tar.xz"; - sha256 = "0d58zgjzdmi2fv8wbn0iz941mlpsxclcldzadwwhh0dbdmgmq6rd"; - name = "qtpositioning-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtpositioning-everywhere-src-6.4.1.tar.xz"; + sha256 = "12yip3awqwcx3fqr8jl64bvp3scvi9pbzyjzk0pm2f6r3kl14qbh"; + name = "qtpositioning-everywhere-src-6.4.1.tar.xz"; }; }; qtquick3d = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtquick3d-everywhere-src-6.4.0.tar.xz"; - sha256 = "1v0py2njivqbj0562pmwpfkqz1ylwkffsn7j943ky46lsih1c2pi"; - name = "qtquick3d-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtquick3d-everywhere-src-6.4.1.tar.xz"; + sha256 = "11881pfia0nwjxsgy2789s01qcvi9x4rhfcckxfzl4819pxw1nx6"; + name = "qtquick3d-everywhere-src-6.4.1.tar.xz"; }; }; qtquick3dphysics = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtquick3dphysics-everywhere-src-6.4.0.tar.xz"; - sha256 = "01zx50f5gmvwg2mb853hsr2hgrciyg62h365ryq5y9fi6hs48nfw"; - name = "qtquick3dphysics-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtquick3dphysics-everywhere-src-6.4.1.tar.xz"; + sha256 = "1fxd3d8x0sgwqsvwv61m0kg4pd9gz99gqkgqd3schdhlcwgaim0x"; + name = "qtquick3dphysics-everywhere-src-6.4.1.tar.xz"; }; }; qtquicktimeline = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtquicktimeline-everywhere-src-6.4.0.tar.xz"; - sha256 = "0msg0l75m0slwar9p3vpx99cyf3j3mfbajfra26jmi0haf5s5s3h"; - name = "qtquicktimeline-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtquicktimeline-everywhere-src-6.4.1.tar.xz"; + sha256 = "0p6yb3qg9i7774kvwcj8i56ab9vkifi5d92y2w8v9s25g31pspzk"; + name = "qtquicktimeline-everywhere-src-6.4.1.tar.xz"; }; }; qtremoteobjects = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtremoteobjects-everywhere-src-6.4.0.tar.xz"; - sha256 = "1kp1as4ih021dz37z53nv7s2byb4w04cxpj4qkxqdvvgxvmps6pm"; - name = "qtremoteobjects-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtremoteobjects-everywhere-src-6.4.1.tar.xz"; + sha256 = "1jvsvfj8bdqxfc0vhihgmvglck0zk5nl487kbbjyhkgia1v37m98"; + name = "qtremoteobjects-everywhere-src-6.4.1.tar.xz"; }; }; qtscxml = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtscxml-everywhere-src-6.4.0.tar.xz"; - sha256 = "0r3nv4bbdab8hsvzz0d03qq977smlfmp7k4wm6n2jj2rwsjp61yl"; - name = "qtscxml-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtscxml-everywhere-src-6.4.1.tar.xz"; + sha256 = "13mvih36shrjhpp1z3kqlyzgyh35gkx3a12rzh0yff4gmp5y9w6j"; + name = "qtscxml-everywhere-src-6.4.1.tar.xz"; }; }; qtsensors = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtsensors-everywhere-src-6.4.0.tar.xz"; - sha256 = "1njhrbhknbil8dllknc8p3q16k65rmqdx1gkhlcn6qlzbcphg37k"; - name = "qtsensors-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtsensors-everywhere-src-6.4.1.tar.xz"; + sha256 = "1qpr6g424dpy2xccfyrkf5v2rszczq5p73lzk79s8g95fl33yzk6"; + name = "qtsensors-everywhere-src-6.4.1.tar.xz"; }; }; qtserialbus = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtserialbus-everywhere-src-6.4.0.tar.xz"; - sha256 = "14ga962x9h5rkgybf63b4b4fn8i96c0z9q60ns2ml20jgikmbjpg"; - name = "qtserialbus-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtserialbus-everywhere-src-6.4.1.tar.xz"; + sha256 = "12y4pd87k1y044rfppnmv0zdfmqx42ng0hixhzblr8fbvvwh494g"; + name = "qtserialbus-everywhere-src-6.4.1.tar.xz"; }; }; qtserialport = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtserialport-everywhere-src-6.4.0.tar.xz"; - sha256 = "10s4997n3b0vp51slrjcdkkfqf8kabcn8ypz5gl2h8nfhygcqj7i"; - name = "qtserialport-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtserialport-everywhere-src-6.4.1.tar.xz"; + sha256 = "1yl25cv0ajfjswg8jgkf4jwwsasr5g7sgsc3fb3zsaz6cd8cw2hx"; + name = "qtserialport-everywhere-src-6.4.1.tar.xz"; }; }; qtshadertools = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtshadertools-everywhere-src-6.4.0.tar.xz"; - sha256 = "141vmracfa9r71l0mqilgllfb3c1ygpc913yx8pwsy411vqabmnv"; - name = "qtshadertools-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtshadertools-everywhere-src-6.4.1.tar.xz"; + sha256 = "012525kfnnkprgzgncqkzmif3z9k1qa6hfpscbsqg3084s1p9hbb"; + name = "qtshadertools-everywhere-src-6.4.1.tar.xz"; }; }; qtspeech = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtspeech-everywhere-src-6.4.0.tar.xz"; - sha256 = "1xrx323vyvrgrphxvf3nxy8s7ps26pgxaj71rlgipl58jqhc4fw7"; - name = "qtspeech-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtspeech-everywhere-src-6.4.1.tar.xz"; + sha256 = "0jbv6r953r884wfnxrrcvf44xpvc7d8kzjd3lqv4y234748hsrih"; + name = "qtspeech-everywhere-src-6.4.1.tar.xz"; }; }; qtsvg = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtsvg-everywhere-src-6.4.0.tar.xz"; - sha256 = "09av5ky5zlsz4smf3xwvk07ylkz1wz3g5hbx73xdqx6h6yaaxz83"; - name = "qtsvg-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtsvg-everywhere-src-6.4.1.tar.xz"; + sha256 = "1rcwrsdq9412qq9ilfs54yjz7ih8a6r8mbwx7y4dnrqmjk2lalsy"; + name = "qtsvg-everywhere-src-6.4.1.tar.xz"; }; }; qttools = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qttools-everywhere-src-6.4.0.tar.xz"; - sha256 = "18pv3b0y9ycbn5v98rjir8wsvsy40vy8xc5pyylfg2s5ikwdbwwp"; - name = "qttools-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qttools-everywhere-src-6.4.1.tar.xz"; + sha256 = "0cq99c79p90yv3vlb3xbzamgx7qn4s9fb2gdnjyizhh4dcn5c84y"; + name = "qttools-everywhere-src-6.4.1.tar.xz"; }; }; qttranslations = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qttranslations-everywhere-src-6.4.0.tar.xz"; - sha256 = "0pwjfsi4b4fr2hw9mx76fiix0mz0wss3ic4pmd9yngk91f9kmfbs"; - name = "qttranslations-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qttranslations-everywhere-src-6.4.1.tar.xz"; + sha256 = "04kal5b3bplylf33kjc8f7kc4x801qj5qrpsjs609ljnsbqwdns4"; + name = "qttranslations-everywhere-src-6.4.1.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtvirtualkeyboard-everywhere-src-6.4.0.tar.xz"; - sha256 = "087xlc7ljkbmm85n42qx0cz8rvyhfkw1dzypxp5h3c5glamhkar5"; - name = "qtvirtualkeyboard-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtvirtualkeyboard-everywhere-src-6.4.1.tar.xz"; + sha256 = "089v5nxfvrglp9ilaayxls8mhdbrq80z38m2agmw147m8d8dspy2"; + name = "qtvirtualkeyboard-everywhere-src-6.4.1.tar.xz"; }; }; qtwayland = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwayland-everywhere-src-6.4.0.tar.xz"; - sha256 = "1z32bdgcril9ijqsn4d60znm610mm72rgn1a6dblvhxy9zhsi2zh"; - name = "qtwayland-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwayland-everywhere-src-6.4.1.tar.xz"; + sha256 = "1mgjd6qbz0m2kq9bcdn6mnypfjycwdfyna6z7dhj1m61s52id5lw"; + name = "qtwayland-everywhere-src-6.4.1.tar.xz"; }; }; qtwebchannel = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebchannel-everywhere-src-6.4.0.tar.xz"; - sha256 = "0nk92cbdph5ri91pnh54i3bdpx1pn9pbgyysmpg59265gj1nv3sj"; - name = "qtwebchannel-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebchannel-everywhere-src-6.4.1.tar.xz"; + sha256 = "1abw58yccjhgwjrry56mih0vnxlg69dc10vfyi8grqy543qikgid"; + name = "qtwebchannel-everywhere-src-6.4.1.tar.xz"; }; }; qtwebengine = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebengine-everywhere-src-6.4.0.tar.xz"; - sha256 = "00skwxlin6za8wsh6ddhy7nmpabzjzj1lxf2w81fj04vb7nfjak6"; - name = "qtwebengine-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebengine-everywhere-src-6.4.1.tar.xz"; + sha256 = "10m763yq39jn6k02bqax6mhgbc0bpnmfmxj4wkw5b67ks48w0n9c"; + name = "qtwebengine-everywhere-src-6.4.1.tar.xz"; }; }; qtwebsockets = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebsockets-everywhere-src-6.4.0.tar.xz"; - sha256 = "1jlvxidjaj44hky1cwm0y8gj6zynrnd70hf44dhjcdv5rllncg7z"; - name = "qtwebsockets-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebsockets-everywhere-src-6.4.1.tar.xz"; + sha256 = "093ssssws3w1cjacjzp9j80n7b9y7i87yp8ibshshgj0avm8jxsk"; + name = "qtwebsockets-everywhere-src-6.4.1.tar.xz"; }; }; qtwebview = { - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebview-everywhere-src-6.4.0.tar.xz"; - sha256 = "19z5d1gs6jm2776si9i3dxn4j70y3s8yh3m299gvb2b8fby8xfwl"; - name = "qtwebview-everywhere-src-6.4.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebview-everywhere-src-6.4.1.tar.xz"; + sha256 = "15rqka6pyvi33cmizdjfhc2k5ldd1pykmc4nfx826drar6y32a27"; + name = "qtwebview-everywhere-src-6.4.1.tar.xz"; }; }; } From b0db91b8e86a9b3e332f86df1f1f20a26476a930 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 21:31:39 +0100 Subject: [PATCH 669/797] python310Packages.pyotgw: add changelog to meta --- pkgs/development/python-modules/pyotgw/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyotgw/default.nix b/pkgs/development/python-modules/pyotgw/default.nix index c0f24aa3dc6d..3629b84d2676 100644 --- a/pkgs/development/python-modules/pyotgw/default.nix +++ b/pkgs/development/python-modules/pyotgw/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mvn23"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-gMrLoITDBO7T9JtY4O43aMKF88zhwnJ/rlw8U3yvG8k="; }; @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interact the OpenTherm Gateway"; homepage = "https://github.com/mvn23/pyotgw"; + changelog = "https://github.com/mvn23/pyotgw/blob/${version}/CHANGELOG.md"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; From 2889b5d347207246e1c174c9170197af724dc4af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 21:32:01 +0100 Subject: [PATCH 670/797] python310Packages.pyotgw: 2.1.1 -> 2.1.2 https://github.com/mvn23/pyotgw/blob/2.1.2/CHANGELOG.md --- pkgs/development/python-modules/pyotgw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyotgw/default.nix b/pkgs/development/python-modules/pyotgw/default.nix index 3629b84d2676..7e6807854180 100644 --- a/pkgs/development/python-modules/pyotgw/default.nix +++ b/pkgs/development/python-modules/pyotgw/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyotgw"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mvn23"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gMrLoITDBO7T9JtY4O43aMKF88zhwnJ/rlw8U3yvG8k="; + hash = "sha256-qUwpW9C9VqsbDNa9zqa/BZtMuzmPU21Au/q0iGRkBNY="; }; propagatedBuildInputs = [ From 95f7d621b63e5ce408d39eaefce1dee403f45305 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 21:35:56 +0100 Subject: [PATCH 671/797] python310Packages.msldap: add changelog to meta --- pkgs/development/python-modules/msldap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index 445eea622d24..14677ab5ac00 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python LDAP library for auditing MS AD"; homepage = "https://github.com/skelsec/msldap"; + changelog = "https://github.com/skelsec/msldap/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From d4eb8afee2bc0a8f549fba282d5a33de55107e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 20 Nov 2022 14:40:21 -0600 Subject: [PATCH 672/797] qt6.qtwebengine: remove no longer needed patch --- .../libraries/qt-6/modules/qtwebengine.nix | 6 ---- .../qt-6/patches/qtwebengine-fix.patch | 28 ------------------- 2 files changed, 34 deletions(-) delete mode 100644 pkgs/development/libraries/qt-6/patches/qtwebengine-fix.patch diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index f7bdd2543b0e..f8f52763496a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -94,12 +94,6 @@ qtModule { # which cannot be set at the same time as -Wformat-security hardeningDisable = [ "format" ]; - patches = [ - # fixes consistent crashing in github on 6.4.0, can probably remove when there is a patch release - # https://codereview.qt-project.org/c/qt/qtwebengine/+/436316 - ../patches/qtwebengine-fix.patch - ]; - postPatch = '' # Patch Chromium build tools ( diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-fix.patch b/pkgs/development/libraries/qt-6/patches/qtwebengine-fix.patch deleted file mode 100644 index 672421ed43d4..000000000000 --- a/pkgs/development/libraries/qt-6/patches/qtwebengine-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 81bf140583f7b7bf13cc8dd522e1ca2aba873fc4 Mon Sep 17 00:00:00 2001 -From: Martin Negyokru -Date: Mon, 03 Oct 2022 12:20:00 +0200 -Subject: [PATCH] Do not intercept websocket connection when there is no associated frame - -This fix is based on chrome's implementation. - -Fixes: QTBUG-107144 -Change-Id: If042e4156b8a4bdb27a210c4db94e3a6198aed7d -Reviewed-by: Allan Sandfeld Jensen -(cherry picked from commit 64b7da9dab82713fdcb2e03d8a2715421eae5685) -Reviewed-by: Qt Cherry-pick Bot ---- - -diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp -index 020ae91..99a3aa3 100644 ---- a/src/core/content_browser_client_qt.cpp -+++ b/src/core/content_browser_client_qt.cpp -@@ -1237,8 +1237,7 @@ - - bool ContentBrowserClientQt::WillInterceptWebSocket(content::RenderFrameHost *frame) - { -- Q_UNUSED(frame); -- return true; // It is probably not worth it to only intercept when interceptors are installed -+ return frame != nullptr; - } - - QWebEngineUrlRequestInterceptor *getProfileInterceptorFromFrame(content::RenderFrameHost *frame) From 8ad2c9538bdaebd3c82ad4cc714ee26c2525a4d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 21:43:18 +0100 Subject: [PATCH 673/797] python310Packages.asyauth: 0.0.6 -> 0.0.7 https://github.com/skelsec/asyauth/releases/tag/0.0.7 --- pkgs/development/python-modules/asyauth/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index ca276bc37e8b..4ac397875ec9 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.6"; + version = "0.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XUUeZ8yqnZEMj3fCtq8YrZJH6Ci77f2OKXcCIHMbY8w="; + hash = "sha256-a4M2I+xIla+S3Hi5F+AZpZRicTp7EycGRWWldVyAV8E="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unified authentication library"; homepage = "https://github.com/skelsec/asyauth"; + changelog = "https://github.com/skelsec/asyauth/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 15c029caf1ebdbb354269306602e13aaf4065675 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 21:44:34 +0100 Subject: [PATCH 674/797] python310Packages.msldap: 0.4.6 -> 0.4.7 https://github.com/skelsec/msldap/releases/tag/0.4.7 --- pkgs/development/python-modules/msldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index 14677ab5ac00..4afd120430b8 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.4.6"; + version = "0.4.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iiAtylJIzcfNyh1d92wA1oOYk7UWdD/F0sWtlAMMv2g="; + hash = "sha256-WMMqNSRDBwPQ/1ACgtuSvA50j+xNyjnxl7rTbx3uQ1w="; }; propagatedBuildInputs = [ From 1eb3a69e3988d1a02c7aae43ce3f66eaa7325144 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 21 Nov 2022 06:51:10 +1000 Subject: [PATCH 675/797] nix-update: 0.8.0 -> 0.9.0 https://github.com/Mic92/nix-update/releases/tag/0.9.0 --- pkgs/tools/package-management/nix-update/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 036cc53efc99..71af0ab1d159 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -8,14 +8,14 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.8.0"; + version = "0.9.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-EwEGHiJxdubecuXMuBrk6pDld3mNl2ortwlIa0Cdgu0="; + sha256 = "sha256-wivScgtcdapf5bfXR1sjuBIPQEgi6QGH/f+Aucc3CEQ="; }; makeWrapperArgs = [ From 9d2ca56a02b2773bb9196302717147e5147ae5cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 20:54:06 +0000 Subject: [PATCH 676/797] python310Packages.mypy-boto3-builder: 7.11.10 -> 7.11.11 --- .../python-modules/mypy-boto3-builder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 659ca88d0f9a..00be47cf8207 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.11.10"; + version = "7.11.11"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "youtype"; repo = "mypy_boto3_builder"; - rev = version; - hash = "sha256-bS56xHrAoYKjwfbz5vh6O41EGDM821z4ZFZfpqc65cE="; + rev = "refs/tags/${version}"; + hash = "sha256-4iyh/oXuYsdtqEf1Dh4Z3y8AHWiS1TmimO5HUwsHrHA="; }; nativeBuildInputs = [ From 48400c178109a28702bffc11c3c418789ff81bbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 22:01:00 +0100 Subject: [PATCH 677/797] python310Packages.ocifs: 1.1.3 -> 1.1.4 --- pkgs/development/python-modules/ocifs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ocifs/default.nix b/pkgs/development/python-modules/ocifs/default.nix index bf5bbe175ade..2d4e4bfa8757 100644 --- a/pkgs/development/python-modules/ocifs/default.nix +++ b/pkgs/development/python-modules/ocifs/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ocifs"; - version = "1.1.3"; + version = "1.1.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "oracle"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wMKrK7ONc3M6beF9czrGddSeElCOTGh+JD9efb4Shbg="; + hash = "sha256-zZREWEFWQj4G2RyEMH0X3oPr5Yu5/96UX6nm9HDmJCY="; }; propagatedBuildInputs = [ From 711afefbd17b5cbe4cb64334d14221eae99facad Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 13 Nov 2022 15:12:27 +0100 Subject: [PATCH 678/797] =?UTF-8?q?ocamlPackages.flac:=200.3.0=20=E2=86=92?= =?UTF-8?q?=200.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/flac/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/flac/default.nix b/pkgs/development/ocaml-modules/flac/default.nix index e08841ac32fe..d79416b7053a 100644 --- a/pkgs/development/ocaml-modules/flac/default.nix +++ b/pkgs/development/ocaml-modules/flac/default.nix @@ -2,15 +2,13 @@ buildDunePackage rec { pname = "flac"; - version = "0.3.0"; - - useDune2 = true; + version = "0.3.1"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-flac"; rev = "v${version}"; - sha256 = "06gfbrp30sdxigzkix83y1b610ljzik6rrxmbl3ppmpx4dqlwnxa"; + sha256 = "sha256-oMmxZtphEX/OPfyTumjkWQJidAjSRqriygaTjVJTCG0="; }; nativeBuildInputs = [ pkg-config ]; From 6898184997c77e735ce8c96fd0f92282387e6c7f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Nov 2022 07:15:43 +1000 Subject: [PATCH 679/797] nixVersions.nix_2_11: add non-existing output patch --- pkgs/tools/package-management/nix/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 6295449c7f9b..53d744d34b3c 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -92,7 +92,15 @@ in lib.makeExtensible (self: { nix_2_11 = common { version = "2.11.0"; sha256 = "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ="; - patches = [ ./patches/flaky-tests.patch ]; + patches = [ + ./patches/flaky-tests.patch + (fetchpatch { + # https://github.com/NixOS/nix/pull/7283 + name = "fix-requires-non-existing-output.patch"; + url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch"; + sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0="; + }) + ]; }; stable = self.nix_2_11; From 5c45e5d3d9d839e43e1d947d11dee2555b3d88f6 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Nov 2022 07:15:49 +1000 Subject: [PATCH 680/797] nixVersions.nix_2_10: add non-existing output patch --- pkgs/tools/package-management/nix/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 53d744d34b3c..7ec91bef1d68 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -86,7 +86,15 @@ in lib.makeExtensible (self: { nix_2_10 = common { version = "2.10.3"; sha256 = "sha256-B9EyDUz/9tlcWwf24lwxCFmkxuPTVW7HFYvp0C4xGbc="; - patches = [ ./patches/flaky-tests.patch ]; + patches = [ + ./patches/flaky-tests.patch + (fetchpatch { + # https://github.com/NixOS/nix/pull/7283 + name = "fix-requires-non-existing-output.patch"; + url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch"; + sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0="; + }) + ]; }; nix_2_11 = common { From da14dfafd9a740a01464ab2f42d04d0bd7825459 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Nov 2022 07:15:58 +1000 Subject: [PATCH 681/797] nixVersions.nix_2_9: add non-existing output patch --- pkgs/tools/package-management/nix/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 7ec91bef1d68..c2d016a1bc33 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -81,6 +81,14 @@ in lib.makeExtensible (self: { nix_2_9 = common { version = "2.9.2"; sha256 = "sha256-uZCaBo9rdWRO/AlQMvVVjpAwzYijB2H5KKQqde6eHkg="; + patches = [ + (fetchpatch { + # https://github.com/NixOS/nix/pull/7283 + name = "fix-requires-non-existing-output.patch"; + url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch"; + sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0="; + }) + ]; }; nix_2_10 = common { From 419e261c1b1a9593cf2b8afcecd0f5c0e4b3e7e8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 20 Nov 2022 18:52:37 -0300 Subject: [PATCH 682/797] openshot-qt: update dependencies Because the old pyqt5-with-webkit depends on an old, buggy, full of CVEs WebKit implementation. --- .../video/openshot-qt/default.nix | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index c94dc643daad..5d8b68200ded 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -6,12 +6,12 @@ , doxygen , gtk3 , libopenshot -, python3Packages +, python3 , qtsvg , wrapGAppsHook }: -mkDerivationWith python3Packages.buildPythonApplication rec { +mkDerivationWith python3.pkgs.buildPythonApplication rec { pname = "openshot-qt"; version = "2.6.1"; @@ -19,7 +19,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "0pa8iwl217503bjlqg2zlrw5lxyq5hvxrf5apxrh3843hj1w1myv"; + hash = "sha256-29fAg4SDoAFzv6q43Dcs2HdaeKZfPEzlGqCcICiPSF0="; }; nativeBuildInputs = [ @@ -31,18 +31,15 @@ mkDerivationWith python3Packages.buildPythonApplication rec { gtk3 ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ httplib2 libopenshot - pyqt5_with_qtwebkit + pyqtwebengine pyzmq requests sip_4 ]; - dontWrapGApps = true; - dontWrapQtApps = true; - preConfigure = '' # tries to create caching directories during install export HOME=$(mktemp -d) @@ -64,19 +61,26 @@ mkDerivationWith python3Packages.buildPythonApplication rec { }) ]; + doCheck = false; + + dontWrapGApps = true; + dontWrapQtApps = true; + postFixup = '' wrapProgram $out/bin/openshot-qt \ '' # Fix toolbar icons on Darwin + lib.optionalString stdenv.isDarwin '' - --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \ - '' - + '' - "''${gappsWrapperArgs[@]}" \ - "''${qtWrapperArgs[@]}" + --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \ + '' + '' + "''${gappsWrapperArgs[@]}" \ + "''${qtWrapperArgs[@]}" ''; - doCheck = false; + passthru = { + inherit libopenshot; + inherit (libopenshot) libopenshot-audio; + }; meta = with lib; { homepage = "http://openshot.org/"; @@ -92,9 +96,4 @@ mkDerivationWith python3Packages.buildPythonApplication rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; }; - - passthru = { - inherit libopenshot; - inherit (libopenshot) libopenshot-audio; - }; } From 405187ba419726d08dfea31ee132975fbddfda73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Nov 2022 14:19:03 -0800 Subject: [PATCH 683/797] tumpa: mark broken It is incompatible with johnnycanencrypt 0.11. --- pkgs/applications/misc/tumpa/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/tumpa/default.nix b/pkgs/applications/misc/tumpa/default.nix index 4ea7a0f52299..f7dfdd95d5db 100644 --- a/pkgs/applications/misc/tumpa/default.nix +++ b/pkgs/applications/misc/tumpa/default.nix @@ -37,5 +37,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/kushaldas/tumpa"; license = licenses.gpl3Plus; maintainers = with maintainers; [ _0x4A6F ]; + broken = true; }; } From d1f7cd28080732dba67eb33fca82c5af6403f6f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 22:32:49 +0000 Subject: [PATCH 684/797] python310Packages.niapy: 2.0.3 -> 2.0.4 --- pkgs/development/python-modules/niapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index 867c7969e545..65bc3d472886 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "niapy"; - version = "2.0.3"; + version = "2.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "NiaOrg"; repo = "NiaPy"; rev = "refs/tags/${version}"; - hash = "sha256-h3bCitNFjw2WQtsQFR25VJlNVMojdfik+lrPMKwp8Mw="; + hash = "sha256-bZ9bONFntNx5tcm/gR/uPS5CqicJX281WsvSno8aVlY="; }; propagatedBuildInputs = [ From 4f9825046889ac72688a5f30279ddae22cacd631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 20 Nov 2022 23:47:32 +0100 Subject: [PATCH 685/797] goreleaser: 1.12.3 -> 1.13.0 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 9bc7b2d4898c..74837d367ade 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.12.3"; + version = "1.13.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-64oivUXAPP0Wo4CYt82Xs/yVhvuiyWVEurZrporCyJw="; + sha256 = "sha256-sgYTWiiFsrr+1c3C5GFpwSiGHfYizbjBTcj0JDuZXkE="; }; - vendorSha256 = "sha256-DJwHLitsyHJmZ8FhVAoLTI6HwoHPFAAv8RYmhMwh1Bg="; + vendorSha256 = "sha256-UpQ2yFprWdwE67MR5voPjgY7wqrtw/ZQbt05Tbo50XY="; ldflags = [ "-s" From 16647a437943cfb5504969e0c05cc7d2bf96b9c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Nov 2022 14:51:03 -0800 Subject: [PATCH 686/797] python310Packages.pytest-mockito: init at 0.0.4 --- .../python-modules/pytest-mockito/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-mockito/default.nix diff --git a/pkgs/development/python-modules/pytest-mockito/default.nix b/pkgs/development/python-modules/pytest-mockito/default.nix new file mode 100644 index 000000000000..240cf44343e2 --- /dev/null +++ b/pkgs/development/python-modules/pytest-mockito/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, mockito +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-mockito"; + version = "0.0.4"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "kaste"; + repo = "pytest-mockito"; + rev = version; + hash = "sha256-vY/i1YV1lo4mZvnxsXBOyaq31YTiF0BY6PTVwdVX10I="; + }; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + mockito + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Base fixtures for mockito"; + homepage = "https://github.com/kaste/pytest-mockito"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e53cc1f64213..dc13dd291b6a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7059,6 +7059,8 @@ self: super: with self; { pysyncthru = callPackage ../development/python-modules/pysyncthru { }; + pytest-mockito = callPackage ../development/python-modules/pytest-mockito { }; + python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; python-crfsuite = callPackage ../development/python-modules/python-crfsuite { }; From 4bc0392ec941e8707d0a80d9300b89b3bcc9b7a3 Mon Sep 17 00:00:00 2001 From: Jordan Isaacs Date: Sun, 20 Nov 2022 18:03:05 -0500 Subject: [PATCH 687/797] maintainers: add jordanisaacs --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 33d6bcd382f3..c95a2d45f4bc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15893,4 +15893,10 @@ github = "wuyoli"; githubId = 104238274; }; + jordanisaacs = { + name = "Jordan Isaacs"; + email = "nix@jdisaacs.com"; + github = "jordanisaacs"; + githubId = 19742638; + }; } From f525342399d1650a54eba42a807d86d3d9d4e083 Mon Sep 17 00:00:00 2001 From: Jordan Isaacs Date: Sun, 20 Nov 2022 18:03:15 -0500 Subject: [PATCH 688/797] waylock: init at 0.4.2 When using, ensure to install a waylock pam.d file. On NixOS use `security.pam.services.waylock = {}`. --- pkgs/applications/misc/waylock/default.nix | 52 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/applications/misc/waylock/default.nix diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix new file mode 100644 index 000000000000..2a29eab29730 --- /dev/null +++ b/pkgs/applications/misc/waylock/default.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + zig, + wayland, + pkg-config, + scdoc, + wayland-protocols, + libxkbcommon, + pam, +}: +stdenv.mkDerivation rec { + pname = "waylock"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "ifreund"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-yWjWcnGa4a+Dpc82H65yr8H7v88g/tDq0FSguubhbEI="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [zig wayland scdoc pkg-config]; + + buildInputs = [ + wayland-protocols + libxkbcommon + pam + ]; + + dontConfigure = true; + + preBuild = '' + export HOME=$TMPDIR + ''; + + installPhase = '' + runHook preInstall + zig build -Drelease-safe -Dman-pages --prefix $out install + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/ifreund/waylock"; + description = "A small screenlocker for Wayland compositors"; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [jordanisaacs]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24bbf58576b0..657ae6eb097d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29432,6 +29432,8 @@ with pkgs; waybar = callPackage ../applications/misc/waybar {}; + waylock = callPackage ../applications/misc/waylock {}; + wayshot = callPackage ../tools/misc/wayshot { }; waylevel = callPackage ../tools/misc/waylevel { }; From 18c8904c11e3e393ef3c1dafdde853c8043f82db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Nov 2022 00:08:44 +0100 Subject: [PATCH 689/797] workflows: add 24 hour periodic merges for 22.11 --- .github/workflows/periodic-merge-24h.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index e8ec13496025..44892f926eb7 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -34,6 +34,10 @@ jobs: pairs: - from: master into: haskell-updates + - from: release-22.11 + into: staging-next-22.11 + - from: staging-next-22.11 + into: staging-22.11 - from: release-22.05 into: staging-next-22.05 - from: staging-next-22.05 From b762a9b71f3d91c565bb05c9d0e4e6cf05f31a97 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 20 Nov 2022 18:21:12 -0500 Subject: [PATCH 690/797] ruff: 0.0.131 -> 0.0.132 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 7bbb333e48b8..dcf13834a51f 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.131"; + version = "0.0.132"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-botqrFWfW0+hu0oi6UhDcz8jO5TCKWwgN+u6oaWB7pE="; + sha256 = "sha256-0UcZBGD1l2hP8VH0tdNKY/SiXVTPLL0/eZpOwYnUgPs="; }; - cargoSha256 = "sha256-5fDhwcdLOGDqtWcCR9C1BOonb1CIxfwlcMFZ3spvfGU="; + cargoSha256 = "sha256-DlSSzFf2AludfAKrXSsI/V0K2ZjCy/ehZd3ULe3fjK4="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From c276f24e2922e2cb31230cb4bb419918ff903ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:40:41 +0200 Subject: [PATCH 691/797] phpExtensions.pinba: replace version number --- pkgs/development/php-packages/pinba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/pinba/default.nix b/pkgs/development/php-packages/pinba/default.nix index 1649da7c6545..7d4e020f406b 100644 --- a/pkgs/development/php-packages/pinba/default.nix +++ b/pkgs/development/php-packages/pinba/default.nix @@ -1,13 +1,13 @@ { buildPecl, lib, fetchFromGitHub }: -buildPecl { +buildPecl rec { pname = "pinba"; version = "1.1.2"; src = fetchFromGitHub { owner = "tony2001"; repo = "pinba_extension"; - rev = "RELEASE_1_1_2"; + rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}"; sha256 = "0wqcqq6sb51wiawa37hbd1h9dbvmyyndzdvz87xqji7lpr9vn8jy"; }; From 2953d4b93203eb653008bb10c572c2b4761fdbba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:40:51 +0200 Subject: [PATCH 692/797] phpExtensions.protobuf: format description --- pkgs/development/php-packages/protobuf/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix index a5b22e97953a..de71b8c8000d 100644 --- a/pkgs/development/php-packages/protobuf/default.nix +++ b/pkgs/development/php-packages/protobuf/default.nix @@ -9,9 +9,7 @@ buildPecl { buildInputs = [ pcre2 ]; meta = with lib; { - description = '' - Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. - ''; + description = "Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data."; license = licenses.bsd3; homepage = "https://developers.google.com/protocol-buffers/"; maintainers = teams.php.members; From 8b63f7e1744b23ae5f6bc0e50d2cb1778fe82cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:40:56 +0200 Subject: [PATCH 693/797] phpExtensions.yaml: update homepage --- pkgs/development/php-packages/yaml/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix index d4803c9d21ac..3a385e8f9bbf 100644 --- a/pkgs/development/php-packages/yaml/default.nix +++ b/pkgs/development/php-packages/yaml/default.nix @@ -13,7 +13,7 @@ buildPecl { meta = with lib; { description = "YAML-1.1 parser and emitter"; license = licenses.mit; - homepage = "http://bd808.com/pecl-file_formats-yaml/"; + homepage = "https://bd808.com/pecl-file_formats-yaml/"; maintainers = teams.php.members; }; } From 023798d172ea7a9c81b926dd56b214e2e97a79d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:41:05 +0200 Subject: [PATCH 694/797] build-pecl: fetch via https --- pkgs/build-support/build-pecl.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index 8168c7a3de18..d30a073d2fb9 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -9,7 +9,7 @@ , postPhpize ? "" , makeFlags ? [ ] , src ? fetchurl { - url = "http://pecl.php.net/get/${pname}-${version}.tgz"; + url = "https://pecl.php.net/get/${pname}-${version}.tgz"; inherit (args) sha256; } , ... From a4bdbb7073ee59555576fd866c6359de4e15ed70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?= =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= Date: Sat, 12 Nov 2022 23:01:35 +0100 Subject: [PATCH 695/797] go2tv: init at 1.13.0 Cast media files to UPnP/DLNA Media Renderers and Smart TVs. https://github.com/alexballas/go2tv provides 2 packages: - go2tv the GUI version (based on go-gl/glfw) - go2tv-lite just a cli version Co-authored-by: Sandro --- pkgs/applications/video/go2tv/default.nix | 57 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 62 insertions(+) create mode 100644 pkgs/applications/video/go2tv/default.nix diff --git a/pkgs/applications/video/go2tv/default.nix b/pkgs/applications/video/go2tv/default.nix new file mode 100644 index 000000000000..1137193ef41c --- /dev/null +++ b/pkgs/applications/video/go2tv/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, Carbon +, Cocoa +, Kernel +, UserNotifications +, xorg +, libglvnd +, pkg-config +, withGui ? true +}: + +buildGoModule rec { + pname = "go2tv" + lib.optionalString (!withGui) "-lite"; + version = "1.13.0"; + + src = fetchFromGitHub { + owner = "alexballas"; + repo = "go2tv"; + rev = "v${version}"; + sha256 = "sha256-ZHKfBKOX3/kVR6Nc+jSmLgfmpihc6QMb6NvTFlsBr5E="; + }; + + vendorSha256 = "sha256-msXfXFWXyZeT6zrRPZkBV7PEyPqYkx+JlpTWUwgFavI="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + xorg.libXinerama + xorg.libXi + xorg.libXext + xorg.libXxf86vm + libglvnd + ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel UserNotifications ]; + + ldflags = [ + "-s" "-w" + "-linkmode=external" + ]; + + # conditionally build with GUI or not (go2tv or go2tv-lite sub-packages) + subPackages = [ "cmd/${pname}" ]; + + doCheck = false; + + meta = with lib; { + description = "Cast media files to UPnP/DLNA Media Renderers and Smart TVs"; + homepage = "https://github.com/alexballas/go2tv"; + license = licenses.mit; + maintainers = with maintainers; [ gdamjan ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf9717b760e6..8e5a6c702fa6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2690,6 +2690,11 @@ with pkgs; gmnitohtml = callPackage ../applications/misc/gmnitohtml { }; + go2tv = darwin.apple_sdk_11_0.callPackage ../applications/video/go2tv { + inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa Kernel UserNotifications; + }; + go2tv-lite = go2tv.override { withGui = false; }; + goimapnotify = callPackage ../tools/networking/goimapnotify { }; gojsontoyaml = callPackage ../development/tools/gojsontoyaml { }; From df7a332cdc6ba4af2b85530ac0e419250acb7dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 21 Nov 2022 00:29:58 +0100 Subject: [PATCH 696/797] lscolors: 0.12.0 -> 0.13.0 --- pkgs/applications/misc/lscolors/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index e39ef723df8f..b80c8d0a2abf 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.12.0"; + version = "0.13.0"; src = fetchCrate { inherit version pname; - sha256 = "sha256-1tLI+M2hpXWsiO/x27ncs8zn8dBDx18AgsSbN/YE2Ic="; + sha256 = "sha256-rs/qv6zmSHy2FFiPSgGzxAV/r0SqK9vnfwnLj45WY4I="; }; - cargoSha256 = "sha256-4bFzFztaD9jV3GXpZwCowAhvszedM5ion5/h3D26EY8="; + cargoSha256 = "sha256-WDvflAb56l+UkrxeQQZrloxlaK/mZavT9sA+VOWDW5Q="; # setid is not allowed in the sandbox checkFlags = [ "--skip=tests::style_for_setid" ]; From 91137f5929dad7655f3bb4e9a6122e0519cd091d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 21 Nov 2022 01:29:32 +0100 Subject: [PATCH 697/797] intel-media-driver: 22.5.3.1 -> 22.6.3 --- .../libraries/intel-media-driver/32bit.patch | 22 +++++++++++++++++++ .../libraries/intel-media-driver/default.nix | 14 +++++------- 2 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/libraries/intel-media-driver/32bit.patch diff --git a/pkgs/development/libraries/intel-media-driver/32bit.patch b/pkgs/development/libraries/intel-media-driver/32bit.patch new file mode 100644 index 000000000000..ddeeea66e3b8 --- /dev/null +++ b/pkgs/development/libraries/intel-media-driver/32bit.patch @@ -0,0 +1,22 @@ +diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp +index 66fab63de..a2cdf79d7 100644 +--- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp ++++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp +@@ -2195,8 +2195,8 @@ void MediaLibvaUtilNext::MediaPrintFps() + + int64_t diff = (tv2.tv_sec - m_tv1.tv_sec)*1000000 + tv2.tv_usec - m_tv1.tv_usec; + float fps = m_frameCountFps / (diff / 1000000.0); +- DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11lu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000)); +- sprintf(temp,"FPS:%6.4f, Interval:%11lu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000)); ++ DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11llu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000)); ++ sprintf(temp,"FPS:%6.4f, Interval:%11llu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000)); + + MOS_ZeroMemory(fpsFileName,LENGTH_OF_FPS_FILE_NAME); + sprintf(fpsFileName, FPS_FILE_NAME); +@@ -2213,4 +2213,4 @@ void MediaLibvaUtilNext::MediaPrintFps() + pthread_mutex_unlock(&m_fpsMutex); + return; + } +-#endif +\ No newline at end of file ++#endif diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 925cd2eeb8f8..4f5f8fc28613 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.5.3.1"; + version = "22.6.3"; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "sha256-3l8mfw1h1se0+w4VtfMr0xuPW8G3JA6hbvkyCaEGTek="; + sha256 = "sha256-lQg+L64DW2ZIBeJRimNkba7EL+SM4jSnX9PWIx4j2AY="; }; patches = [ @@ -33,12 +33,10 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0="; }) - # fix compilation on i686-linux - (fetchpatch { - url = "https://github.com/intel/media-driver/commit/5ee502b84eb70f0d677a3b49d624c356b3f0c2b1.patch"; - revert = true; - sha256 = "sha256-yRS10BKD5IkW8U0PxmyB7ryQiLwrqeetm0NivnoM224="; - }) + ] ++ lib.optional stdenv.is32bit [ + # fix compilation on i686-linux but also breaks x86_64 + # a similar issue got fixed in https://github.com/intel/media-driver/pull/1493 but thats to much C magic for me + ./32bit.patch ]; cmakeFlags = [ From 8cdb30946686bf45cba20f28ca5ef57060c9ebc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 21 Nov 2022 01:30:39 +0100 Subject: [PATCH 698/797] libva: add intel-media-driver to passthru.tests --- pkgs/development/libraries/libva/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 045b060a04fb..0ded7e20088e 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -3,6 +3,7 @@ , minimal ? false, libva-minimal , libX11, libXext, libXfixes, wayland, libffi, libGL , mesa +, intel-media-driver }: stdenv.mkDerivation rec { @@ -29,6 +30,10 @@ stdenv.mkDerivation rec { "-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/i386-linux-gnu/dri" ]; + passthru.tests = { + inherit intel-media-driver; + }; + meta = with lib; { description = "An implementation for VA-API (Video Acceleration API)"; longDescription = '' From 57dcd38be45061d846f63d36e15f2024e2d1189f Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 20 Nov 2022 16:35:25 -0800 Subject: [PATCH 699/797] notepadqq: 1.4.8 -> 2.0.0-beta (#202075) Co-authored-by: Sandro --- .../editors/notepadqq/default.nix | 28 +++++++++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index 545d64ef5122..3aa08559bdf7 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -1,22 +1,40 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, which, qtbase, qtsvg, qttools, qtwebkit }: +{ mkDerivation +, lib +, fetchFromGitHub +, pkg-config +, which +, libuchardet +, qtbase +, qtsvg +, qttools +, qtwebengine +, qtwebsockets +}: mkDerivation rec { pname = "notepadqq"; - version = "1.4.8"; + # shipping a beta build as there's no proper release which supports qtwebengine + version = "2.0.0-beta"; src = fetchFromGitHub { owner = "notepadqq"; repo = "notepadqq"; rev = "v${version}"; - sha256 = "0lbv4s7ng31dkznzbkmp2cvkqglmfj6lv4mbg3r410fif2nrva7k"; + sha256 = "sha256-XA9Ay9kJApY+bDeOf0iPv+BWYFuTmIuqsLEPgRTCZCE="; }; nativeBuildInputs = [ - pkg-config which qttools + pkg-config + which + qttools ]; buildInputs = [ - qtbase qtsvg qtwebkit + libuchardet + qtbase + qtsvg + qtwebengine + qtwebsockets ]; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf4f1a343f23..cde6b546bad3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30985,7 +30985,7 @@ with pkgs; notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; - notepadqq = libsForQt514.callPackage ../applications/editors/notepadqq { }; + notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; notmuch = callPackage ../applications/networking/mailreaders/notmuch { gmime = gmime3; From a6e32c105cae8546aa0f03209e9049e1f948f6bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Nov 2022 00:48:55 +0100 Subject: [PATCH 700/797] python3Packages.ansible: 6.5.0 -> 6.6.0 --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index bd435fc617e6..81839ecce007 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "6.5.0"; + version = "6.6.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-fAzc0RIaXxKrLaS90uFMLBU+ASFL/GprwVa2G9dAHFs="; + sha256 = "sha256-4blAqNT0EhI+3jwUsly5nDyKTVNf0ECqv45Pt7Dk8JI="; }; postPatch = '' From f3dd2a89c6daed303cfe94b5056dab051fd9679e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Nov 2022 00:58:09 +0100 Subject: [PATCH 701/797] ansible: 2.13.5 -> 2.14.0 - Init ansible_2_14 at 2.14.0 - ansible_2_13: 2.13.5 -> 2.13.6 - ansible_2_12: 2.12.6 -> 2.12.10 --- .../python-modules/ansible/core.nix | 4 ++-- pkgs/top-level/all-packages.nix | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 5858fa875cd3..b4d09d38f887 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.13.5"; + version = "2.14.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JtzZIY1VRMwVFE9gu1tjTyJ25HbIn0gbP2GcT53vFYg="; + hash = "sha256-+ki0gctiO/ebuQPyIwl2gaDBPhtOx+eOfdfYWNNqNLI="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 434659693be1..a1639939b9e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16256,14 +16256,20 @@ with pkgs; autoadb = callPackage ../misc/autoadb { }; - ansible = ansible_2_12; - ansible_2_13 = python3Packages.toPythonApplication python3Packages.ansible-core; - ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { - version = "2.12.6"; + ansible = ansible_2_14; + ansible_2_14 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible_2_13 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { + version = "2.13.6"; src = oldAttrs.src.override { inherit version; - hash = "sha256-XzZuhRFZ2Pcs5o0yuMDt2lbuU3wB6faOyjgr0VEK9l0="; - sha256 = ""; + hash = "sha256-Mf4yK2MpBnSo9zhhEN9QHwBEqkSJC+OrMTpuIluaKc8="; + }; + })); + ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { + version = "2.12.10"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-/rHfYXOM/B9eiTtCouwafeMpd9Z+hnB7Retj0MXDwjY="; }; meta.changelog = "https://github.com/ansible/ansible/blob/v${version}/changelogs/CHANGELOG-v${lib.versions.majorMinor version}.rst"; })); From beb97ce75aed31a96b4f46baecb8ba8d40f35505 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Nov 2022 13:16:02 +0100 Subject: [PATCH 702/797] python3Packages.ansible-compat: 2.2.3 -> 2.2.5 --- pkgs/development/python-modules/ansible-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index d2363d3e14a7..f92423fde31a 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "2.2.3"; + version = "2.2.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-H06GH6OwhDaIrdMsWHOyCEjr75bvcV0dgI0mWDViBCg="; + sha256 = "sha256-KMfFRf1g75wwWc+y/v0n+S2wkf9rWGj4PxIc614f4bU="; }; nativeBuildInputs = [ From a304f169019d701af8d81d0396a95c91334286b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Nov 2022 13:16:28 +0100 Subject: [PATCH 703/797] python3Packages.ansible-lint: 6.8.5 -> 6.8.6 --- pkgs/development/python-modules/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 37948ff4ea66..6460c0c923db 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.8.5"; + version = "6.8.6"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-r+lWJWLp5tGxehhltUDU9xZb8Bz+8q0DA9HK1q05f4g="; + sha256 = "sha256-Fx/o2tYgeLmBm1x01g61r6ow6py5ybqHBhSeVsVam24="; }; postPatch = '' From c933e98715d526522818268dc06322634a41a634 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Nov 2022 13:24:40 +0100 Subject: [PATCH 704/797] python3Packages.ansible-runner: 2.3.0 -> 2.3.1 Pass glibcLocales to tests, so locale initialization testing works. --- pkgs/development/python-modules/ansible-runner/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 614bbe28a21c..44e5a519a7bb 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -3,6 +3,7 @@ , ansible-core , buildPythonPackage , fetchPypi +, glibcLocales , mock , openssh , pbr @@ -20,14 +21,14 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mcTfu+reRGOXvRqeC/BQhz2KBrWSbVXSQIWyld2/Ecs="; + hash = "sha256-HS8C06Ylc/OOaKI3kBGLeYF5HCvtK18i96NqIhwoh1Y="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ buildPythonPackage rec { checkInputs = [ ansible-core # required to place ansible CLI onto the PATH in tests + glibcLocales pytestCheckHook pytest-mock pytest-timeout From 0a732598cf10b91702888368463e852796b00c4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 12:44:23 +0000 Subject: [PATCH 705/797] mutagen-compose: 0.16.1 -> 0.16.2 --- pkgs/tools/misc/mutagen-compose/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/tools/misc/mutagen-compose/default.nix index 8c110b89bbd2..8fb8a19dabee 100644 --- a/pkgs/tools/misc/mutagen-compose/default.nix +++ b/pkgs/tools/misc/mutagen-compose/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen-compose"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tH1aYMjKsSMWls53IgsqtAgMMLUvotb5zGlAmV3dlvQ="; + sha256 = "sha256-x8tgdrb4WtjCaa28A4+fL/lUgMYaN71bEyQ1iDayNHM="; }; - vendorSha256 = "sha256-nRH26ty3JVSz2ZnrZ+owTj2fponnvYkrASQxcJXm8aE="; + vendorSha256 = "sha256-FJEB7rii6DcWyGqrmPEKOZTy27tG+CkZ2xUY+cpKakE="; doCheck = false; From fd6f02ed5b72daecf5564d50fa5f684af2f1fb73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 12:53:35 +0000 Subject: [PATCH 706/797] werf: 1.2.188 -> 1.2.190 --- pkgs/applications/networking/cluster/werf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index f42a3be95944..fb19070e4591 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.188"; + version = "1.2.190"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-C8y86q+uf+8EZ9kBAZehld7PpGByJLjhYQOrc3YKH1A="; + hash = "sha256-xjZVBLdDLLlfnXX87lwgIeQ6ySI9cNoE5nrRJVBS/l0="; }; vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; From 81b13c864dc831298509aece6391a4ab55bc3167 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Nov 2022 02:16:34 +0100 Subject: [PATCH 707/797] python3Packages.bleak-retry-connector: 2.8.4 -> 2.8.5 https://github.com/Bluetooth-Devices/bleak-retry-connector/releases/tag/v2.8.5 --- .../python-modules/bleak-retry-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 843a955cd069..ce23142f8928 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "2.8.4"; + version = "2.8.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eXHgxjSmr+BH+kI3qLbjq+z+YGRbyrvYvDgx6xwt2os="; + hash = "sha256-Uct040yI4tJkdQNBAJhr/aOjMRcGkTOAnm4pzmeHNZM="; }; postPatch = '' From ecc2879314c471b118a9d0d9aee3634ec6e7b55e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Nov 2022 02:17:37 +0100 Subject: [PATCH 708/797] python3Packages.xknx: 1.2.0 -> 1.2.1 https://github.com/XKNX/xknx/releases/tag/1.2.1 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index e82602d3458c..7a950df3af24 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-IHZvmVloBSLcK3GZV9urFeqRxOG76O9O/3ZDNTz4wjQ="; + hash = "sha256-5uRPMu9qZ0ofMdgk8d1IpKjHjnEP+zhWs+EDQx9wk6U="; }; propagatedBuildInputs = [ From 47a45a7955fce017d974c1542c3ee9901ab7874d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Nov 2022 02:21:06 +0100 Subject: [PATCH 709/797] home-assistant: 2022.11.3 -> 2022.11.4 https://github.com/home-assistant/core/releases/tag/2022.11.4 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3aee605e4c06..7ea4d02a227b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.11.3"; + version = "2022.11.4"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 790f7a012570..6e8dbf7e7dbd 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -258,7 +258,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 = "2022.11.3"; + hassVersion = "2022.11.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -276,7 +276,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-9L2GBgM3RTqeOCnW47Kr4OxqVjcbBEvzkiPYZ5qEQAE="; + hash = "sha256-3vNwWPFSR9Ap89rAxZjUOptigBaDlboxvLZysMyUUX0="; }; # leave this in, so users don't have to constantly update their downstream patch handling From 31df5aed9ee6abf2b00b77018640b13eb1ad31d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 01:30:28 +0000 Subject: [PATCH 710/797] cargo-update: 11.0.0 -> 11.1.0 --- pkgs/development/tools/rust/cargo-update/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix index ba5c8589241b..30aa56aa29f2 100644 --- a/pkgs/development/tools/rust/cargo-update/default.nix +++ b/pkgs/development/tools/rust/cargo-update/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "11.0.0"; + version = "11.1.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-bqDbMQXzOlNQBVufEwBeH9XOjS3gpacowzHVTwu8XhA="; + sha256 = "sha256-WQUWAE8PR3FxTmWxoXmi6nsiyfbmLaIzOBJhC/8QYQw="; }; - cargoSha256 = "sha256-oHp4olxnTeVXxhhWqWPBZXRfYZRtzuPfP3rENJAJQMo="; + cargoSha256 = "sha256-GirS6Tu5gkNPVGAKzfFkyi3tTlu3RRzp/PWHhPbmKdI="; nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ]; From bcdde34a8962fbc973a930d44817a911d6006b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Nov 2022 14:47:13 -0800 Subject: [PATCH 711/797] python310Packages.robotframework-pythonlibcore: init at 4.0.0 --- .../robotframework-pythonlibcore/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/robotframework-pythonlibcore/default.nix diff --git a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix new file mode 100644 index 000000000000..01e6a98c0228 --- /dev/null +++ b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchpatch +, pytest-mockito +, pytestCheckHook +, robotframework +}: + +buildPythonPackage rec { + pname = "robotframework-pythonlibcore"; + version = "4.0.0"; + + disabled = pythonOlder "3.7"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "robotframework"; + repo = "PythonLibCore"; + rev = "v${version}"; + hash = "sha256-86o5Lh9zWo4vUF2186dN7e8tTUu5PIxM/ZukPwNl0S8="; + }; + + patches = [ + (fetchpatch { + name = "fix-finding-version.patch"; + url = "https://github.com/robotframework/PythonLibCore/commit/84c73979e309f59de057ae6a77725ab0f468b71f.patch"; + hash = "sha256-zrjsNvXpJDLpXql200NV+QGWFLtnRVZTeAjT52dRn2s="; + }) + ]; + + checkInputs = [ + pytest-mockito + pytestCheckHook + robotframework + ]; + + preCheck = '' + export PYTHONPATH="atest:utest/helpers:$PYTHONPATH" + ''; + + pythonImportsCheck = [ "robotlibcore" ]; + + meta = { + changelog = "https://github.com/robotframework/PythonLibCore/blob/${src.rev}/docs/PythonLibCore-${version}.rst"; + description = "Tools to ease creating larger test libraries for Robot Framework using Python"; + homepage = "https://github.com/robotframework/PythonLibCore"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dc13dd291b6a..63796205d215 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9816,6 +9816,8 @@ self: super: with self; { robotframework-databaselibrary = callPackage ../development/python-modules/robotframework-databaselibrary { }; + robotframework-pythonlibcore = callPackage ../development/python-modules/robotframework-pythonlibcore { }; + robotframework-requests = callPackage ../development/python-modules/robotframework-requests { }; robotframework-selenium2library = callPackage ../development/python-modules/robotframework-selenium2library { }; From 6f5527487c59421a553b76e12b4d30089a48a630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Nov 2022 15:06:55 -0800 Subject: [PATCH 712/797] python310Packages.robotframework-seleniumlibrary: fix build --- .../default.nix | 53 +++++++++++++++---- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 806387f1095e..7f08c345bc6b 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -1,4 +1,16 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, python +, robotframework +, robotframework-pythonlibcore +, selenium +, approvaltests +, pytest-mockito +, pytestCheckHook +, robotstatuschecker +}: buildPythonPackage rec { version = "6.0.0"; @@ -12,17 +24,40 @@ buildPythonPackage rec { sha256 = "1rjzz6mrx4zavcck2ry8269rf3dkvvs1qfa9ra7dkppbarrjin3f"; }; - propagatedBuildInputs = [ robotframework selenium ]; - checkInputs = [ mockito robotstatuschecker approvaltests ]; + propagatedBuildInputs = [ + robotframework + robotframework-pythonlibcore + selenium + ]; - # Only execute Unit Tests. Acceptance Tests require headlesschrome, currently - # not available in nixpkgs - checkPhase = '' - ${python.interpreter} utest/run.py - ''; + checkInputs = [ + approvaltests + pytest-mockito + pytestCheckHook + robotstatuschecker + ]; + + disabledTestPaths = [ + # https://github.com/robotframework/SeleniumLibrary/issues/1804 + "utest/test/keywords/test_webdrivercache.py" + ]; + + disabledTests = [ + "test_create_opera_executable_path_not_set" + "test_create_opera_executable_path_set" + "test_create_opera_with_options" + "test_create_opera_with_service_log_path_real_path" + "test_get_executable_path" + "test_get_ff_profile_instance_FirefoxProfile" + "test_has_options" + "test_importer" + "test_log_file_with_index_exist" + "test_opera" + "test_single_method" + ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + changelog = "https://github.com/robotframework/SeleniumLibrary/blob/${src.rev}/docs/SeleniumLibrary-${version}.rst"; description = "Web testing library for Robot Framework"; homepage = "https://github.com/robotframework/SeleniumLibrary"; license = licenses.asl20; From c16d0fd62c850c285ab5c01c598c3ead4129d31b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 01:51:53 +0000 Subject: [PATCH 713/797] checkip: 0.43.0 -> 0.44.0 --- pkgs/tools/networking/checkip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index dff7dee6d445..1096bf899dc6 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "checkip"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KeHITGUf0/sSYwMmwIxh9195KZiMVLb8IXI7SxeOz6A="; + sha256 = "sha256-B+gi3BNEQUZL5McSPnSRyUssa9AhnMHswfmCrK0BP2o="; }; vendorSha256 = "sha256-bFhSMjm9rqUUbCV9keeXm+yhzQMKrYKs1DbCt53J8aM="; From ca87d0cac8e6fa6d5150d332424c37d45225efdd Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 21 Nov 2022 02:53:53 +0100 Subject: [PATCH 714/797] b612: update homepage --- pkgs/data/fonts/b612/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/data/fonts/b612/default.nix index 93698578ff3e..c38329227f02 100644 --- a/pkgs/data/fonts/b612/default.nix +++ b/pkgs/data/fonts/b612/default.nix @@ -21,7 +21,7 @@ fetchFromGitHub rec { hash = "sha256-aJ3XzWQauPsWwEDAHT2rD9a8RvLv1kqU3krFXprmypk="; meta = with lib; { - homepage = "http://b612-font.com/"; + homepage = "https://b612-font.com/"; description = "Highly legible font family for use on aircraft cockpit screens"; longDescription = '' B612 is the result of a research project initiated by Airbus. The font From af90e66439fbb734472671ef520e2879f350ddcb Mon Sep 17 00:00:00 2001 From: toonn Date: Mon, 21 Nov 2022 02:55:27 +0100 Subject: [PATCH 715/797] teensy-loader-cli: 2.1+unstable=2021-04-10 -> 2.2 (#198461) Co-authored-by: Anderson Torres --- .../embedded/teensy-loader-cli/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/embedded/teensy-loader-cli/default.nix b/pkgs/development/embedded/teensy-loader-cli/default.nix index ccae93770249..e8445a9955f2 100644 --- a/pkgs/development/embedded/teensy-loader-cli/default.nix +++ b/pkgs/development/embedded/teensy-loader-cli/default.nix @@ -6,15 +6,15 @@ , libusb-compat-0_1 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "teensy-loader-cli"; - version = "2.1+unstable=2021-04-10"; + version = "2.2"; src = fetchFromGitHub { owner = "PaulStoffregen"; repo = "teensy_loader_cli"; - rev = "9dbbfa3b367b6c37e91e8a42dae3c6edfceccc4d"; - sha256 = "lQ1XtaWPr6nvE8NArD1980QVOH6NggO3FlfsntUjY7s="; + rev = finalAttrs.version; + sha256 = "sha256-C9Qhd6LhAES7X0sh4rofjAM+gxwuosahVQHeR76LyIo="; }; nativeBuildInputs = [ @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { runHook preInstall install -Dm555 teensy_loader_cli $out/bin/teensy-loader-cli - install -Dm444 -t $out/share/doc/${pname} *.md *.txt - go-md2man -in README.md -out ${pname}.1 + install -Dm444 -t $out/share/doc/teensy-loader-cli *.md *.txt + go-md2man -in README.md -out teensy-loader-cli.1 installManPage *.1 runHook postInstall @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.unix; }; -} +}) From d9fb8de8fb379298a3dd95ea3471c11333f24d55 Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Mon, 21 Nov 2022 04:55:11 +0300 Subject: [PATCH 716/797] maintainers: add ataraxiasjel --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 30c1a1332e13..bfd89bd6fa51 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1285,6 +1285,15 @@ fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; }]; }; + ataraxiasjel = { + email = "nix@ataraxiadev.com"; + github = "AtaraxiaSjel"; + githubId = 5314145; + name = "Dmitriy"; + keys = [{ + fingerprint = "922D A6E7 58A0 FE4C FAB4 E4B2 FD26 6B81 0DF4 8DF2"; + }]; + }; atemu = { name = "Atemu"; email = "atemu.main+nixpkgs@gmail.com"; From 23b3add0e305ec447ba19613be723e781522e7f9 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 20 Nov 2022 21:01:51 -0500 Subject: [PATCH 717/797] nixos: Fix hibernate test with systemd stage 1 --- nixos/tests/hibernate.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 7a4b331169a3..cb75322ca5f9 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -26,8 +26,9 @@ let powerManagement.resumeCommands = "systemctl --no-block restart backdoor.service"; - fileSystems = { - "/".device = "/dev/vda2"; + fileSystems."/" = { + device = "/dev/vda2"; + fsType = "ext3"; }; swapDevices = mkOverride 0 [ { device = "/dev/vda1"; } ]; boot.resumeDevice = mkIf systemdStage1 "/dev/vda1"; From 77f77dc97fd85cb7360b3607bfe363a056095880 Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Mon, 21 Nov 2022 05:03:21 +0300 Subject: [PATCH 718/797] mullvad: 2022.4 -> 2022.5 --- pkgs/applications/networking/mullvad/libwg.nix | 2 +- pkgs/applications/networking/mullvad/mullvad.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mullvad/libwg.nix b/pkgs/applications/networking/mullvad/libwg.nix index d54a2cafe8c0..287797fd8e67 100644 --- a/pkgs/applications/networking/mullvad/libwg.nix +++ b/pkgs/applications/networking/mullvad/libwg.nix @@ -13,7 +13,7 @@ buildGoModule { sourceRoot = "source/wireguard/libwg"; - vendorSha256 = "qvymWCdJ+GY90W/Fpdp+r1+mTq6O4LyN2Yw/PjKdFm0="; + vendorSha256 = "QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU="; # XXX: hack to make the ar archive go to the correct place # This is necessary because passing `-o ...` to `ldflags` does not work diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index 65aeab2de49d..03bc81c8b543 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -15,16 +15,16 @@ }: rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2022.4"; + version = "2022.5"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; rev = version; - hash = "sha256-s0Cmeh10lQUB5BK4i1qxkDy/ylx/3c6V66dxH+kcnLs="; + hash = "sha256-LiaELeEBIn/GZibKf25W3DHe+IkpaTY8UC7ca/7lp8k="; }; - cargoHash = "sha256-HPURL+CFUVLWRq8nzLiZxDhckgH76b6JBUObLGtoEEw="; + cargoHash = "sha256-KpBhdZce8Ug3ws7f1qg+5LtOMQw2Mf/uJsBg/TZSYyk="; nativeBuildInputs = [ pkg-config From 49dcf51e2a4b843712fbaabe6481c5cf00a94ecd Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Mon, 21 Nov 2022 05:03:29 +0300 Subject: [PATCH 719/797] mullvad-vpn: 2022.4 -> 2022.5 --- pkgs/applications/networking/mullvad-vpn/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 0d79f41828f9..9b1a609d8325 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2022.4"; + version = "2022.5"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "sha256-OwTtWzlZjHNFSN5/UjFJbcrPCv9+ucWYEL2idYjeozU="; + sha256 = "sha256-G3B4kb+ugukYtCVH3HHI43u3n9G0dX6WyYUA3X/sZ+o="; }; nativeBuildInputs = [ @@ -75,7 +75,6 @@ stdenv.mkDerivation rec { mv opt/Mullvad\ VPN/* $out/share/mullvad ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/ - ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon ln -sf $out/share/mullvad/resources/mullvad-problem-report $out/bin/mullvad-problem-report wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 @@ -92,7 +91,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ Br1ght0ne ymarkus ]; + maintainers = with maintainers; [ Br1ght0ne ymarkus ataraxiasjel ]; }; } From 570a37eaed8f995331010b3f19f2a316ebc879f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 02:24:56 +0000 Subject: [PATCH 720/797] python310Packages.oslo-log: 5.0.1 -> 5.0.2 --- pkgs/development/python-modules/oslo-log/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 0e5850da05ae..87e2b969f734 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "5.0.1"; + version = "5.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-+2Xy+dJEI/pt1urY7NIfZlxi4P2fkL8xHkwVO1+Kt+o="; + hash = "sha256-5F5zEqpxUooWc2zkUVK+PxrxI/XvYqqB2gRoBVhPzKM="; }; propagatedBuildInputs = [ From cd4c55fe0e57abb83d3d80919c1265c7fb6d35c0 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 20 Nov 2022 18:36:36 -0800 Subject: [PATCH 721/797] python310Packages.repeated-test: add tjni as maintainer --- pkgs/development/python-modules/repeated-test/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/repeated-test/default.nix b/pkgs/development/python-modules/repeated-test/default.nix index bd8d8d765a09..5d934d2559f8 100644 --- a/pkgs/development/python-modules/repeated-test/default.nix +++ b/pkgs/development/python-modules/repeated-test/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Unittest-compatible framework for repeating a test function over many fixtures"; homepage = "https://github.com/epsy/repeated_test"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ tjni ]; }; } From 71c74bf1738d306fff289f8d48f82313e2c100f4 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 20 Nov 2022 22:27:28 -0500 Subject: [PATCH 722/797] nixos: Add ext to fsPackages in stage 2 with systemd-initrd enabled --- nixos/modules/tasks/filesystems/ext.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix index 9b61f21643ab..edc0efc55213 100644 --- a/nixos/modules/tasks/filesystems/ext.nix +++ b/nixos/modules/tasks/filesystems/ext.nix @@ -3,13 +3,14 @@ let inInitrd = lib.any (fs: fs == "ext2" || fs == "ext3" || fs == "ext4") config.boot.initrd.supportedFilesystems; + inSystem = lib.any (fs: fs == "ext2" || fs == "ext3" || fs == "ext4") config.boot.supportedFilesystems; in { config = { - system.fsPackages = lib.mkIf (config.boot.initrd.systemd.enable -> inInitrd) [ pkgs.e2fsprogs ]; + system.fsPackages = lib.mkIf (config.boot.initrd.systemd.enable -> (inInitrd || inSystem)) [ pkgs.e2fsprogs ]; # As of kernel 4.3, there is no separate ext3 driver (they're also handled by ext4.ko) boot.initrd.availableKernelModules = lib.mkIf (config.boot.initrd.systemd.enable -> inInitrd) [ "ext2" "ext4" ]; From b48a339973650d10d8a24a3a31c3491eea65b145 Mon Sep 17 00:00:00 2001 From: Francis St-Amour Date: Wed, 9 Nov 2022 22:55:19 -0500 Subject: [PATCH 723/797] maintainers: change username "mpsyco" -> "fstamour" Because I haven't used that username in years. --- maintainers/maintainer-list.nix | 12 ++++++------ pkgs/development/libraries/linenoise/default.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 30c1a1332e13..963d4f8a7f03 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4820,6 +4820,12 @@ githubId = 868283; name = "Fatih Altinok"; }; + fstamour = { + email = "fr.st-amour@gmail.com"; + github = "fstamour"; + githubId = 2881922; + name = "Francis St-Amour"; + }; ftrvxmtrx = { email = "ftrvxmtrx@gmail.com"; github = "ftrvxmtrx"; @@ -9426,12 +9432,6 @@ githubId = 2072185; name = "Marc Scholten"; }; - mpsyco = { - email = "fr.st-amour@gmail.com"; - github = "fstamour"; - githubId = 2881922; - name = "Francis St-Amour"; - }; mtrsk = { email = "marcos.schonfinkel@protonmail.com"; github = "mtrsk"; diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix index d465b48a8f46..e337e32b2353 100644 --- a/pkgs/development/libraries/linenoise/default.nix +++ b/pkgs/development/libraries/linenoise/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/antirez/linenoise"; description = "A minimal, zero-config, BSD licensed, readline replacement"; - maintainers = with lib.maintainers; [ mpsyco ]; + maintainers = with lib.maintainers; [ fstamour ]; platforms = lib.platforms.unix; license = lib.licenses.bsd2; }; From eec373924998d9f428f89d495f34fb674e81e47c Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 21 Nov 2022 06:00:21 +0100 Subject: [PATCH 724/797] nix-output-monitor: 2.0.0.3 -> 2.0.0.4 https://github.com/maralorn/nix-output-monitor/releases/tag/v2.0.0.4 --- .../nix/nix-output-monitor/generated-package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/pkgs/tools/nix/nix-output-monitor/generated-package.nix index f48056a2e4a4..5f924c81a4e1 100644 --- a/pkgs/tools/nix/nix-output-monitor/generated-package.nix +++ b/pkgs/tools/nix/nix-output-monitor/generated-package.nix @@ -28,6 +28,8 @@ safe, stm, streamly, + strict, + strict-types, terminal-size, text, time, @@ -37,10 +39,10 @@ }: mkDerivation { pname = "nix-output-monitor"; - version = "2.0.0.3"; + version = "2.0.0.4"; src = fetchzip { - url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.3.tar.gz"; - sha256 = "0mgg309vncjvx80mhqcyb7kk1918nfl02d38jczm9lsrlrmdafd9"; + url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.4.tar.gz"; + sha256 = "1pgrynsjjry253fqpmm3yr4k9xcvqffnbs4p8i1nlfi9l821wj8c"; }; isLibrary = true; isExecutable = true; @@ -66,6 +68,8 @@ mkDerivation { safe stm streamly + strict + strict-types terminal-size text time @@ -94,6 +98,8 @@ mkDerivation { safe stm streamly + strict + strict-types terminal-size text time @@ -126,6 +132,8 @@ mkDerivation { safe stm streamly + strict + strict-types terminal-size text time From 6ee0a023cdd54dd5aa5fbd4b0e659f57c88e25c7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 14 Nov 2022 07:44:12 +0100 Subject: [PATCH 725/797] ocamlPackages.labltk: add version 8.06.13 for OCaml 5.0 --- pkgs/development/ocaml-modules/labltk/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 90bd678f287f..fd7e59424547 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -46,6 +46,10 @@ let version = "8.06.12"; sha256 = "sha256:17fmb13l18isgwr38hg9r5a0nayf2hhw6acj5153cy1sygsdg3b5"; }; + "5.0" = mkNewParam { + version = "8.06.13"; + sha256 = "sha256-Vpf13g3DEWlUI5aypiowGp2fkQPK0cOGv2XiRUY/Ip4="; + }; }; param = params . ${lib.versions.majorMinor ocaml.version} or (throw "labltk is not available for OCaml ${ocaml.version}"); From b2bd69babc51d6fe68910f6a86dadd76e0750267 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 06:27:09 +0000 Subject: [PATCH 726/797] aws-c-sdkutils: 0.1.6 -> 0.1.7 --- pkgs/development/libraries/aws-c-sdkutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/development/libraries/aws-c-sdkutils/default.nix index 3022cf462746..298ea5cb946c 100644 --- a/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - sha256 = "sha256-KfQKOQrSgTy9Z+iUGnLblRArkq3xnFEnSq6HajcbysQ="; + sha256 = "sha256-qu/+xYorB+QXP5Ixj5ZFP9ZenVYV6hcmxHnH14DEgrU="; }; nativeBuildInputs = [ From 51e4bd298f8a1b449aa6784dbfdf7d575e0c2549 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 4 Aug 2022 17:06:03 +0800 Subject: [PATCH 727/797] nixos/udev: enable initrd-udevadm-cleanup-db.service in systemd stage 1 --- nixos/modules/services/hardware/udev.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 7a7f8330243a..d95261332419 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -46,6 +46,11 @@ let SUBSYSTEM=="input", KERNEL=="mice", TAG+="systemd" ''; + nixosInitrdRules = '' + # Mark dm devices as db_persist so that they are kept active after switching root + SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS+="db_persist" + ''; + # Perform substitutions in all udev rules files. udevRulesFor = { name, udevPackages, udevPath, udev, systemd, binPackages, initrdBin ? null }: pkgs.runCommand name { preferLocalBuild = true; @@ -364,8 +369,10 @@ in EOF ''; + boot.initrd.services.udev.rules = nixosInitrdRules; + boot.initrd.systemd.additionalUpstreamUnits = [ - # TODO: "initrd-udevadm-cleanup-db.service" is commented out because of https://github.com/systemd/systemd/issues/12953 + "initrd-udevadm-cleanup-db.service" "systemd-udevd-control.socket" "systemd-udevd-kernel.socket" "systemd-udevd.service" From 46328f5596bcc2743f727e3ab884dea362c627d8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 21 Nov 2022 14:49:20 +0800 Subject: [PATCH 728/797] nixosTests.systemd-initrd-luks-password: test mounting device unlocked in initrd after switching root --- nixos/tests/systemd-initrd-luks-password.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/tests/systemd-initrd-luks-password.nix b/nixos/tests/systemd-initrd-luks-password.nix index e8e651f7b35f..55d0b4324b40 100644 --- a/nixos/tests/systemd-initrd-luks-password.nix +++ b/nixos/tests/systemd-initrd-luks-password.nix @@ -23,6 +23,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { cryptroot2.device = "/dev/vdd"; }; virtualisation.bootDevice = "/dev/mapper/cryptroot"; + # test mounting device unlocked in initrd after switching root + virtualisation.fileSystems."/cryptroot2".device = "/dev/mapper/cryptroot2"; }; }; @@ -31,6 +33,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { machine.wait_for_unit("multi-user.target") machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdc -") machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdd -") + machine.succeed("echo -n supersecret | cryptsetup luksOpen -q /dev/vdd cryptroot2") + machine.succeed("mkfs.ext4 /dev/mapper/cryptroot2") # Boot from the encrypted disk machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf") @@ -44,5 +48,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { machine.wait_for_unit("multi-user.target") assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") + assert "/dev/mapper/cryptroot2 on /cryptroot2 type ext4" in machine.succeed("mount") ''; }) From 55d8fccd2d2dfd7b9e542255447fc586f23ed99a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 07:21:05 +0000 Subject: [PATCH 729/797] aws-c-auth: 0.6.20 -> 0.6.21 --- pkgs/development/libraries/aws-c-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index 0720b836388b..e901d8887bd4 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.20"; + version = "0.6.21"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-d6o+ClQMhoSU8wjdP0nr+g6r4ZqzXhxBJcEfTOSlS7o="; + sha256 = "sha256-RVwSSr0EgVnZt/uUAldWQdjBw6/L+CHUutWcinysvNw="; }; nativeBuildInputs = [ From 801b38a29cd6d30080b12fa8559527fc4373f19c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 21 Nov 2022 15:55:30 +0800 Subject: [PATCH 730/797] guile_3_0: use correct version of guile for cross compilation --- pkgs/development/interpreters/guile/3.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index ced8561720d3..afad1c7a29ff 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -38,7 +38,7 @@ builder rec { depsBuildBuild = [ buildPackages.stdenv.cc ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - pkgsBuildBuild.guile; + pkgsBuildBuild.guile_3_0; nativeBuildInputs = [ makeWrapper pkg-config From aec0480b206405db7b55d5699d6166ca122cac04 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 21 Nov 2022 15:55:07 +0800 Subject: [PATCH 731/797] guile_2_2: use correct version of guile for cross compilation --- pkgs/development/interpreters/guile/2.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index c101f5ae3903..91cb993fae06 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -38,7 +38,7 @@ builder rec { buildPackages.stdenv.cc ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - pkgsBuildBuild.guile; + pkgsBuildBuild.guile_2_2; nativeBuildInputs = [ makeWrapper pkg-config From 85c5ea3834336bacd0fad204dc9fbace0d538f2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 08:01:25 +0000 Subject: [PATCH 732/797] aws-c-io: 0.13.9 -> 0.13.11 --- pkgs/development/libraries/aws-c-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 4bb38144763e..3f3ade4065e1 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.13.9"; + version = "0.13.11"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G7FYWrpg4TLsfK6C3JCTWkZ65iu3+gF3To5qYgUAqb0="; + sha256 = "sha256-3HNfEZ/PMHLhPp7boYyY/x5wXN9Eg+G1400q1riG2oI="; }; nativeBuildInputs = [ cmake ]; From 73eab78fd8ece416345ddfa7595cd959e0a45515 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 17 Nov 2022 13:59:54 +0800 Subject: [PATCH 733/797] puddletag: fix permissions so our wrapper works --- pkgs/applications/audio/puddletag/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 3fa0ea533b26..705820950b0d 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -59,8 +59,9 @@ python3.pkgs.buildPythonApplication rec { rapidfuzz ]; + # the file should be executable but it isn't so our wrapper doesn't run preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") + chmod 555 $out/bin/puddletag ''; doCheck = false; # there are no tests From 4de63c6750f2dcba7705f3a1bbbc16f05d6781de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannik=20R=C3=B6del?= Date: Mon, 21 Nov 2022 09:33:08 +0100 Subject: [PATCH 734/797] outline: 0.66.3 -> 0.67.0 --- nixos/modules/services/web-apps/outline.nix | 21 +- pkgs/servers/web-apps/outline/default.nix | 4 +- pkgs/servers/web-apps/outline/yarn.lock | 3140 ++++++++++--------- pkgs/servers/web-apps/outline/yarn.nix | 2672 ++++++++-------- 4 files changed, 3049 insertions(+), 2788 deletions(-) diff --git a/nixos/modules/services/web-apps/outline.nix b/nixos/modules/services/web-apps/outline.nix index 8a312d79584e..701930393f01 100644 --- a/nixos/modules/services/web-apps/outline.nix +++ b/nixos/modules/services/web-apps/outline.nix @@ -6,10 +6,10 @@ let in { # See here for a reference of all the options: - # https://github.com/outline/outline/blob/v0.65.2/.env.sample - # https://github.com/outline/outline/blob/v0.65.2/app.json - # https://github.com/outline/outline/blob/v0.65.2/server/env.ts - # https://github.com/outline/outline/blob/v0.65.2/shared/types.ts + # https://github.com/outline/outline/blob/v0.67.0/.env.sample + # https://github.com/outline/outline/blob/v0.67.0/app.json + # https://github.com/outline/outline/blob/v0.67.0/server/env.ts + # https://github.com/outline/outline/blob/v0.67.0/shared/types.ts # The order is kept the same here to make updating easier. options.services.outline = { enable = lib.mkEnableOption (lib.mdDoc "outline"); @@ -123,7 +123,7 @@ in description = lib.mdDoc '' To support uploading of images for avatars and document attachments an s3-compatible storage must be provided. AWS S3 is recommended for - redundency however if you want to keep all file storage local an + redundancy however if you want to keep all file storage local an alternative such as [minio](https://github.com/minio/minio) can be used. @@ -435,6 +435,16 @@ in ''; }; + sentryTunnel = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = lib.mdDoc '' + Optionally add a + [Sentry proxy tunnel](https://docs.sentry.io/platforms/javascript/troubleshooting/#using-the-tunnel-option) + for bypassing ad blockers in the UI. + ''; + }; + logo = lib.mkOption { type = lib.types.nullOr lib.types.str; default = null; @@ -621,6 +631,7 @@ in DEBUG = cfg.debugOutput; GOOGLE_ANALYTICS_ID = lib.optionalString (cfg.googleAnalyticsId != null) cfg.googleAnalyticsId; SENTRY_DSN = lib.optionalString (cfg.sentryDsn != null) cfg.sentryDsn; + SENTRY_TUNNEL = lib.optionalString (cfg.sentryTunnel != null) cfg.sentryTunnel; TEAM_LOGO = lib.optionalString (cfg.logo != null) cfg.logo; DEFAULT_LANGUAGE = cfg.defaultLanguage; diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 81c99012bdb2..5e047f326dd0 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.66.3"; + version = "0.67.0"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - sha256 = "sha256-2o5rRVOd+dvJOzQFGuuA0PZmmK/wnItcNu8WX9WShQ8="; + sha256 = "l7EJkmH/ctP8P937bV5gUqmeKeuH2mjby7Mj/USaCcA="; }; nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ]; diff --git a/pkgs/servers/web-apps/outline/yarn.lock b/pkgs/servers/web-apps/outline/yarn.lock index d82c2432d603..ef3b53a5f0f1 100644 --- a/pkgs/servers/web-apps/outline/yarn.lock +++ b/pkgs/servers/web-apps/outline/yarn.lock @@ -36,6 +36,13 @@ "@nicolo-ribaudo/chokidar-2" "^2.1.8" chokidar "^3.4.0" +"@babel/code-frame@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== + dependencies: + "@babel/highlight" "^7.10.4" + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" @@ -78,12 +85,12 @@ "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.16.0", "@babel/helper-annotate-as-pure@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" - integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw== +"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.16.0", "@babel/helper-annotate-as-pure@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" + integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA== dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" "@babel/helper-builder-binary-assignment-operator-visitor@^7.16.0": version "7.16.0" @@ -103,18 +110,18 @@ browserslist "^4.20.2" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.16.0", "@babel/helper-create-class-features-plugin@^7.16.7": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz#71835d7fb9f38bd9f1378e40a4c0902fdc2ea49d" - integrity sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ== +"@babel/helper-create-class-features-plugin@^7.16.0", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz#d802ee16a64a9e824fcbf0a2ffc92f19d58550ce" + integrity sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.17.9" - "@babel/helper-member-expression-to-functions" "^7.17.7" - "@babel/helper-optimise-call-expression" "^7.16.7" - "@babel/helper-replace-supers" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.18.9" + "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-create-regexp-features-plugin@^7.16.0": version "7.16.0" @@ -138,7 +145,7 @@ resolve "^1.14.2" semver "^6.1.2" -"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.9": +"@babel/helper-environment-visitor@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== @@ -150,7 +157,7 @@ dependencies: "@babel/types" "^7.16.0" -"@babel/helper-function-name@^7.16.0", "@babel/helper-function-name@^7.17.9", "@babel/helper-function-name@^7.18.9": +"@babel/helper-function-name@^7.16.0", "@babel/helper-function-name@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0" integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A== @@ -165,12 +172,12 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4" - integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw== +"@babel/helper-member-expression-to-functions@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815" + integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg== dependencies: - "@babel/types" "^7.17.0" + "@babel/types" "^7.18.9" "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.18.6": version "7.18.6" @@ -193,17 +200,17 @@ "@babel/traverse" "^7.18.9" "@babel/types" "^7.18.9" -"@babel/helper-optimise-call-expression@^7.16.0", "@babel/helper-optimise-call-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2" - integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w== +"@babel/helper-optimise-call-expression@^7.16.0", "@babel/helper-optimise-call-expression@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe" + integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA== dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.18.6" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" - integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" + integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== "@babel/helper-remap-async-to-generator@^7.16.0": version "7.16.0" @@ -214,16 +221,16 @@ "@babel/helper-wrap-function" "^7.16.0" "@babel/types" "^7.16.0" -"@babel/helper-replace-supers@^7.16.0", "@babel/helper-replace-supers@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1" - integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw== +"@babel/helper-replace-supers@^7.16.0", "@babel/helper-replace-supers@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz#1092e002feca980fbbb0bd4d51b74a65c6a500e6" + integrity sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ== dependencies: - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-member-expression-to-functions" "^7.16.7" - "@babel/helper-optimise-call-expression" "^7.16.7" - "@babel/traverse" "^7.16.7" - "@babel/types" "^7.16.7" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/traverse" "^7.18.9" + "@babel/types" "^7.18.9" "@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.6": version "7.18.6" @@ -239,7 +246,7 @@ dependencies: "@babel/types" "^7.16.0" -"@babel/helper-split-export-declaration@^7.16.0", "@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6": +"@babel/helper-split-export-declaration@^7.16.0", "@babel/helper-split-export-declaration@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== @@ -280,7 +287,7 @@ "@babel/traverse" "^7.18.9" "@babel/types" "^7.18.9" -"@babel/highlight@^7.18.6": +"@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== @@ -336,14 +343,16 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-proposal-decorators@^7.10.5": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz#59271439fed4145456c41067450543aee332d15f" - integrity sha512-knNIuusychgYN8fGJHONL0RbFxLGawhXOJNLBk75TniTsZZeA+wdkDuv6wp4lGwzQEKjZi6/WYtnb3udNPmQmQ== +"@babel/plugin-proposal-decorators@^7.18.10": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.10.tgz#788650d01e518a8a722eb8b3055dd9d73ecb7a35" + integrity sha512-wdGTwWF5QtpTY/gbBtQLAiCnoxfD4qMbN87NYZle1dOZ9Os8Y6zXcKrIaOU8W+TIvFUWVGG9tUgNww3CjXRVVw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-decorators" "^7.12.1" + "@babel/helper-create-class-features-plugin" "^7.18.9" + "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/plugin-syntax-decorators" "^7.18.6" "@babel/plugin-proposal-dynamic-import@^7.16.0": version "7.16.0" @@ -475,12 +484,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-decorators@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd" - integrity sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w== +"@babel/plugin-syntax-decorators@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.18.6.tgz#2e45af22835d0b0f8665da2bfd4463649ce5dbc1" + integrity sha512-fqyLgjcxf/1yhyZ6A+yo1u9gJ7eleFQod2lkaUsF9DQ7sbbY3Ligym3L0+I2c0WmqNKDpoD9UTb1AKP3qRMOAQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" @@ -630,12 +639,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-destructuring@^7.10.4", "@babel/plugin-transform-destructuring@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.0.tgz#ad3d7e74584ad5ea4eadb1e6642146c590dee33c" - integrity sha512-Q7tBUwjxLTsHEoqktemHBMtb3NYwyJPTJdM+wDwb0g8PZ3kQUIzNvwD5lPaqW/p54TXBc/MXZu9Jr7tbUEUM8Q== +"@babel/plugin-transform-destructuring@^7.16.0", "@babel/plugin-transform-destructuring@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz#c23741cfa44ddd35f5e53896e88c75331b8b2792" + integrity sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-dotall-regex@^7.16.0", "@babel/plugin-transform-dotall-regex@^7.4.4": version "7.16.0" @@ -1002,10 +1011,10 @@ core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.2", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.6.tgz#6a1ef59f838debd670421f8c7f2cbb8da9751580" - integrity sha512-t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ== +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.2", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a" + integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw== dependencies: regenerator-runtime "^0.13.4" @@ -1018,7 +1027,7 @@ "@babel/parser" "^7.18.10" "@babel/types" "^7.18.10" -"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.18.10", "@babel/traverse@^7.18.9", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2": +"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.18.10", "@babel/traverse@^7.18.9", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2": version "7.18.11" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.11.tgz#3d51f2afbd83ecf9912bcbb5c4d94e3d2ddaa16f" integrity sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ== @@ -1034,7 +1043,7 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": +"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": version "7.18.10" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.10.tgz#4908e81b6b339ca7c6b7a555a5fc29446f26dde6" integrity sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ== @@ -1053,20 +1062,20 @@ resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.0.tgz#fe364f025ba74f6de6c837a84ef44bdb1d61e68f" integrity sha512-mgmE7XBYY/21erpzhexk4Cj1cyTQ9LzvnTxtzM17BJ7ERMNE6W72mQRo0I1Ud8eFJ+RVVIcBNhLFZ3GX4XFz5w== -"@bull-board/api@4.2.2", "@bull-board/api@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-4.2.2.tgz#42838f4fda71a3bdca560ea7c6eb80b3d846f446" - integrity sha512-YFkkeWvMit0P04k+xu4ZZ22i24m+Tq/w82LBtpt3z9Xu1rGrZoui8CI/YRsaJJE0o9TsqL5tY653oFVcdg35pQ== +"@bull-board/api@4.6.2", "@bull-board/api@^4.2.2": + version "4.6.2" + resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-4.6.2.tgz#c9dd1e5e6ee5113eb93e73765b50e6e7388b71f6" + integrity sha512-0LzUZumGgRfszNfmaNm57l48oUvUTBM01A/GzC5mkP4o5lc9ZgJh2yf+cH8aTG8TAhI1oDWQ8TXZLVJ8+JgDlA== dependencies: redis-info "^3.0.8" -"@bull-board/koa@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@bull-board/koa/-/koa-4.2.2.tgz#97b74fde56d2df51c3cd2277cedc6f91a921dc63" - integrity sha512-ekrD3utbSM1PEdNcstvhli+aFjtdoFJpulkxoLfBPQweRc9yCzfqbgcg6g1DgjaNgQ5iEWLKGr3FSwBON5v6wQ== +"@bull-board/koa@^4.6.2": + version "4.6.2" + resolved "https://registry.yarnpkg.com/@bull-board/koa/-/koa-4.6.2.tgz#548d584b6d37869b497ab8a38b383410caace9b9" + integrity sha512-rBV36JKnOt2dwDGzaeNdF+G0BfuKPwl5t+j1ME2JxZjyAeTuEnN4flJFTc8kdJ0EdB/hMQoFLXLvXEesJsQQJg== dependencies: - "@bull-board/api" "4.2.2" - "@bull-board/ui" "4.2.2" + "@bull-board/api" "4.6.2" + "@bull-board/ui" "4.6.2" ejs "^3.1.7" koa "^2.13.1" koa-mount "^4.0.0" @@ -1074,12 +1083,12 @@ koa-static "^5.0.0" koa-views "^7.0.1" -"@bull-board/ui@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@bull-board/ui/-/ui-4.2.2.tgz#2d5d7cbabfdea292988458d58e267bbc4b33aff0" - integrity sha512-QLWWTtVj6kQ01ox4OqCs/IdKm+jWFtLvhBU7RwYt8UxmxA6dZ8ffS6hWmjWk5sJ4cKk9GzPoASYMgFv0AMuh0w== +"@bull-board/ui@4.6.2": + version "4.6.2" + resolved "https://registry.yarnpkg.com/@bull-board/ui/-/ui-4.6.2.tgz#dc1172cbdc471cf4a042c8639b44376aa11e852e" + integrity sha512-QwapaE5N9Y1xo8VxyeybTJHHdeGi3hfaLXtYSnAFkgPUD6b4s3knYhdoAOE0/lUy7kzFTPCEezhYOTDaXOy2OQ== dependencies: - "@bull-board/api" "4.2.2" + "@bull-board/api" "4.6.2" "@bundle-stats/plugin-webpack-filter@^3.1.3": version "3.2.0" @@ -1093,35 +1102,35 @@ dependencies: superstruct "^0.8.3" -"@chakra-ui/counter@^1.1.9": - version "1.1.9" - resolved "https://registry.yarnpkg.com/@chakra-ui/counter/-/counter-1.1.9.tgz#954794624806ea6a00f0ebdd3d50c6838d0b41fc" - integrity sha512-WHkYSHJynkFwVFD6wg6afDteBeAmDHV35/tPMwpyTcgagpF99xY/8mULnBoLkkCc/PMe+meHuZJEXuCaxy4ecg== +"@chakra-ui/counter@^1.2.5": + version "1.2.10" + resolved "https://registry.yarnpkg.com/@chakra-ui/counter/-/counter-1.2.10.tgz#544de1f53b783e8577cc74208ae1b0ca74385834" + integrity sha512-HQd09IuJ4z8M8vWajH+99jBWWSHDesQZmnN95jUg3HKOuNleLaipf2JFdrqbO1uWQyHobn2PM6u+B+JCAh2nig== dependencies: - "@chakra-ui/hooks" "1.6.0" - "@chakra-ui/utils" "1.8.2" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/hooks@1.6.0", "@chakra-ui/hooks@^1.6.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@chakra-ui/hooks/-/hooks-1.6.0.tgz#94f54540298b6a5a7ef68b15e451e76b0ee1fed4" - integrity sha512-5QFICaE1omNCJyVQQX62sZvRvIpI4VansN2AvZpSdrMjRiWvmBNLZN2Khr7+8j6F7uDh5LSgTxiP02vWLp12hA== +"@chakra-ui/hooks@1.9.1", "@chakra-ui/hooks@^1.8.2": + version "1.9.1" + resolved "https://registry.yarnpkg.com/@chakra-ui/hooks/-/hooks-1.9.1.tgz#7a00659e6bb4d56cf56022071eca0b77a7df1ac1" + integrity sha512-SEeh1alDKzrP9gMLWMnXOUDBQDKF/URL6iTmkumTn6vhawWNla6sPrcMyoCzWdMzwUhZp3QNtCKbUm7dxBXvPw== dependencies: - "@chakra-ui/react-utils" "1.1.2" - "@chakra-ui/utils" "1.8.2" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" compute-scroll-into-view "1.0.14" copy-to-clipboard "3.3.1" -"@chakra-ui/react-utils@1.1.2", "@chakra-ui/react-utils@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@chakra-ui/react-utils/-/react-utils-1.1.2.tgz#7ea80b6ae25bd7b182095cc9ffaad23c464408b5" - integrity sha512-S8jPVKGZH2qF7ZGxl/0DF/dXXI2AxDNGf4Ahi2LGHqajMvqBB7vtYIRRmIA7+jAnErhzO8WUi3i4Z7oScp6xSA== +"@chakra-ui/react-utils@1.2.3", "@chakra-ui/react-utils@^1.2.2": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@chakra-ui/react-utils/-/react-utils-1.2.3.tgz#3356c9299bc8faada8fac6c5886ca65ec95bb5be" + integrity sha512-r8pUwCVVB7UPhb0AiRa9ZzSp4xkMz64yIeJ4O4aGy4WMw7TRH4j4QkbkE1YC9tQitrXrliOlvx4WWJR4VyiGpw== dependencies: - "@chakra-ui/utils" "^1.7.0" + "@chakra-ui/utils" "^1.10.4" -"@chakra-ui/utils@1.8.2", "@chakra-ui/utils@^1.7.0", "@chakra-ui/utils@^1.8.2": - version "1.8.2" - resolved "https://registry.yarnpkg.com/@chakra-ui/utils/-/utils-1.8.2.tgz#5a9f1f67c5f2232769fe7d009fcf96eebf3c2b4e" - integrity sha512-MnE4czCQCE87Ch1DfAdmZvObgRviw9wQ9Zti372P8VD1ILEdff/C5WBWHW6mgG3YcorPAxgnrNF3MmNE95jRkA== +"@chakra-ui/utils@1.10.4", "@chakra-ui/utils@^1.10.2", "@chakra-ui/utils@^1.10.4": + version "1.10.4" + resolved "https://registry.yarnpkg.com/@chakra-ui/utils/-/utils-1.10.4.tgz#40a32d4efd8684b2e7432a40b285796383eacfd3" + integrity sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA== dependencies: "@types/lodash.mergewith" "4.6.6" css-box-model "1.2.1" @@ -1137,37 +1146,48 @@ enabled "2.0.x" kuler "^2.0.0" -"@datadog/native-metrics@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@datadog/native-metrics/-/native-metrics-1.1.0.tgz#ef860a4cbea81b6e1559b280f5f1f3cd2cc22585" - integrity sha512-OSrhoo8U/JB/FltvAp54cgMHCBWEriF/D/ZboBH4Pn7UY/Zu8dkzB6eAWQFJIxQlHjYrAEuNgZPBkaHhS3e0KQ== +"@datadog/native-appsec@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@datadog/native-appsec/-/native-appsec-1.2.1.tgz#f9d4003b470608018c1f697e2d401202a3084632" + integrity sha512-jF+k7xhBmJIYYLtjvhCey08RBbItTG7O2zcSCDGFffhvCvo3ZOoou+IKtAm9z+U7hOoeOmD+Xg+h29xj/BB9MA== + dependencies: + detect-libc "^1.0.3" + minimist "^1.2.6" + tar "^6.1.11" + +"@datadog/native-metrics@^1.4.3": + version "1.4.3" + resolved "https://registry.yarnpkg.com/@datadog/native-metrics/-/native-metrics-1.4.3.tgz#30b62bdf227f3a193ca0ab06728a3ad9ccd70f1c" + integrity sha512-EUOoTbCWEAqCp3Cswe3JR3DkK6GUaBQIz7sLPNdy1RDu6Zc39HNCXEDo5RL3Hexo87gDkOq+pRifLkxjwrf7gQ== dependencies: - nan "^2.14.2" node-gyp-build "^3.9.0" -"@datadog/pprof@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-0.3.0.tgz#aa6f4611844e2521633f34b1649778ceec0493bb" - integrity sha512-RskYpLD2mWdvUk2OU9p3gynx8QxHtfPdRPWs3vqlM+PMf+wstibcYMW7auNY4s3gVA1mT7HiBjW7j0m37rOHOQ== +"@datadog/pprof@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-1.0.2.tgz#835b2e8596738348a5ba81e5e399cdf3bc85bd35" + integrity sha512-AMTK55W3Aa2QX2X8mN9SQfDGw3HvwIK9Or8pXQFss+kjtH5pCkO9oqE5838MeXgRh9BR8HWrjAQE3Ji7FRCK2g== dependencies: delay "^5.0.0" findit2 "^2.2.3" - nan "^2.14.0" + nan "^2.16.0" node-gyp-build "^3.9.0" - p-limit "^3.0.0" + p-limit "^3.1.0" pify "^5.0.0" - protobufjs "~6.11.0" + protobufjs "^7.0.0" rimraf "^3.0.2" semver "^7.3.5" source-map "^0.7.3" split "^1.0.1" -"@datadog/sketches-js@^1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@datadog/sketches-js/-/sketches-js-1.0.4.tgz#6213c26e3459fed80b075d80ffff551979fb0e6a" - integrity sha512-9S5fdz448dLfGw4jSH1A4GZpkLWBufdsJu4PeevEjDvkauEmE175xBiBLfYHQEdKe7lEVNB4IRtUZqY16QRVUw== - dependencies: - protobufjs "^6.10.2" +"@datadog/sketches-js@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@datadog/sketches-js/-/sketches-js-2.1.0.tgz#8c7e8028a5fc22ad102fa542b0a446c956830455" + integrity sha512-smLocSfrt3s53H/XSVP3/1kP42oqvrkjUPtyaFd1F79ux24oE31BKt+q0c6lsa6hOYrFzsIwyc5GXAI5JmfOew== + +"@discoveryjs/json-ext@^0.5.0": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" + integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== "@dnd-kit/accessibility@^3.0.0": version "3.0.0" @@ -1176,35 +1196,35 @@ dependencies: tslib "^2.0.0" -"@dnd-kit/core@^4.0.3": - version "4.0.3" - resolved "https://registry.yarnpkg.com/@dnd-kit/core/-/core-4.0.3.tgz#49abe3c9b481b6e07909df1781e88b20f3dd25b0" - integrity sha512-uT1uHZxKx3iEkupmLfknMIvbykMJSetoXXmra6sGGvtWy+OMKrWm3axH2c90+JC/q6qaeKs2znd3Qs8GLnCa5Q== +"@dnd-kit/core@^6.0.5": + version "6.0.5" + resolved "https://registry.yarnpkg.com/@dnd-kit/core/-/core-6.0.5.tgz#5670ad0dcc83cd51dbf2fa8c6a5c8af4ac0c1989" + integrity sha512-3nL+Zy5cT+1XwsWdlXIvGIFvbuocMyB4NBxTN74DeBaBqeWdH9JsnKwQv7buZQgAHmAH+eIENfS1ginkvW6bCw== dependencies: "@dnd-kit/accessibility" "^3.0.0" - "@dnd-kit/utilities" "^3.0.1" + "@dnd-kit/utilities" "^3.2.0" tslib "^2.0.0" -"@dnd-kit/modifiers@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@dnd-kit/modifiers/-/modifiers-4.0.0.tgz#d1577b806b2319f14a1a0a155f270e672cfca636" - integrity sha512-4OkNTamneH9u3YMJqG6yJ6cwFoEd/4yY9BF39TgmDh9vyMK2MoPZFVAV0vOEm193ZYsPczq3Af5tJFtJhR9jJQ== +"@dnd-kit/modifiers@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@dnd-kit/modifiers/-/modifiers-6.0.0.tgz#61d8834132f791a68e9e93be5426becbcd45c078" + integrity sha512-V3+JSo6/BTcgPRHiNUTSKgqVv/doKXg+T4Z0QvKiiXp+uIyJTUtPkQOBRQApUWi3ApBhnoWljyt/3xxY4fTd0Q== dependencies: - "@dnd-kit/utilities" "^3.0.0" + "@dnd-kit/utilities" "^3.2.0" tslib "^2.0.0" -"@dnd-kit/sortable@^5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@dnd-kit/sortable/-/sortable-5.1.0.tgz#f30ec12c95ca5aa90e2e4d9ef3dbe16b3eb26d69" - integrity sha512-CPyiUHbTrSYzhddfgdeoX0ERg/dEyVKIWx9+4O6uqpoppo84SXCBHVFiFBRVpQ9wtpsXs7prtUAnAUTcvFQTZg== +"@dnd-kit/sortable@^7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@dnd-kit/sortable/-/sortable-7.0.1.tgz#99c6012bbab4d8bb726c0eef7b921a338c404fdb" + integrity sha512-n77qAzJQtMMywu25sJzhz3gsHnDOUlEjTtnRl8A87rWIhnu32zuP+7zmFjwGgvqfXmRufqiHOSlH7JPC/tnJ8Q== dependencies: - "@dnd-kit/utilities" "^3.0.0" + "@dnd-kit/utilities" "^3.2.0" tslib "^2.0.0" -"@dnd-kit/utilities@^3.0.0", "@dnd-kit/utilities@^3.0.1": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@dnd-kit/utilities/-/utilities-3.0.2.tgz#24fd796491a85c2904e9c97f1fdb42005df645f2" - integrity sha512-J4WpZXKbLJzBkuALqsIy5KmQr6PQk86ixoPKoixzjWj1+XGE5KdA2vga9Vf43EB/Ewpng+E5SmXVLfTs7ukbhw== +"@dnd-kit/utilities@^3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@dnd-kit/utilities/-/utilities-3.2.0.tgz#b3e956ea63a1347c9d0e1316b037ddcc6140acda" + integrity sha512-h65/pn2IPCCIWwdlR2BMLqRkDxpTEONA+HQW3n765HBijLYGyrnTCLa2YQt8VVjjSQD6EfFlTE6aS2Q/b6nb2g== dependencies: tslib "^2.0.0" @@ -1230,60 +1250,59 @@ resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== -"@eslint/eslintrc@^0.2.1": - version "0.2.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c" - integrity sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA== +"@eslint/eslintrc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" + integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== dependencies: ajv "^6.12.4" debug "^4.1.1" espree "^7.3.0" - globals "^12.1.0" + globals "^13.9.0" ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" - lodash "^4.17.19" minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@formatjs/ecma402-abstract@1.9.8": - version "1.9.8" - resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.9.8.tgz#f3dad447fbc7f063f88e2a148b7a353161740e74" - integrity sha512-2U4n11bLmTij/k4ePCEFKJILPYwdMcJTdnKVBi+JMWBgu5O1N+XhCazlE6QXqVO1Agh2Doh0b/9Jf1mSmSVfhA== +"@formatjs/ecma402-abstract@1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.12.0.tgz#2fb5e8983d5fae2fad9ec6c77aec1803c2b88d8e" + integrity sha512-0/wm9b7brUD40kx7KSE0S532T8EfH06Zc41rGlinoNyYXnuusR6ull2x63iFJgVXgwahm42hAW7dcYdZ+llZzA== dependencies: - "@formatjs/intl-localematcher" "0.2.20" - tslib "^2.1.0" + "@formatjs/intl-localematcher" "0.2.31" + tslib "2.4.0" -"@formatjs/fast-memoize@1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.0.tgz#1123bfcc5d21d761f15d8b1c32d10e1b6530355d" - integrity sha512-fObitP9Tlc31SKrPHgkPgQpGo4+4yXfQQITTCNH8AZdEqB7Mq4nPrjpUL/tNGN3lEeJcFxDbi0haX8HM7QvQ8w== +"@formatjs/fast-memoize@1.2.6": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.6.tgz#a442970db7e9634af556919343261a7bbe5e88c3" + integrity sha512-9CWZ3+wCkClKHX+i5j+NyoBVqGf0pIskTo6Xl6ihGokYM2yqSSS68JIgeo+99UIHc+7vi9L3/SDSz/dWI9SNlA== dependencies: - tslib "^2.1.0" + tslib "2.4.0" -"@formatjs/icu-messageformat-parser@2.0.11": - version "2.0.11" - resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.11.tgz#e4ba40b9a8aefc8bccfc96be5906d3bca305b4b3" - integrity sha512-5mWb8U8aulYGwnDZWrr+vdgn5PilvtrqQYQ1pvpgzQes/osi85TwmL2GqTGLlKIvBKD2XNA61kAqXYY95w4LWg== +"@formatjs/icu-messageformat-parser@2.1.7": + version "2.1.7" + resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.7.tgz#35dc556c13a0544cc730300c8ddb730ba7f44bd4" + integrity sha512-KM4ikG5MloXMulqn39Js3ypuVzpPKq/DDplvl01PE2qD9rAzFO8YtaUCC9vr9j3sRXwdHPeTe8r3J/8IJgvYEQ== dependencies: - "@formatjs/ecma402-abstract" "1.9.8" - "@formatjs/icu-skeleton-parser" "1.2.12" - tslib "^2.1.0" + "@formatjs/ecma402-abstract" "1.12.0" + "@formatjs/icu-skeleton-parser" "1.3.13" + tslib "2.4.0" -"@formatjs/icu-skeleton-parser@1.2.12": - version "1.2.12" - resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.2.12.tgz#45426eb1448c0c08c931eb9f0672283c0e4d0062" - integrity sha512-DTFxWmEA02ZNW6fsYjGYSADvtrqqjCYF7DSgCmMfaaE0gLP4pCdAgOPE+lkXXU+jP8iCw/YhMT2Seyk/C5lBWg== +"@formatjs/icu-skeleton-parser@1.3.13": + version "1.3.13" + resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.13.tgz#f7e186e72ed73c3272d22a3aacb646e77368b099" + integrity sha512-qb1kxnA4ep76rV+d9JICvZBThBpK5X+nh1dLmmIReX72QyglicsaOmKEcdcbp7/giCWfhVs6CXPVA2JJ5/ZvAw== dependencies: - "@formatjs/ecma402-abstract" "1.9.8" - tslib "^2.1.0" + "@formatjs/ecma402-abstract" "1.12.0" + tslib "2.4.0" -"@formatjs/intl-localematcher@0.2.20": - version "0.2.20" - resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.20.tgz#782aef53d1c1b6112ee67468dc59f9b8d1ba7b17" - integrity sha512-/Ro85goRZnCojzxOegANFYL0LaDIpdPjAukR7xMTjOtRx+3yyjR0ifGTOW3/Kjhmab3t6GnyHBYWZSudxEOxPA== +"@formatjs/intl-localematcher@0.2.31": + version "0.2.31" + resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.31.tgz#aada2b1e58211460cedba56889e3c489117eb6eb" + integrity sha512-9QTjdSBpQ7wHShZgsNzNig5qT3rCPvmZogS/wXZzKotns5skbXgs0I7J8cuN0PPqXyynvNVuN+iOKhNS2eb+ZA== dependencies: - tslib "^2.1.0" + tslib "2.4.0" "@getoutline/jest-runner-serial@^2.0.0": version "2.0.0" @@ -1332,23 +1351,51 @@ y-protocols "^1.0.5" yjs "^13.5.29" +"@humanwhocodes/config-array@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" + integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== + dependencies: + "@humanwhocodes/object-schema" "^1.2.0" + debug "^4.1.1" + minimatch "^3.0.4" + +"@humanwhocodes/object-schema@^1.2.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== + "@icons/material@^0.2.4": version "0.2.4" resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8" integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw== -"@internationalized/message@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@internationalized/message/-/message-3.0.2.tgz#c3db2b6b7f75af815819f77da11f8424381416e3" - integrity sha512-ZZ8FQDCsri3vUB2mfDD76Vbf97DH361AiZUXKHV4BqwCtYyaNYiZqIr8KXrcMCxJvrIYVQLSn8+jeIQRO3bvtw== +"@internationalized/date@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@internationalized/date/-/date-3.0.1.tgz#66332e9ca8f59b7be010ca65d946bca430ba4b66" + integrity sha512-E/3lASs4mAeJ2Z2ye6ab7eUD0bPUfTeNVTAv6IS+ne9UtMu9Uepb9A1U2Ae0hDr6WAlBuvUtrakaxEdYB9TV6Q== dependencies: "@babel/runtime" "^7.6.2" - intl-messageformat "^9.6.12" -"@internationalized/number@^3.0.2": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@internationalized/number/-/number-3.0.3.tgz#d29003dffdff54ca6f2287ec0cb77ff3d045478f" - integrity sha512-ewFoVvsxSyd9QZnknvOWPjirYqdMQhXTeDhJg3hM6C/FeZt0banpGH1nZ0SGMZXHz8NK9uAa2KVIq+jqAIOg4w== +"@internationalized/message@^3.0.9": + version "3.0.9" + resolved "https://registry.yarnpkg.com/@internationalized/message/-/message-3.0.9.tgz#52bc20debe5296375d66ffcf56c3df5d8118a37d" + integrity sha512-yHQggKWUuSvj1GznVtie4tcYq+xMrkd/lTKCFHp6gG18KbIliDw+UI7sL9+yJPGuWiR083xuLyyhzqiPbNOEww== + dependencies: + "@babel/runtime" "^7.6.2" + intl-messageformat "^10.1.0" + +"@internationalized/number@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@internationalized/number/-/number-3.1.1.tgz#160584316741de4381689ab759001603ee17b595" + integrity sha512-dBxCQKIxvsZvW2IBt3KsqrCfaw2nV6o6a8xsloJn/hjW0ayeyhKuiiMtTwW3/WGNPP7ZRyDbtuiUEjMwif1ENQ== + dependencies: + "@babel/runtime" "^7.6.2" + +"@internationalized/string@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@internationalized/string/-/string-3.0.0.tgz#de563871e1b19e4d0ce3246ec18d25da1a73db73" + integrity sha512-NUSr4u+mNu5BysXFeVWZW4kvjXylPkU/YYqaWzdNuz1eABfehFiZTEYhWAAMzI3U8DTxfqF9PM3zyhk5gcfz6w== dependencies: "@babel/runtime" "^7.6.2" @@ -1851,6 +1898,11 @@ "@babel/runtime" "^7.7.2" regenerator-runtime "^0.13.3" +"@jonkemp/package-utils@^1.0.8": + version "1.0.8" + resolved "https://registry.yarnpkg.com/@jonkemp/package-utils/-/package-utils-1.0.8.tgz#4bce132a18f34407a88bb15c28bd3ed3030c4776" + integrity sha512-bIcKnH5YmtTYr7S6J3J86dn/rFiklwRpOqbTOQ9C0WMmR9FKHVb3bxs2UYfqEmNb93O4nbA97sb6rtz33i9SyA== + "@joplin/turndown-plugin-gfm@^1.0.44": version "1.0.44" resolved "https://registry.yarnpkg.com/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.44.tgz#028e4c56bf58e57a4d0d923bb7d10a21c30d5c7d" @@ -1985,10 +2037,22 @@ dependencies: passport-oauth "1.0.x" -"@pmmmwh/react-refresh-webpack-plugin@^0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.4.tgz#df0d0d855fc527db48aac93c218a0bf4ada41f99" - integrity sha512-zZbZeHQDnoTlt2AF+diQT0wsSXpvWiaIOZwBRdltNFhG1+I3ozyaw7U/nBiUwyJ0D+zwdXp0E3bWOl38Ag2BMw== +"@pkgr/utils@^2.3.1": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.3.1.tgz#0a9b06ffddee364d6642b3cd562ca76f55b34a03" + integrity sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw== + dependencies: + cross-spawn "^7.0.3" + is-glob "^4.0.3" + open "^8.4.0" + picocolors "^1.0.0" + tiny-glob "^0.2.9" + tslib "^2.4.0" + +"@pmmmwh/react-refresh-webpack-plugin@^0.5.7": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.7.tgz#58f8217ba70069cc6a73f5d7e05e85b458c150e2" + integrity sha512-bcKCAzF0DV2IIROp9ZHkRJa6O4jy7NlnHdWL3GmcUxYWNjLXkK5kfELELwEfSP5hXPfVL/qOGMAROuMQb9GG8Q== dependencies: ansi-html-community "^0.0.8" common-path-prefix "^3.0.0" @@ -2000,10 +2064,10 @@ schema-utils "^3.0.0" source-map "^0.7.3" -"@popperjs/core@^2.5.4": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.6.0.tgz#f022195afdfc942e088ee2101285a1d31c7d727f" - integrity sha512-cPqjjzuFWNK3BSKLm0abspP0sp/IGOli4p5I5fKFAzdS8fvjdOwDCfZqAaIiXd9lPkOWi3SUUfZof3hEb7J/uw== +"@popperjs/core@^2.5.4", "@popperjs/core@^2.9.0": + version "2.11.6" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45" + integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" @@ -2058,6 +2122,36 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== +"@radix-ui/popper@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@radix-ui/popper/-/popper-0.1.0.tgz#c387a38f31b7799e1ea0d2bb1ca0c91c2931b063" + integrity sha512-uzYeElL3w7SeNMuQpXiFlBhTT+JyaNMCwDfjKkrzugEcYrf5n52PHqncNdQPUtR42hJh8V9FsqyEDbDxkeNjJQ== + dependencies: + "@babel/runtime" "^7.13.10" + csstype "^3.0.4" + +"@radix-ui/react-use-rect@^0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-use-rect/-/react-use-rect-0.1.1.tgz#6c15384beee59c086e75b89a7e66f3d2e583a856" + integrity sha512-kHNNXAsP3/PeszEmM/nxBBS9Jbo93sO+xuMTcRfwzXsmxT5gDXQzAiKbZQ0EecCPtJIzqvr7dlaQi/aP1PKYqQ== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/rect" "0.1.1" + +"@radix-ui/react-use-size@^0.1.0": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-use-size/-/react-use-size-0.1.1.tgz#f6b75272a5d41c3089ca78c8a2e48e5f204ef90f" + integrity sha512-pTgWM5qKBu6C7kfKxrKPoBI2zZYZmp2cSXzpUiGM3qEBQlMLtYhaY2JXdXUCxz+XmD1YEjc8oRwvyfsD4AG4WA== + dependencies: + "@babel/runtime" "^7.13.10" + +"@radix-ui/rect@0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@radix-ui/rect/-/rect-0.1.1.tgz#95b5ba51f469bea6b1b841e2d427e17e37d38419" + integrity sha512-g3hnE/UcOg7REdewduRPAK88EPuLZtaq7sA9ouu8S+YEtnyFRI16jgv6GZYe3VMoQLL1T171ebmEPtDjyxWLzw== + dependencies: + "@babel/runtime" "^7.13.10" + "@reach/observe-rect@^1.1.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@reach/observe-rect/-/observe-rect-1.2.0.tgz#d7a6013b8aafcc64c778a0ccb83355a11204d3b2" @@ -2079,74 +2173,102 @@ tiny-warning "^1.0.3" tslib "^2.3.0" -"@react-aria/i18n@^3.3.2": - version "3.3.2" - resolved "https://registry.yarnpkg.com/@react-aria/i18n/-/i18n-3.3.2.tgz#891902938333c6ab5491b7acb7581f8567045dbc" - integrity sha512-a4AptbWLPVMJfjPdyW60TFtT4gvKAputx9YaUrIywoV/5p900AcOOc3uuL43+vuCKBzMkGUeTa1a4eL1HstDUA== +"@react-aria/focus@^3.8.0": + version "3.8.0" + resolved "https://registry.yarnpkg.com/@react-aria/focus/-/focus-3.8.0.tgz#b292df7e35ed1b57af43f98df8135b00c4667d17" + integrity sha512-XuaLFdqf/6OyILifkVJo++5k2O+wlpNvXgsJkRWn/wSmB77pZKURm2MMGiSg2u911NqY+829UrSlpmhCZrc8RA== dependencies: "@babel/runtime" "^7.6.2" - "@internationalized/message" "^3.0.2" - "@internationalized/number" "^3.0.2" - "@react-aria/ssr" "^3.0.3" - "@react-aria/utils" "^3.8.2" - "@react-types/shared" "^3.8.0" - -"@react-aria/interactions@^3.5.1", "@react-aria/interactions@^3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@react-aria/interactions/-/interactions-3.6.0.tgz#63c16e6179e8ae38221e26256d9a7639d7f9b24e" - integrity sha512-dMEGYIIhJ3uxDd19Z/rxuqQp9Rx9c46AInrfzAiOijQj/fTmb4ubCsuFOAQrc0sy1HCY1/ntnRZQuRgT/iS74w== - dependencies: - "@babel/runtime" "^7.6.2" - "@react-aria/utils" "^3.9.0" - "@react-types/shared" "^3.9.0" - -"@react-aria/live-announcer@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@react-aria/live-announcer/-/live-announcer-3.0.1.tgz#772888326808d180adc5bc9fa0b4b1416ec08811" - integrity sha512-c63UZ4JhXxy29F6FO1LUkQLDRzv17W4g3QQ+sy6tmFw7R5I5r8uh8jR7RCbBX7bdGCLnQDwOQ055KsM/a9MT3A== - dependencies: - "@babel/runtime" "^7.6.2" - "@react-aria/utils" "^3.8.2" - "@react-aria/visually-hidden" "^3.2.3" - -"@react-aria/spinbutton@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@react-aria/spinbutton/-/spinbutton-3.0.1.tgz#e0d5595e1c74518ca46acdeebf7bd19022ee5d50" - integrity sha512-V2wUhSgJDxSqzo5HPbx7OgGpFeuvxq8/7nNO8mT3cEZfZASUGvjIdCRmAf243qyfo9Yby4zdx9E/BxNOGCZ9cQ== - dependencies: - "@babel/runtime" "^7.6.2" - "@react-aria/i18n" "^3.3.2" - "@react-aria/live-announcer" "^3.0.1" - "@react-aria/utils" "^3.8.2" - "@react-types/button" "^3.4.1" - "@react-types/shared" "^3.8.0" - -"@react-aria/ssr@^3.0.3", "@react-aria/ssr@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@react-aria/ssr/-/ssr-3.1.0.tgz#b7163e6224725c30121932a8d1422ef91d1fab22" - integrity sha512-RxqQKmE8sO7TGdrcSlHTcVzMP450hqowtBSd2bBS9oPlcokVkaGq28c3Rwa8ty5ctw4EBCjXqjP7xdcKMGDzug== - dependencies: - "@babel/runtime" "^7.6.2" - -"@react-aria/utils@^3.8.2", "@react-aria/utils@^3.9.0": - version "3.9.0" - resolved "https://registry.yarnpkg.com/@react-aria/utils/-/utils-3.9.0.tgz#c5446f807091a744311d4d559fa8a42e7448824d" - integrity sha512-P0dEOMHGHHJ5KC8iCpaMxAtgdUdeISAm4FZnmoD5fK3JxlKEC046hUxlad83RkNOBZkT2dDvF4HeDCUqdMWHKQ== - dependencies: - "@babel/runtime" "^7.6.2" - "@react-aria/ssr" "^3.1.0" - "@react-stately/utils" "^3.2.2" - "@react-types/shared" "^3.9.0" + "@react-aria/interactions" "^3.11.0" + "@react-aria/utils" "^3.13.3" + "@react-types/shared" "^3.14.1" clsx "^1.1.1" -"@react-aria/visually-hidden@^3.2.3": - version "3.2.3" - resolved "https://registry.yarnpkg.com/@react-aria/visually-hidden/-/visually-hidden-3.2.3.tgz#4779df0a468873550afb42a7f5fcb2411d82db8d" - integrity sha512-iAe5EFI7obEOwTnIdAwWrKq+CrIJFGTw85v8fXnQ7CIVGRDblX85GOUww9bzQNPDLLRYWS4VF702ii8kV4+JCw== +"@react-aria/i18n@^3.3.5", "@react-aria/i18n@^3.6.0": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@react-aria/i18n/-/i18n-3.6.0.tgz#0caf4d2173de411839ee55c1d4591aaf3919d6dc" + integrity sha512-FbdoBpMPgO0uldrpn43vCm8Xcveb46AklvUmh+zIUYRSIyIl2TKs5URTnwl9Sb1aloawoHQm2A5kASj5+TCxuA== dependencies: "@babel/runtime" "^7.6.2" - "@react-aria/interactions" "^3.5.1" - "@react-aria/utils" "^3.8.2" + "@internationalized/date" "^3.0.1" + "@internationalized/message" "^3.0.9" + "@internationalized/number" "^3.1.1" + "@internationalized/string" "^3.0.0" + "@react-aria/ssr" "^3.3.0" + "@react-aria/utils" "^3.13.3" + "@react-types/shared" "^3.14.1" + +"@react-aria/interactions@^3.11.0": + version "3.11.0" + resolved "https://registry.yarnpkg.com/@react-aria/interactions/-/interactions-3.11.0.tgz#aa6118af58ff443670152393edab97e403d6d359" + integrity sha512-ZjK4m8u6FlV7Q9/1h9P2Ii6j/NwKR3BmTeGeBQssS2i4dV2pJeOPePnGzVQQGG8FzGQ+TcNRvZPXKaU4AlnBjw== + dependencies: + "@babel/runtime" "^7.6.2" + "@react-aria/utils" "^3.13.3" + "@react-types/shared" "^3.14.1" + +"@react-aria/label@^3.4.1": + version "3.4.1" + resolved "https://registry.yarnpkg.com/@react-aria/label/-/label-3.4.1.tgz#562633a04e97b44cf6c65a3b31c4e82c1aca9cf9" + integrity sha512-sdXkCrMh3JfV8dw/S+ENOuATG39sFFyCcokhhRgshIlbqkjWU0Wa2RQ2fxr1hmDepai/5LNOPwWTTOqI+SfMMw== + dependencies: + "@babel/runtime" "^7.6.2" + "@react-aria/utils" "^3.13.3" + "@react-types/label" "^3.6.3" + "@react-types/shared" "^3.14.1" + +"@react-aria/live-announcer@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@react-aria/live-announcer/-/live-announcer-3.1.1.tgz#40f340f6794fca42682fb308fe750ff56bf7c07f" + integrity sha512-e7b+dRh1SUTla42vzjdbhGYkeLD7E6wIYjYaHW9zZ37rBkSqLHUhTigh3eT3k5NxFlDD/uRxTYuwaFnWQgR+4g== + dependencies: + "@babel/runtime" "^7.6.2" + +"@react-aria/slider@^3.0.4": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@react-aria/slider/-/slider-3.2.1.tgz#a67068cf2457563f6bb198164fc714503fbcc5fa" + integrity sha512-zRSOAyK6BfKliUGv+II8XEWjn/wT8ols47SeMLZvBzuWEfI74xpHMnB1jQs23Jt3PaVTZ+VziAjScBgayLeXxA== + dependencies: + "@babel/runtime" "^7.6.2" + "@react-aria/focus" "^3.8.0" + "@react-aria/i18n" "^3.6.0" + "@react-aria/interactions" "^3.11.0" + "@react-aria/label" "^3.4.1" + "@react-aria/utils" "^3.13.3" + "@react-stately/radio" "^3.5.1" + "@react-stately/slider" "^3.2.1" + "@react-types/radio" "^3.2.3" + "@react-types/shared" "^3.14.1" + "@react-types/slider" "^3.2.1" + +"@react-aria/spinbutton@^3.0.2": + version "3.1.3" + resolved "https://registry.yarnpkg.com/@react-aria/spinbutton/-/spinbutton-3.1.3.tgz#d5050e1a7ab6059878a212f503952ce001f3f417" + integrity sha512-9DhWRdYZe9x9La7up8f3A2zvbQ6PooMjAvXDIXRFAZLTOUxwk2dnn9WwHq5XjbjnOm71yzvHmm/MmMzTO/ZP2w== + dependencies: + "@babel/runtime" "^7.6.2" + "@react-aria/i18n" "^3.6.0" + "@react-aria/live-announcer" "^3.1.1" + "@react-aria/utils" "^3.13.3" + "@react-types/button" "^3.6.1" + "@react-types/shared" "^3.14.1" + +"@react-aria/ssr@^3.3.0": + version "3.3.0" + resolved "https://registry.yarnpkg.com/@react-aria/ssr/-/ssr-3.3.0.tgz#25e81daf0c7a270a4a891159d8d984578e4512d8" + integrity sha512-yNqUDuOVZIUGP81R87BJVi/ZUZp/nYOBXbPsRe7oltJOfErQZD+UezMpw4vM2KRz18cURffvmC8tJ6JTeyDtaQ== + dependencies: + "@babel/runtime" "^7.6.2" + +"@react-aria/utils@^3.11.1", "@react-aria/utils@^3.13.3": + version "3.13.3" + resolved "https://registry.yarnpkg.com/@react-aria/utils/-/utils-3.13.3.tgz#1b27912e4630f0db6a7b39eb1013f6c4f710075c" + integrity sha512-wqjGNFX4TrXriUU1gvCaoqRhuckdoYogUWN0iyQRkTmzvb7H/NNzQzHou5ggWAdts/NzJUInwKarBWM9hCZZbg== + dependencies: + "@babel/runtime" "^7.6.2" + "@react-aria/ssr" "^3.3.0" + "@react-stately/utils" "^3.5.1" + "@react-types/shared" "^3.14.1" clsx "^1.1.1" "@react-dnd/asap@^4.0.0": @@ -2174,24 +2296,66 @@ resolved "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz#a3031eb54129f2c66b2753f8404266ec7bf67f0a" integrity sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg== -"@react-stately/utils@^3.2.2": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@react-stately/utils/-/utils-3.2.2.tgz#468eafa60740c6b0b847a368215dfaa55e87f505" - integrity sha512-7NCpRMAexDdgVqbrB9uDrkDpM4Tdw5BU6Gu6IKUXmKsoDYziE6mAjaGkCZBitsrln1Cezc6euI5YPa1JqxgpJg== +"@react-stately/radio@^3.5.1": + version "3.5.1" + resolved "https://registry.yarnpkg.com/@react-stately/radio/-/radio-3.5.1.tgz#7bff0a4d0d12b534af1593106d9b356d3fb92e4f" + integrity sha512-0x84/JTUshB5ZIhv4KPNaRBHztegGfHZ/dheCN/cNYiDPFmUPkce4mOYgL3byUgVabbDYqohTHkpvoA54UOgew== + dependencies: + "@babel/runtime" "^7.6.2" + "@react-stately/utils" "^3.5.1" + "@react-types/radio" "^3.2.3" + +"@react-stately/slider@^3.0.4", "@react-stately/slider@^3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@react-stately/slider/-/slider-3.2.1.tgz#310e6a64b626f433808a82282a09480778588009" + integrity sha512-LJ6ESPmDnu1H/Y750DWLLqJl3Q2RkOUp4d55YuQ/iwtSoEYxxIHflOxsbUKaTP/Ttmj9eMIXSTeW7hkWidsxQw== + dependencies: + "@babel/runtime" "^7.6.2" + "@react-aria/i18n" "^3.6.0" + "@react-aria/utils" "^3.13.3" + "@react-stately/utils" "^3.5.1" + "@react-types/shared" "^3.14.1" + "@react-types/slider" "^3.2.1" + +"@react-stately/utils@^3.5.1": + version "3.5.1" + resolved "https://registry.yarnpkg.com/@react-stately/utils/-/utils-3.5.1.tgz#502de762e5d33e892347c5f58053674e06d3bc92" + integrity sha512-INeQ5Er2Jm+db8Py4upKBtgfzp3UYgwXYmbU/XJn49Xw27ktuimH9e37qP3bgHaReb5L3g8IrGs38tJUpnGPHA== dependencies: "@babel/runtime" "^7.6.2" -"@react-types/button@^3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@react-types/button/-/button-3.4.1.tgz#715ac9d4997c79233be4d9020b58f85936b8252b" - integrity sha512-B54M84LxdEppwjXNlkBEJyMfe9fd+bvFV7R6+NJvupGrZm/LuFNYjFcHk7yjMKWTdWm6DbpIuQz54n5qTW7Vlg== +"@react-types/button@^3.6.1": + version "3.6.1" + resolved "https://registry.yarnpkg.com/@react-types/button/-/button-3.6.1.tgz#0bc75fe4129966673cf239df7a7aea83b6c68585" + integrity sha512-F7m3/MVmzChkBqD5gO7rIglPRHY6KZg/RaU8f8VqZuEOAHuQ1CtTEfpc6r9artBSs2Gdw7yNWxfCI2dP95lYow== dependencies: - "@react-types/shared" "^3.8.0" + "@react-types/shared" "^3.14.1" -"@react-types/shared@^3.8.0", "@react-types/shared@^3.9.0": - version "3.9.0" - resolved "https://registry.yarnpkg.com/@react-types/shared/-/shared-3.9.0.tgz#d834f3e6e2c992089192f3c83fb7963e3a6f5207" - integrity sha512-YYksINfR6q92P10AhPEGo47Hd7oz1hrnZ6Vx8Gsrq62IbqDdv1XOTzPBaj17Z1ymNY2pitLUSEXsLmozt4wxxQ== +"@react-types/label@^3.6.3": + version "3.6.3" + resolved "https://registry.yarnpkg.com/@react-types/label/-/label-3.6.3.tgz#d0fa3c9b573a666ffa2f4197eff694fc96a1ad48" + integrity sha512-Q+8qx4x7+ZqgdfNJorX7CqysYAGAeT1IWzJyNxwcT1OLjFuUIBJyg7njjpkZyK8sFFYdGIKhLxk0Q1Sf8Y5Stw== + dependencies: + "@react-types/shared" "^3.14.1" + +"@react-types/radio@^3.2.3": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@react-types/radio/-/radio-3.2.3.tgz#223266c1edd4bc297ab72ad95c62f2aeaca9a16c" + integrity sha512-TiW0PJPQuVKcni8UWI84hc8dYGDsuSkKT/Dgj1r82csYGz/92RnyQDF12CCg9+MpqWZweK30uYQzbtrxa74qBg== + dependencies: + "@react-types/shared" "^3.14.1" + +"@react-types/shared@^3.14.1": + version "3.14.1" + resolved "https://registry.yarnpkg.com/@react-types/shared/-/shared-3.14.1.tgz#8fe25f729426e8043054e442eb5392364200e028" + integrity sha512-yPPgVRWWanXqbdxFTgJmVwx0JlcnEK3dqkKDIbVk6mxAHvEESI9+oDnHvO8IMHqF+GbrTCzVtAs0zwhYI/uHJA== + +"@react-types/slider@^3.0.3", "@react-types/slider@^3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@react-types/slider/-/slider-3.2.1.tgz#4b317a1948c61bf665ee40398ccdb06f54301c30" + integrity sha512-adqWZLE2IEzqBGnGHKYQwJ2IY4xlwFcPt3KWCsfp1c1WyG/d7xxQus8rL4eWLqoiMgguTxbYm9F2TF77itw8JA== + dependencies: + "@react-types/shared" "^3.14.1" "@relative-ci/agent@^3.0.0": version "3.0.0" @@ -2210,20 +2374,27 @@ lodash "^4.17.15" yargs "^17.1.1" -"@renderlesskit/react@^0.6.0": - version "0.6.0" - resolved "https://registry.yarnpkg.com/@renderlesskit/react/-/react-0.6.0.tgz#93ced709412f6e50538c132812e40ae6fe1f96ef" - integrity sha512-v1FChZQj8te+XK9MhGT5XVxgynAMriY6CKcY4pCa7+YljM2vLuRgo7yaOhh5saHrd/t5dbtcdS4s/xo9lZFYEQ== +"@renderlesskit/react@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@renderlesskit/react/-/react-0.11.0.tgz#ab0bc77239bb3723e8b0ca13a1914a7265dc64ba" + integrity sha512-hfQZ59DyE7pX5u7JF5UqzAzZdcC69eMxOfQZ4uavEwafPgDbuudtVFubcRY//uOxDPAq2ewKTnRhptcL7sgmlg== dependencies: - "@chakra-ui/counter" "^1.1.9" - "@chakra-ui/hooks" "^1.6.0" - "@chakra-ui/react-utils" "^1.1.2" - "@chakra-ui/utils" "^1.8.2" - "@react-aria/i18n" "^3.3.2" - "@react-aria/interactions" "^3.6.0" - "@react-aria/spinbutton" "^3.0.1" - "@react-aria/utils" "^3.9.0" - date-fns "^2.23.0" + "@chakra-ui/counter" "^1.2.5" + "@chakra-ui/hooks" "^1.8.2" + "@chakra-ui/react-utils" "^1.2.2" + "@chakra-ui/utils" "^1.10.2" + "@radix-ui/popper" "^0.1.0" + "@radix-ui/react-use-rect" "^0.1.1" + "@radix-ui/react-use-size" "^0.1.0" + "@react-aria/i18n" "^3.3.5" + "@react-aria/slider" "^3.0.4" + "@react-aria/spinbutton" "^3.0.2" + "@react-aria/utils" "^3.11.1" + "@react-stately/slider" "^3.0.4" + "@react-types/slider" "^3.0.3" + date-fns "^2.28.0" + raf "^3.4.1" + react-remove-scroll "^2.4.4" reakit-system "^0.15.2" reakit-utils "^0.15.2" reakit-warning "^0.6.2" @@ -2265,94 +2436,70 @@ estree-walker "^1.0.1" picomatch "^2.2.2" -"@sentry/browser@6.3.1": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.3.1.tgz#6142dd4c72308f4e1a12e585e3300fd54ca058cd" - integrity sha512-Ri4tYsyuJIeLQnvQUqbpGzailUYpbjFSYM0+yEM63gPsjiXdg+W8yKHluA6cs6FLWVN3oWfwHW7Kd61echlGuw== +"@sentry/browser@7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.15.0.tgz#1723dc8efcea9239d26072126755f61f6fb9448d" + integrity sha512-vZYr8L2JmniV8cns4yGOpX32moazz6tsllB1uv7XmmELW98sIuuugVFX0k6cBi89R8pyhdqULFCf9CL8CRguRg== dependencies: - "@sentry/core" "6.3.1" - "@sentry/types" "6.3.1" - "@sentry/utils" "6.3.1" + "@sentry/core" "7.15.0" + "@sentry/types" "7.15.0" + "@sentry/utils" "7.15.0" tslib "^1.9.3" -"@sentry/core@6.3.1": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.3.1.tgz#5e32ca919c9be30fec0bb3125a556bc711584bdf" - integrity sha512-aVuvVbaehGeN86jZlLDGGkhEtprdOtB6lvYLfGy40Dj1Tkh2mGWE550QsRXAXAqYvQzIYwQR23r6m3o8FujgVg== +"@sentry/core@7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.15.0.tgz#983e08326afdb8ddb10494372cd22b3886d683c9" + integrity sha512-W8d44g04GShBn4Z9VBTUhf1T9LTMfzUnETEx237zzUucv0kkyj3LsWQsJapWchMbmwr1V/CdnNDN+lGDm8iXQA== dependencies: - "@sentry/hub" "6.3.1" - "@sentry/minimal" "6.3.1" - "@sentry/types" "6.3.1" - "@sentry/utils" "6.3.1" + "@sentry/types" "7.15.0" + "@sentry/utils" "7.15.0" tslib "^1.9.3" -"@sentry/hub@6.3.1": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.3.1.tgz#dda07888a82d1c48bbefa00205bfa9d035691f07" - integrity sha512-2er+OeVlsdVZkhl9kXQAANwgjwoCdM1etK2iFuhzX8xkMaJlAuZLyQInv2U1BbXBlIfWjvzRM8B95hCWvVrR3Q== +"@sentry/node@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.15.0.tgz#8784a747d9b933754b29bba954b22f0d54c3b614" + integrity sha512-gfyo6YTo4Sw5pdKWCzs7trqZpBm5D/ArR4vylQrQayfImiYyNY6yaOK1R7g4rM34MXUu91pfVJLUpXvjk/NsHw== dependencies: - "@sentry/types" "6.3.1" - "@sentry/utils" "6.3.1" - tslib "^1.9.3" - -"@sentry/minimal@6.3.1": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.3.1.tgz#38f71c77e8820555effb6e868336d4f5672018cd" - integrity sha512-0eN9S7HvXsCQEjX/qXHTMgvSb3mwrnZEWS9Qz/Bz5ig9pEGXKgJ1om5NTTHVHhXqd3wFCjdvIo6slufLHoCtSw== - dependencies: - "@sentry/hub" "6.3.1" - "@sentry/types" "6.3.1" - tslib "^1.9.3" - -"@sentry/node@^6.3.1": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.3.1.tgz#0f81a0e352fa5b3e36bcc53adb6e26cd214c637d" - integrity sha512-D0r603fdNwUPkwvy0IcQaUSTafl+7lrOytiO5dfdLdlkhtTcwivwENc/n8ER8GOC2zpIvYOEIJvzP4PGL85khw== - dependencies: - "@sentry/core" "6.3.1" - "@sentry/hub" "6.3.1" - "@sentry/tracing" "6.3.1" - "@sentry/types" "6.3.1" - "@sentry/utils" "6.3.1" + "@sentry/core" "7.15.0" + "@sentry/types" "7.15.0" + "@sentry/utils" "7.15.0" cookie "^0.4.1" https-proxy-agent "^5.0.0" lru_map "^0.3.3" tslib "^1.9.3" -"@sentry/react@^6.3.1": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@sentry/react/-/react-6.3.1.tgz#5082aa145972eec38cc8ceea8e5d8ee3f7f5f86a" - integrity sha512-3eFSqdS0QAb4RFNxS0gzVm05q8c5KQp+3TlmqBjoovqWL/FvGvDoqaBmFT+arvPZ88qngveMEk1v6445L0gFTg== +"@sentry/react@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.15.0.tgz#441ed851ca64afeef10abcb00302e0c95846404e" + integrity sha512-a+5+Og93YPtWSCmOFYa/qzrbvfgIZXShJk1bsIaEI0KdltTOVJBdwvLQc8OiIOBe/CMDVCmK1t2DqiWfOWj41w== dependencies: - "@sentry/browser" "6.3.1" - "@sentry/minimal" "6.3.1" - "@sentry/types" "6.3.1" - "@sentry/utils" "6.3.1" + "@sentry/browser" "7.15.0" + "@sentry/types" "7.15.0" + "@sentry/utils" "7.15.0" hoist-non-react-statics "^3.3.2" tslib "^1.9.3" -"@sentry/tracing@6.3.1", "@sentry/tracing@^6.3.1": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.3.1.tgz#3b96aabf4d9cebadfec070c006db79801a68ee24" - integrity sha512-qveDmoWsXy9qLEblZJwJ1OU/zZRlEd/q7Jhd0Hnwlob8Ci96huABEbYyGdJs18BKVHEFU3gSdVfvrikUE/W17g== +"@sentry/tracing@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.15.0.tgz#ea516957b2ed39f389c21132f433b6470d54b465" + integrity sha512-c0Y3+z6EWsc+EJsfBcRtc58ugkWYa6+6KTu3ceMkx2ZgZTCmRUuzAb7yodMt/gwezBsxzq706fnQivx1lQgzlQ== dependencies: - "@sentry/hub" "6.3.1" - "@sentry/minimal" "6.3.1" - "@sentry/types" "6.3.1" - "@sentry/utils" "6.3.1" + "@sentry/core" "7.15.0" + "@sentry/types" "7.15.0" + "@sentry/utils" "7.15.0" tslib "^1.9.3" -"@sentry/types@6.3.1": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.3.1.tgz#af3b54728b29f633f38fbe51b8c10e3834fbc158" - integrity sha512-BEBn8JX1yaooCAuonbaMci9z0RjwwMbQ3Eny/eyDdd+rjXprZCZaStZnCvSThbNBqAJ8YaUqY2YBMnEwJxarAw== +"@sentry/types@7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.15.0.tgz#50c57c924993d4dd16b43172d310c66384d17463" + integrity sha512-MN9haDRh9ZOsTotoDTHu2BT3sT8Vs1F0alhizUpDyjN2YgBCqR6JV+AbAE1XNHwS2+5zbppch1PwJUVeE58URQ== -"@sentry/utils@6.3.1": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.3.1.tgz#6d8e691139b5b49d8c655ad1dcaf2cb3ff0d0b03" - integrity sha512-cdtl/QWC9FtinAuW3w8QfvSfh/Q9ui5vwvjzVHiS1ga/U38edi2XX+cttY39ZYwz0SQG99cE10GOIhd1p7/mAA== +"@sentry/utils@7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.15.0.tgz#cda642a353a58fd6631979c1e5986788e6db6c43" + integrity sha512-akic22/6xa/RG5Mj7UN6pLc23VnX9zQlKM53L/q3yIr0juckSVthJiiFNdgdqrX03S1tHYlBgPeShKFFTHpkjA== dependencies: - "@sentry/types" "6.3.1" + "@sentry/types" "7.15.0" tslib "^1.9.3" "@sinclair/typebox@^0.24.1": @@ -2360,11 +2507,6 @@ resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.27.tgz#d55643516a1546174e10da681a8aaa81e757452d" integrity sha512-K7C7IlQ3zLePEZleUN21ceBA2aLcMnLHTLph8QWk1JK37L90obdpY+QGY8bXMKxf1ht1Z0MNewvXxWv0oGDYFg== -"@sindresorhus/is@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" - integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== - "@sinonjs/commons@^1.7.0": version "1.8.1" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" @@ -2389,33 +2531,30 @@ magic-string "^0.25.0" string.prototype.matchall "^4.0.6" -"@szmarczak/http-timer@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" - integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== +"@theo.gravity/datadog-apm@^3.0.0": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@theo.gravity/datadog-apm/-/datadog-apm-3.0.1.tgz#25a1e1aa40a72a121871a939e340208c9ad19138" + integrity sha512-jzPKRWaVIjvbMaM1b7N5kQG8y9c7NrCkesAtlSpqhnXlyHjODOXVWdLi36H0NAr+xg9+oZ+Cja6NukJc2wGRWg== dependencies: - defer-to-connect "^1.0.1" + dd-trace "^2.12.1" -"@theo.gravity/datadog-apm@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@theo.gravity/datadog-apm/-/datadog-apm-2.2.0.tgz#a005949a9436c24316e6ad99a7e5fe182a29f0b5" - integrity sha512-2538L5oW69eApPPSdlPGcyDqlpb4vo6knGONQax7eIiO44gW7XK2r/Hc6hdQ6aSl8PMoNP6uG6khHg0kTz8Nsw== +"@tippyjs/react@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@tippyjs/react/-/react-4.2.6.tgz#971677a599bf663f20bb1c60a62b9555b749cc71" + integrity sha512-91RicDR+H7oDSyPycI13q3b7o4O60wa2oRbjlz2fyRLmHImc4vyDwuUP8NtZaN0VARJY5hybvDYrFzhY9+Lbyw== dependencies: - dd-trace "^1.7.1" - -"@tippy.js/react@^2.2.2": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@tippy.js/react/-/react-2.2.3.tgz#2ffb0af6693055be7db4b329b2d3cc7f2356f68e" - integrity sha512-5XYvbQujzDj9r00JYEz/cBtm6DutjOdv2azdco53B+eWF7FDBCQfkLVn87wimfEpmGK0vqRQv/cwFxFcoOP98Q== - dependencies: - prop-types "^15.6.2" - tippy.js "^4.3.4" + tippy.js "^6.3.1" "@tommoor/remove-markdown@^0.3.2": version "0.3.2" resolved "https://registry.yarnpkg.com/@tommoor/remove-markdown/-/remove-markdown-0.3.2.tgz#5288ddd0e26b6b173e76ebb31c94653b0dcff45d" integrity sha512-awcc9hfLZqyyZHOGzAHbnjgZJpQGS1W1oZZ5GXOTTnbKVdKQ4OWYbrRWPUvXI2YAKJazrcS8rxPh67PX3rpGkQ== +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + "@tootallnate/once@2": version "2.0.0" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" @@ -2574,10 +2713,10 @@ dependencies: "@types/enzyme" "*" -"@types/enzyme@*", "@types/enzyme@^3.10.10": - version "3.10.10" - resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.10.tgz#3a44cc66571432ab9e1773a831af3742beb39275" - integrity sha512-/D4wFhiEjUDfPu+j5FVK0g/jf7rqeEIpNfAI+kyxzLpw5CKO0drnW3W5NC38alIjsWgnyQ8pbuPF5+UD+vhVyg== +"@types/enzyme@*", "@types/enzyme@^3.10.12": + version "3.10.12" + resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.12.tgz#ac4494801b38188935580642f772ad18f72c132f" + integrity sha512-xryQlOEIe1TduDWAOphR0ihfebKFSWOXpIsk+70JskCfRfW+xALdnJ0r1ZOTo85F9Qsjk6vtlU7edTYHbls9tA== dependencies: "@types/cheerio" "*" "@types/react" "*" @@ -2692,6 +2831,13 @@ resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.1.tgz#e81ad28a60bee0328c6d2384e029aec626f1ae67" integrity sha512-e+2rjEwK6KDaNOm5Aa9wNGgyS9oSZU/4pfSMMPYNOfjvFI0WVXm29+ITRFr6aKDvvKo7uU1jV68MW4ScsfDi7Q== +"@types/inline-css@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/inline-css/-/inline-css-3.0.1.tgz#b98708cfc8c13c247ce11f3c82a509ce468d181b" + integrity sha512-1bs+MjVvZIuF71D8P+FZf79LcqccqVBNF6txnabXT1vGnRMqZO0agtdyC585fcjuSs7Nj9qal8CF9rfWVQxnTQ== + dependencies: + "@types/cheerio" "*" + "@types/invariant@^2.2.35": version "2.2.35" resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.35.tgz#cd3ebf581a6557452735688d8daba6cf0bd5a3be" @@ -2806,7 +2952,7 @@ dependencies: "@types/koa" "*" -"@types/koa-send@*": +"@types/koa-send@^4.1.3": version "4.1.3" resolved "https://registry.yarnpkg.com/@types/koa-send/-/koa-send-4.1.3.tgz#17193c6472ae9e5d1b99ae8086949cc4fd69179d" integrity sha512-daaTqPZlgjIJycSTNjKpHYuKhXYP30atFc1pBcy6HHqB9+vcymDgYTguPdx9tO4HMOqNyz6bz/zqpxt5eLR+VA== @@ -2820,14 +2966,6 @@ dependencies: "@types/koa" "*" -"@types/koa-static@^4.0.2": - version "4.0.2" - resolved "https://registry.yarnpkg.com/@types/koa-static/-/koa-static-4.0.2.tgz#a199d2d64d2930755eb3ea370aeaf2cb6f501d67" - integrity sha512-ns/zHg+K6XVPMuohjpOlpkR1WLa4VJ9czgUP9bxkCDn0JZBtUWbD/wKDZzPGDclkQK1bpAEScufCHOy8cbfL0w== - dependencies: - "@types/koa" "*" - "@types/koa-send" "*" - "@types/koa-useragent@^2.1.2": version "2.1.2" resolved "https://registry.yarnpkg.com/@types/koa-useragent/-/koa-useragent-2.1.2.tgz#7c75fe55c742e559c4643d65b34c6ce5945f853f" @@ -2866,15 +3004,10 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a" integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw== -"@types/long@^4.0.1": - version "4.0.2" - resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a" - integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA== - -"@types/markdown-it-container@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@types/markdown-it-container/-/markdown-it-container-2.0.4.tgz#da15919befbdce2fe2ff0a472f68d31180345424" - integrity sha512-QgzDCr8OWtWktWtlwPT908sKqZqSHUEaxTH/uVz68tYd6bsCS3defHLzN2rFeoKJ3q344qG0dWQ42K4UQSBqcw== +"@types/markdown-it-container@^2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@types/markdown-it-container/-/markdown-it-container-2.0.5.tgz#abd793b64c5adc7b2d1e8963eddb388198248152" + integrity sha512-8v5jIC5gcCUv+JcD0DExwNBkoKC0kLB4acensF0NoNlTIcXmQxF3RDjzAdIW82sXSoR+n772ePguxIWlq2ELvA== dependencies: "@types/markdown-it" "*" @@ -2898,10 +3031,10 @@ resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9" integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA== -"@types/mermaid@^8.2.9": - version "8.2.9" - resolved "https://registry.yarnpkg.com/@types/mermaid/-/mermaid-8.2.9.tgz#1844505dcffcd47703e94628a6200583d35c2c76" - integrity sha512-f1i8fNoVFVJXedk+R7GcEk4KoOWzWAU3CzFqlVw1qWKktfsataBERezCz1pOdKy8Ec02ZdPQXGM7NU2lPHABYQ== +"@types/mermaid@^9.1.0": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@types/mermaid/-/mermaid-9.1.0.tgz#e9ba511d8a6793749d6be84f86325f0f58553154" + integrity sha512-rc8QqhveKAY7PouzY/p8ljS+eBSNCv7o79L97RSub/Ic2SQ34ph1Ng3s8wFLWVjvaEt6RLOWtSCsgYWd95NY8A== "@types/mime-types@^2.1.1": version "2.1.1" @@ -3001,7 +3134,7 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== -"@types/prosemirror-commands@*", "@types/prosemirror-commands@^1.0.1": +"@types/prosemirror-commands@*", "@types/prosemirror-commands@^1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@types/prosemirror-commands/-/prosemirror-commands-1.0.4.tgz#d08551415127d93ae62e7239d30db0b5e7208e22" integrity sha512-utDNYB3EXLjAfYIcRWJe6pn3kcQ5kG4RijbT/0Y/TFOm6yhvYS/D9eJVnijdg9LDjykapcezchxGRqFD5LcyaQ== @@ -3120,10 +3253,10 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-avatar-editor@^10.3.6": - version "10.3.6" - resolved "https://registry.yarnpkg.com/@types/react-avatar-editor/-/react-avatar-editor-10.3.6.tgz#f902a91b336eac7e3d141ec931eeae9a082e8125" - integrity sha512-2r9+WYriqXIyjOTxy/DSiCUhr2TBiYD4Gzbyych1WUEwdPboNj0JRz9B5868TwiGgKD61jdWYyKy/OutHs7L6A== +"@types/react-avatar-editor@^13.0.0": + version "13.0.0" + resolved "https://registry.yarnpkg.com/@types/react-avatar-editor/-/react-avatar-editor-13.0.0.tgz#5963e16c931746c47e478d669dd72d388b427393" + integrity sha512-5ymOayy6mfT35xTqzni7UjXvCNEg8/pH4pI5RenITp9PBc02KGTYjSV1WboXiQDYSh5KomLT0ngBLEAIhV1QoQ== dependencies: "@types/react" "*" @@ -3142,10 +3275,10 @@ dependencies: "@types/react" "*" -"@types/react-helmet@^6.1.4": - version "6.1.4" - resolved "https://registry.yarnpkg.com/@types/react-helmet/-/react-helmet-6.1.4.tgz#3e54a3eb37ba7fb34ffafc64f425be4e68df03b9" - integrity sha512-jyx50RNZXVaTGHY3MsoRPNpeiVk8b0XTPgD/O6KHF6COTDnG/+lRjPYvTK5nfWtR3xDOux0w6bHLAsaHo2ZLTA== +"@types/react-helmet@^6.1.5": + version "6.1.5" + resolved "https://registry.yarnpkg.com/@types/react-helmet/-/react-helmet-6.1.5.tgz#35f89a6b1646ee2bc342a33a9a6c8777933f9083" + integrity sha512-/ICuy7OHZxR0YCAZLNg9r7I9aijWUWvxaPR6uTuyxe8tAj5RL4Sw1+R6NhXUtOsarkGYPmaHdBDvuXh2DIN/uA== dependencies: "@types/react" "*" @@ -3349,20 +3482,20 @@ resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ== -"@types/utf8@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/utf8/-/utf8-3.0.0.tgz#8f4875063d2ea966c57a34a25c11333520e83980" - integrity sha512-QrhvCktdm5wD48axAnjqSzPH9lOj0MiCYfMX6MSqGs2Jv+txwvdxviXiCEj8zSCWIEDU9SIJ7g9pU5KtxRgYSg== +"@types/utf8@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/utf8/-/utf8-3.0.1.tgz#bf081663d4fff05ee63b41f377a35f8b189f7e5b" + integrity sha512-1EkWuw7rT3BMz2HpmcEOr/HL61mWNA6Ulr/KdbXR9AI0A55wD4Qfv8hizd8Q1DnknSIzzDvQmvvY/guvX7jjZA== "@types/uuid@^8.3.4": version "8.3.4" resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw== -"@types/validator@*", "@types/validator@^13.7.1": - version "13.7.1" - resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.7.1.tgz#cdab1b4779f6b1718a08de89d92d2603b71950cb" - integrity sha512-I6OUIZ5cYRk5lp14xSOAiXjWrfVoMZVjDuevBYgQDYzZIjsf2CAISpEcXOkFAtpAHbmWIDLcZObejqny/9xq5Q== +"@types/validator@*", "@types/validator@^13.7.1", "@types/validator@^13.7.8": + version "13.7.8" + resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.7.8.tgz#1340c85e51d5deee03df95721c4ff5c28dae5ff8" + integrity sha512-HKayOBe2ThTcQykiycCQYf70Fvo0WaJEJdxxNjvX3D/mnC0IUAhMe6wsIb1wwthmjiqBAR3qGkEzHYx74MS2yw== "@types/webpack-sources@*": version "3.2.0" @@ -3404,75 +3537,86 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^5.3.1": - version "5.3.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.3.1.tgz#d8ff412f10f54f6364e7fd7c1e70eb6767f434c3" - integrity sha512-cFImaoIr5Ojj358xI/SDhjog57OK2NqlpxwdcgyxDA3bJlZcJq5CPzUXtpD7CxI2Hm6ATU7w5fQnnkVnmwpHqw== +"@typescript-eslint/eslint-plugin@^5.40.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.0.tgz#0159bb71410eec563968288a17bd4478cdb685bd" + integrity sha512-FIBZgS3DVJgqPwJzvZTuH4HNsZhHMa9SjxTKAZTlMsPw/UzpEjcf9f4dfgDJEHjK+HboUJo123Eshl6niwEm/Q== dependencies: - "@typescript-eslint/experimental-utils" "5.3.1" - "@typescript-eslint/scope-manager" "5.3.1" - debug "^4.3.2" - functional-red-black-tree "^1.0.1" - ignore "^5.1.8" + "@typescript-eslint/scope-manager" "5.40.0" + "@typescript-eslint/type-utils" "5.40.0" + "@typescript-eslint/utils" "5.40.0" + debug "^4.3.4" + ignore "^5.2.0" regexpp "^3.2.0" - semver "^7.3.5" + semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@5.3.1": - version "5.3.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.3.1.tgz#bbd8f9b67b4d5fdcb9d2f90297d8fcda22561e05" - integrity sha512-RgFn5asjZ5daUhbK5Sp0peq0SSMytqcrkNfU4pnDma2D8P3ElZ6JbYjY8IMSFfZAJ0f3x3tnO3vXHweYg0g59w== +"@typescript-eslint/parser@^5.40.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.40.0.tgz#432bddc1fe9154945660f67c1ba6d44de5014840" + integrity sha512-Ah5gqyX2ySkiuYeOIDg7ap51/b63QgWZA7w6AHtFrag7aH0lRQPbLzUjk0c9o5/KZ6JRkTTDKShL4AUrQa6/hw== + dependencies: + "@typescript-eslint/scope-manager" "5.40.0" + "@typescript-eslint/types" "5.40.0" + "@typescript-eslint/typescript-estree" "5.40.0" + debug "^4.3.4" + +"@typescript-eslint/scope-manager@5.40.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.40.0.tgz#d6ea782c8e3a2371ba3ea31458dcbdc934668fc4" + integrity sha512-d3nPmjUeZtEWRvyReMI4I1MwPGC63E8pDoHy0BnrYjnJgilBD3hv7XOiETKLY/zTwI7kCnBDf2vWTRUVpYw0Uw== + dependencies: + "@typescript-eslint/types" "5.40.0" + "@typescript-eslint/visitor-keys" "5.40.0" + +"@typescript-eslint/type-utils@5.40.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.40.0.tgz#4964099d0158355e72d67a370249d7fc03331126" + integrity sha512-nfuSdKEZY2TpnPz5covjJqav+g5qeBqwSHKBvz7Vm1SAfy93SwKk/JeSTymruDGItTwNijSsno5LhOHRS1pcfw== + dependencies: + "@typescript-eslint/typescript-estree" "5.40.0" + "@typescript-eslint/utils" "5.40.0" + debug "^4.3.4" + tsutils "^3.21.0" + +"@typescript-eslint/types@5.40.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.40.0.tgz#8de07e118a10b8f63c99e174a3860f75608c822e" + integrity sha512-V1KdQRTXsYpf1Y1fXCeZ+uhjW48Niiw0VGt4V8yzuaDTU8Z1Xl7yQDyQNqyAFcVhpYXIVCEuxSIWTsLDpHgTbw== + +"@typescript-eslint/typescript-estree@5.40.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.0.tgz#e305e6a5d65226efa5471ee0f12e0ffaab6d3075" + integrity sha512-b0GYlDj8TLTOqwX7EGbw2gL5EXS2CPEWhF9nGJiGmEcmlpNBjyHsTwbqpyIEPVpl6br4UcBOYlcI2FJVtJkYhg== + dependencies: + "@typescript-eslint/types" "5.40.0" + "@typescript-eslint/visitor-keys" "5.40.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + semver "^7.3.7" + tsutils "^3.21.0" + +"@typescript-eslint/utils@5.40.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.40.0.tgz#647f56a875fd09d33c6abd70913c3dd50759b772" + integrity sha512-MO0y3T5BQ5+tkkuYZJBjePewsY+cQnfkYeRqS6tPh28niiIwPnQ1t59CSRcs1ZwJJNOdWw7rv9pF8aP58IMihA== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.3.1" - "@typescript-eslint/types" "5.3.1" - "@typescript-eslint/typescript-estree" "5.3.1" + "@typescript-eslint/scope-manager" "5.40.0" + "@typescript-eslint/types" "5.40.0" + "@typescript-eslint/typescript-estree" "5.40.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" + semver "^7.3.7" -"@typescript-eslint/parser@^5.3.1": - version "5.3.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.3.1.tgz#8ff1977c3d3200c217b3e4628d43ef92f89e5261" - integrity sha512-TD+ONlx5c+Qhk21x9gsJAMRohWAUMavSOmJgv3JGy9dgPhuBd5Wok0lmMClZDyJNLLZK1JRKiATzCKZNUmoyfw== +"@typescript-eslint/visitor-keys@5.40.0": + version "5.40.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.0.tgz#dd2d38097f68e0d2e1e06cb9f73c0173aca54b68" + integrity sha512-ijJ+6yig+x9XplEpG2K6FUdJeQGGj/15U3S56W9IqXKJqleuD7zJ2AX/miLezwxpd7ZxDAqO87zWufKg+RPZyQ== dependencies: - "@typescript-eslint/scope-manager" "5.3.1" - "@typescript-eslint/types" "5.3.1" - "@typescript-eslint/typescript-estree" "5.3.1" - debug "^4.3.2" - -"@typescript-eslint/scope-manager@5.3.1": - version "5.3.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.3.1.tgz#3cfbfbcf5488fb2a9a6fbbe97963ee1e8d419269" - integrity sha512-XksFVBgAq0Y9H40BDbuPOTUIp7dn4u8oOuhcgGq7EoDP50eqcafkMVGrypyVGvDYHzjhdUCUwuwVUK4JhkMAMg== - dependencies: - "@typescript-eslint/types" "5.3.1" - "@typescript-eslint/visitor-keys" "5.3.1" - -"@typescript-eslint/types@5.3.1": - version "5.3.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.3.1.tgz#afaa715b69ebfcfde3af8b0403bf27527912f9b7" - integrity sha512-bG7HeBLolxKHtdHG54Uac750eXuQQPpdJfCYuw4ZI3bZ7+GgKClMWM8jExBtp7NSP4m8PmLRM8+lhzkYnSmSxQ== - -"@typescript-eslint/typescript-estree@5.3.1": - version "5.3.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.1.tgz#50cc4bfb93dc31bc75e08ae52e29fcb786d606ec" - integrity sha512-PwFbh/PKDVo/Wct6N3w+E4rLZxUDgsoII/GrWM2A62ETOzJd4M6s0Mu7w4CWsZraTbaC5UQI+dLeyOIFF1PquQ== - dependencies: - "@typescript-eslint/types" "5.3.1" - "@typescript-eslint/visitor-keys" "5.3.1" - debug "^4.3.2" - globby "^11.0.4" - is-glob "^4.0.3" - semver "^7.3.5" - tsutils "^3.21.0" - -"@typescript-eslint/visitor-keys@5.3.1": - version "5.3.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.3.1.tgz#c2860ff22939352db4f3806f34b21d8ad00588ba" - integrity sha512-3cHUzUuVTuNHx0Gjjt5pEHa87+lzyqOiHXy/Gz+SJOCW1mpw9xQHIIEwnKn+Thph1mgWyZ90nboOcSuZr/jTTQ== - dependencies: - "@typescript-eslint/types" "5.3.1" - eslint-visitor-keys "^3.0.0" + "@typescript-eslint/types" "5.40.0" + eslint-visitor-keys "^3.3.0" "@webassemblyjs/ast@1.9.0": version "1.9.0" @@ -3619,6 +3763,23 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" +"@webpack-cli/configtest@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" + integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg== + +"@webpack-cli/info@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" + integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ== + dependencies: + envinfo "^7.7.3" + +"@webpack-cli/serve@^1.7.0": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" + integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -3660,16 +3821,21 @@ acorn-globals@^6.0.0: acorn "^7.1.1" acorn-walk "^7.1.1" -acorn-jsx@^5.2.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" - integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== +acorn-jsx@^5.3.1: + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn-walk@^7.1.1: version "7.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== +acorn-walk@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== + acorn@^6.4.1: version "6.4.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" @@ -3680,12 +3846,12 @@ acorn@^7.1.1, acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.5.0: +acorn@^8.5.0, acorn@^8.7.0, acorn@^8.7.1: version "8.8.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== -agent-base@6: +agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== @@ -3725,16 +3891,6 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@^5.0.0: - version "5.5.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" - integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU= - dependencies: - co "^4.6.0" - fast-deep-equal "^1.0.0" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.3.0" - ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -3745,7 +3901,7 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.6.0: +ajv@^8.0.1, ajv@^8.6.0: version "8.11.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== @@ -3760,13 +3916,6 @@ amdefine@>=0.0.4: resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= -ansi-align@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" - integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== - dependencies: - string-width "^4.1.0" - ansi-colors@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" @@ -3789,11 +3938,6 @@ ansi-regex@^2.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -3809,7 +3953,7 @@ ansi-styles@^2.2.1: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== @@ -3866,11 +4010,6 @@ append-buffer@^1.0.2: dependencies: buffer-equal "^1.0.0" -append-field@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56" - integrity sha1-HjRA6RXwsSA9I3SOeO3XubW0PlY= - aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -3979,6 +4118,11 @@ arrify@^1.0.1: resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= +asap@^2.0.0: + version "2.0.6" + resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" + integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== + asn1.js@^5.2.0: version "5.4.1" resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" @@ -4007,10 +4151,12 @@ ast-types-flow@^0.0.7: resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0= -astral-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" - integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== +ast-types@^0.13.2: + version "0.13.4" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz#ee0d77b343263965ecc3fb62da16e7222b2b6782" + integrity sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w== + dependencies: + tslib "^2.0.1" astral-regex@^2.0.0: version "2.0.0" @@ -4425,6 +4571,11 @@ base@^0.11.1: mixin-deep "^1.2.0" pascalcase "^0.1.1" +batch@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" + integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw== + big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -4482,12 +4633,7 @@ bn.js@^5.0.0, bn.js@^5.1.1: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b" integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ== -body-scroll-lock@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/body-scroll-lock/-/body-scroll-lock-3.1.5.tgz#c1392d9217ed2c3e237fee1e910f6cdd80b7aaec" - integrity sha512-Yi1Xaml0EvNA0OYWxXiYNqY24AfWkbA6w5vxE7GWxtKfzIbZM+Qw+aSmkgsbWzbHiy/RCSkUZBplVxTA+E4jJg== - -body-scroll-lock@^4.0.0-beta.0: +body-scroll-lock@^3.1.5, body-scroll-lock@^4.0.0-beta.0: version "4.0.0-beta.0" resolved "https://registry.yarnpkg.com/body-scroll-lock/-/body-scroll-lock-4.0.0-beta.0.tgz#4f78789d10e6388115c0460cd6d7d4dd2bbc4f7e" integrity sha512-a7tP5+0Mw3YlUJcGAKUqIBkYYGlYxk2fnCasq/FUph1hadxlTRjF+gAcZksxANnaMnALjxEddmSi/H3OR8ugcQ== @@ -4497,20 +4643,6 @@ boolbase@^1.0.0, boolbase@~1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= -boxen@^5.0.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" - integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== - dependencies: - ansi-align "^3.0.0" - camelcase "^6.2.0" - chalk "^4.1.0" - cli-boxes "^2.2.1" - string-width "^4.2.2" - type-fest "^0.20.2" - widest-line "^3.1.0" - wrap-ansi "^7.0.0" - brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -4740,14 +4872,6 @@ bull@^4.8.5: semver "^7.3.2" uuid "^8.3.0" -busboy@^0.2.11: - version "0.2.14" - resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.2.14.tgz#6c2a622efcf47c57bbbe1e2a9c37ad36c7925453" - integrity sha1-bCpiLvz0fFe7vh4qnDetNseSVFM= - dependencies: - dicer "0.2.5" - readable-stream "1.1.x" - bytes@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" @@ -4825,19 +4949,6 @@ cache-content-type@^1.0.0: mime-types "^2.1.18" ylru "^1.2.0" -cacheable-request@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" - integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== - dependencies: - clone-response "^1.0.2" - get-stream "^5.1.0" - http-cache-semantics "^4.0.0" - keyv "^3.0.0" - lowercase-keys "^2.0.0" - normalize-url "^4.1.0" - responselike "^1.0.2" - call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" @@ -4859,7 +4970,7 @@ camel-case@^4.1.1: pascal-case "^3.1.2" tslib "^2.0.3" -camelcase@^5.0.0, camelcase@^5.3.1: +camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== @@ -4884,9 +4995,9 @@ cancan@3.1.0: is-plain-obj "^1.1.0" caniuse-lite@^1.0.30001332: - version "1.0.30001339" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001339.tgz#f9aece4ea8156071613b27791547ba0b33f176cf" - integrity sha512-Es8PiVqCe+uXdms0Gu5xP5PF2bxLR7OBp3wUzUnuO7OHzhOfCyg3hdiGWVPVxhiuniOzng+hTc1u3fEQ0TlkSQ== + version "1.0.30001430" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001430.tgz" + integrity sha512-IB1BXTZKPDVPM7cnV4iaKaHxckvdr/3xtctB3f7Hmenx3qYBhGtTZ//7EllK66aKXW98Lx0+7Yr0kxBtIt3tzg== chalk@^1.1.3: version "1.1.3" @@ -4947,7 +5058,19 @@ cheerio-select@^1.5.0: domhandler "^4.2.0" domutils "^2.7.0" -cheerio@^1.0.0-rc.2, cheerio@^1.0.0-rc.3: +cheerio-select@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4" + integrity sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g== + dependencies: + boolbase "^1.0.0" + css-select "^5.1.0" + css-what "^6.1.0" + domelementtype "^2.3.0" + domhandler "^5.0.3" + domutils "^3.0.1" + +cheerio@1.0.0-rc.10: version "1.0.0-rc.10" resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e" integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw== @@ -4960,6 +5083,19 @@ cheerio@^1.0.0-rc.2, cheerio@^1.0.0-rc.3: parse5-htmlparser2-tree-adapter "^6.0.1" tslib "^2.2.0" +cheerio@^1.0.0-rc.10, cheerio@^1.0.0-rc.2, cheerio@^1.0.0-rc.3: + version "1.0.0-rc.12" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683" + integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q== + dependencies: + cheerio-select "^2.1.0" + dom-serializer "^2.0.0" + domhandler "^5.0.3" + domutils "^3.0.1" + htmlparser2 "^8.0.1" + parse5 "^7.0.0" + parse5-htmlparser2-tree-adapter "^7.0.0" + chokidar@2.1.8, chokidar@^2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" @@ -5011,11 +5147,6 @@ chrome-trace-event@^1.0.2: dependencies: tslib "^1.9.0" -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - ci-info@^3.2.0: version "3.3.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" @@ -5064,11 +5195,6 @@ clean-stack@^2.0.0: resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cli-boxes@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" - integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== - cli-color@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.2.tgz#e295addbae470800def0254183c648531cdf4e3f" @@ -5103,15 +5229,6 @@ cli-truncate@^3.1.0: slice-ansi "^5.0.0" string-width "^5.0.0" -cliui@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" - integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== - dependencies: - string-width "^3.1.0" - strip-ansi "^5.2.0" - wrap-ansi "^5.1.0" - cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -5126,12 +5243,14 @@ clone-buffer@^1.0.0: resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg= -clone-response@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" - integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== dependencies: - mimic-response "^1.0.0" + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" clone-stats@^1.0.0: version "1.0.0" @@ -5230,10 +5349,10 @@ color@3.0.x: color-convert "^1.9.1" color-string "^1.5.2" -colorette@^2.0.16: - version "2.0.16" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" - integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== +colorette@^2.0.14, colorette@^2.0.16: + version "2.0.19" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" + integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== colors@1.4.0, colors@^1.2.1: version "1.4.0" @@ -5260,7 +5379,7 @@ comma-separated-tokens@^1.0.0: resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw== -commander@7: +commander@7, commander@^7.0.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== @@ -5305,7 +5424,7 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= -component-emitter@^1.2.1, component-emitter@~1.3.0: +component-emitter@^1.2.1, component-emitter@^1.3.0, component-emitter@~1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== @@ -5340,7 +5459,7 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@^1.5.0, concat-stream@^1.5.2: +concat-stream@^1.5.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -5360,13 +5479,13 @@ concat-stream@~2.0.0: readable-stream "^3.0.2" typedarray "^0.0.6" -concurrently@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.3.0.tgz#eb45cdbc8df43da195f619aba218a980cae49184" - integrity sha512-IiDwm+8DOcFEInca494A8V402tNTQlJaYq78RF2rijOrKEk/AOHTxhN4U1cp7GYKYX5Q6Ymh1dLTBlzIMN0ikA== +concurrently@^7.4.0: + version "7.4.0" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.4.0.tgz#bb0e344964bc172673577c420db21e963f2f7368" + integrity sha512-M6AfrueDt/GEna/Vg9BqQ+93yuvzkSKmoTixnwEJkH0LlcGrRC2eCmjeG1tLLHIYfpYJABokqSGyMcXjm96AFA== dependencies: chalk "^4.1.0" - date-fns "^2.16.1" + date-fns "^2.29.1" lodash "^4.17.21" rxjs "^7.0.0" shell-quote "^1.7.3" @@ -5392,18 +5511,6 @@ config-chain@^1.1.13: ini "^1.3.4" proto-list "~1.2.1" -configstore@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" - integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== - dependencies: - dot-prop "^5.2.0" - graceful-fs "^4.1.2" - make-dir "^3.0.0" - unique-string "^2.0.0" - write-file-atomic "^3.0.0" - xdg-basedir "^4.0.0" - console-browserify@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" @@ -5450,6 +5557,11 @@ cookie@^0.4.1, cookie@~0.4.1: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== +cookiejar@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc" + integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ== + cookies@~0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90" @@ -5500,10 +5612,10 @@ core-js@^2.4.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== -core-js@^3.10.2, core-js@^3.6.4: - version "3.10.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.10.2.tgz#17cb038ce084522a717d873b63f2b3ee532e2cd5" - integrity sha512-W+2oVYeNghuBr3yTzZFQ5rfmjZtYB/Ubg87R5YOmlGrIb+Uw9f7qjUbhsj+/EkXhcV7eOD3jiM4+sgraX3FZUw== +core-js@^3.26.0, core-js@^3.6.4: + version "3.26.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.26.0.tgz#a516db0ed0811be10eac5d94f3b8463d03faccfe" + integrity sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw== core-util-is@~1.0.0: version "1.0.2" @@ -5574,17 +5686,6 @@ cross-fetch@3.1.5, cross-fetch@^3.0.4: dependencies: node-fetch "2.6.7" -cross-spawn@^6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -5643,6 +5744,13 @@ css-color-names@1.0.1: resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz#6ff7ee81a823ad46e020fa2fd6ab40a887e2ba67" integrity sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA== +css-rules@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/css-rules/-/css-rules-1.1.0.tgz#404b8b1f77bd775f6c6902b7a7b534f5c016b07f" + integrity sha512-7L6krLIRwAEVCaVKyCEL6PQjQXUmf8DM9bWYKutlZd0DqOe0SiKIGQOkFb59AjDBb+3If7SDp3X8UlzDAgYSow== + dependencies: + cssom "^0.5.0" + css-select@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" @@ -5664,6 +5772,17 @@ css-select@^4.1.3: domutils "^2.6.0" nth-check "^2.0.0" +css-select@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6" + integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg== + dependencies: + boolbase "^1.0.0" + css-what "^6.1.0" + domhandler "^5.0.2" + domutils "^3.0.1" + nth-check "^2.0.1" + css-to-react-native@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756" @@ -5683,6 +5802,11 @@ css-what@^5.0.0, css-what@^5.0.1: resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad" integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg== +css-what@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" + integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== + cssom@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" @@ -5700,10 +5824,10 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -csstype@^3.0.2: - version "3.0.10" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" - integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA== +csstype@^3.0.2, csstype@^3.0.4: + version "3.1.0" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2" + integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA== cyclist@^1.0.1: version "1.0.1" @@ -5985,7 +6109,12 @@ damerau-levenshtein@^1.0.6: resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791" integrity sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug== -data-urls@^3.0.1: +data-uri-to-buffer@3: + version "3.0.1" + resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636" + integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og== + +data-urls@^3.0.1, data-urls@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143" integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ== @@ -6002,39 +6131,40 @@ datadog-metrics@^0.9.3: debug "3.1.0" dogapi "2.8.4" -date-fns@^2.16.1, date-fns@^2.23.0, date-fns@^2.25.0: - version "2.25.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.25.0.tgz#8c5c8f1d958be3809a9a03f4b742eba894fc5680" - integrity sha512-ovYRFnTrbGPD4nqaEqescPEv1mNwvt+UTqI3Ay9SzNtey9NZnYu6E2qCcBBgJ6/2VF1zGGygpyTDITqpQQ5e+w== +date-fns@^2.25.0, date-fns@^2.28.0, date-fns@^2.29.1: + version "2.29.2" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.2.tgz#0d4b3d0f3dff0f920820a070920f0d9662c51931" + integrity sha512-0VNbwmWJDS/G3ySwFSJA3ayhbURMTJLtwM2DTxf9CWondCnh6DTNlO9JgRSq6ibf4eD0lfMJNBxUdEAHHix+bA== -dd-trace@^1.7.1: - version "1.7.1" - resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-1.7.1.tgz#fb3276df4fa29f5b157fa72fa94c8ea156e83aac" - integrity sha512-hRrgJgjP3xF/s4EKxSGzOG+ARkWyRz33dwIwi1gJych7zSE7qnt5VL6LcK1Jou4mfyn+kHUbbb0d7t19YpmZsg== +dd-trace@^2.12.1: + version "2.18.0" + resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-2.18.0.tgz#04638b4aec21b5d62dcbd06c3beab52abd2cb84f" + integrity sha512-1UVo3knRHA39/X5/qgBKjPmfjss7bSJcZAESk3g4FA9jmTh8NbozfWDbvk+nBXJI20Fcgc+Jamf0I9w5KAceRg== dependencies: - "@datadog/native-metrics" "^1.1.0" - "@datadog/pprof" "^0.3.0" - "@datadog/sketches-js" "^1.0.4" + "@datadog/native-appsec" "^1.2.1" + "@datadog/native-metrics" "^1.4.3" + "@datadog/pprof" "^1.0.2" + "@datadog/sketches-js" "^2.1.0" "@types/node" ">=12" crypto-randomuuid "^1.0.0" - form-data "^3.0.0" - import-in-the-middle "^1.1.2" + diagnostics_channel "^1.1.0" + ignore "^5.2.0" + import-in-the-middle "^1.3.4" + ipaddr.js "^2.0.1" + istanbul-lib-coverage "3.2.0" koalas "^1.0.2" limiter "^1.1.4" lodash.kebabcase "^4.1.1" lodash.pick "^4.4.0" lodash.sortby "^4.7.0" lodash.uniq "^4.5.0" + lru-cache "^7.14.0" methods "^1.1.2" module-details-from-path "^1.0.3" - multer "^1.4.2" opentracing ">=0.12.1" path-to-regexp "^0.1.2" - performance-now "^2.1.0" retry "^0.10.1" semver "^5.5.0" - source-map "^0.7.3" - source-map-resolve "^0.6.0" de-indent@^1.0.2: version "1.0.2" @@ -6048,14 +6178,14 @@ debug@3.1.0: dependencies: ms "2.0.0" -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@~4.3.1: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" -debug@^2.2.0, debug@^2.3.3, debug@^2.6.1, debug@^2.6.3, debug@^2.6.8, debug@^2.6.9: +debug@^2.2.0, debug@^2.3.3, debug@^2.6.1, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -6074,11 +6204,6 @@ debuglog@^1.0.0: resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= -decamelize@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= - decimal.js@^10.3.1: version "10.3.1" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" @@ -6089,13 +6214,6 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= - dependencies: - mimic-response "^1.0.0" - dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" @@ -6121,10 +6239,10 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -defer-to-connect@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" - integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== +define-lazy-prop@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== define-properties@^1.1.2, define-properties@^1.1.3, define-properties@^1.1.4: version "1.1.4" @@ -6156,6 +6274,16 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" +degenerator@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.2.tgz#6a61fcc42a702d6e50ff6023fe17bff435f68235" + integrity sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ== + dependencies: + ast-types "^0.13.2" + escodegen "^1.8.1" + esprima "^4.0.0" + vm2 "^3.9.8" + delaunator@5: version "5.0.0" resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.0.tgz#60f052b28bd91c9b4566850ebf7756efe821d81b" @@ -6206,23 +6334,33 @@ destroy@^1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -detect-file@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" - integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg== detect-newline@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== -dicer@0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.2.5.tgz#5996c086bb33218c812c090bddc09cd12facb70f" - integrity sha1-WZbAhrszIYyBLAkL3cCc0S+stw8= +detect-node-es@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz#163acdf643330caa0b4cd7c21e7ee7755d6fa493" + integrity sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ== + +dezalgo@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" + integrity sha512-K7i4zNfT2kgQz3GylDw40ot9GAE47sFZ9EXHFSPP6zONLgH6kWXE0KWJchkbQJLBkRazq4APwZ4OwiFFlT95OQ== dependencies: - readable-stream "1.1.x" - streamsearch "0.1.2" + asap "^2.0.0" + wrappy "1" + +diagnostics_channel@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/diagnostics_channel/-/diagnostics_channel-1.1.0.tgz#bd66c49124ce3bac697dff57466464487f57cea5" + integrity sha512-OE1ngLDjSBPG6Tx0YATELzYzy3RKHC+7veQ8gLa8yS7AAgw65mFbVdcsu3501abqOZCEZqZyAIemB0zXlqDSuw== diff-sequences@^28.1.1: version "28.1.1" @@ -6327,6 +6465,15 @@ dom-serializer@^1.0.1, dom-serializer@^1.3.2: domhandler "^4.2.0" entities "^2.0.0" +dom-serializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" + integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.2" + entities "^4.2.0" + dom-utils@^0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/dom-utils/-/dom-utils-0.9.0.tgz#e615a5af15ac4505e55ef612c72b5b5d176121f3" @@ -6347,10 +6494,10 @@ domelementtype@1, domelementtype@^1.3.1: resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== -domelementtype@^2.0.1, domelementtype@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" - integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== +domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== domexception@^4.0.0: version "4.0.0" @@ -6373,15 +6520,22 @@ domhandler@^4.0.0, domhandler@^4.2.0: dependencies: domelementtype "^2.2.0" +domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" + integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== + dependencies: + domelementtype "^2.3.0" + domino@^2.1.6: version "2.1.6" resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.6.tgz#fe4ace4310526e5e7b9d12c7de01b7f485a57ffe" integrity sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ== -dompurify@2.3.8: - version "2.3.8" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz#224fe9ae57d7ebd9a1ae1ac18c1c1ca3f532226f" - integrity sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw== +dompurify@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.0.tgz#c9c88390f024c2823332615c9e20a453cf3825dd" + integrity sha512-Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA== domutils@1.5.1: version "1.5.1" @@ -6408,6 +6562,15 @@ domutils@^2.5.2, domutils@^2.6.0, domutils@^2.7.0: domelementtype "^2.2.0" domhandler "^4.2.0" +domutils@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" + integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== + dependencies: + dom-serializer "^2.0.0" + domelementtype "^2.3.0" + domhandler "^5.0.1" + dot-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" @@ -6445,11 +6608,6 @@ duck@^0.1.12: dependencies: underscore "^1.13.1" -duplexer3@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" - integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= - duplexer@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" @@ -6532,11 +6690,6 @@ emoji-regex@*, emoji-regex@^10.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.0.0.tgz#96559e19f82231b436403e059571241d627c42b8" integrity sha512-KmJa8l6uHi1HrBI34udwlzZY1jOEuID/ft4d8BSSEdRyap7PwBEt910453PJa5MuGvxkLqlt4Uvhu7tttFHViw== -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -6605,7 +6758,7 @@ engine.io@~4.1.0: engine.io-parser "~4.0.0" ws "~7.4.2" -enhanced-resolve@^4.1.1, enhanced-resolve@^4.3.0: +enhanced-resolve@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126" integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ== @@ -6614,6 +6767,14 @@ enhanced-resolve@^4.1.1, enhanced-resolve@^4.3.0: memory-fs "^0.5.0" tapable "^1.0.0" +enhanced-resolve@^5.10.0: + version "5.10.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6" + integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + enquirer@^2.3.5: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" @@ -6636,6 +6797,11 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== +entities@^4.2.0, entities@^4.3.0, entities@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" + integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== + entities@~3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" @@ -6650,6 +6816,11 @@ env-ci@^5.3.3: fromentries "^1.3.2" java-properties "^1.0.0" +envinfo@^7.7.3: + version "7.8.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" + integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== + enzyme-adapter-react-16@^1.15.6: version "1.15.6" resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.6.tgz#fd677a658d62661ac5afd7f7f541f141f8085901" @@ -6829,11 +7000,6 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-goat@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" - integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== - escape-html@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -6849,6 +7015,23 @@ escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +escodegen@^1.8.1: + version "1.14.3" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" + integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + escodegen@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" @@ -6874,16 +7057,18 @@ eslint-import-resolver-node@^0.3.6: debug "^3.2.7" resolve "^1.20.0" -eslint-import-resolver-typescript@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.5.0.tgz#07661966b272d14ba97f597b51e1a588f9722f0a" - integrity sha512-qZ6e5CFr+I7K4VVhQu3M/9xGv9/YmwsEXrsm3nimw8vWaVHRDrQRp26BgCypTxBp3vUp4o5aVEJRiy0F2DFddQ== +eslint-import-resolver-typescript@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.2.tgz#9431acded7d898fd94591a08ea9eec3514c7de91" + integrity sha512-zX4ebnnyXiykjhcBvKIf5TNvt8K7yX6bllTRZ14MiurKPjDpCAZujlszTdB8pcNXhZcOf+god4s9SjQa5GnytQ== dependencies: - debug "^4.3.1" - glob "^7.1.7" - is-glob "^4.0.1" - resolve "^1.20.0" - tsconfig-paths "^3.9.0" + debug "^4.3.4" + enhanced-resolve "^5.10.0" + get-tsconfig "^4.2.0" + globby "^13.1.2" + is-core-module "^2.10.0" + is-glob "^4.0.3" + synckit "^0.8.4" eslint-module-utils@^2.7.1: version "2.7.1" @@ -7027,34 +7212,37 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== -eslint-visitor-keys@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2" - integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA== +eslint-visitor-keys@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" + integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@^7.6.0: - version "7.13.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.13.0.tgz#7f180126c0dcdef327bfb54b211d7802decc08da" - integrity sha512-uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ== +eslint@^7.32.0: + version "7.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" + integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== dependencies: - "@babel/code-frame" "^7.0.0" - "@eslint/eslintrc" "^0.2.1" + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.3" + "@humanwhocodes/config-array" "^0.5.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" enquirer "^2.3.5" + escape-string-regexp "^4.0.0" eslint-scope "^5.1.1" eslint-utils "^2.1.0" eslint-visitor-keys "^2.0.0" - espree "^7.3.0" - esquery "^1.2.0" + espree "^7.3.1" + esquery "^1.4.0" esutils "^2.0.2" - file-entry-cache "^5.0.1" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" - globals "^12.1.0" + glob-parent "^5.1.2" + globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -7062,7 +7250,7 @@ eslint@^7.6.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.19" + lodash.merge "^4.6.2" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -7071,17 +7259,17 @@ eslint@^7.6.0: semver "^7.2.1" strip-ansi "^6.0.0" strip-json-comments "^3.1.0" - table "^5.2.3" + table "^6.0.9" text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348" - integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw== +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== dependencies: acorn "^7.4.0" - acorn-jsx "^5.2.0" + acorn-jsx "^5.3.1" eslint-visitor-keys "^1.3.0" esprima@^4.0.0, esprima@^4.0.1: @@ -7089,10 +7277,10 @@ esprima@^4.0.0, esprima@^4.0.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" - integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== dependencies: estraverse "^5.1.0" @@ -7108,7 +7296,7 @@ esrever@^0.2.0: resolved "https://registry.yarnpkg.com/esrever/-/esrever-0.2.0.tgz#96e9d28f4f1b1a76784cd5d490eaae010e7407b8" integrity sha1-lunSj08bGnZ4TNXUkOquAQ50B7g= -estraverse@^4.1.1: +estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -7192,13 +7380,6 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expand-tilde@^2.0.0, expand-tilde@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" - integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= - dependencies: - homedir-polyfill "^1.0.1" - expect@^28.1.3: version "28.1.3" resolved "https://registry.yarnpkg.com/expect/-/expect-28.1.3.tgz#90a7c1a124f1824133dd4533cce2d2bdcb6603ec" @@ -7264,10 +7445,15 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -fast-deep-equal@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" - integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ= +extract-css@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/extract-css/-/extract-css-3.0.0.tgz#b4b942fe3aee801c335c3e790bee87d4e161b25f" + integrity sha512-ZM2IuJkX79gys2PMN12yWrHvyK2sw1ReCdCtp/RAdgcFaBui+wY3Bsll9Em2LJXzKI8BYEBZLm2UczqyBCXSjQ== + dependencies: + batch "^0.6.1" + href-content "^2.0.1" + list-stylesheets "^2.0.0" + style-data "^2.0.0" fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" @@ -7284,10 +7470,10 @@ fast-equals@^2.0.3: resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-2.0.3.tgz#7039b0a039909f345a2ce53f6202a14e5f392efc" integrity sha512-0EMw4TTUxsMDpDkCg0rXor2gsg+npVrMIHbEhvD0HZyIhUX6AktC/yasm+qKwfyswd06Qy95ZKk8p2crTo0iPA== -fast-glob@^3.2.9: - version "3.2.11" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" - integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== +fast-glob@^3.2.11, fast-glob@^3.2.9: + version "3.2.12" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" + integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -7305,11 +7491,16 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -fast-safe-stringify@^2.0.4: +fast-safe-stringify@^2.0.4, fast-safe-stringify@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== +fastest-levenshtein@^1.0.12: + version "1.0.16" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" + integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== + fastq@^1.6.0: version "1.13.0" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" @@ -7357,12 +7548,12 @@ figgy-pudding@^3.5.1: resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== -file-entry-cache@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" - integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g== +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== dependencies: - flat-cache "^2.0.1" + flat-cache "^3.0.4" file-loader@^1.1.6: version "1.1.11" @@ -7389,6 +7580,11 @@ file-uri-to-path@1.0.0: resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== +file-uri-to-path@2: + version "2.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz#7b415aeba227d575851e0a5b0c640d7656403fba" + integrity sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg== + filelist@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" @@ -7479,29 +7675,23 @@ findit2@^2.2.3: resolved "https://registry.yarnpkg.com/findit2/-/findit2-2.2.3.tgz#58a466697df8a6205cdfdbf395536b8bd777a5f6" integrity sha1-WKRmaX34piBc39vzlVNri9d3pfY= -findup-sync@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" - integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg== +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== dependencies: - detect-file "^1.0.0" - is-glob "^4.0.0" - micromatch "^3.0.4" - resolve-dir "^1.0.1" + flatted "^3.1.0" + rimraf "^3.0.2" -flat-cache@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" - integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA== - dependencies: - flatted "^2.0.0" - rimraf "2.6.3" - write "1.0.3" +flat-util@^1.1.8: + version "1.1.9" + resolved "https://registry.yarnpkg.com/flat-util/-/flat-util-1.1.9.tgz#87095653dcf77226a3bc99f7157794c2335b2b08" + integrity sha512-BOTMw/6rbbxVjv5JQvwgGMc2/6wWGd2VeyTvnzvvE49VRjS0tTxLbry/QVP1yPw8SaAOBYsnixmzruXoqjdUHA== -flatted@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" - integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== +flatted@^3.1.0: + version "3.2.7" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" + integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== flush-write-stream@^1.0.0, flush-write-stream@^1.0.2: version "1.1.1" @@ -7556,6 +7746,16 @@ formidable@^1.1.1: resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9" integrity sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q== +formidable@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/formidable/-/formidable-2.0.1.tgz#4310bc7965d185536f9565184dee74fbb75557ff" + integrity sha512-rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ== + dependencies: + dezalgo "1.0.3" + hexoid "1.0.0" + once "1.4.0" + qs "6.9.3" + fractional-index@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fractional-index/-/fractional-index-1.0.0.tgz#98d528e26176a70930ef397e3f912de259b6cda9" @@ -7722,6 +7922,14 @@ fsevents@^2.3.2, fsevents@~2.3.2: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== +ftp@^0.3.10: + version "0.3.10" + resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d" + integrity sha512-faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ== + dependencies: + readable-stream "1.1.x" + xregexp "2.0.0" + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -7762,7 +7970,7 @@ gensync@^1.0.0-beta.2: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -get-caller-file@^2.0.1, get-caller-file@^2.0.5: +get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== @@ -7776,6 +7984,11 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: has "^1.0.3" has-symbols "^1.0.1" +get-nonce@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/get-nonce/-/get-nonce-1.0.1.tgz#fdf3f0278073820d2ce9426c18f07481b1e0cdf3" + integrity sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q== + get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" @@ -7798,20 +8011,6 @@ get-port@^5.1.1: resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193" integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ== -get-stream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== - dependencies: - pump "^3.0.0" - -get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== - dependencies: - pump "^3.0.0" - get-stream@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" @@ -7825,6 +8024,23 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" +get-tsconfig@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.2.0.tgz#ff368dd7104dab47bf923404eb93838245c66543" + integrity sha512-X8u8fREiYOE6S8hLbq99PeykTDoLVnxvF4DjWKJmz9xy2nNRdUcV8ZN9tniJFeKyTU3qnC9lL8n4Chd6LmVKHg== + +get-uri@3: + version "3.0.2" + resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-3.0.2.tgz#f0ef1356faabc70e1f9404fa3b66b2ba9bfc725c" + integrity sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg== + dependencies: + "@tootallnate/once" "1" + data-uri-to-buffer "3" + debug "4" + file-uri-to-path "2" + fs-extra "^8.1.0" + ftp "^0.3.10" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -7846,7 +8062,7 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" -glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.2: +glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -7869,7 +8085,7 @@ glob-stream@^6.1.0: to-absolute-glob "^2.0.0" unique-stream "^2.0.2" -glob@7.2.0, glob@^7.0.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: +glob@7.2.0, glob@^7.0.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -7881,49 +8097,6 @@ glob@7.2.0, glob@^7.0.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glo once "^1.3.0" path-is-absolute "^1.0.0" -global-dirs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" - integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== - dependencies: - ini "2.0.0" - -global-modules@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" - integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== - dependencies: - global-prefix "^1.0.1" - is-windows "^1.0.1" - resolve-dir "^1.0.0" - -global-modules@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" - integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== - dependencies: - global-prefix "^3.0.0" - -global-prefix@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" - integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= - dependencies: - expand-tilde "^2.0.2" - homedir-polyfill "^1.0.1" - ini "^1.3.4" - is-windows "^1.0.1" - which "^1.2.14" - -global-prefix@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" - integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== - dependencies: - ini "^1.3.5" - kind-of "^6.0.2" - which "^1.3.1" - global@~4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" @@ -7937,19 +8110,24 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== +globals@^13.6.0, globals@^13.9.0: + version "13.17.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz#902eb1e680a41da93945adbdcb5a9f361ba69bd4" + integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw== dependencies: - type-fest "^0.8.1" + type-fest "^0.20.2" globals@^9.18.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== -globby@^11.0.4: +globalyzer@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465" + integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q== + +globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -7961,6 +8139,22 @@ globby@^11.0.4: merge2 "^1.4.1" slash "^3.0.0" +globby@^13.1.2: + version "13.1.2" + resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.2.tgz#29047105582427ab6eca4f905200667b056da515" + integrity sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ== + dependencies: + dir-glob "^3.0.1" + fast-glob "^3.2.11" + ignore "^5.2.0" + merge2 "^1.4.1" + slash "^4.0.0" + +globrex@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098" + integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg== + google-closure-compiler-js@^20170423.0.0: version "20170423.0.0" resolved "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20170423.0.0.tgz#e9e8b40dadfdf0e64044c9479b5d26d228778fbc" @@ -7970,24 +8164,7 @@ google-closure-compiler-js@^20170423.0.0: vinyl "^2.0.1" webpack-core "^0.6.8" -got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== - dependencies: - "@sindresorhus/is" "^0.14.0" - "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" - -graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.9: +graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -8090,11 +8267,6 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has-yarn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" - integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -8165,6 +8337,11 @@ helmet@^4.0.0, helmet@^4.4.1: resolved "https://registry.yarnpkg.com/helmet/-/helmet-4.6.0.tgz#579971196ba93c5978eb019e4e8ec0e50076b4df" integrity sha512-HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg== +hexoid@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18" + integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g== + hey-listen@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/hey-listen/-/hey-listen-1.0.8.tgz#8e59561ff724908de1aa924ed6ecc84a56a9aa68" @@ -8198,12 +8375,12 @@ hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react- dependencies: react-is "^16.7.0" -homedir-polyfill@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" - integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== +href-content@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/href-content/-/href-content-2.0.1.tgz#d1fb136e5b4c99b8ef44e4a9fe14e8863c1a939f" + integrity sha512-5uiAmBCvzCFVu70kli3Hp0BONbAOfwGqR7jKolV+bAh174sIAZBL8DHfg5SnxAhId2mQmYgyL7Y62msnWJ34Xg== dependencies: - parse-passwd "^1.0.0" + remote-content "^3.0.0" html-element-map@^1.2.0: version "1.3.1" @@ -8287,6 +8464,16 @@ htmlparser2@^6.1.0: domutils "^2.5.2" entities "^2.0.0" +htmlparser2@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" + integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.2" + domutils "^3.0.1" + entities "^4.3.0" + http-assert@^1.3.0: version "1.4.1" resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.4.1.tgz#c5f725d677aa7e873ef736199b89686cceb37878" @@ -8295,11 +8482,6 @@ http-assert@^1.3.0: deep-equal "~1.0.1" http-errors "~1.7.2" -http-cache-semantics@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== - http-errors@1.7.3, http-errors@~1.7.2: version "1.7.3" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" @@ -8322,7 +8504,7 @@ http-errors@2.0.0: statuses "2.0.1" toidentifier "1.0.1" -http-errors@^1.3.1, http-errors@^1.6.1, http-errors@^1.6.3, http-errors@^1.7.3, http-errors@^1.8.0: +http-errors@^1.3.1, http-errors@^1.6.3, http-errors@^1.7.3, http-errors@^1.8.0: version "1.8.1" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== @@ -8343,6 +8525,15 @@ http-errors@~1.6.2: setprototypeof "1.1.0" statuses ">= 1.4.0 < 2" +http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + http-proxy-agent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" @@ -8357,10 +8548,10 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== +https-proxy-agent@5, https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== dependencies: agent-base "6" debug "4" @@ -8469,7 +8660,7 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.1, ignore@^5.1.8, ignore@^5.2.0: +ignore@^5.1.1, ignore@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== @@ -8497,26 +8688,13 @@ import-fresh@^3.0.0, import-fresh@^3.2.1: parent-module "^1.0.0" resolve-from "^4.0.0" -import-in-the-middle@^1.1.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.2.1.tgz#30d4e98be7329eee0d284943dd0df092cc422b3c" - integrity sha512-KdYqCJbJWBOU9740nr9lrmCDhW7htxY1dHmbP4iUEeCaxupj2fKFhyHixsly2WmxMbRIsxzSWSJMfGNEU7el+w== +import-in-the-middle@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.3.4.tgz#7074bbd4e84e8cdafd1eae400b04e6fe252a0768" + integrity sha512-TUXqqEFacJ2DWAeYOhHwGZTMJtFxFVw0C1pYA+AXmuWXZGnBqUhHdtVrSkSbW5D7k2yriBG45j23iH9TRtI+bQ== dependencies: module-details-from-path "^1.0.3" -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= - -import-local@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" - integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== - dependencies: - pkg-dir "^3.0.0" - resolve-cwd "^2.0.0" - import-local@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" @@ -8573,16 +8751,24 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" - integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== - -ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@^1.3.4, ini@~1.3.0: version "1.3.7" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== +inline-css@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/inline-css/-/inline-css-4.0.1.tgz#19e55dcb1828dfffd4784278b0103fb9ca597e4d" + integrity sha512-gzumhrp0waBLF5TtwQcm5bviA9ZNURXeNOs2xVSTsX60FWPFlrPJol4HI8yrozZ6V5udWKUT3LS2tMUDMMdi1Q== + dependencies: + cheerio "^1.0.0-rc.10" + css-rules "^1.1.0" + extract-css "^3.0.0" + flat-util "^1.1.8" + pick-util "^1.1.4" + slick "^1.12.2" + specificity "^0.4.1" + internal-slot@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" @@ -8597,21 +8783,22 @@ internal-slot@^1.0.3: resolved "https://registry.yarnpkg.com/internmap/-/internmap-2.0.3.tgz#6685f23755e43c524e251d29cbc97248e3061009" integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg== -interpret@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" - integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== +interpret@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" + integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== -intl-messageformat@^9.6.12: - version "9.9.1" - resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.9.1.tgz#255d453b0656b4f7e741f31d2b4a95bf2adfe064" - integrity sha512-cuzS/XKHn//hvKka77JKU2dseiVY2dofQjIOZv6ZFxFt4Z9sPXnZ7KQ9Ak2r+4XBCjI04MqJ1PhKs/3X22AkfA== +intl-messageformat@^10.1.0: + version "10.1.4" + resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.1.4.tgz#bf5ad48e357e3f3ab6559599296f54c175b22a92" + integrity sha512-tXCmWCXhbeHOF28aIf5b9ce3kwdwGyIiiSXVZsyDwksMiGn5Tp0MrMvyeuHuz4uN1UL+NfGOztHmE+6aLFp1wQ== dependencies: - "@formatjs/fast-memoize" "1.2.0" - "@formatjs/icu-messageformat-parser" "2.0.11" - tslib "^2.1.0" + "@formatjs/ecma402-abstract" "1.12.0" + "@formatjs/fast-memoize" "1.2.6" + "@formatjs/icu-messageformat-parser" "2.1.7" + tslib "2.4.0" -invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4: +invariant@^2.2.2, invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== @@ -8635,7 +8822,17 @@ ioredis@^4.28.5: redis-parser "^3.0.0" standard-as-callback "^2.1.0" -ipaddr.js@^2.0.0: +ip@^1.1.5: + version "1.1.8" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48" + integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg== + +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== + +ipaddr.js@^2.0.0, ipaddr.js@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== @@ -8734,17 +8931,10 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== -is-ci@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" - integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== - dependencies: - ci-info "^2.0.0" - -is-core-module@^2.2.0, is-core-module@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" - integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== +is-core-module@^2.10.0, is-core-module@^2.8.0, is-core-module@^2.9.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed" + integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg== dependencies: has "^1.0.3" @@ -8790,6 +8980,11 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: is-data-descriptor "^1.0.0" kind-of "^6.0.2" +is-docker@^2.0.0, is-docker@^2.1.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -8807,11 +9002,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= - is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -8856,14 +9046,6 @@ is-hexadecimal@^1.0.0: resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== -is-installed-globally@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" - integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== - dependencies: - global-dirs "^3.0.0" - is-path-inside "^3.0.2" - is-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" @@ -8879,11 +9061,6 @@ is-negative-zero@^2.0.2: resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== -is-npm@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" - integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== - is-number-object@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" @@ -8911,11 +9088,6 @@ is-obj@^2.0.0: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== -is-path-inside@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - is-plain-obj@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" @@ -9010,11 +9182,6 @@ is-typed-array@^1.1.3, is-typed-array@^1.1.9: for-each "^0.3.3" has-tostringtag "^1.0.0" -is-typedarray@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - is-unc-path@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" @@ -9054,10 +9221,12 @@ is-wsl@^1.1.0: resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= -is-yarn-global@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" - integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== +is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" isarray@0.0.1: version "0.0.1" @@ -9099,7 +9268,7 @@ isomorphic.js@^0.2.4: resolved "https://registry.yarnpkg.com/isomorphic.js/-/isomorphic.js-0.2.4.tgz#24ca374163ae54a7ce3b86ce63b701b91aa84969" integrity sha512-Y4NjZceAwaPXctwsHgNsmfuPxR8lJ3f8X7QTAkhltrX4oGIv+eTlgHLXn4tWysC9zGTi929gapnPp+8F8cg7nA== -istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: +istanbul-lib-coverage@3.2.0, istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== @@ -9617,6 +9786,39 @@ jsdom@^19.0.0: ws "^8.2.3" xml-name-validator "^4.0.0" +jsdom@^20.0.0: + version "20.0.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.0.tgz#882825ac9cc5e5bbee704ba16143e1fa78361ebf" + integrity sha512-x4a6CKCgx00uCmP+QakBDFXwjAJ69IkkIWHmtmjd3wvXPcdOS44hfX2vqkOQrVrq8l9DhNNADZRXaCEWvgXtVA== + dependencies: + abab "^2.0.6" + acorn "^8.7.1" + acorn-globals "^6.0.0" + cssom "^0.5.0" + cssstyle "^2.3.0" + data-urls "^3.0.2" + decimal.js "^10.3.1" + domexception "^4.0.0" + escodegen "^2.0.0" + form-data "^4.0.0" + html-encoding-sniffer "^3.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" + is-potential-custom-element-name "^1.0.1" + nwsapi "^2.2.0" + parse5 "^7.0.0" + saxes "^6.0.0" + symbol-tree "^3.2.4" + tough-cookie "^4.0.0" + w3c-hr-time "^1.0.2" + w3c-xmlserializer "^3.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^2.0.0" + whatwg-mimetype "^3.0.0" + whatwg-url "^11.0.0" + ws "^8.8.0" + xml-name-validator "^4.0.0" + jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -9634,15 +9836,10 @@ json-bigint@^1.0.0: dependencies: bignumber.js "^9.0.0" -json-buffer@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= - -json-loader@0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de" - integrity sha1-i6oTZaYy9Yo8RtIBdfxgAsluN94= +json-loader@0.5.7: + version "0.5.7" + resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" + integrity sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w== json-parse-better-errors@^1.0.2: version "1.0.2" @@ -9654,11 +9851,6 @@ json-parse-even-better-errors@^2.3.0: resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== -json-schema-traverse@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" - integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A= - json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -9748,10 +9940,10 @@ jsonwebtoken@^8.5.0: array-includes "^3.1.1" object.assign "^4.1.1" -jszip@^3.10.0, jszip@^3.7.1: - version "3.10.0" - resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.0.tgz#faf3db2b4b8515425e34effcdbb086750a346061" - integrity sha512-LDfVtOLtOxb9RXkYOwPyNBTQDL4eUbqahtoY6x07GiDJHwSYvn8sHHIw8wINImV3MqbMNve2gSuM1DDqEKk09Q== +jszip@^3.10.1, jszip@^3.7.1: + version "3.10.1" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2" + integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g== dependencies: lie "~3.3.0" pako "~1.0.2" @@ -9793,13 +9985,6 @@ keygrip@~1.1.0: dependencies: tsscmp "1.0.6" -keyv@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" - integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== - dependencies: - json-buffer "3.0.0" - khroma@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/khroma/-/khroma-2.0.0.tgz#7577de98aed9f36c7a474c4d453d94c0d6c6588b" @@ -9957,29 +10142,11 @@ koa-send@5.0.1, koa-send@^5.0.0: http-errors "^1.7.3" resolve-path "^1.4.0" -koa-send@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/koa-send/-/koa-send-4.1.3.tgz#0822207bbf5253a414c8f1765ebc29fa41353cb6" - integrity sha512-3UetMBdaXSiw24qM2Mx5mKmxLKw5ZTPRjACjfhK6Haca55RKm9hr/uHDrkrxhSl5/S1CKI/RivZVIopiatZuTA== - dependencies: - debug "^2.6.3" - http-errors "^1.6.1" - mz "^2.6.0" - resolve-path "^1.4.0" - koa-sslify@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/koa-sslify/-/koa-sslify-2.1.2.tgz#8947fd53949d69d539607814097863c1ecf38f30" integrity sha1-iUf9U5SdadU5YHgUCXhjwezzjzA= -koa-static@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/koa-static/-/koa-static-4.0.3.tgz#5f93ad00fb1905db9ce46667c0e8bb7d22abfcd8" - integrity sha512-JGmxTuPWy4bH7bt6gD/OMWkhprawvRmzJSr8TWKmTL4N7+IMv3s0SedeQi5S4ilxM9Bo6ptkCyXj/7wf+VS5tg== - dependencies: - debug "^3.1.0" - koa-send "^4.1.3" - koa-static@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/koa-static/-/koa-static-5.0.0.tgz#5e92fc96b537ad5219f425319c95b64772776943" @@ -10074,13 +10241,6 @@ language-tags@^1.0.5: dependencies: language-subtag-registry "~0.3.2" -latest-version@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" - integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== - dependencies: - package-json "^6.3.0" - lazystream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" @@ -10177,6 +10337,14 @@ lint-staged@^12.3.8: supports-color "^9.2.1" yaml "^1.10.2" +list-stylesheets@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/list-stylesheets/-/list-stylesheets-2.0.0.tgz#83d5a419a35bae5913b97d2faf6142c8ad4a0c39" + integrity sha512-EMhWosVmqftbB3WZb4JWcS3tVj9rhBpkDqB87HaNdOi5gpFZNC+Od7hHPFSSlB99Qt/HxJZs8atINa/z672EDA== + dependencies: + cheerio "1.0.0-rc.10" + pick-util "^1.1.4" + listr2@^4.0.1: version "4.0.5" resolved "https://registry.yarnpkg.com/listr2/-/listr2-4.0.5.tgz#9dcc50221583e8b4c71c43f9c7dfd0ef546b75d5" @@ -10211,9 +10379,9 @@ loader-runner@^2.4.0: integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== loader-utils@^1.0.2, loader-utils@^1.2.3, loader-utils@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" - integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + version "1.4.1" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz#278ad7006660bccc4d2c0c1578e17c5c78d5c0e0" + integrity sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" @@ -10278,7 +10446,7 @@ lodash.escape@^4.0.1: resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98" integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg= -lodash.flatten@^4.2.0, lodash.flatten@^4.4.0: +lodash.flatten@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= @@ -10333,6 +10501,11 @@ lodash.kebabcase@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY= +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + lodash.mergewith@4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55" @@ -10353,12 +10526,17 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw== + lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: +lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -10384,10 +10562,10 @@ logform@^2.2.0: ms "^2.1.1" triple-beam "^1.3.0" -long@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== +long@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/long/-/long-5.2.0.tgz#2696dadf4b4da2ce3f6f6b89186085d94d52fd61" + integrity sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w== loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" @@ -10412,16 +10590,6 @@ lower-case@^2.0.2: dependencies: tslib "^2.0.3" -lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== - -lowercase-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" - integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== - lru-cache@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" @@ -10444,6 +10612,11 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.14.0: + version "7.14.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f" + integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ== + lru-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3" @@ -10578,6 +10751,13 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= +mediaquery-text@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mediaquery-text/-/mediaquery-text-1.2.0.tgz#266f7ca5a339c81ef17dc80f219a46e4a610ebce" + integrity sha512-cJyRqgYQi+hsYhRkyd5le0s4LsEPvOB7r+6X3jdEELNqVlM9mRIgyUPg9BzF+PuTqQH1ZekgIjYVOeWSXWq35Q== + dependencies: + cssom "^0.5.0" + "memoize-one@>=3.1.1 <6": version "5.1.1" resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0" @@ -10623,19 +10803,19 @@ merge2@^1.3.0, merge2@^1.4.1: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -mermaid@9.1.3: - version "9.1.3" - resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-9.1.3.tgz#15d08662c66250124ce31106a4620285061ac59c" - integrity sha512-jTIYiqKwsUXVCoxHUVkK8t0QN3zSKIdJlb9thT0J5jCnzXyc+gqTbZE2QmjRfavFTPPn5eRy5zaFp7V+6RhxYg== +mermaid@9.1.7: + version "9.1.7" + resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-9.1.7.tgz#e24de9b2d36c8cb25a09d72ffce966941b24bd6e" + integrity sha512-MRVHXy5FLjnUQUG7YS3UN9jEN6FXCJbFCXVGJQjVIbiR6Vhw0j/6pLIjqsiah9xoHmQU6DEaKOvB3S1g/1nBPA== dependencies: "@braintree/sanitize-url" "^6.0.0" d3 "^7.0.0" dagre "^0.8.5" dagre-d3 "^0.6.4" - dompurify "2.3.8" + dompurify "2.4.0" graphlib "^2.1.8" khroma "^2.0.0" - moment-mini "^2.24.0" + moment-mini "2.24.0" stylis "^4.0.10" methods@^1.0.1, methods@^1.1.2: @@ -10643,7 +10823,7 @@ methods@^1.0.1, methods@^1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: +micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -10683,7 +10863,7 @@ mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.35, mime-types@~2.1.24: +mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.27, mime-types@^2.1.35, mime-types@~2.1.24: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -10695,7 +10875,12 @@ mime@2.4.6: resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== -mime@^1.3.4, mime@^1.4.1, mime@^1.5.0: +mime@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" + integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== + +mime@^1.3.4, mime@^1.5.0: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== @@ -10705,11 +10890,6 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mimic-response@^1.0.0, mimic-response@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" - integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== - min-document@^2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" @@ -10735,17 +10915,17 @@ minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -minimatch@^3.0.2, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== +minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" -minimist@^1.2.0, minimist@^1.2.5: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== +minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== minipass-collect@^1.0.2: version "1.0.2" @@ -10836,6 +11016,11 @@ mobx-react@^6.3.1: dependencies: mobx-react-lite "^2.2.0" +mobx-utils@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-4.0.1.tgz#1bd8648332be7ca83d7023aaa0ba24bbf389a300" + integrity sha512-hWYLNJNBoGY/iQbQuOzYkUsTGArpTTutrXaQQrXvxBMefDwhWyNHr7bx/g7syf6KQ1f6aKzgQICqC+zXSvGzJQ== + mobx@^4.15.4: version "4.15.7" resolved "https://registry.yarnpkg.com/mobx/-/mobx-4.15.7.tgz#933281268c3b4658b6cf2526e872cf78ea48ab95" @@ -10846,7 +11031,7 @@ module-details-from-path@^1.0.3: resolved "https://registry.yarnpkg.com/module-details-from-path/-/module-details-from-path-1.0.3.tgz#114c949673e2a8a35e9d35788527aa37b679da2b" integrity sha1-EUyUlnPiqKNenTV4hSeqN7Z52is= -moment-mini@^2.24.0: +moment-mini@2.24.0: version "2.24.0" resolved "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.24.0.tgz#fa68d98f7fe93ae65bf1262f6abb5fb6983d8d18" integrity sha512-9ARkWHBs+6YJIvrIp0Ik5tyTTtP9PoV0Ssu2Ocq5y9v8+NOOpWiRshAp8c4rZVWTOe+157on/5G+zj5pwIQFEQ== @@ -10911,21 +11096,7 @@ msgpackr@^1.5.2: optionalDependencies: msgpackr-extract "^2.0.2" -multer@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.2.tgz#2f1f4d12dbaeeba74cb37e623f234bf4d3d2057a" - integrity sha512-xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg== - dependencies: - append-field "^1.0.0" - busboy "^0.2.11" - concat-stream "^1.5.2" - mkdirp "^0.5.1" - object-assign "^4.1.1" - on-finished "^2.3.0" - type-is "^1.6.4" - xtend "^4.0.0" - -mz@^2.4.0, mz@^2.6.0: +mz@^2.4.0: version "2.7.0" resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== @@ -10934,10 +11105,10 @@ mz@^2.4.0, mz@^2.6.0: object-assign "^4.0.1" thenify-all "^1.0.0" -nan@^2.12.1, nan@^2.14.0, nan@^2.14.2: - version "2.15.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" - integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== +nan@^2.12.1, nan@^2.16.0: + version "2.17.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" + integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== nanomatch@^1.2.9: version "1.2.13" @@ -10986,16 +11157,16 @@ neo-async@^2.5.0, neo-async@^2.6.1: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== +netmask@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7" + integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg== + next-tick@1, next-tick@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb" integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ== -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - no-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" @@ -11026,6 +11197,11 @@ node-gyp-build@^3.9.0: resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-3.9.0.tgz#53a350187dd4d5276750da21605d1cb681d09e25" integrity sha512-zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A== +node-htmldiff@^0.9.4: + version "0.9.4" + resolved "https://registry.yarnpkg.com/node-htmldiff/-/node-htmldiff-0.9.4.tgz#d8fec52fbe736780afff28d2c8476ec106520887" + integrity sha512-Nvnv0bcehOFsH/TD+bi4ls3iWTRQiytqII5+I1iBUypO+GFMYLcyBJfS2U3DMRSIYzfZHysaYLYoCXx6Q148Hg== + node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -11070,21 +11246,21 @@ nodemailer@^6.6.1: resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.6.1.tgz#2a05fbf205b897d71bf43884167b5d4d3bd01b99" integrity sha512-1xzFN3gqv+/qJ6YRyxBxfTYstLNt0FCtZaFRvf4Sg9wxNGWbwFmGXVpfSi6ThGK6aRxAo+KjHtYSW8NvCsNSAg== -nodemon@^2.0.18: - version "2.0.18" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.18.tgz#0f5a3aa7b4587f2626e6f01369deba89cb0462a2" - integrity sha512-uAvrKipi2zAz8E7nkSz4qW4F4zd5fs2wNGsTx+xXlP8KXqd9ucE0vY9wankOsPboeDyuUGN9vsXGV1pLn80l/A== +nodemon@^2.0.20: + version "2.0.20" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.20.tgz#e3537de768a492e8d74da5c5813cb0c7486fc701" + integrity sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw== dependencies: chokidar "^3.5.2" debug "^3.2.7" ignore-by-default "^1.0.1" - minimatch "^3.0.4" + minimatch "^3.1.2" pstree.remy "^1.1.8" semver "^5.7.1" + simple-update-notifier "^1.0.7" supports-color "^5.5.0" touch "^3.1.0" undefsafe "^2.0.5" - update-notifier "^5.1.0" nopt@^5.0.0: version "5.0.0" @@ -11112,11 +11288,6 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -normalize-url@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" - integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== - notepack.io@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/notepack.io/-/notepack.io-2.2.0.tgz#d7ea71d1cb90094f88c6f3c8d84277c2d0cd101c" @@ -11136,10 +11307,10 @@ npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -nth-check@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125" - integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q== +nth-check@^2.0.0, nth-check@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" + integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w== dependencies: boolbase "^1.0.0" @@ -11264,7 +11435,7 @@ on-finished@^2.3.0: dependencies: ee-first "1.1.1" -once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0: +once@1.4.0, once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= @@ -11290,6 +11461,15 @@ only@~0.0.2: resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4" integrity sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q= +open@^8.4.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" + integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== + dependencies: + define-lazy-prop "^2.0.0" + is-docker "^2.1.1" + is-wsl "^2.2.0" + opentracing@>=0.12.1: version "0.14.5" resolved "https://registry.yarnpkg.com/opentracing/-/opentracing-0.14.5.tgz#891fa92cd90a24e64f99bc964370227310926c85" @@ -11341,25 +11521,20 @@ os-browserify@^0.3.0: resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= -outline-icons@^1.44.0: - version "1.44.0" - resolved "https://registry.yarnpkg.com/outline-icons/-/outline-icons-1.44.0.tgz#ce9fd272f0556db9b05b5615f87c12b16bd18ea0" - integrity sha512-nkKGXuGbOgZjPkyVpZZu7CIDrfmt2eER+3RWfE1LU/GqHkuUt0c5JpCsEyhxXAPMUW09q4sDvHjLVge7DUWeYg== +outline-icons@^1.45.2: + version "1.45.2" + resolved "https://registry.yarnpkg.com/outline-icons/-/outline-icons-1.45.2.tgz#7249b26af6b58db6a0ba601a5ad5043d18e2841d" + integrity sha512-BClcM9JhfloM5FlrqWFr4i9Kc+n1rdvL9in5O83oH+1nGY/ZMDOcxaP0G+m7ucaltDMBRjEyaXBrNk5vX1Iorw== -oy-vey@^0.11.2: - version "0.11.2" - resolved "https://registry.yarnpkg.com/oy-vey/-/oy-vey-0.11.2.tgz#3bbc36a4064993a2ff52f985b066d44dcb4500d9" - integrity sha512-06prDST4MicbAWie4eXcouJbGhAu0r7j3Yta1KFtgs7v2t7goHmY06/GWFjT6lpIsGKJC+7vZtwdecRSYnFtPQ== +oy-vey@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/oy-vey/-/oy-vey-0.12.0.tgz#49901cc0ddde04096eddfee149c0b9cf0c6f5075" + integrity sha512-NjI+i5jwYeWU5HjpXjUzwNvm3XuaSbGtpU/0uobkk8JH+m+OeAvTpiAcTHldSZ0QiBrulZQeaD1Q/BzzT/4eyQ== dependencies: clean-css "^4.0.12" object-assign "^4.1.1" sanitizer "^0.1.3" -p-cancelable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" - integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== - p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" @@ -11379,7 +11554,7 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.0, p-limit@^3.0.2, p-limit@^3.1.0: +p-limit@^3.0.2, p-limit@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -11443,15 +11618,29 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== -package-json@^6.3.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" - integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== +pac-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz#b718f76475a6a5415c2efbe256c1c971c84f635e" + integrity sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ== dependencies: - got "^9.6.0" - registry-auth-token "^4.0.0" - registry-url "^5.0.0" - semver "^6.2.0" + "@tootallnate/once" "1" + agent-base "6" + debug "4" + get-uri "3" + http-proxy-agent "^4.0.1" + https-proxy-agent "5" + pac-resolver "^5.0.0" + raw-body "^2.2.0" + socks-proxy-agent "5" + +pac-resolver@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-5.0.1.tgz#c91efa3a9af9f669104fa2f51102839d01cde8e7" + integrity sha512-cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q== + dependencies: + degenerator "^3.0.2" + ip "^1.1.5" + netmask "^2.0.2" packet-reader@1.0.0: version "1.0.0" @@ -11543,11 +11732,6 @@ parse-json@^5.0.0, parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-passwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" - integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= - parse5-htmlparser2-tree-adapter@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" @@ -11555,11 +11739,26 @@ parse5-htmlparser2-tree-adapter@^6.0.1: dependencies: parse5 "^6.0.1" +parse5-htmlparser2-tree-adapter@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz#23c2cc233bcf09bb7beba8b8a69d46b08c62c2f1" + integrity sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g== + dependencies: + domhandler "^5.0.2" + parse5 "^7.0.0" + parse5@6.0.1, parse5@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== +parse5@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz#4649f940ccfb95d8754f37f73078ea20afe0c746" + integrity sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg== + dependencies: + entities "^4.4.0" + parseqs@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" @@ -11675,17 +11874,12 @@ path-is-absolute@1.0.1, path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= - path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.6: +path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== @@ -11801,6 +11995,13 @@ phin@^2.9.1: resolved "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz#f9b6ac10a035636fb65dfc576aaaa17b8743125c" integrity sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA== +pick-util@^1.1.4: + version "1.1.5" + resolved "https://registry.yarnpkg.com/pick-util/-/pick-util-1.1.5.tgz#514b11b1a49486d30c805a23125003a360175b6d" + integrity sha512-H0MaM8T7wpQ/azvB12ChZw7kpSFzjsgv3Z+N7fUWnL1McTGSEeroCngcK4eOPiFQq08rAyKX3hadcAB1kUqfXA== + dependencies: + "@jonkemp/package-utils" "^1.0.8" + picocolors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" @@ -11893,11 +12094,6 @@ popmotion@9.3.6: style-value-types "4.1.4" tslib "^2.1.0" -popper.js@^1.14.7: - version "1.16.1" - resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" - integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== - posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -11940,11 +12136,6 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -prepend-http@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= - prettier-linter-helpers@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" @@ -11989,10 +12180,10 @@ pretty@^2.0.0: extend-shallow "^2.0.1" js-beautify "^1.6.12" -prismjs@~1.25.0: - version "1.25.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756" - integrity sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg== +prismjs@~1.27.0: + version "1.27.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057" + integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA== process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: version "2.0.1" @@ -12057,10 +12248,10 @@ property-information@^5.0.0: dependencies: xtend "^4.0.0" -prosemirror-commands@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.2.1.tgz#eae0cb714df695260659b78ff5d201d3a037e50d" - integrity sha512-S/IkpXfpuLFsRynC2HQ5iYROUPiZskKS1+ClcWycGJvj4HMb/mVfeEkQrixYxgTl96EAh+RZQNWPC06GZXk5tQ== +prosemirror-commands@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.2.2.tgz#1bd167372ee20abf488aca9cece63c43fab182c9" + integrity sha512-TX+KpWudMon06frryfpO/u7hsQv2hu8L4VSVbCpi3/7wXHBgl+35mV85qfa3RpT8xD2f3MdeoTqH0vy5JdbXPg== dependencies: prosemirror-model "^1.0.0" prosemirror-state "^1.0.0" @@ -12178,10 +12369,10 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= -protobufjs@^6.10.2, protobufjs@~6.11.0: - version "6.11.3" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74" - integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg== +protobufjs@^7.0.0: + version "7.1.2" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.1.2.tgz#a0cf6aeaf82f5625bffcf5a38b7cd2a7de05890c" + integrity sha512-4ZPTPkXCdel3+L81yw3dG6+Kq3umdWKh7Dc7GW/CpNk4SX3hK58iPCWeCyhVTDrbkNeKrYNZ7EojM5WDaEWTLQ== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -12193,11 +12384,24 @@ protobufjs@^6.10.2, protobufjs@~6.11.0: "@protobufjs/path" "^1.1.2" "@protobufjs/pool" "^1.1.0" "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.1" "@types/node" ">=13.7.0" - long "^4.0.0" + long "^5.0.0" -proxy-from-env@^1.1.0: +proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-5.0.0.tgz#d31405c10d6e8431fde96cba7a0c027ce01d633b" + integrity sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g== + dependencies: + agent-base "^6.0.0" + debug "4" + http-proxy-agent "^4.0.0" + https-proxy-agent "^5.0.0" + lru-cache "^5.1.1" + pac-proxy-agent "^5.0.0" + proxy-from-env "^1.0.0" + socks-proxy-agent "^5.0.0" + +proxy-from-env@^1.0.0, proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== @@ -12274,22 +12478,22 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -pupa@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" - integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== +qs@6.9.3: + version "6.9.3" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e" + integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw== + +qs@^6.10.3, qs@^6.4.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== dependencies: - escape-goat "^2.0.0" + side-channel "^1.0.4" -qs@^6.4.0: - version "6.9.4" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687" - integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ== - -query-string@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.0.1.tgz#45bd149cf586aaa582dffc7ec7a8ad97dd02f75d" - integrity sha512-uIw3iRvHnk9to1blJCG3BTc+Ro56CBowJXKmNNAm3RulvPBzWLRqKSiiDk+IplJhsydwtuNMHi8UGQFcCLVfkA== +query-string@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.1.tgz#754620669db978625a90f635f12617c271a088e1" + integrity sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w== dependencies: decode-uri-component "^0.2.0" filter-obj "^1.1.0" @@ -12404,10 +12608,10 @@ rc@^1.2.8: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-avatar-editor@^11.1.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/react-avatar-editor/-/react-avatar-editor-11.1.0.tgz#0eaec7970b1fbbd90d42a1955be440ea27f598ea" - integrity sha512-Z89qLKS3skld2Ov80EvCCzZKz87eLiEEhwJRYsGG6k2OM0Bo+V0dFrM2i0yAPeGjyagmTkoOSkQgDUfM+zc1vw== +react-avatar-editor@^13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/react-avatar-editor/-/react-avatar-editor-13.0.0.tgz#55013625ee9ae715c1fe2dc553b8079994d8a5f2" + integrity sha512-0xw63MbRRQdDy7YI1IXU9+7tTFxYEFLV8CABvryYOGjZmXRTH2/UA0mafe57ns62uaEFX181kA4XlGlxCaeXKA== dependencies: "@babel/plugin-transform-runtime" "^7.12.1" "@babel/runtime" "^7.12.5" @@ -12477,10 +12681,10 @@ react-helmet@^6.1.0: react-fast-compare "^3.1.1" react-side-effect "^2.1.0" -react-hook-form@^7.31.2: - version "7.31.2" - resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.31.2.tgz#efb7ac469810954488b7cf40be4e5017122c6e5e" - integrity sha512-oPudn3YuyzWg//IsT9z2cMEjWocAgHWX/bmueDT8cmsYQnGY5h7/njjvMDfLVv3mbdhYBjslTRnII2MIT7eNCA== +react-hook-form@^7.37.0: + version "7.37.0" + resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.37.0.tgz#4d1738f092d3d8a3ade34ee892d97350b1032b19" + integrity sha512-6NFTxsnw+EXSpNNvLr5nFMjPdYKRryQcelTHg7zwBB6vAzfPIcZq4AExP4heVlwdzntepQgwiOQW4z7Mr99Lsg== react-i18next@^11.16.6: version "11.16.6" @@ -12523,10 +12727,29 @@ react-portal@^4.2.0: dependencies: prop-types "^15.5.8" -react-refresh@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.9.0.tgz#71863337adc3e5c2f8a6bfddd12ae3bfe32aafbf" - integrity sha512-Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ== +react-refresh@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e" + integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ== + +react-remove-scroll-bar@^2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.3.tgz#e291f71b1bb30f5f67f023765b7435f4b2b2cd94" + integrity sha512-i9GMNWwpz8XpUpQ6QlevUtFjHGqnPG4Hxs+wlIJntu/xcsZVEpJcIV71K3ZkqNy2q3GfgvkD7y6t/Sv8ofYSbw== + dependencies: + react-style-singleton "^2.2.1" + tslib "^2.0.0" + +react-remove-scroll@^2.4.4: + version "2.5.5" + resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz#1e31a1260df08887a8a0e46d09271b52b3a37e77" + integrity sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw== + dependencies: + react-remove-scroll-bar "^2.3.3" + react-style-singleton "^2.2.1" + tslib "^2.1.0" + use-callback-ref "^1.3.0" + use-sidecar "^1.1.2" react-router-dom@^5.2.0: version "5.2.0" @@ -12562,6 +12785,15 @@ react-side-effect@^2.1.0: resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3" integrity sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ== +react-style-singleton@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.1.tgz#f99e420492b2d8f34d38308ff660b60d0b1205b4" + integrity sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g== + dependencies: + get-nonce "^1.0.0" + invariant "^2.2.4" + tslib "^2.0.0" + react-table@^7.7.0: version "7.7.0" resolved "https://registry.yarnpkg.com/react-table/-/react-table-7.7.0.tgz#e2ce14d7fe3a559f7444e9ecfe8231ea8373f912" @@ -12689,10 +12921,10 @@ reakit-warning@^0.6.2: dependencies: reakit-utils "^0.15.2" -reakit@^1.3.10: - version "1.3.10" - resolved "https://registry.yarnpkg.com/reakit/-/reakit-1.3.10.tgz#9b04efb8962cc17ecaffa31bae0396940177d431" - integrity sha512-HxHtnegMDwidGU4Ik/fKTZ3coihf4nKeycs0QSIFWcau77qL5wL6xnqZrAxcjjDDPOIANct3LxTiAlf+qGLOlw== +reakit@^1.3.11: + version "1.3.11" + resolved "https://registry.yarnpkg.com/reakit/-/reakit-1.3.11.tgz#c15360ac43e94fbe4291d233af3ac5040428252e" + integrity sha512-mYxw2z0fsJNOQKAEn5FJCPTU3rcrY33YZ/HzoWqZX0G7FwySp1wkCYW79WhuYMNIUFQ8s3Baob1RtsEywmZSig== dependencies: "@popperjs/core" "^2.5.4" body-scroll-lock "^3.1.5" @@ -12700,6 +12932,13 @@ reakit@^1.3.10: reakit-utils "^0.15.2" reakit-warning "^0.6.2" +rechoir@^0.7.0: + version "0.7.1" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" + integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== + dependencies: + resolve "^1.9.0" + redis-commands@1.7.0, redis-commands@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.7.0.tgz#15a6fea2d58281e27b1cd1acfb4b293e278c3a89" @@ -12751,14 +12990,14 @@ reflect.ownkeys@^0.2.0: resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460" integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA= -refractor@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.5.0.tgz#334586f352dda4beaf354099b48c2d18e0819aec" - integrity sha512-QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg== +refractor@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.6.0.tgz#ac318f5a0715ead790fcfb0c71f4dd83d977935a" + integrity sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA== dependencies: hastscript "^6.0.0" parse-entities "^2.0.0" - prismjs "~1.25.0" + prismjs "~1.27.0" regenerate-unicode-properties@^8.2.0: version "8.2.0" @@ -12823,20 +13062,6 @@ regexpu-core@^4.7.1: unicode-match-property-ecmascript "^1.0.4" unicode-match-property-value-ecmascript "^1.2.0" -registry-auth-token@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" - integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== - dependencies: - rc "^1.2.8" - -registry-url@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" - integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== - dependencies: - rc "^1.2.8" - regjsgen@^0.5.1: version "0.5.2" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" @@ -12854,6 +13079,15 @@ relateurl@^0.2.7: resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= +remote-content@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/remote-content/-/remote-content-3.0.0.tgz#78ac5d0723f8ddae0561774edb03edc23b9f585c" + integrity sha512-/hjCYVqWY/jYR07ptEJpClnYrGedSQ5AxCrEeMb3NlrxTgUK/7+iCOReE3z1QMYm3UL7sJX3o7cww/NC6UgyhA== + dependencies: + proxy-from-env "^1.1.0" + superagent "^7.0.2" + superagent-proxy "^3.0.0" + remove-accents@0.4.2: version "0.4.2" resolved "https://registry.yarnpkg.com/remove-accents/-/remove-accents-0.4.2.tgz#0a43d3aaae1e80db919e07ae254b285d9e1c7bb5" @@ -12924,11 +13158,6 @@ require-from-string@^2.0.2: resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== -require-main-filename@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" - integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== - require-package-name@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9" @@ -12939,13 +13168,6 @@ reselect@^4.0.0: resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.4.tgz#66df0aff41b6ee0f51e2cc17cfaf2c1995916f32" integrity sha512-i1LgXw8DKSU5qz1EV0ZIKz4yIUHJ7L3bODh+Da6HmVSm9vdL/hG7IpbgzQ3k2XSirzf8/eI7OMEs81gb1VV2fQ== -resolve-cwd@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" - integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo= - dependencies: - resolve-from "^3.0.0" - resolve-cwd@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" @@ -12953,19 +13175,6 @@ resolve-cwd@^3.0.0: dependencies: resolve-from "^5.0.0" -resolve-dir@^1.0.0, resolve-dir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" - integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= - dependencies: - expand-tilde "^2.0.0" - global-modules "^1.0.0" - -resolve-from@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" - integrity sha1-six699nWiBvItuZTM17rywoYh0g= - resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -13006,20 +13215,14 @@ resolve.exports@^1.1.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== -resolve@^1.1.6, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== +resolve@^1.1.6, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.9.0: + version "1.22.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" - -responselike@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= - dependencies: - lowercase-keys "^1.0.0" + is-core-module "^2.9.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" restore-cursor@^3.1.0: version "3.1.0" @@ -13054,13 +13257,6 @@ rfdc@^1.3.0: resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== -rimraf@2.6.3: - version "2.6.3" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" - integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== - dependencies: - glob "^7.1.3" - rimraf@^2.5.4, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" @@ -13224,6 +13420,13 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" +saxes@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" + integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA== + dependencies: + xmlchars "^2.2.0" + scheduler@^0.19.1: version "0.19.1" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" @@ -13240,13 +13443,6 @@ scheduler@^0.20.2: loose-envify "^1.1.0" object-assign "^4.1.1" -schema-utils@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" - integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8= - dependencies: - ajv "^5.0.0" - schema-utils@^0.4.5: version "0.4.7" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" @@ -13289,14 +13485,7 @@ scroll-into-view-if-needed@^2.2.28: dependencies: compute-scroll-into-view "^1.0.17" -semver-diff@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" - integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== - dependencies: - semver "^6.3.0" - -semver@7.0.0: +semver@7.0.0, semver@~7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== @@ -13306,12 +13495,12 @@ semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: +semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: +semver@^7.2.1, semver@^7.3.2, semver@^7.3.5, semver@^7.3.7: version "7.3.7" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== @@ -13384,11 +13573,6 @@ serialize-javascript@^5.0.1: dependencies: randombytes "^2.1.0" -set-blocking@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - set-value@^2.0.0, set-value@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" @@ -13427,18 +13611,18 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + shallowequal@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= - dependencies: - shebang-regex "^1.0.0" - shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -13446,11 +13630,6 @@ shebang-command@^2.0.0: dependencies: shebang-regex "^3.0.0" -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= - shebang-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" @@ -13487,6 +13666,13 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" +simple-update-notifier@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz#7edf75c5bdd04f88828d632f762b2bc32996a9cc" + integrity sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew== + dependencies: + semver "~7.0.0" + sisteransi@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" @@ -13502,6 +13688,11 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== +slash@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" + integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== + slate-md-serializer@5.5.4: version "5.5.4" resolved "https://registry.yarnpkg.com/slate-md-serializer/-/slate-md-serializer-5.5.4.tgz#33d91378ce2c678585f7925ab4f054680816b1f0" @@ -13523,15 +13714,6 @@ slate@0.45.0: tiny-warning "^0.0.3" type-of "^2.0.1" -slice-ansi@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" - integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== - dependencies: - ansi-styles "^3.2.0" - astral-regex "^1.0.0" - is-fullwidth-code-point "^2.0.0" - slice-ansi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" @@ -13558,6 +13740,11 @@ slice-ansi@^5.0.0: ansi-styles "^6.0.0" is-fullwidth-code-point "^4.0.0" +slick@^1.12.2: + version "1.12.2" + resolved "https://registry.yarnpkg.com/slick/-/slick-1.12.2.tgz#bd048ddb74de7d1ca6915faa4a57570b3550c2d7" + integrity sha512-4qdtOGcBjral6YIBCWJ0ljFSKNLz9KkhbWtuGvUyRowl1kxfuE1x/Z/aJcaiilpb3do9bl5K7/1h9XC5wWpY/A== + slug@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/slug/-/slug-5.3.0.tgz#d63d3a5a88d5508c1adcf2b8aeeb045c3f43760b" @@ -13568,6 +13755,11 @@ slugify@^1.6.5: resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.6.5.tgz#c8f5c072bf2135b80703589b39a3d41451fbe8c8" integrity sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ== +smart-buffer@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + smooth-scroll-into-view-if-needed@^1.1.32: version "1.1.32" resolved "https://registry.yarnpkg.com/smooth-scroll-into-view-if-needed/-/smooth-scroll-into-view-if-needed-1.1.32.tgz#57718cb2caa5265ade3e96006dfcf28b2fdcfca0" @@ -13663,6 +13855,23 @@ socket.io@^3.1.2: socket.io-adapter "~2.1.0" socket.io-parser "~4.0.3" +socks-proxy-agent@5, socks-proxy-agent@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz#032fb583048a29ebffec2e6a73fca0761f48177e" + integrity sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ== + dependencies: + agent-base "^6.0.2" + debug "4" + socks "^2.3.3" + +socks@^2.3.3: + version "2.7.0" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz#f9225acdb841e874dca25f870e9130990f3913d0" + integrity sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA== + dependencies: + ip "^2.0.0" + smart-buffer "^4.2.0" + sort-keys@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-5.0.0.tgz#5d775f8ae93ecc29bc7312bbf3acac4e36e3c446" @@ -13691,14 +13900,6 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-resolve@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" - integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - source-map-support@0.5.13: version "0.5.13" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" @@ -13771,6 +13972,11 @@ spawn-command@^0.0.2-1: resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0" integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A= +specificity@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019" + integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg== + split-on-first@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f" @@ -13903,11 +14109,6 @@ stream-wormhole@^1.1.0: resolved "https://registry.yarnpkg.com/stream-wormhole/-/stream-wormhole-1.1.0.tgz#300aff46ced553cfec642a05251885417693c33d" integrity sha512-gHFfL3px0Kctd6Po0M8TzEvt3De/xu6cnRrjlfYNhwbhLPLwigI2t1nc6jrzNuaYg5C4YF78PPFuQPzRiqn9ew== -streamsearch@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" - integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= - strict-uri-encode@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" @@ -13926,25 +14127,12 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -string-replace-to-array@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string-replace-to-array/-/string-replace-to-array-1.0.3.tgz#c93eba999a5ee24d731aebbaf5aba36b5f18f7bf" - integrity sha1-yT66mZpe4k1zGuu69auja18Y978= - dependencies: - invariant "^2.2.1" - lodash.flatten "^4.2.0" - lodash.isstring "^4.0.1" +string-replace-to-array@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/string-replace-to-array/-/string-replace-to-array-2.1.0.tgz#44571dbd33a3e23de31db948b5b84f1b7913fb39" + integrity sha512-xG2w4fE5FsTXS4AFxoF3uctByqTIFBX8lFRNcPcIznTVCMXbYvbatkPVLpAo13tfuWtzbWEV6u5bjoE9bOv87w== -string-width@^3.0.0, string-width@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -14038,13 +14226,6 @@ strip-ansi@^3.0.0: dependencies: ansi-regex "^2.0.0" -strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.0" - strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -14089,6 +14270,15 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= +style-data@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/style-data/-/style-data-2.0.0.tgz#1cea7cf3b7658170b1addfbc7ee1036185318c06" + integrity sha512-8RJ+MnHlwFUrf3B3gUjs9KIrOk0TppHHwfIHfBd6QjYmZcuzN1OGqeMkWA3ZnD6GiRWJjCVouY/l11v4rlfnPA== + dependencies: + cheerio "^1.0.0-rc.10" + mediaquery-text "^1.2.0" + pick-util "^1.1.4" + style-value-types@4.1.4: version "4.1.4" resolved "https://registry.yarnpkg.com/style-value-types/-/style-value-types-4.1.4.tgz#80f37cb4fb024d6394087403dfb275e8bb627e75" @@ -14128,6 +14318,31 @@ stylis@^4.0.10: resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.1.tgz#e46c6a9bbf7c58db1e65bb730be157311ae1fe12" integrity sha512-lVrM/bNdhVX2OgBFNa2YJ9Lxj7kPzylieHd3TNjuGE0Re9JB7joL5VUKOVH1kdNNJTgGPpT8hmwIAPLaSyEVFQ== +superagent-proxy@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/superagent-proxy/-/superagent-proxy-3.0.0.tgz#e1a17ccba25883599e18d2974020fe83ee7d95d1" + integrity sha512-wAlRInOeDFyd9pyonrkJspdRAxdLrcsZ6aSnS+8+nu4x1aXbz6FWSTT9M6Ibze+eG60szlL7JA8wEIV7bPWuyQ== + dependencies: + debug "^4.3.2" + proxy-agent "^5.0.0" + +superagent@^7.0.2: + version "7.1.6" + resolved "https://registry.yarnpkg.com/superagent/-/superagent-7.1.6.tgz#64f303ed4e4aba1e9da319f134107a54cacdc9c6" + integrity sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g== + dependencies: + component-emitter "^1.3.0" + cookiejar "^2.1.3" + debug "^4.3.4" + fast-safe-stringify "^2.1.1" + form-data "^4.0.0" + formidable "^2.0.1" + methods "^1.1.2" + mime "2.6.0" + qs "^6.10.3" + readable-stream "^3.6.0" + semver "^7.3.7" + superstruct@^0.8.3: version "0.8.4" resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.8.4.tgz#478a19649f6b02c6319c02044db6a1f5863c391f" @@ -14148,13 +14363,6 @@ supports-color@^5.3.0, supports-color@^5.5.0: dependencies: has-flag "^3.0.0" -supports-color@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" - integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== - dependencies: - has-flag "^3.0.0" - supports-color@^7.0.0, supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -14182,6 +14390,11 @@ supports-hyperlinks@^2.0.0: has-flag "^4.0.0" supports-color "^7.0.0" +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -14192,27 +14405,36 @@ symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0, symlink-or-copy@^1.3.1: resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe" integrity sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA== -table@^5.2.3: - version "5.4.6" - resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" - integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== +synckit@^0.8.4: + version "0.8.4" + resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.8.4.tgz#0e6b392b73fafdafcde56692e3352500261d64ec" + integrity sha512-Dn2ZkzMdSX827QbowGbU/4yjWuvNaCoScLLoMo/yKbu+P4GBR6cRGKZH27k6a9bRzdqcyd1DE96pQtQ6uNkmyw== dependencies: - ajv "^6.10.2" - lodash "^4.17.14" - slice-ansi "^2.1.0" - string-width "^3.0.0" + "@pkgr/utils" "^2.3.1" + tslib "^2.4.0" + +table@^6.0.9: + version "6.8.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca" + integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA== + dependencies: + ajv "^8.0.1" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tapable@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b" - integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw== +tapable@^2.0.0, tapable@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -tar@^6.0.2: +tar@^6.0.2, tar@^6.1.11: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== @@ -14393,6 +14615,14 @@ tiny-cookie@^2.3.1: resolved "https://registry.yarnpkg.com/tiny-cookie/-/tiny-cookie-2.3.2.tgz#3b5fb4e0888cfa0b4728d5f6b7be3d3a88e6a5f0" integrity sha512-qbymkVh+6+Gc/c9sqnvbG+dOHH6bschjphK3SHgIfT6h/t+63GBL37JXNoXEc6u/+BcwU6XmaWUuf19ouLVtPg== +tiny-glob@^0.2.9: + version "0.2.9" + resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2" + integrity sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg== + dependencies: + globalyzer "0.1.0" + globrex "^0.1.2" + tiny-invariant@^1.0.1, tiny-invariant@^1.0.2, tiny-invariant@^1.0.6, tiny-invariant@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" @@ -14413,12 +14643,12 @@ tinycolor2@^1.4.1: resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803" integrity sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA== -tippy.js@^4.3.4: - version "4.3.5" - resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-4.3.5.tgz#882bff8d92f09bb0546d2826d5668c0560006f54" - integrity sha512-NDq3efte8nGK6BOJ1dDN1/WelAwfmh3UtIYXXck6+SxLzbIQNZE/cmRSnwScZ/FyiKdIcvFHvYUgqmoGx8CcyA== +tippy.js@^6.3.1: + version "6.3.7" + resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz#8ccfb651d642010ed9a32ff29b0e9e19c5b8c61c" + integrity sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ== dependencies: - popper.js "^1.14.7" + "@popperjs/core" "^2.9.0" tmp@^0.2.1: version "0.2.1" @@ -14462,11 +14692,6 @@ to-object-path@^0.3.0: dependencies: kind-of "^3.0.2" -to-readable-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" - integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== - to-regex-range@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" @@ -14564,7 +14789,7 @@ triple-beam@^1.2.0, triple-beam@^1.3.0: resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== -tsconfig-paths@^3.11.0, tsconfig-paths@^3.9.0: +tsconfig-paths@^3.11.0: version "3.12.0" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b" integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg== @@ -14574,16 +14799,16 @@ tsconfig-paths@^3.11.0, tsconfig-paths@^3.9.0: minimist "^1.2.0" strip-bom "^3.0.0" +tslib@2.4.0, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== + tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== - tsscmp@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb" @@ -14649,12 +14874,7 @@ type-fest@^0.21.3: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - -type-is@^1.6.14, type-is@^1.6.16, type-is@^1.6.4: +type-is@^1.6.14, type-is@^1.6.16: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== @@ -14677,13 +14897,6 @@ type@^2.0.0: resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== - dependencies: - is-typedarray "^1.0.0" - typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -14834,26 +15047,6 @@ upath@^1.1.1, upath@^1.2.0: resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== -update-notifier@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" - integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== - dependencies: - boxen "^5.0.0" - chalk "^4.1.0" - configstore "^5.0.1" - has-yarn "^2.1.0" - import-lazy "^2.1.0" - is-ci "^2.0.0" - is-installed-globally "^0.4.0" - is-npm "^5.0.0" - is-yarn-global "^0.3.0" - latest-version "^5.1.0" - pupa "^2.1.1" - semver "^7.3.4" - semver-diff "^3.1.1" - xdg-basedir "^4.0.0" - uri-js@^4.2.2: version "4.4.0" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602" @@ -14871,21 +15064,14 @@ urix@^0.1.0: resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= -url-loader@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7" - integrity sha512-h3qf9TNn53BpuXTTcpC+UehiRrl0Cv45Yr/xWayApjw6G8Bg2dGke7rIwDQ39piciWCWrC+WiqLjOh3SUp9n0Q== +url-loader@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2" + integrity sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA== dependencies: - loader-utils "^1.0.2" - mime "^1.4.1" - schema-utils "^0.3.0" - -url-parse-lax@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= - dependencies: - prepend-http "^2.0.0" + loader-utils "^2.0.0" + mime-types "^2.1.27" + schema-utils "^3.0.0" url@0.10.3: version "0.10.3" @@ -14903,6 +15089,21 @@ url@^0.11.0: punycode "1.3.2" querystring "0.2.0" +use-callback-ref@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.3.0.tgz#772199899b9c9a50526fedc4993fc7fa1f7e32d5" + integrity sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w== + dependencies: + tslib "^2.0.0" + +use-sidecar@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.1.2.tgz#2f43126ba2d7d7e117aa5855e5d8f0276dfe73c2" + integrity sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw== + dependencies: + detect-node-es "^1.1.0" + tslib "^2.0.0" + use@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" @@ -14989,7 +15190,7 @@ uuid@^8.3.0, uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1: +v8-compile-cache@^2.0.3: version "2.2.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== @@ -15076,6 +15277,14 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== +vm2@^3.9.8: + version "3.9.11" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.11.tgz#a880f510a606481719ec3f9803b940c5805a06fe" + integrity sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg== + dependencies: + acorn "^8.7.0" + acorn-walk "^8.2.0" + void-elements@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09" @@ -15158,22 +15367,23 @@ webidl-conversions@^7.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== -webpack-cli@^3.3.12: - version "3.3.12" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz#94e9ada081453cd0aa609c99e500012fd3ad2d4a" - integrity sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag== +webpack-cli@^4.10.0: + version "4.10.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" + integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== dependencies: - chalk "^2.4.2" - cross-spawn "^6.0.5" - enhanced-resolve "^4.1.1" - findup-sync "^3.0.0" - global-modules "^2.0.0" - import-local "^2.0.0" - interpret "^1.4.0" - loader-utils "^1.4.0" - supports-color "^6.1.0" - v8-compile-cache "^2.1.1" - yargs "^13.3.2" + "@discoveryjs/json-ext" "^0.5.0" + "@webpack-cli/configtest" "^1.2.0" + "@webpack-cli/info" "^1.5.0" + "@webpack-cli/serve" "^1.7.0" + colorette "^2.0.14" + commander "^7.0.0" + cross-spawn "^7.0.3" + fastest-levenshtein "^1.0.12" + import-local "^3.0.2" + interpret "^2.2.0" + rechoir "^0.7.0" + webpack-merge "^5.7.3" webpack-core@^0.6.8: version "0.6.9" @@ -15212,6 +15422,14 @@ webpack-manifest-plugin@^3.0.0: tapable "^2.0.0" webpack-sources "^2.2.0" +webpack-merge@^5.7.3: + version "5.8.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" + integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== + dependencies: + clone-deep "^4.0.1" + wildcard "^2.0.0" + webpack-pwa-manifest@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/webpack-pwa-manifest/-/webpack-pwa-manifest-4.3.0.tgz#a9382f3e280ba4f74b6e855c529bcb550461ab5e" @@ -15327,11 +15545,6 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" -which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= - which-typed-array@^1.1.2: version "1.1.8" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.8.tgz#0cfd53401a6f334d90ed1125754a42ed663eb01f" @@ -15344,13 +15557,6 @@ which-typed-array@^1.1.2: has-tostringtag "^1.0.0" is-typed-array "^1.1.9" -which@^1.2.14, which@^1.2.9, which@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" @@ -15358,12 +15564,10 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -widest-line@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" - integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== - dependencies: - string-width "^4.0.0" +wildcard@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== winston-transport@^4.4.0: version "4.4.0" @@ -15576,15 +15780,6 @@ worker-farm@^1.7.0: dependencies: errno "~0.1.7" -wrap-ansi@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" - integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== - dependencies: - ansi-styles "^3.2.0" - string-width "^3.0.0" - strip-ansi "^5.0.0" - wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" @@ -15608,16 +15803,6 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== - dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" - write-file-atomic@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f" @@ -15626,19 +15811,12 @@ write-file-atomic@^4.0.1: imurmurhash "^0.1.4" signal-exit "^3.0.7" -write@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" - integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig== - dependencies: - mkdirp "^0.5.1" - ws@^7.5.3: version "7.5.6" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== -ws@^8.2.3, ws@^8.5.0: +ws@^8.2.3, ws@^8.5.0, ws@^8.8.0: version "8.8.1" resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0" integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA== @@ -15648,11 +15826,6 @@ ws@~7.4.2: resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== -xdg-basedir@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" - integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== - xhr@^2.0.1: version "2.6.0" resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.6.0.tgz#b69d4395e792b4173d6b7df077f0fc5e4e2b249d" @@ -15714,6 +15887,11 @@ xmlhttprequest-ssl@~1.6.2: resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz#03b713873b01659dfa2c1c5d056065b27ddc2de6" integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q== +xregexp@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" + integrity sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA== + xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" @@ -15763,14 +15941,6 @@ yaml@^1.10.0, yaml@^1.10.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yargs-parser@^13.1.2: - version "13.1.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" - integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - yargs-parser@^20.2.2: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" @@ -15781,22 +15951,6 @@ yargs-parser@^21.0.0: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== -yargs@^13.3.2: - version "13.3.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" - integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== - dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.2" - yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" diff --git a/pkgs/servers/web-apps/outline/yarn.nix b/pkgs/servers/web-apps/outline/yarn.nix index fa4464046bd2..9602cdbab09f 100644 --- a/pkgs/servers/web-apps/outline/yarn.nix +++ b/pkgs/servers/web-apps/outline/yarn.nix @@ -25,6 +25,14 @@ sha512 = "eRJREyrfAJ2r42Iaxe8h3v6yyj1wu9OyosaUHW6UImjGf9ahGL9nsFNh7OCopvtcPL8WnEo7tp78wrZaZ6vG9g=="; }; } + { + name = "_babel_code_frame___code_frame_7.12.11.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; + }; + } { name = "_babel_code_frame___code_frame_7.18.6.tgz"; path = fetchurl { @@ -58,11 +66,11 @@ }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.16.7.tgz"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.18.6.tgz"; path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz"; - sha512 = "s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw=="; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"; + sha512 = "duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="; }; } { @@ -82,11 +90,11 @@ }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.17.9.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.18.9.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.17.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz"; - sha512 = "kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ=="; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.18.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz"; + sha512 = "WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw=="; }; } { @@ -138,11 +146,11 @@ }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.17.7.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.18.9.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.17.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz"; - sha512 = "thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw=="; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.18.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"; + sha512 = "RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg=="; }; } { @@ -162,19 +170,19 @@ }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.16.7.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.18.6.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz"; - sha512 = "EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w=="; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"; + sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.16.7.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.20.2.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz"; - sha512 = "Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.20.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz"; + sha512 = "8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ=="; }; } { @@ -186,11 +194,11 @@ }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.16.7.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.18.9.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz"; - sha512 = "y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw=="; + name = "_babel_helper_replace_supers___helper_replace_supers_7.18.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz"; + sha512 = "dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ=="; }; } { @@ -314,11 +322,11 @@ }; } { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.12.1.tgz"; + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.18.10.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz"; - sha512 = "knNIuusychgYN8fGJHONL0RbFxLGawhXOJNLBk75TniTsZZeA+wdkDuv6wp4lGwzQEKjZi6/WYtnb3udNPmQmQ=="; + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.18.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.10.tgz"; + sha512 = "wdGTwWF5QtpTY/gbBtQLAiCnoxfD4qMbN87NYZle1dOZ9Os8Y6zXcKrIaOU8W+TIvFUWVGG9tUgNww3CjXRVVw=="; }; } { @@ -450,11 +458,11 @@ }; } { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.1.tgz"; + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.18.6.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz"; - sha512 = "ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w=="; + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.18.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.18.6.tgz"; + sha512 = "fqyLgjcxf/1yhyZ6A+yo1u9gJ7eleFQod2lkaUsF9DQ7sbbY3Ligym3L0+I2c0WmqNKDpoD9UTb1AKP3qRMOAQ=="; }; } { @@ -618,11 +626,11 @@ }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.16.0.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.20.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.0.tgz"; - sha512 = "Q7tBUwjxLTsHEoqktemHBMtb3NYwyJPTJdM+wDwb0g8PZ3kQUIzNvwD5lPaqW/p54TXBc/MXZu9Jr7tbUEUM8Q=="; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.20.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz"; + sha512 = "mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw=="; }; } { @@ -914,11 +922,11 @@ }; } { - name = "_babel_runtime___runtime_7.18.6.tgz"; + name = "_babel_runtime___runtime_7.18.9.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.6.tgz"; - sha512 = "t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ=="; + name = "_babel_runtime___runtime_7.18.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz"; + sha512 = "lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw=="; }; } { @@ -962,27 +970,27 @@ }; } { - name = "_bull_board_api___api_4.2.2.tgz"; + name = "_bull_board_api___api_4.6.2.tgz"; path = fetchurl { - name = "_bull_board_api___api_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/@bull-board/api/-/api-4.2.2.tgz"; - sha512 = "YFkkeWvMit0P04k+xu4ZZ22i24m+Tq/w82LBtpt3z9Xu1rGrZoui8CI/YRsaJJE0o9TsqL5tY653oFVcdg35pQ=="; + name = "_bull_board_api___api_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/@bull-board/api/-/api-4.6.2.tgz"; + sha512 = "0LzUZumGgRfszNfmaNm57l48oUvUTBM01A/GzC5mkP4o5lc9ZgJh2yf+cH8aTG8TAhI1oDWQ8TXZLVJ8+JgDlA=="; }; } { - name = "_bull_board_koa___koa_4.2.2.tgz"; + name = "_bull_board_koa___koa_4.6.2.tgz"; path = fetchurl { - name = "_bull_board_koa___koa_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/@bull-board/koa/-/koa-4.2.2.tgz"; - sha512 = "ekrD3utbSM1PEdNcstvhli+aFjtdoFJpulkxoLfBPQweRc9yCzfqbgcg6g1DgjaNgQ5iEWLKGr3FSwBON5v6wQ=="; + name = "_bull_board_koa___koa_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/@bull-board/koa/-/koa-4.6.2.tgz"; + sha512 = "rBV36JKnOt2dwDGzaeNdF+G0BfuKPwl5t+j1ME2JxZjyAeTuEnN4flJFTc8kdJ0EdB/hMQoFLXLvXEesJsQQJg=="; }; } { - name = "_bull_board_ui___ui_4.2.2.tgz"; + name = "_bull_board_ui___ui_4.6.2.tgz"; path = fetchurl { - name = "_bull_board_ui___ui_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/@bull-board/ui/-/ui-4.2.2.tgz"; - sha512 = "QLWWTtVj6kQ01ox4OqCs/IdKm+jWFtLvhBU7RwYt8UxmxA6dZ8ffS6hWmjWk5sJ4cKk9GzPoASYMgFv0AMuh0w=="; + name = "_bull_board_ui___ui_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/@bull-board/ui/-/ui-4.6.2.tgz"; + sha512 = "QwapaE5N9Y1xo8VxyeybTJHHdeGi3hfaLXtYSnAFkgPUD6b4s3knYhdoAOE0/lUy7kzFTPCEezhYOTDaXOy2OQ=="; }; } { @@ -1002,35 +1010,35 @@ }; } { - name = "_chakra_ui_counter___counter_1.1.9.tgz"; + name = "_chakra_ui_counter___counter_1.2.10.tgz"; path = fetchurl { - name = "_chakra_ui_counter___counter_1.1.9.tgz"; - url = "https://registry.yarnpkg.com/@chakra-ui/counter/-/counter-1.1.9.tgz"; - sha512 = "WHkYSHJynkFwVFD6wg6afDteBeAmDHV35/tPMwpyTcgagpF99xY/8mULnBoLkkCc/PMe+meHuZJEXuCaxy4ecg=="; + name = "_chakra_ui_counter___counter_1.2.10.tgz"; + url = "https://registry.yarnpkg.com/@chakra-ui/counter/-/counter-1.2.10.tgz"; + sha512 = "HQd09IuJ4z8M8vWajH+99jBWWSHDesQZmnN95jUg3HKOuNleLaipf2JFdrqbO1uWQyHobn2PM6u+B+JCAh2nig=="; }; } { - name = "_chakra_ui_hooks___hooks_1.6.0.tgz"; + name = "_chakra_ui_hooks___hooks_1.9.1.tgz"; path = fetchurl { - name = "_chakra_ui_hooks___hooks_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/@chakra-ui/hooks/-/hooks-1.6.0.tgz"; - sha512 = "5QFICaE1omNCJyVQQX62sZvRvIpI4VansN2AvZpSdrMjRiWvmBNLZN2Khr7+8j6F7uDh5LSgTxiP02vWLp12hA=="; + name = "_chakra_ui_hooks___hooks_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/@chakra-ui/hooks/-/hooks-1.9.1.tgz"; + sha512 = "SEeh1alDKzrP9gMLWMnXOUDBQDKF/URL6iTmkumTn6vhawWNla6sPrcMyoCzWdMzwUhZp3QNtCKbUm7dxBXvPw=="; }; } { - name = "_chakra_ui_react_utils___react_utils_1.1.2.tgz"; + name = "_chakra_ui_react_utils___react_utils_1.2.3.tgz"; path = fetchurl { - name = "_chakra_ui_react_utils___react_utils_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@chakra-ui/react-utils/-/react-utils-1.1.2.tgz"; - sha512 = "S8jPVKGZH2qF7ZGxl/0DF/dXXI2AxDNGf4Ahi2LGHqajMvqBB7vtYIRRmIA7+jAnErhzO8WUi3i4Z7oScp6xSA=="; + name = "_chakra_ui_react_utils___react_utils_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/@chakra-ui/react-utils/-/react-utils-1.2.3.tgz"; + sha512 = "r8pUwCVVB7UPhb0AiRa9ZzSp4xkMz64yIeJ4O4aGy4WMw7TRH4j4QkbkE1YC9tQitrXrliOlvx4WWJR4VyiGpw=="; }; } { - name = "_chakra_ui_utils___utils_1.8.2.tgz"; + name = "_chakra_ui_utils___utils_1.10.4.tgz"; path = fetchurl { - name = "_chakra_ui_utils___utils_1.8.2.tgz"; - url = "https://registry.yarnpkg.com/@chakra-ui/utils/-/utils-1.8.2.tgz"; - sha512 = "MnE4czCQCE87Ch1DfAdmZvObgRviw9wQ9Zti372P8VD1ILEdff/C5WBWHW6mgG3YcorPAxgnrNF3MmNE95jRkA=="; + name = "_chakra_ui_utils___utils_1.10.4.tgz"; + url = "https://registry.yarnpkg.com/@chakra-ui/utils/-/utils-1.10.4.tgz"; + sha512 = "AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA=="; }; } { @@ -1042,27 +1050,43 @@ }; } { - name = "_datadog_native_metrics___native_metrics_1.1.0.tgz"; + name = "_datadog_native_appsec___native_appsec_1.2.1.tgz"; path = fetchurl { - name = "_datadog_native_metrics___native_metrics_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/@datadog/native-metrics/-/native-metrics-1.1.0.tgz"; - sha512 = "OSrhoo8U/JB/FltvAp54cgMHCBWEriF/D/ZboBH4Pn7UY/Zu8dkzB6eAWQFJIxQlHjYrAEuNgZPBkaHhS3e0KQ=="; + name = "_datadog_native_appsec___native_appsec_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@datadog/native-appsec/-/native-appsec-1.2.1.tgz"; + sha512 = "jF+k7xhBmJIYYLtjvhCey08RBbItTG7O2zcSCDGFffhvCvo3ZOoou+IKtAm9z+U7hOoeOmD+Xg+h29xj/BB9MA=="; }; } { - name = "_datadog_pprof___pprof_0.3.0.tgz"; + name = "_datadog_native_metrics___native_metrics_1.4.3.tgz"; path = fetchurl { - name = "_datadog_pprof___pprof_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-0.3.0.tgz"; - sha512 = "RskYpLD2mWdvUk2OU9p3gynx8QxHtfPdRPWs3vqlM+PMf+wstibcYMW7auNY4s3gVA1mT7HiBjW7j0m37rOHOQ=="; + name = "_datadog_native_metrics___native_metrics_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/@datadog/native-metrics/-/native-metrics-1.4.3.tgz"; + sha512 = "EUOoTbCWEAqCp3Cswe3JR3DkK6GUaBQIz7sLPNdy1RDu6Zc39HNCXEDo5RL3Hexo87gDkOq+pRifLkxjwrf7gQ=="; }; } { - name = "_datadog_sketches_js___sketches_js_1.0.4.tgz"; + name = "_datadog_pprof___pprof_1.0.2.tgz"; path = fetchurl { - name = "_datadog_sketches_js___sketches_js_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/@datadog/sketches-js/-/sketches-js-1.0.4.tgz"; - sha512 = "9S5fdz448dLfGw4jSH1A4GZpkLWBufdsJu4PeevEjDvkauEmE175xBiBLfYHQEdKe7lEVNB4IRtUZqY16QRVUw=="; + name = "_datadog_pprof___pprof_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-1.0.2.tgz"; + sha512 = "AMTK55W3Aa2QX2X8mN9SQfDGw3HvwIK9Or8pXQFss+kjtH5pCkO9oqE5838MeXgRh9BR8HWrjAQE3Ji7FRCK2g=="; + }; + } + { + name = "_datadog_sketches_js___sketches_js_2.1.0.tgz"; + path = fetchurl { + name = "_datadog_sketches_js___sketches_js_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/@datadog/sketches-js/-/sketches-js-2.1.0.tgz"; + sha512 = "smLocSfrt3s53H/XSVP3/1kP42oqvrkjUPtyaFd1F79ux24oE31BKt+q0c6lsa6hOYrFzsIwyc5GXAI5JmfOew=="; + }; + } + { + name = "_discoveryjs_json_ext___json_ext_0.5.7.tgz"; + path = fetchurl { + name = "_discoveryjs_json_ext___json_ext_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"; + sha512 = "dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="; }; } { @@ -1074,35 +1098,35 @@ }; } { - name = "_dnd_kit_core___core_4.0.3.tgz"; + name = "_dnd_kit_core___core_6.0.5.tgz"; path = fetchurl { - name = "_dnd_kit_core___core_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/@dnd-kit/core/-/core-4.0.3.tgz"; - sha512 = "uT1uHZxKx3iEkupmLfknMIvbykMJSetoXXmra6sGGvtWy+OMKrWm3axH2c90+JC/q6qaeKs2znd3Qs8GLnCa5Q=="; + name = "_dnd_kit_core___core_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/@dnd-kit/core/-/core-6.0.5.tgz"; + sha512 = "3nL+Zy5cT+1XwsWdlXIvGIFvbuocMyB4NBxTN74DeBaBqeWdH9JsnKwQv7buZQgAHmAH+eIENfS1ginkvW6bCw=="; }; } { - name = "_dnd_kit_modifiers___modifiers_4.0.0.tgz"; + name = "_dnd_kit_modifiers___modifiers_6.0.0.tgz"; path = fetchurl { - name = "_dnd_kit_modifiers___modifiers_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/@dnd-kit/modifiers/-/modifiers-4.0.0.tgz"; - sha512 = "4OkNTamneH9u3YMJqG6yJ6cwFoEd/4yY9BF39TgmDh9vyMK2MoPZFVAV0vOEm193ZYsPczq3Af5tJFtJhR9jJQ=="; + name = "_dnd_kit_modifiers___modifiers_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/@dnd-kit/modifiers/-/modifiers-6.0.0.tgz"; + sha512 = "V3+JSo6/BTcgPRHiNUTSKgqVv/doKXg+T4Z0QvKiiXp+uIyJTUtPkQOBRQApUWi3ApBhnoWljyt/3xxY4fTd0Q=="; }; } { - name = "_dnd_kit_sortable___sortable_5.1.0.tgz"; + name = "_dnd_kit_sortable___sortable_7.0.1.tgz"; path = fetchurl { - name = "_dnd_kit_sortable___sortable_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/@dnd-kit/sortable/-/sortable-5.1.0.tgz"; - sha512 = "CPyiUHbTrSYzhddfgdeoX0ERg/dEyVKIWx9+4O6uqpoppo84SXCBHVFiFBRVpQ9wtpsXs7prtUAnAUTcvFQTZg=="; + name = "_dnd_kit_sortable___sortable_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/@dnd-kit/sortable/-/sortable-7.0.1.tgz"; + sha512 = "n77qAzJQtMMywu25sJzhz3gsHnDOUlEjTtnRl8A87rWIhnu32zuP+7zmFjwGgvqfXmRufqiHOSlH7JPC/tnJ8Q=="; }; } { - name = "_dnd_kit_utilities___utilities_3.0.2.tgz"; + name = "_dnd_kit_utilities___utilities_3.2.0.tgz"; path = fetchurl { - name = "_dnd_kit_utilities___utilities_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/@dnd-kit/utilities/-/utilities-3.0.2.tgz"; - sha512 = "J4WpZXKbLJzBkuALqsIy5KmQr6PQk86ixoPKoixzjWj1+XGE5KdA2vga9Vf43EB/Ewpng+E5SmXVLfTs7ukbhw=="; + name = "_dnd_kit_utilities___utilities_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/@dnd-kit/utilities/-/utilities-3.2.0.tgz"; + sha512 = "h65/pn2IPCCIWwdlR2BMLqRkDxpTEONA+HQW3n765HBijLYGyrnTCLa2YQt8VVjjSQD6EfFlTE6aS2Q/b6nb2g=="; }; } { @@ -1138,51 +1162,51 @@ }; } { - name = "_eslint_eslintrc___eslintrc_0.2.1.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.3.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz"; - sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA=="; + name = "_eslint_eslintrc___eslintrc_0.4.3.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"; + sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; } { - name = "_formatjs_ecma402_abstract___ecma402_abstract_1.9.8.tgz"; + name = "_formatjs_ecma402_abstract___ecma402_abstract_1.12.0.tgz"; path = fetchurl { - name = "_formatjs_ecma402_abstract___ecma402_abstract_1.9.8.tgz"; - url = "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.9.8.tgz"; - sha512 = "2U4n11bLmTij/k4ePCEFKJILPYwdMcJTdnKVBi+JMWBgu5O1N+XhCazlE6QXqVO1Agh2Doh0b/9Jf1mSmSVfhA=="; + name = "_formatjs_ecma402_abstract___ecma402_abstract_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.12.0.tgz"; + sha512 = "0/wm9b7brUD40kx7KSE0S532T8EfH06Zc41rGlinoNyYXnuusR6ull2x63iFJgVXgwahm42hAW7dcYdZ+llZzA=="; }; } { - name = "_formatjs_fast_memoize___fast_memoize_1.2.0.tgz"; + name = "_formatjs_fast_memoize___fast_memoize_1.2.6.tgz"; path = fetchurl { - name = "_formatjs_fast_memoize___fast_memoize_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.0.tgz"; - sha512 = "fObitP9Tlc31SKrPHgkPgQpGo4+4yXfQQITTCNH8AZdEqB7Mq4nPrjpUL/tNGN3lEeJcFxDbi0haX8HM7QvQ8w=="; + name = "_formatjs_fast_memoize___fast_memoize_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.6.tgz"; + sha512 = "9CWZ3+wCkClKHX+i5j+NyoBVqGf0pIskTo6Xl6ihGokYM2yqSSS68JIgeo+99UIHc+7vi9L3/SDSz/dWI9SNlA=="; }; } { - name = "_formatjs_icu_messageformat_parser___icu_messageformat_parser_2.0.11.tgz"; + name = "_formatjs_icu_messageformat_parser___icu_messageformat_parser_2.1.7.tgz"; path = fetchurl { - name = "_formatjs_icu_messageformat_parser___icu_messageformat_parser_2.0.11.tgz"; - url = "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.0.11.tgz"; - sha512 = "5mWb8U8aulYGwnDZWrr+vdgn5PilvtrqQYQ1pvpgzQes/osi85TwmL2GqTGLlKIvBKD2XNA61kAqXYY95w4LWg=="; + name = "_formatjs_icu_messageformat_parser___icu_messageformat_parser_2.1.7.tgz"; + url = "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.7.tgz"; + sha512 = "KM4ikG5MloXMulqn39Js3ypuVzpPKq/DDplvl01PE2qD9rAzFO8YtaUCC9vr9j3sRXwdHPeTe8r3J/8IJgvYEQ=="; }; } { - name = "_formatjs_icu_skeleton_parser___icu_skeleton_parser_1.2.12.tgz"; + name = "_formatjs_icu_skeleton_parser___icu_skeleton_parser_1.3.13.tgz"; path = fetchurl { - name = "_formatjs_icu_skeleton_parser___icu_skeleton_parser_1.2.12.tgz"; - url = "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.2.12.tgz"; - sha512 = "DTFxWmEA02ZNW6fsYjGYSADvtrqqjCYF7DSgCmMfaaE0gLP4pCdAgOPE+lkXXU+jP8iCw/YhMT2Seyk/C5lBWg=="; + name = "_formatjs_icu_skeleton_parser___icu_skeleton_parser_1.3.13.tgz"; + url = "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.13.tgz"; + sha512 = "qb1kxnA4ep76rV+d9JICvZBThBpK5X+nh1dLmmIReX72QyglicsaOmKEcdcbp7/giCWfhVs6CXPVA2JJ5/ZvAw=="; }; } { - name = "_formatjs_intl_localematcher___intl_localematcher_0.2.20.tgz"; + name = "_formatjs_intl_localematcher___intl_localematcher_0.2.31.tgz"; path = fetchurl { - name = "_formatjs_intl_localematcher___intl_localematcher_0.2.20.tgz"; - url = "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.20.tgz"; - sha512 = "/Ro85goRZnCojzxOegANFYL0LaDIpdPjAukR7xMTjOtRx+3yyjR0ifGTOW3/Kjhmab3t6GnyHBYWZSudxEOxPA=="; + name = "_formatjs_intl_localematcher___intl_localematcher_0.2.31.tgz"; + url = "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.31.tgz"; + sha512 = "9QTjdSBpQ7wHShZgsNzNig5qT3rCPvmZogS/wXZzKotns5skbXgs0I7J8cuN0PPqXyynvNVuN+iOKhNS2eb+ZA=="; }; } { @@ -1225,6 +1249,22 @@ sha512 = "U82HAy9S9gNuPShsUrefJH2Bdv71+6gjIueNW39oLiWjR87Nmuenjzu1gbVcC6sJwjlsj3JJ0E1NDPu0xTDfxQ=="; }; } + { + name = "_humanwhocodes_config_array___config_array_0.5.0.tgz"; + path = fetchurl { + name = "_humanwhocodes_config_array___config_array_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"; + sha512 = "FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="; + }; + } + { + name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; + path = fetchurl { + name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; + sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; + }; + } { name = "_icons_material___material_0.2.4.tgz"; path = fetchurl { @@ -1234,19 +1274,35 @@ }; } { - name = "_internationalized_message___message_3.0.2.tgz"; + name = "_internationalized_date___date_3.0.1.tgz"; path = fetchurl { - name = "_internationalized_message___message_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/@internationalized/message/-/message-3.0.2.tgz"; - sha512 = "ZZ8FQDCsri3vUB2mfDD76Vbf97DH361AiZUXKHV4BqwCtYyaNYiZqIr8KXrcMCxJvrIYVQLSn8+jeIQRO3bvtw=="; + name = "_internationalized_date___date_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/@internationalized/date/-/date-3.0.1.tgz"; + sha512 = "E/3lASs4mAeJ2Z2ye6ab7eUD0bPUfTeNVTAv6IS+ne9UtMu9Uepb9A1U2Ae0hDr6WAlBuvUtrakaxEdYB9TV6Q=="; }; } { - name = "_internationalized_number___number_3.0.3.tgz"; + name = "_internationalized_message___message_3.0.9.tgz"; path = fetchurl { - name = "_internationalized_number___number_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/@internationalized/number/-/number-3.0.3.tgz"; - sha512 = "ewFoVvsxSyd9QZnknvOWPjirYqdMQhXTeDhJg3hM6C/FeZt0banpGH1nZ0SGMZXHz8NK9uAa2KVIq+jqAIOg4w=="; + name = "_internationalized_message___message_3.0.9.tgz"; + url = "https://registry.yarnpkg.com/@internationalized/message/-/message-3.0.9.tgz"; + sha512 = "yHQggKWUuSvj1GznVtie4tcYq+xMrkd/lTKCFHp6gG18KbIliDw+UI7sL9+yJPGuWiR083xuLyyhzqiPbNOEww=="; + }; + } + { + name = "_internationalized_number___number_3.1.1.tgz"; + path = fetchurl { + name = "_internationalized_number___number_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/@internationalized/number/-/number-3.1.1.tgz"; + sha512 = "dBxCQKIxvsZvW2IBt3KsqrCfaw2nV6o6a8xsloJn/hjW0ayeyhKuiiMtTwW3/WGNPP7ZRyDbtuiUEjMwif1ENQ=="; + }; + } + { + name = "_internationalized_string___string_3.0.0.tgz"; + path = fetchurl { + name = "_internationalized_string___string_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@internationalized/string/-/string-3.0.0.tgz"; + sha512 = "NUSr4u+mNu5BysXFeVWZW4kvjXylPkU/YYqaWzdNuz1eABfehFiZTEYhWAAMzI3U8DTxfqF9PM3zyhk5gcfz6w=="; }; } { @@ -1625,6 +1681,14 @@ sha512 = "8fULQjB0x4LzUSiSYG6ZtQl355sZjxbv8r9PPAuYHzS9sGiSHJQavNqK/nKnpDsVkU88/vRGcE7t3nMU0dEnVw=="; }; } + { + name = "_jonkemp_package_utils___package_utils_1.0.8.tgz"; + path = fetchurl { + name = "_jonkemp_package_utils___package_utils_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/@jonkemp/package-utils/-/package-utils-1.0.8.tgz"; + sha512 = "bIcKnH5YmtTYr7S6J3J86dn/rFiklwRpOqbTOQ9C0WMmR9FKHVb3bxs2UYfqEmNb93O4nbA97sb6rtz33i9SyA=="; + }; + } { name = "_joplin_turndown_plugin_gfm___turndown_plugin_gfm_1.0.44.tgz"; path = fetchurl { @@ -1802,19 +1866,27 @@ }; } { - name = "_pmmmwh_react_refresh_webpack_plugin___react_refresh_webpack_plugin_0.5.4.tgz"; + name = "_pkgr_utils___utils_2.3.1.tgz"; path = fetchurl { - name = "_pmmmwh_react_refresh_webpack_plugin___react_refresh_webpack_plugin_0.5.4.tgz"; - url = "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.4.tgz"; - sha512 = "zZbZeHQDnoTlt2AF+diQT0wsSXpvWiaIOZwBRdltNFhG1+I3ozyaw7U/nBiUwyJ0D+zwdXp0E3bWOl38Ag2BMw=="; + name = "_pkgr_utils___utils_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.3.1.tgz"; + sha512 = "wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw=="; }; } { - name = "_popperjs_core___core_2.6.0.tgz"; + name = "_pmmmwh_react_refresh_webpack_plugin___react_refresh_webpack_plugin_0.5.7.tgz"; path = fetchurl { - name = "_popperjs_core___core_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/@popperjs/core/-/core-2.6.0.tgz"; - sha512 = "cPqjjzuFWNK3BSKLm0abspP0sp/IGOli4p5I5fKFAzdS8fvjdOwDCfZqAaIiXd9lPkOWi3SUUfZof3hEb7J/uw=="; + name = "_pmmmwh_react_refresh_webpack_plugin___react_refresh_webpack_plugin_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.7.tgz"; + sha512 = "bcKCAzF0DV2IIROp9ZHkRJa6O4jy7NlnHdWL3GmcUxYWNjLXkK5kfELELwEfSP5hXPfVL/qOGMAROuMQb9GG8Q=="; + }; + } + { + name = "_popperjs_core___core_2.11.6.tgz"; + path = fetchurl { + name = "_popperjs_core___core_2.11.6.tgz"; + url = "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz"; + sha512 = "50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="; }; } { @@ -1897,6 +1969,38 @@ sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; } + { + name = "_radix_ui_popper___popper_0.1.0.tgz"; + path = fetchurl { + name = "_radix_ui_popper___popper_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/@radix-ui/popper/-/popper-0.1.0.tgz"; + sha512 = "uzYeElL3w7SeNMuQpXiFlBhTT+JyaNMCwDfjKkrzugEcYrf5n52PHqncNdQPUtR42hJh8V9FsqyEDbDxkeNjJQ=="; + }; + } + { + name = "_radix_ui_react_use_rect___react_use_rect_0.1.1.tgz"; + path = fetchurl { + name = "_radix_ui_react_use_rect___react_use_rect_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/@radix-ui/react-use-rect/-/react-use-rect-0.1.1.tgz"; + sha512 = "kHNNXAsP3/PeszEmM/nxBBS9Jbo93sO+xuMTcRfwzXsmxT5gDXQzAiKbZQ0EecCPtJIzqvr7dlaQi/aP1PKYqQ=="; + }; + } + { + name = "_radix_ui_react_use_size___react_use_size_0.1.1.tgz"; + path = fetchurl { + name = "_radix_ui_react_use_size___react_use_size_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/@radix-ui/react-use-size/-/react-use-size-0.1.1.tgz"; + sha512 = "pTgWM5qKBu6C7kfKxrKPoBI2zZYZmp2cSXzpUiGM3qEBQlMLtYhaY2JXdXUCxz+XmD1YEjc8oRwvyfsD4AG4WA=="; + }; + } + { + name = "_radix_ui_rect___rect_0.1.1.tgz"; + path = fetchurl { + name = "_radix_ui_rect___rect_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/@radix-ui/rect/-/rect-0.1.1.tgz"; + sha512 = "g3hnE/UcOg7REdewduRPAK88EPuLZtaq7sA9ouu8S+YEtnyFRI16jgv6GZYe3VMoQLL1T171ebmEPtDjyxWLzw=="; + }; + } { name = "_reach_observe_rect___observe_rect_1.2.0.tgz"; path = fetchurl { @@ -1922,59 +2026,75 @@ }; } { - name = "_react_aria_i18n___i18n_3.3.2.tgz"; + name = "_react_aria_focus___focus_3.8.0.tgz"; path = fetchurl { - name = "_react_aria_i18n___i18n_3.3.2.tgz"; - url = "https://registry.yarnpkg.com/@react-aria/i18n/-/i18n-3.3.2.tgz"; - sha512 = "a4AptbWLPVMJfjPdyW60TFtT4gvKAputx9YaUrIywoV/5p900AcOOc3uuL43+vuCKBzMkGUeTa1a4eL1HstDUA=="; + name = "_react_aria_focus___focus_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/@react-aria/focus/-/focus-3.8.0.tgz"; + sha512 = "XuaLFdqf/6OyILifkVJo++5k2O+wlpNvXgsJkRWn/wSmB77pZKURm2MMGiSg2u911NqY+829UrSlpmhCZrc8RA=="; }; } { - name = "_react_aria_interactions___interactions_3.6.0.tgz"; + name = "_react_aria_i18n___i18n_3.6.0.tgz"; path = fetchurl { - name = "_react_aria_interactions___interactions_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/@react-aria/interactions/-/interactions-3.6.0.tgz"; - sha512 = "dMEGYIIhJ3uxDd19Z/rxuqQp9Rx9c46AInrfzAiOijQj/fTmb4ubCsuFOAQrc0sy1HCY1/ntnRZQuRgT/iS74w=="; + name = "_react_aria_i18n___i18n_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/@react-aria/i18n/-/i18n-3.6.0.tgz"; + sha512 = "FbdoBpMPgO0uldrpn43vCm8Xcveb46AklvUmh+zIUYRSIyIl2TKs5URTnwl9Sb1aloawoHQm2A5kASj5+TCxuA=="; }; } { - name = "_react_aria_live_announcer___live_announcer_3.0.1.tgz"; + name = "_react_aria_interactions___interactions_3.11.0.tgz"; path = fetchurl { - name = "_react_aria_live_announcer___live_announcer_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/@react-aria/live-announcer/-/live-announcer-3.0.1.tgz"; - sha512 = "c63UZ4JhXxy29F6FO1LUkQLDRzv17W4g3QQ+sy6tmFw7R5I5r8uh8jR7RCbBX7bdGCLnQDwOQ055KsM/a9MT3A=="; + name = "_react_aria_interactions___interactions_3.11.0.tgz"; + url = "https://registry.yarnpkg.com/@react-aria/interactions/-/interactions-3.11.0.tgz"; + sha512 = "ZjK4m8u6FlV7Q9/1h9P2Ii6j/NwKR3BmTeGeBQssS2i4dV2pJeOPePnGzVQQGG8FzGQ+TcNRvZPXKaU4AlnBjw=="; }; } { - name = "_react_aria_spinbutton___spinbutton_3.0.1.tgz"; + name = "_react_aria_label___label_3.4.1.tgz"; path = fetchurl { - name = "_react_aria_spinbutton___spinbutton_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/@react-aria/spinbutton/-/spinbutton-3.0.1.tgz"; - sha512 = "V2wUhSgJDxSqzo5HPbx7OgGpFeuvxq8/7nNO8mT3cEZfZASUGvjIdCRmAf243qyfo9Yby4zdx9E/BxNOGCZ9cQ=="; + name = "_react_aria_label___label_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/@react-aria/label/-/label-3.4.1.tgz"; + sha512 = "sdXkCrMh3JfV8dw/S+ENOuATG39sFFyCcokhhRgshIlbqkjWU0Wa2RQ2fxr1hmDepai/5LNOPwWTTOqI+SfMMw=="; }; } { - name = "_react_aria_ssr___ssr_3.1.0.tgz"; + name = "_react_aria_live_announcer___live_announcer_3.1.1.tgz"; path = fetchurl { - name = "_react_aria_ssr___ssr_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/@react-aria/ssr/-/ssr-3.1.0.tgz"; - sha512 = "RxqQKmE8sO7TGdrcSlHTcVzMP450hqowtBSd2bBS9oPlcokVkaGq28c3Rwa8ty5ctw4EBCjXqjP7xdcKMGDzug=="; + name = "_react_aria_live_announcer___live_announcer_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/@react-aria/live-announcer/-/live-announcer-3.1.1.tgz"; + sha512 = "e7b+dRh1SUTla42vzjdbhGYkeLD7E6wIYjYaHW9zZ37rBkSqLHUhTigh3eT3k5NxFlDD/uRxTYuwaFnWQgR+4g=="; }; } { - name = "_react_aria_utils___utils_3.9.0.tgz"; + name = "_react_aria_slider___slider_3.2.1.tgz"; path = fetchurl { - name = "_react_aria_utils___utils_3.9.0.tgz"; - url = "https://registry.yarnpkg.com/@react-aria/utils/-/utils-3.9.0.tgz"; - sha512 = "P0dEOMHGHHJ5KC8iCpaMxAtgdUdeISAm4FZnmoD5fK3JxlKEC046hUxlad83RkNOBZkT2dDvF4HeDCUqdMWHKQ=="; + name = "_react_aria_slider___slider_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/@react-aria/slider/-/slider-3.2.1.tgz"; + sha512 = "zRSOAyK6BfKliUGv+II8XEWjn/wT8ols47SeMLZvBzuWEfI74xpHMnB1jQs23Jt3PaVTZ+VziAjScBgayLeXxA=="; }; } { - name = "_react_aria_visually_hidden___visually_hidden_3.2.3.tgz"; + name = "_react_aria_spinbutton___spinbutton_3.1.3.tgz"; path = fetchurl { - name = "_react_aria_visually_hidden___visually_hidden_3.2.3.tgz"; - url = "https://registry.yarnpkg.com/@react-aria/visually-hidden/-/visually-hidden-3.2.3.tgz"; - sha512 = "iAe5EFI7obEOwTnIdAwWrKq+CrIJFGTw85v8fXnQ7CIVGRDblX85GOUww9bzQNPDLLRYWS4VF702ii8kV4+JCw=="; + name = "_react_aria_spinbutton___spinbutton_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/@react-aria/spinbutton/-/spinbutton-3.1.3.tgz"; + sha512 = "9DhWRdYZe9x9La7up8f3A2zvbQ6PooMjAvXDIXRFAZLTOUxwk2dnn9WwHq5XjbjnOm71yzvHmm/MmMzTO/ZP2w=="; + }; + } + { + name = "_react_aria_ssr___ssr_3.3.0.tgz"; + path = fetchurl { + name = "_react_aria_ssr___ssr_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/@react-aria/ssr/-/ssr-3.3.0.tgz"; + sha512 = "yNqUDuOVZIUGP81R87BJVi/ZUZp/nYOBXbPsRe7oltJOfErQZD+UezMpw4vM2KRz18cURffvmC8tJ6JTeyDtaQ=="; + }; + } + { + name = "_react_aria_utils___utils_3.13.3.tgz"; + path = fetchurl { + name = "_react_aria_utils___utils_3.13.3.tgz"; + url = "https://registry.yarnpkg.com/@react-aria/utils/-/utils-3.13.3.tgz"; + sha512 = "wqjGNFX4TrXriUU1gvCaoqRhuckdoYogUWN0iyQRkTmzvb7H/NNzQzHou5ggWAdts/NzJUInwKarBWM9hCZZbg=="; }; } { @@ -2018,27 +2138,67 @@ }; } { - name = "_react_stately_utils___utils_3.2.2.tgz"; + name = "_react_stately_radio___radio_3.5.1.tgz"; path = fetchurl { - name = "_react_stately_utils___utils_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/@react-stately/utils/-/utils-3.2.2.tgz"; - sha512 = "7NCpRMAexDdgVqbrB9uDrkDpM4Tdw5BU6Gu6IKUXmKsoDYziE6mAjaGkCZBitsrln1Cezc6euI5YPa1JqxgpJg=="; + name = "_react_stately_radio___radio_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/@react-stately/radio/-/radio-3.5.1.tgz"; + sha512 = "0x84/JTUshB5ZIhv4KPNaRBHztegGfHZ/dheCN/cNYiDPFmUPkce4mOYgL3byUgVabbDYqohTHkpvoA54UOgew=="; }; } { - name = "_react_types_button___button_3.4.1.tgz"; + name = "_react_stately_slider___slider_3.2.1.tgz"; path = fetchurl { - name = "_react_types_button___button_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/@react-types/button/-/button-3.4.1.tgz"; - sha512 = "B54M84LxdEppwjXNlkBEJyMfe9fd+bvFV7R6+NJvupGrZm/LuFNYjFcHk7yjMKWTdWm6DbpIuQz54n5qTW7Vlg=="; + name = "_react_stately_slider___slider_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/@react-stately/slider/-/slider-3.2.1.tgz"; + sha512 = "LJ6ESPmDnu1H/Y750DWLLqJl3Q2RkOUp4d55YuQ/iwtSoEYxxIHflOxsbUKaTP/Ttmj9eMIXSTeW7hkWidsxQw=="; }; } { - name = "_react_types_shared___shared_3.9.0.tgz"; + name = "_react_stately_utils___utils_3.5.1.tgz"; path = fetchurl { - name = "_react_types_shared___shared_3.9.0.tgz"; - url = "https://registry.yarnpkg.com/@react-types/shared/-/shared-3.9.0.tgz"; - sha512 = "YYksINfR6q92P10AhPEGo47Hd7oz1hrnZ6Vx8Gsrq62IbqDdv1XOTzPBaj17Z1ymNY2pitLUSEXsLmozt4wxxQ=="; + name = "_react_stately_utils___utils_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/@react-stately/utils/-/utils-3.5.1.tgz"; + sha512 = "INeQ5Er2Jm+db8Py4upKBtgfzp3UYgwXYmbU/XJn49Xw27ktuimH9e37qP3bgHaReb5L3g8IrGs38tJUpnGPHA=="; + }; + } + { + name = "_react_types_button___button_3.6.1.tgz"; + path = fetchurl { + name = "_react_types_button___button_3.6.1.tgz"; + url = "https://registry.yarnpkg.com/@react-types/button/-/button-3.6.1.tgz"; + sha512 = "F7m3/MVmzChkBqD5gO7rIglPRHY6KZg/RaU8f8VqZuEOAHuQ1CtTEfpc6r9artBSs2Gdw7yNWxfCI2dP95lYow=="; + }; + } + { + name = "_react_types_label___label_3.6.3.tgz"; + path = fetchurl { + name = "_react_types_label___label_3.6.3.tgz"; + url = "https://registry.yarnpkg.com/@react-types/label/-/label-3.6.3.tgz"; + sha512 = "Q+8qx4x7+ZqgdfNJorX7CqysYAGAeT1IWzJyNxwcT1OLjFuUIBJyg7njjpkZyK8sFFYdGIKhLxk0Q1Sf8Y5Stw=="; + }; + } + { + name = "_react_types_radio___radio_3.2.3.tgz"; + path = fetchurl { + name = "_react_types_radio___radio_3.2.3.tgz"; + url = "https://registry.yarnpkg.com/@react-types/radio/-/radio-3.2.3.tgz"; + sha512 = "TiW0PJPQuVKcni8UWI84hc8dYGDsuSkKT/Dgj1r82csYGz/92RnyQDF12CCg9+MpqWZweK30uYQzbtrxa74qBg=="; + }; + } + { + name = "_react_types_shared___shared_3.14.1.tgz"; + path = fetchurl { + name = "_react_types_shared___shared_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/@react-types/shared/-/shared-3.14.1.tgz"; + sha512 = "yPPgVRWWanXqbdxFTgJmVwx0JlcnEK3dqkKDIbVk6mxAHvEESI9+oDnHvO8IMHqF+GbrTCzVtAs0zwhYI/uHJA=="; + }; + } + { + name = "_react_types_slider___slider_3.2.1.tgz"; + path = fetchurl { + name = "_react_types_slider___slider_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/@react-types/slider/-/slider-3.2.1.tgz"; + sha512 = "adqWZLE2IEzqBGnGHKYQwJ2IY4xlwFcPt3KWCsfp1c1WyG/d7xxQus8rL4eWLqoiMgguTxbYm9F2TF77itw8JA=="; }; } { @@ -2050,11 +2210,11 @@ }; } { - name = "_renderlesskit_react___react_0.6.0.tgz"; + name = "_renderlesskit_react___react_0.11.0.tgz"; path = fetchurl { - name = "_renderlesskit_react___react_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/@renderlesskit/react/-/react-0.6.0.tgz"; - sha512 = "v1FChZQj8te+XK9MhGT5XVxgynAMriY6CKcY4pCa7+YljM2vLuRgo7yaOhh5saHrd/t5dbtcdS4s/xo9lZFYEQ=="; + name = "_renderlesskit_react___react_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/@renderlesskit/react/-/react-0.11.0.tgz"; + sha512 = "hfQZ59DyE7pX5u7JF5UqzAzZdcC69eMxOfQZ4uavEwafPgDbuudtVFubcRY//uOxDPAq2ewKTnRhptcL7sgmlg=="; }; } { @@ -2090,75 +2250,59 @@ }; } { - name = "_sentry_browser___browser_6.3.1.tgz"; + name = "_sentry_browser___browser_7.15.0.tgz"; path = fetchurl { - name = "_sentry_browser___browser_6.3.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.3.1.tgz"; - sha512 = "Ri4tYsyuJIeLQnvQUqbpGzailUYpbjFSYM0+yEM63gPsjiXdg+W8yKHluA6cs6FLWVN3oWfwHW7Kd61echlGuw=="; + name = "_sentry_browser___browser_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.15.0.tgz"; + sha512 = "vZYr8L2JmniV8cns4yGOpX32moazz6tsllB1uv7XmmELW98sIuuugVFX0k6cBi89R8pyhdqULFCf9CL8CRguRg=="; }; } { - name = "_sentry_core___core_6.3.1.tgz"; + name = "_sentry_core___core_7.15.0.tgz"; path = fetchurl { - name = "_sentry_core___core_6.3.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/core/-/core-6.3.1.tgz"; - sha512 = "aVuvVbaehGeN86jZlLDGGkhEtprdOtB6lvYLfGy40Dj1Tkh2mGWE550QsRXAXAqYvQzIYwQR23r6m3o8FujgVg=="; + name = "_sentry_core___core_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/core/-/core-7.15.0.tgz"; + sha512 = "W8d44g04GShBn4Z9VBTUhf1T9LTMfzUnETEx237zzUucv0kkyj3LsWQsJapWchMbmwr1V/CdnNDN+lGDm8iXQA=="; }; } { - name = "_sentry_hub___hub_6.3.1.tgz"; + name = "_sentry_node___node_7.15.0.tgz"; path = fetchurl { - name = "_sentry_hub___hub_6.3.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.3.1.tgz"; - sha512 = "2er+OeVlsdVZkhl9kXQAANwgjwoCdM1etK2iFuhzX8xkMaJlAuZLyQInv2U1BbXBlIfWjvzRM8B95hCWvVrR3Q=="; + name = "_sentry_node___node_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/node/-/node-7.15.0.tgz"; + sha512 = "gfyo6YTo4Sw5pdKWCzs7trqZpBm5D/ArR4vylQrQayfImiYyNY6yaOK1R7g4rM34MXUu91pfVJLUpXvjk/NsHw=="; }; } { - name = "_sentry_minimal___minimal_6.3.1.tgz"; + name = "_sentry_react___react_7.15.0.tgz"; path = fetchurl { - name = "_sentry_minimal___minimal_6.3.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.3.1.tgz"; - sha512 = "0eN9S7HvXsCQEjX/qXHTMgvSb3mwrnZEWS9Qz/Bz5ig9pEGXKgJ1om5NTTHVHhXqd3wFCjdvIo6slufLHoCtSw=="; + name = "_sentry_react___react_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/react/-/react-7.15.0.tgz"; + sha512 = "a+5+Og93YPtWSCmOFYa/qzrbvfgIZXShJk1bsIaEI0KdltTOVJBdwvLQc8OiIOBe/CMDVCmK1t2DqiWfOWj41w=="; }; } { - name = "_sentry_node___node_6.3.1.tgz"; + name = "_sentry_tracing___tracing_7.15.0.tgz"; path = fetchurl { - name = "_sentry_node___node_6.3.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/node/-/node-6.3.1.tgz"; - sha512 = "D0r603fdNwUPkwvy0IcQaUSTafl+7lrOytiO5dfdLdlkhtTcwivwENc/n8ER8GOC2zpIvYOEIJvzP4PGL85khw=="; + name = "_sentry_tracing___tracing_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.15.0.tgz"; + sha512 = "c0Y3+z6EWsc+EJsfBcRtc58ugkWYa6+6KTu3ceMkx2ZgZTCmRUuzAb7yodMt/gwezBsxzq706fnQivx1lQgzlQ=="; }; } { - name = "_sentry_react___react_6.3.1.tgz"; + name = "_sentry_types___types_7.15.0.tgz"; path = fetchurl { - name = "_sentry_react___react_6.3.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/react/-/react-6.3.1.tgz"; - sha512 = "3eFSqdS0QAb4RFNxS0gzVm05q8c5KQp+3TlmqBjoovqWL/FvGvDoqaBmFT+arvPZ88qngveMEk1v6445L0gFTg=="; + name = "_sentry_types___types_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/types/-/types-7.15.0.tgz"; + sha512 = "MN9haDRh9ZOsTotoDTHu2BT3sT8Vs1F0alhizUpDyjN2YgBCqR6JV+AbAE1XNHwS2+5zbppch1PwJUVeE58URQ=="; }; } { - name = "_sentry_tracing___tracing_6.3.1.tgz"; + name = "_sentry_utils___utils_7.15.0.tgz"; path = fetchurl { - name = "_sentry_tracing___tracing_6.3.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.3.1.tgz"; - sha512 = "qveDmoWsXy9qLEblZJwJ1OU/zZRlEd/q7Jhd0Hnwlob8Ci96huABEbYyGdJs18BKVHEFU3gSdVfvrikUE/W17g=="; - }; - } - { - name = "_sentry_types___types_6.3.1.tgz"; - path = fetchurl { - name = "_sentry_types___types_6.3.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/types/-/types-6.3.1.tgz"; - sha512 = "BEBn8JX1yaooCAuonbaMci9z0RjwwMbQ3Eny/eyDdd+rjXprZCZaStZnCvSThbNBqAJ8YaUqY2YBMnEwJxarAw=="; - }; - } - { - name = "_sentry_utils___utils_6.3.1.tgz"; - path = fetchurl { - name = "_sentry_utils___utils_6.3.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.3.1.tgz"; - sha512 = "cdtl/QWC9FtinAuW3w8QfvSfh/Q9ui5vwvjzVHiS1ga/U38edi2XX+cttY39ZYwz0SQG99cE10GOIhd1p7/mAA=="; + name = "_sentry_utils___utils_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.15.0.tgz"; + sha512 = "akic22/6xa/RG5Mj7UN6pLc23VnX9zQlKM53L/q3yIr0juckSVthJiiFNdgdqrX03S1tHYlBgPeShKFFTHpkjA=="; }; } { @@ -2169,14 +2313,6 @@ sha512 = "K7C7IlQ3zLePEZleUN21ceBA2aLcMnLHTLph8QWk1JK37L90obdpY+QGY8bXMKxf1ht1Z0MNewvXxWv0oGDYFg=="; }; } - { - name = "_sindresorhus_is___is_0.14.0.tgz"; - path = fetchurl { - name = "_sindresorhus_is___is_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; - sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; - }; - } { name = "_sinonjs_commons___commons_1.8.1.tgz"; path = fetchurl { @@ -2202,27 +2338,19 @@ }; } { - name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + name = "_theo.gravity_datadog_apm___datadog_apm_3.0.1.tgz"; path = fetchurl { - name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; - sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; + name = "_theo.gravity_datadog_apm___datadog_apm_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/@theo.gravity/datadog-apm/-/datadog-apm-3.0.1.tgz"; + sha512 = "jzPKRWaVIjvbMaM1b7N5kQG8y9c7NrCkesAtlSpqhnXlyHjODOXVWdLi36H0NAr+xg9+oZ+Cja6NukJc2wGRWg=="; }; } { - name = "_theo.gravity_datadog_apm___datadog_apm_2.2.0.tgz"; + name = "_tippyjs_react___react_4.2.6.tgz"; path = fetchurl { - name = "_theo.gravity_datadog_apm___datadog_apm_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/@theo.gravity/datadog-apm/-/datadog-apm-2.2.0.tgz"; - sha512 = "2538L5oW69eApPPSdlPGcyDqlpb4vo6knGONQax7eIiO44gW7XK2r/Hc6hdQ6aSl8PMoNP6uG6khHg0kTz8Nsw=="; - }; - } - { - name = "_tippy.js_react___react_2.2.3.tgz"; - path = fetchurl { - name = "_tippy.js_react___react_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/@tippy.js/react/-/react-2.2.3.tgz"; - sha512 = "5XYvbQujzDj9r00JYEz/cBtm6DutjOdv2azdco53B+eWF7FDBCQfkLVn87wimfEpmGK0vqRQv/cwFxFcoOP98Q=="; + name = "_tippyjs_react___react_4.2.6.tgz"; + url = "https://registry.yarnpkg.com/@tippyjs/react/-/react-4.2.6.tgz"; + sha512 = "91RicDR+H7oDSyPycI13q3b7o4O60wa2oRbjlz2fyRLmHImc4vyDwuUP8NtZaN0VARJY5hybvDYrFzhY9+Lbyw=="; }; } { @@ -2233,6 +2361,14 @@ sha512 = "awcc9hfLZqyyZHOGzAHbnjgZJpQGS1W1oZZ5GXOTTnbKVdKQ4OWYbrRWPUvXI2YAKJazrcS8rxPh67PX3rpGkQ=="; }; } + { + name = "_tootallnate_once___once_1.1.2.tgz"; + path = fetchurl { + name = "_tootallnate_once___once_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz"; + sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; + }; + } { name = "_tootallnate_once___once_2.0.0.tgz"; path = fetchurl { @@ -2426,11 +2562,11 @@ }; } { - name = "_types_enzyme___enzyme_3.10.10.tgz"; + name = "_types_enzyme___enzyme_3.10.12.tgz"; path = fetchurl { - name = "_types_enzyme___enzyme_3.10.10.tgz"; - url = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.10.tgz"; - sha512 = "/D4wFhiEjUDfPu+j5FVK0g/jf7rqeEIpNfAI+kyxzLpw5CKO0drnW3W5NC38alIjsWgnyQ8pbuPF5+UD+vhVyg=="; + name = "_types_enzyme___enzyme_3.10.12.tgz"; + url = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.12.tgz"; + sha512 = "xryQlOEIe1TduDWAOphR0ihfebKFSWOXpIsk+70JskCfRfW+xALdnJ0r1ZOTo85F9Qsjk6vtlU7edTYHbls9tA=="; }; } { @@ -2569,6 +2705,14 @@ sha512 = "e+2rjEwK6KDaNOm5Aa9wNGgyS9oSZU/4pfSMMPYNOfjvFI0WVXm29+ITRFr6aKDvvKo7uU1jV68MW4ScsfDi7Q=="; }; } + { + name = "_types_inline_css___inline_css_3.0.1.tgz"; + path = fetchurl { + name = "_types_inline_css___inline_css_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/inline-css/-/inline-css-3.0.1.tgz"; + sha512 = "1bs+MjVvZIuF71D8P+FZf79LcqccqVBNF6txnabXT1vGnRMqZO0agtdyC585fcjuSs7Nj9qal8CF9rfWVQxnTQ=="; + }; + } { name = "_types_invariant___invariant_2.2.35.tgz"; path = fetchurl { @@ -2721,14 +2865,6 @@ sha512 = "wd6P0lPcnj5TWruzLucmQ75cdxkYVSimNAEpyKNRJ4wju8jruhJZYGod4l2R9ODq3LoBKtp/yd6PZu7c+w5/xg=="; }; } - { - name = "_types_koa_static___koa_static_4.0.2.tgz"; - path = fetchurl { - name = "_types_koa_static___koa_static_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/koa-static/-/koa-static-4.0.2.tgz"; - sha512 = "ns/zHg+K6XVPMuohjpOlpkR1WLa4VJ9czgUP9bxkCDn0JZBtUWbD/wKDZzPGDclkQK1bpAEScufCHOy8cbfL0w=="; - }; - } { name = "_types_koa_useragent___koa_useragent_2.1.2.tgz"; path = fetchurl { @@ -2770,19 +2906,11 @@ }; } { - name = "_types_long___long_4.0.2.tgz"; + name = "_types_markdown_it_container___markdown_it_container_2.0.5.tgz"; path = fetchurl { - name = "_types_long___long_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz"; - sha512 = "MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="; - }; - } - { - name = "_types_markdown_it_container___markdown_it_container_2.0.4.tgz"; - path = fetchurl { - name = "_types_markdown_it_container___markdown_it_container_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/markdown-it-container/-/markdown-it-container-2.0.4.tgz"; - sha512 = "QgzDCr8OWtWktWtlwPT908sKqZqSHUEaxTH/uVz68tYd6bsCS3defHLzN2rFeoKJ3q344qG0dWQ42K4UQSBqcw=="; + name = "_types_markdown_it_container___markdown_it_container_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/markdown-it-container/-/markdown-it-container-2.0.5.tgz"; + sha512 = "8v5jIC5gcCUv+JcD0DExwNBkoKC0kLB4acensF0NoNlTIcXmQxF3RDjzAdIW82sXSoR+n772ePguxIWlq2ELvA=="; }; } { @@ -2810,11 +2938,11 @@ }; } { - name = "_types_mermaid___mermaid_8.2.9.tgz"; + name = "_types_mermaid___mermaid_9.1.0.tgz"; path = fetchurl { - name = "_types_mermaid___mermaid_8.2.9.tgz"; - url = "https://registry.yarnpkg.com/@types/mermaid/-/mermaid-8.2.9.tgz"; - sha512 = "f1i8fNoVFVJXedk+R7GcEk4KoOWzWAU3CzFqlVw1qWKktfsataBERezCz1pOdKy8Ec02ZdPQXGM7NU2lPHABYQ=="; + name = "_types_mermaid___mermaid_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/@types/mermaid/-/mermaid-9.1.0.tgz"; + sha512 = "rc8QqhveKAY7PouzY/p8ljS+eBSNCv7o79L97RSub/Ic2SQ34ph1Ng3s8wFLWVjvaEt6RLOWtSCsgYWd95NY8A=="; }; } { @@ -3082,11 +3210,11 @@ }; } { - name = "_types_react_avatar_editor___react_avatar_editor_10.3.6.tgz"; + name = "_types_react_avatar_editor___react_avatar_editor_13.0.0.tgz"; path = fetchurl { - name = "_types_react_avatar_editor___react_avatar_editor_10.3.6.tgz"; - url = "https://registry.yarnpkg.com/@types/react-avatar-editor/-/react-avatar-editor-10.3.6.tgz"; - sha512 = "2r9+WYriqXIyjOTxy/DSiCUhr2TBiYD4Gzbyych1WUEwdPboNj0JRz9B5868TwiGgKD61jdWYyKy/OutHs7L6A=="; + name = "_types_react_avatar_editor___react_avatar_editor_13.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/react-avatar-editor/-/react-avatar-editor-13.0.0.tgz"; + sha512 = "5ymOayy6mfT35xTqzni7UjXvCNEg8/pH4pI5RenITp9PBc02KGTYjSV1WboXiQDYSh5KomLT0ngBLEAIhV1QoQ=="; }; } { @@ -3106,11 +3234,11 @@ }; } { - name = "_types_react_helmet___react_helmet_6.1.4.tgz"; + name = "_types_react_helmet___react_helmet_6.1.5.tgz"; path = fetchurl { - name = "_types_react_helmet___react_helmet_6.1.4.tgz"; - url = "https://registry.yarnpkg.com/@types/react-helmet/-/react-helmet-6.1.4.tgz"; - sha512 = "jyx50RNZXVaTGHY3MsoRPNpeiVk8b0XTPgD/O6KHF6COTDnG/+lRjPYvTK5nfWtR3xDOux0w6bHLAsaHo2ZLTA=="; + name = "_types_react_helmet___react_helmet_6.1.5.tgz"; + url = "https://registry.yarnpkg.com/@types/react-helmet/-/react-helmet-6.1.5.tgz"; + sha512 = "/ICuy7OHZxR0YCAZLNg9r7I9aijWUWvxaPR6uTuyxe8tAj5RL4Sw1+R6NhXUtOsarkGYPmaHdBDvuXh2DIN/uA=="; }; } { @@ -3362,11 +3490,11 @@ }; } { - name = "_types_utf8___utf8_3.0.0.tgz"; + name = "_types_utf8___utf8_3.0.1.tgz"; path = fetchurl { - name = "_types_utf8___utf8_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/utf8/-/utf8-3.0.0.tgz"; - sha512 = "QrhvCktdm5wD48axAnjqSzPH9lOj0MiCYfMX6MSqGs2Jv+txwvdxviXiCEj8zSCWIEDU9SIJ7g9pU5KtxRgYSg=="; + name = "_types_utf8___utf8_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/utf8/-/utf8-3.0.1.tgz"; + sha512 = "1EkWuw7rT3BMz2HpmcEOr/HL61mWNA6Ulr/KdbXR9AI0A55wD4Qfv8hizd8Q1DnknSIzzDvQmvvY/guvX7jjZA=="; }; } { @@ -3378,11 +3506,11 @@ }; } { - name = "_types_validator___validator_13.7.1.tgz"; + name = "_types_validator___validator_13.7.8.tgz"; path = fetchurl { - name = "_types_validator___validator_13.7.1.tgz"; - url = "https://registry.yarnpkg.com/@types/validator/-/validator-13.7.1.tgz"; - sha512 = "I6OUIZ5cYRk5lp14xSOAiXjWrfVoMZVjDuevBYgQDYzZIjsf2CAISpEcXOkFAtpAHbmWIDLcZObejqny/9xq5Q=="; + name = "_types_validator___validator_13.7.8.tgz"; + url = "https://registry.yarnpkg.com/@types/validator/-/validator-13.7.8.tgz"; + sha512 = "HKayOBe2ThTcQykiycCQYf70Fvo0WaJEJdxxNjvX3D/mnC0IUAhMe6wsIb1wwthmjiqBAR3qGkEzHYx74MS2yw=="; }; } { @@ -3426,59 +3554,67 @@ }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.3.1.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.3.1.tgz"; - sha512 = "cFImaoIr5Ojj358xI/SDhjog57OK2NqlpxwdcgyxDA3bJlZcJq5CPzUXtpD7CxI2Hm6ATU7w5fQnnkVnmwpHqw=="; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.0.tgz"; + sha512 = "FIBZgS3DVJgqPwJzvZTuH4HNsZhHMa9SjxTKAZTlMsPw/UzpEjcf9f4dfgDJEHjK+HboUJo123Eshl6niwEm/Q=="; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_5.3.1.tgz"; + name = "_typescript_eslint_parser___parser_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.3.1.tgz"; - sha512 = "RgFn5asjZ5daUhbK5Sp0peq0SSMytqcrkNfU4pnDma2D8P3ElZ6JbYjY8IMSFfZAJ0f3x3tnO3vXHweYg0g59w=="; + name = "_typescript_eslint_parser___parser_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.40.0.tgz"; + sha512 = "Ah5gqyX2ySkiuYeOIDg7ap51/b63QgWZA7w6AHtFrag7aH0lRQPbLzUjk0c9o5/KZ6JRkTTDKShL4AUrQa6/hw=="; }; } { - name = "_typescript_eslint_parser___parser_5.3.1.tgz"; + name = "_typescript_eslint_scope_manager___scope_manager_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.3.1.tgz"; - sha512 = "TD+ONlx5c+Qhk21x9gsJAMRohWAUMavSOmJgv3JGy9dgPhuBd5Wok0lmMClZDyJNLLZK1JRKiATzCKZNUmoyfw=="; + name = "_typescript_eslint_scope_manager___scope_manager_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.40.0.tgz"; + sha512 = "d3nPmjUeZtEWRvyReMI4I1MwPGC63E8pDoHy0BnrYjnJgilBD3hv7XOiETKLY/zTwI7kCnBDf2vWTRUVpYw0Uw=="; }; } { - name = "_typescript_eslint_scope_manager___scope_manager_5.3.1.tgz"; + name = "_typescript_eslint_type_utils___type_utils_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.3.1.tgz"; - sha512 = "XksFVBgAq0Y9H40BDbuPOTUIp7dn4u8oOuhcgGq7EoDP50eqcafkMVGrypyVGvDYHzjhdUCUwuwVUK4JhkMAMg=="; + name = "_typescript_eslint_type_utils___type_utils_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.40.0.tgz"; + sha512 = "nfuSdKEZY2TpnPz5covjJqav+g5qeBqwSHKBvz7Vm1SAfy93SwKk/JeSTymruDGItTwNijSsno5LhOHRS1pcfw=="; }; } { - name = "_typescript_eslint_types___types_5.3.1.tgz"; + name = "_typescript_eslint_types___types_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_types___types_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.3.1.tgz"; - sha512 = "bG7HeBLolxKHtdHG54Uac750eXuQQPpdJfCYuw4ZI3bZ7+GgKClMWM8jExBtp7NSP4m8PmLRM8+lhzkYnSmSxQ=="; + name = "_typescript_eslint_types___types_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.40.0.tgz"; + sha512 = "V1KdQRTXsYpf1Y1fXCeZ+uhjW48Niiw0VGt4V8yzuaDTU8Z1Xl7yQDyQNqyAFcVhpYXIVCEuxSIWTsLDpHgTbw=="; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_5.3.1.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.1.tgz"; - sha512 = "PwFbh/PKDVo/Wct6N3w+E4rLZxUDgsoII/GrWM2A62ETOzJd4M6s0Mu7w4CWsZraTbaC5UQI+dLeyOIFF1PquQ=="; + name = "_typescript_eslint_typescript_estree___typescript_estree_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.0.tgz"; + sha512 = "b0GYlDj8TLTOqwX7EGbw2gL5EXS2CPEWhF9nGJiGmEcmlpNBjyHsTwbqpyIEPVpl6br4UcBOYlcI2FJVtJkYhg=="; }; } { - name = "_typescript_eslint_visitor_keys___visitor_keys_5.3.1.tgz"; + name = "_typescript_eslint_utils___utils_5.40.0.tgz"; path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.3.1.tgz"; - sha512 = "3cHUzUuVTuNHx0Gjjt5pEHa87+lzyqOiHXy/Gz+SJOCW1mpw9xQHIIEwnKn+Thph1mgWyZ90nboOcSuZr/jTTQ=="; + name = "_typescript_eslint_utils___utils_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.40.0.tgz"; + sha512 = "MO0y3T5BQ5+tkkuYZJBjePewsY+cQnfkYeRqS6tPh28niiIwPnQ1t59CSRcs1ZwJJNOdWw7rv9pF8aP58IMihA=="; + }; + } + { + name = "_typescript_eslint_visitor_keys___visitor_keys_5.40.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_visitor_keys___visitor_keys_5.40.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.0.tgz"; + sha512 = "ijJ+6yig+x9XplEpG2K6FUdJeQGGj/15U3S56W9IqXKJqleuD7zJ2AX/miLezwxpd7ZxDAqO87zWufKg+RPZyQ=="; }; } { @@ -3625,6 +3761,30 @@ sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; } + { + name = "_webpack_cli_configtest___configtest_1.2.0.tgz"; + path = fetchurl { + name = "_webpack_cli_configtest___configtest_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz"; + sha512 = "4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg=="; + }; + } + { + name = "_webpack_cli_info___info_1.5.0.tgz"; + path = fetchurl { + name = "_webpack_cli_info___info_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz"; + sha512 = "e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ=="; + }; + } + { + name = "_webpack_cli_serve___serve_1.7.0.tgz"; + path = fetchurl { + name = "_webpack_cli_serve___serve_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz"; + sha512 = "oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q=="; + }; + } { name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; path = fetchurl { @@ -3682,11 +3842,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; - sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; }; } { @@ -3697,6 +3857,14 @@ sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; }; } + { + name = "acorn_walk___acorn_walk_8.2.0.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz"; + sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; + }; + } { name = "acorn___acorn_6.4.2.tgz"; path = fetchurl { @@ -3761,14 +3929,6 @@ sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; }; } - { - name = "ajv___ajv_5.5.2.tgz"; - path = fetchurl { - name = "ajv___ajv_5.5.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz"; - sha1 = "c7Xuyj+rZT49P5Qis0GtQiBdyWU="; - }; - } { name = "ajv___ajv_6.12.6.tgz"; path = fetchurl { @@ -3793,14 +3953,6 @@ sha1 = "SlKCrBZHKek2Gbz9OtFR+BfOkfU="; }; } - { - name = "ansi_align___ansi_align_3.0.1.tgz"; - path = fetchurl { - name = "ansi_align___ansi_align_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz"; - sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; - }; - } { name = "ansi_colors___ansi_colors_4.1.1.tgz"; path = fetchurl { @@ -3833,14 +3985,6 @@ sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8="; }; } - { - name = "ansi_regex___ansi_regex_4.1.0.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; - }; - } { name = "ansi_regex___ansi_regex_5.0.1.tgz"; path = fetchurl { @@ -3937,14 +4081,6 @@ sha1 = "2CIM9GYIFSXv6lBhTz3mUU36WPE="; }; } - { - name = "append_field___append_field_1.0.0.tgz"; - path = fetchurl { - name = "append_field___append_field_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz"; - sha1 = "HjRA6RXwsSA9I3SOeO3XubW0PlY="; - }; - } { name = "aproba___aproba_1.2.0.tgz"; path = fetchurl { @@ -4073,6 +4209,14 @@ sha1 = "iYUI2iIm84DfkEcoRWhJwVAaSw0="; }; } + { + name = "asap___asap_2.0.6.tgz"; + path = fetchurl { + name = "asap___asap_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz"; + sha512 = "BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="; + }; + } { name = "asn1.js___asn1.js_5.4.1.tgz"; path = fetchurl { @@ -4106,11 +4250,11 @@ }; } { - name = "astral_regex___astral_regex_1.0.0.tgz"; + name = "ast_types___ast_types_0.13.4.tgz"; path = fetchurl { - name = "astral_regex___astral_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; - sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; + name = "ast_types___ast_types_0.13.4.tgz"; + url = "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz"; + sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; }; } { @@ -4521,6 +4665,14 @@ sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; } + { + name = "batch___batch_0.6.1.tgz"; + path = fetchurl { + name = "batch___batch_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz"; + sha512 = "x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="; + }; + } { name = "big.js___big.js_5.2.2.tgz"; path = fetchurl { @@ -4609,14 +4761,6 @@ sha512 = "GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ=="; }; } - { - name = "body_scroll_lock___body_scroll_lock_3.1.5.tgz"; - path = fetchurl { - name = "body_scroll_lock___body_scroll_lock_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/body-scroll-lock/-/body-scroll-lock-3.1.5.tgz"; - sha512 = "Yi1Xaml0EvNA0OYWxXiYNqY24AfWkbA6w5vxE7GWxtKfzIbZM+Qw+aSmkgsbWzbHiy/RCSkUZBplVxTA+E4jJg=="; - }; - } { name = "body_scroll_lock___body_scroll_lock_4.0.0_beta.0.tgz"; path = fetchurl { @@ -4633,14 +4777,6 @@ sha1 = "aN/1++YMUes3cl6p4+0xDcwed24="; }; } - { - name = "boxen___boxen_5.1.2.tgz"; - path = fetchurl { - name = "boxen___boxen_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz"; - sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; - }; - } { name = "brace_expansion___brace_expansion_1.1.11.tgz"; path = fetchurl { @@ -4873,14 +5009,6 @@ sha512 = "2Z630e4f6VsLJnWMAtfEHwIqJYmND4W3dcG48RIbXeWpvb4UnYtpe/zxEdslJu0PKrltB4IkFj5YtBsdeQRn8w=="; }; } - { - name = "busboy___busboy_0.2.14.tgz"; - path = fetchurl { - name = "busboy___busboy_0.2.14.tgz"; - url = "https://registry.yarnpkg.com/busboy/-/busboy-0.2.14.tgz"; - sha1 = "bCpiLvz0fFe7vh4qnDetNseSVFM="; - }; - } { name = "bytes___bytes_3.1.0.tgz"; path = fetchurl { @@ -4929,14 +5057,6 @@ sha512 = "IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA=="; }; } - { - name = "cacheable_request___cacheable_request_6.1.0.tgz"; - path = fetchurl { - name = "cacheable_request___cacheable_request_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; - sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; - }; - } { name = "call_bind___call_bind_1.0.2.tgz"; path = fetchurl { @@ -4994,11 +5114,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001339.tgz"; + name = "https___registry.npmjs.org_caniuse_lite___caniuse_lite_1.0.30001430.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001339.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001339.tgz"; - sha512 = "Es8PiVqCe+uXdms0Gu5xP5PF2bxLR7OBp3wUzUnuO7OHzhOfCyg3hdiGWVPVxhiuniOzng+hTc1u3fEQ0TlkSQ=="; + name = "https___registry.npmjs.org_caniuse_lite___caniuse_lite_1.0.30001430.tgz"; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001430.tgz"; + sha512 = "IB1BXTZKPDVPM7cnV4iaKaHxckvdr/3xtctB3f7Hmenx3qYBhGtTZ//7EllK66aKXW98Lx0+7Yr0kxBtIt3tzg=="; }; } { @@ -5065,6 +5185,14 @@ sha512 = "qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg=="; }; } + { + name = "cheerio_select___cheerio_select_2.1.0.tgz"; + path = fetchurl { + name = "cheerio_select___cheerio_select_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz"; + sha512 = "9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g=="; + }; + } { name = "cheerio___cheerio_1.0.0_rc.10.tgz"; path = fetchurl { @@ -5073,6 +5201,14 @@ sha512 = "g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw=="; }; } + { + name = "cheerio___cheerio_1.0.0_rc.12.tgz"; + path = fetchurl { + name = "cheerio___cheerio_1.0.0_rc.12.tgz"; + url = "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz"; + sha512 = "VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q=="; + }; + } { name = "chokidar___chokidar_2.1.8.tgz"; path = fetchurl { @@ -5113,14 +5249,6 @@ sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; }; } - { - name = "ci_info___ci_info_2.0.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; - }; - } { name = "ci_info___ci_info_3.3.0.tgz"; path = fetchurl { @@ -5177,14 +5305,6 @@ sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; }; } - { - name = "cli_boxes___cli_boxes_2.2.1.tgz"; - path = fetchurl { - name = "cli_boxes___cli_boxes_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz"; - sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; - }; - } { name = "cli_color___cli_color_2.0.2.tgz"; path = fetchurl { @@ -5217,14 +5337,6 @@ sha512 = "wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA=="; }; } - { - name = "cliui___cliui_5.0.0.tgz"; - path = fetchurl { - name = "cliui___cliui_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; - sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; - }; - } { name = "cliui___cliui_7.0.4.tgz"; path = fetchurl { @@ -5242,11 +5354,11 @@ }; } { - name = "clone_response___clone_response_1.0.2.tgz"; + name = "clone_deep___clone_deep_4.0.1.tgz"; path = fetchurl { - name = "clone_response___clone_response_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; - sha1 = "0dyXOSAxTfZ/vrlCI7TuNQI56Ws="; + name = "clone_deep___clone_deep_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"; + sha512 = "neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="; }; } { @@ -5370,11 +5482,11 @@ }; } { - name = "colorette___colorette_2.0.16.tgz"; + name = "colorette___colorette_2.0.19.tgz"; path = fetchurl { - name = "colorette___colorette_2.0.16.tgz"; - url = "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz"; - sha512 = "hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="; + name = "colorette___colorette_2.0.19.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz"; + sha512 = "3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="; }; } { @@ -5546,11 +5658,11 @@ }; } { - name = "concurrently___concurrently_7.3.0.tgz"; + name = "concurrently___concurrently_7.4.0.tgz"; path = fetchurl { - name = "concurrently___concurrently_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/concurrently/-/concurrently-7.3.0.tgz"; - sha512 = "IiDwm+8DOcFEInca494A8V402tNTQlJaYq78RF2rijOrKEk/AOHTxhN4U1cp7GYKYX5Q6Ymh1dLTBlzIMN0ikA=="; + name = "concurrently___concurrently_7.4.0.tgz"; + url = "https://registry.yarnpkg.com/concurrently/-/concurrently-7.4.0.tgz"; + sha512 = "M6AfrueDt/GEna/Vg9BqQ+93yuvzkSKmoTixnwEJkH0LlcGrRC2eCmjeG1tLLHIYfpYJABokqSGyMcXjm96AFA=="; }; } { @@ -5569,14 +5681,6 @@ sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; }; } - { - name = "configstore___configstore_5.0.1.tgz"; - path = fetchurl { - name = "configstore___configstore_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; - sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; - }; - } { name = "console_browserify___console_browserify_1.2.0.tgz"; path = fetchurl { @@ -5641,6 +5745,14 @@ sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; } + { + name = "cookiejar___cookiejar_2.1.3.tgz"; + path = fetchurl { + name = "cookiejar___cookiejar_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz"; + sha512 = "JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ=="; + }; + } { name = "cookies___cookies_0.8.0.tgz"; path = fetchurl { @@ -5698,11 +5810,11 @@ }; } { - name = "core_js___core_js_3.10.2.tgz"; + name = "core_js___core_js_3.26.0.tgz"; path = fetchurl { - name = "core_js___core_js_3.10.2.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.10.2.tgz"; - sha512 = "W+2oVYeNghuBr3yTzZFQ5rfmjZtYB/Ubg87R5YOmlGrIb+Uw9f7qjUbhsj+/EkXhcV7eOD3jiM4+sgraX3FZUw=="; + name = "core_js___core_js_3.26.0.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.26.0.tgz"; + sha512 = "+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw=="; }; } { @@ -5769,14 +5881,6 @@ sha512 = "lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw=="; }; } - { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; - }; - } { name = "cross_spawn___cross_spawn_7.0.3.tgz"; path = fetchurl { @@ -5841,6 +5945,14 @@ sha512 = "/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA=="; }; } + { + name = "css_rules___css_rules_1.1.0.tgz"; + path = fetchurl { + name = "css_rules___css_rules_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/css-rules/-/css-rules-1.1.0.tgz"; + sha512 = "7L6krLIRwAEVCaVKyCEL6PQjQXUmf8DM9bWYKutlZd0DqOe0SiKIGQOkFb59AjDBb+3If7SDp3X8UlzDAgYSow=="; + }; + } { name = "css_select___css_select_1.2.0.tgz"; path = fetchurl { @@ -5857,6 +5969,14 @@ sha512 = "gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA=="; }; } + { + name = "css_select___css_select_5.1.0.tgz"; + path = fetchurl { + name = "css_select___css_select_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz"; + sha512 = "nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg=="; + }; + } { name = "css_to_react_native___css_to_react_native_3.0.0.tgz"; path = fetchurl { @@ -5881,6 +6001,14 @@ sha512 = "FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg=="; }; } + { + name = "css_what___css_what_6.1.0.tgz"; + path = fetchurl { + name = "css_what___css_what_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz"; + sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="; + }; + } { name = "cssom___cssom_0.5.0.tgz"; path = fetchurl { @@ -5906,11 +6034,11 @@ }; } { - name = "csstype___csstype_3.0.10.tgz"; + name = "csstype___csstype_3.1.0.tgz"; path = fetchurl { - name = "csstype___csstype_3.0.10.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz"; - sha512 = "2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="; + name = "csstype___csstype_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz"; + sha512 = "uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="; }; } { @@ -6201,6 +6329,14 @@ sha512 = "JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug=="; }; } + { + name = "data_uri_to_buffer___data_uri_to_buffer_3.0.1.tgz"; + path = fetchurl { + name = "data_uri_to_buffer___data_uri_to_buffer_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz"; + sha512 = "WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="; + }; + } { name = "data_urls___data_urls_3.0.2.tgz"; path = fetchurl { @@ -6218,19 +6354,19 @@ }; } { - name = "date_fns___date_fns_2.25.0.tgz"; + name = "date_fns___date_fns_2.29.2.tgz"; path = fetchurl { - name = "date_fns___date_fns_2.25.0.tgz"; - url = "https://registry.yarnpkg.com/date-fns/-/date-fns-2.25.0.tgz"; - sha512 = "ovYRFnTrbGPD4nqaEqescPEv1mNwvt+UTqI3Ay9SzNtey9NZnYu6E2qCcBBgJ6/2VF1zGGygpyTDITqpQQ5e+w=="; + name = "date_fns___date_fns_2.29.2.tgz"; + url = "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.2.tgz"; + sha512 = "0VNbwmWJDS/G3ySwFSJA3ayhbURMTJLtwM2DTxf9CWondCnh6DTNlO9JgRSq6ibf4eD0lfMJNBxUdEAHHix+bA=="; }; } { - name = "dd_trace___dd_trace_1.7.1.tgz"; + name = "dd_trace___dd_trace_2.18.0.tgz"; path = fetchurl { - name = "dd_trace___dd_trace_1.7.1.tgz"; - url = "https://registry.yarnpkg.com/dd-trace/-/dd-trace-1.7.1.tgz"; - sha512 = "hRrgJgjP3xF/s4EKxSGzOG+ARkWyRz33dwIwi1gJych7zSE7qnt5VL6LcK1Jou4mfyn+kHUbbb0d7t19YpmZsg=="; + name = "dd_trace___dd_trace_2.18.0.tgz"; + url = "https://registry.yarnpkg.com/dd-trace/-/dd-trace-2.18.0.tgz"; + sha512 = "1UVo3knRHA39/X5/qgBKjPmfjss7bSJcZAESk3g4FA9jmTh8NbozfWDbvk+nBXJI20Fcgc+Jamf0I9w5KAceRg=="; }; } { @@ -6281,14 +6417,6 @@ sha1 = "qiT/uaw9+aI1GDfPstJ5NgzXhJI="; }; } - { - name = "decamelize___decamelize_1.2.0.tgz"; - path = fetchurl { - name = "decamelize___decamelize_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "9lNNFRSCabIDUue+4m9QH5oZEpA="; - }; - } { name = "decimal.js___decimal.js_10.3.1.tgz"; path = fetchurl { @@ -6305,14 +6433,6 @@ sha1 = "6zkTMzRYd1y4TNGh+uBiEGu4dUU="; }; } - { - name = "decompress_response___decompress_response_3.3.0.tgz"; - path = fetchurl { - name = "decompress_response___decompress_response_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "gKTdMjdIOEv6JICDYirt7Jgq3/M="; - }; - } { name = "dedent___dedent_0.7.0.tgz"; path = fetchurl { @@ -6354,11 +6474,11 @@ }; } { - name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + name = "define_lazy_prop___define_lazy_prop_2.0.0.tgz"; path = fetchurl { - name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; - sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; + name = "define_lazy_prop___define_lazy_prop_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"; + sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; }; } { @@ -6393,6 +6513,14 @@ sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; }; } + { + name = "degenerator___degenerator_3.0.2.tgz"; + path = fetchurl { + name = "degenerator___degenerator_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.2.tgz"; + sha512 = "c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ=="; + }; + } { name = "delaunator___delaunator_5.0.0.tgz"; path = fetchurl { @@ -6466,11 +6594,11 @@ }; } { - name = "detect_file___detect_file_1.0.0.tgz"; + name = "detect_libc___detect_libc_1.0.3.tgz"; path = fetchurl { - name = "detect_file___detect_file_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz"; - sha1 = "8NZtA2cqglyxtzvbP+YjEMjlUrc="; + name = "detect_libc___detect_libc_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; + sha512 = "pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg=="; }; } { @@ -6482,11 +6610,27 @@ }; } { - name = "dicer___dicer_0.2.5.tgz"; + name = "detect_node_es___detect_node_es_1.1.0.tgz"; path = fetchurl { - name = "dicer___dicer_0.2.5.tgz"; - url = "https://registry.yarnpkg.com/dicer/-/dicer-0.2.5.tgz"; - sha1 = "WZbAhrszIYyBLAkL3cCc0S+stw8="; + name = "detect_node_es___detect_node_es_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz"; + sha512 = "ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ=="; + }; + } + { + name = "dezalgo___dezalgo_1.0.3.tgz"; + path = fetchurl { + name = "dezalgo___dezalgo_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz"; + sha512 = "K7i4zNfT2kgQz3GylDw40ot9GAE47sFZ9EXHFSPP6zONLgH6kWXE0KWJchkbQJLBkRazq4APwZ4OwiFFlT95OQ=="; + }; + } + { + name = "diagnostics_channel___diagnostics_channel_1.1.0.tgz"; + path = fetchurl { + name = "diagnostics_channel___diagnostics_channel_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/diagnostics_channel/-/diagnostics_channel-1.1.0.tgz"; + sha512 = "OE1ngLDjSBPG6Tx0YATELzYzy3RKHC+7veQ8gLa8yS7AAgw65mFbVdcsu3501abqOZCEZqZyAIemB0zXlqDSuw=="; }; } { @@ -6601,6 +6745,14 @@ sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; }; } + { + name = "dom_serializer___dom_serializer_2.0.0.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz"; + sha512 = "wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg=="; + }; + } { name = "dom_utils___dom_utils_0.9.0.tgz"; path = fetchurl { @@ -6634,11 +6786,11 @@ }; } { - name = "domelementtype___domelementtype_2.2.0.tgz"; + name = "domelementtype___domelementtype_2.3.0.tgz"; path = fetchurl { - name = "domelementtype___domelementtype_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz"; - sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; + name = "domelementtype___domelementtype_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz"; + sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; }; } { @@ -6665,6 +6817,14 @@ sha512 = "zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA=="; }; } + { + name = "domhandler___domhandler_5.0.3.tgz"; + path = fetchurl { + name = "domhandler___domhandler_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz"; + sha512 = "cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w=="; + }; + } { name = "domino___domino_2.1.6.tgz"; path = fetchurl { @@ -6674,11 +6834,11 @@ }; } { - name = "dompurify___dompurify_2.3.8.tgz"; + name = "dompurify___dompurify_2.4.0.tgz"; path = fetchurl { - name = "dompurify___dompurify_2.3.8.tgz"; - url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz"; - sha512 = "eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw=="; + name = "dompurify___dompurify_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.0.tgz"; + sha512 = "Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA=="; }; } { @@ -6705,6 +6865,14 @@ sha512 = "8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg=="; }; } + { + name = "domutils___domutils_3.0.1.tgz"; + path = fetchurl { + name = "domutils___domutils_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz"; + sha512 = "z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q=="; + }; + } { name = "dot_case___dot_case_3.0.4.tgz"; path = fetchurl { @@ -6753,14 +6921,6 @@ sha512 = "wkctla1O6VfP89gQ+J/yDesM0S7B7XLXjKGzXxMDVFg7uEn706niAtyYovKbyq1oT9YwDcly721/iUWoc8MVRg=="; }; } - { - name = "duplexer3___duplexer3_0.1.4.tgz"; - path = fetchurl { - name = "duplexer3___duplexer3_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; - sha1 = "7gHdHKwO08vH/b6jfcCo8c4ALOI="; - }; - } { name = "duplexer___duplexer_0.1.2.tgz"; path = fetchurl { @@ -6857,14 +7017,6 @@ sha512 = "KmJa8l6uHi1HrBI34udwlzZY1jOEuID/ft4d8BSSEdRyap7PwBEt910453PJa5MuGvxkLqlt4Uvhu7tttFHViw=="; }; } - { - name = "emoji_regex___emoji_regex_7.0.3.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; - }; - } { name = "emoji_regex___emoji_regex_8.0.0.tgz"; path = fetchurl { @@ -6945,6 +7097,14 @@ sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ=="; }; } + { + name = "enhanced_resolve___enhanced_resolve_5.10.0.tgz"; + path = fetchurl { + name = "enhanced_resolve___enhanced_resolve_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz"; + sha512 = "T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ=="; + }; + } { name = "enquirer___enquirer_2.3.6.tgz"; path = fetchurl { @@ -6977,6 +7137,14 @@ sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; }; } + { + name = "entities___entities_4.4.0.tgz"; + path = fetchurl { + name = "entities___entities_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz"; + sha512 = "oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA=="; + }; + } { name = "entities___entities_3.0.1.tgz"; path = fetchurl { @@ -6993,6 +7161,14 @@ sha512 = "xyuCtyFZLpnW5aH0JstETKTSMwHHQX4m42juzEZzvbUCJX7RiPVlhASKM0f/cJ4vvI/+txMkZ7F5To6dCdPYhg=="; }; } + { + name = "envinfo___envinfo_7.8.1.tgz"; + path = fetchurl { + name = "envinfo___envinfo_7.8.1.tgz"; + url = "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz"; + sha512 = "/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw=="; + }; + } { name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.6.tgz"; path = fetchurl { @@ -7129,14 +7305,6 @@ sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; } - { - name = "escape_goat___escape_goat_2.1.1.tgz"; - path = fetchurl { - name = "escape_goat___escape_goat_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; - sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; - }; - } { name = "escape_html___escape_html_1.0.3.tgz"; path = fetchurl { @@ -7161,6 +7329,22 @@ sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; }; } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; + }; + } + { + name = "escodegen___escodegen_1.14.3.tgz"; + path = fetchurl { + name = "escodegen___escodegen_1.14.3.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; + sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; + }; + } { name = "escodegen___escodegen_2.0.0.tgz"; path = fetchurl { @@ -7186,11 +7370,11 @@ }; } { - name = "eslint_import_resolver_typescript___eslint_import_resolver_typescript_2.5.0.tgz"; + name = "eslint_import_resolver_typescript___eslint_import_resolver_typescript_3.5.2.tgz"; path = fetchurl { - name = "eslint_import_resolver_typescript___eslint_import_resolver_typescript_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.5.0.tgz"; - sha512 = "qZ6e5CFr+I7K4VVhQu3M/9xGv9/YmwsEXrsm3nimw8vWaVHRDrQRp26BgCypTxBp3vUp4o5aVEJRiy0F2DFddQ=="; + name = "eslint_import_resolver_typescript___eslint_import_resolver_typescript_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.2.tgz"; + sha512 = "zX4ebnnyXiykjhcBvKIf5TNvt8K7yX6bllTRZ14MiurKPjDpCAZujlszTdB8pcNXhZcOf+god4s9SjQa5GnytQ=="; }; } { @@ -7314,27 +7498,27 @@ }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_3.1.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_3.3.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz"; - sha512 = "yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA=="; + name = "eslint_visitor_keys___eslint_visitor_keys_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"; + sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; }; } { - name = "eslint___eslint_7.13.0.tgz"; + name = "eslint___eslint_7.32.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.13.0.tgz"; - sha512 = "uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ=="; + name = "eslint___eslint_7.32.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz"; + sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; } { - name = "espree___espree_7.3.0.tgz"; + name = "espree___espree_7.3.1.tgz"; path = fetchurl { - name = "espree___espree_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz"; - sha512 = "dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw=="; + name = "espree___espree_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; + sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; } { @@ -7346,11 +7530,11 @@ }; } { - name = "esquery___esquery_1.3.1.tgz"; + name = "esquery___esquery_1.4.0.tgz"; path = fetchurl { - name = "esquery___esquery_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; - sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; + name = "esquery___esquery_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; }; } { @@ -7465,14 +7649,6 @@ sha1 = "t3c14xXOMPa27/D4OwQVGiJEliI="; }; } - { - name = "expand_tilde___expand_tilde_2.0.2.tgz"; - path = fetchurl { - name = "expand_tilde___expand_tilde_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz"; - sha1 = "l+gBqgUt8CRU3kawK/YhZCzchQI="; - }; - } { name = "expect___expect_28.1.3.tgz"; path = fetchurl { @@ -7538,11 +7714,11 @@ }; } { - name = "fast_deep_equal___fast_deep_equal_1.1.0.tgz"; + name = "extract_css___extract_css_3.0.0.tgz"; path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; - sha1 = "wFNHeBfIa1HaqFPIHgWbcz0CNhQ="; + name = "extract_css___extract_css_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/extract-css/-/extract-css-3.0.0.tgz"; + sha512 = "ZM2IuJkX79gys2PMN12yWrHvyK2sw1ReCdCtp/RAdgcFaBui+wY3Bsll9Em2LJXzKI8BYEBZLm2UczqyBCXSjQ=="; }; } { @@ -7570,11 +7746,11 @@ }; } { - name = "fast_glob___fast_glob_3.2.11.tgz"; + name = "fast_glob___fast_glob_3.2.12.tgz"; path = fetchurl { - name = "fast_glob___fast_glob_3.2.11.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz"; - sha512 = "xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew=="; + name = "fast_glob___fast_glob_3.2.12.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz"; + sha512 = "DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w=="; }; } { @@ -7601,6 +7777,14 @@ sha512 = "W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="; }; } + { + name = "fastest_levenshtein___fastest_levenshtein_1.0.16.tgz"; + path = fetchurl { + name = "fastest_levenshtein___fastest_levenshtein_1.0.16.tgz"; + url = "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz"; + sha512 = "eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="; + }; + } { name = "fastq___fastq_1.13.0.tgz"; path = fetchurl { @@ -7658,11 +7842,11 @@ }; } { - name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; path = fetchurl { - name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; - sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; } { @@ -7697,6 +7881,14 @@ sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; }; } + { + name = "file_uri_to_path___file_uri_to_path_2.0.0.tgz"; + path = fetchurl { + name = "file_uri_to_path___file_uri_to_path_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz"; + sha512 = "hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg=="; + }; + } { name = "filelist___filelist_1.0.2.tgz"; path = fetchurl { @@ -7794,27 +7986,27 @@ }; } { - name = "findup_sync___findup_sync_3.0.0.tgz"; + name = "flat_cache___flat_cache_3.0.4.tgz"; path = fetchurl { - name = "findup_sync___findup_sync_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz"; - sha512 = "YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg=="; + name = "flat_cache___flat_cache_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; } { - name = "flat_cache___flat_cache_2.0.1.tgz"; + name = "flat_util___flat_util_1.1.9.tgz"; path = fetchurl { - name = "flat_cache___flat_cache_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; - sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="; + name = "flat_util___flat_util_1.1.9.tgz"; + url = "https://registry.yarnpkg.com/flat-util/-/flat-util-1.1.9.tgz"; + sha512 = "BOTMw/6rbbxVjv5JQvwgGMc2/6wWGd2VeyTvnzvvE49VRjS0tTxLbry/QVP1yPw8SaAOBYsnixmzruXoqjdUHA=="; }; } { - name = "flatted___flatted_2.0.2.tgz"; + name = "flatted___flatted_3.2.7.tgz"; path = fetchurl { - name = "flatted___flatted_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz"; - sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; + name = "flatted___flatted_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz"; + sha512 = "5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="; }; } { @@ -7881,6 +8073,14 @@ sha512 = "V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q=="; }; } + { + name = "formidable___formidable_2.0.1.tgz"; + path = fetchurl { + name = "formidable___formidable_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/formidable/-/formidable-2.0.1.tgz"; + sha512 = "rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ=="; + }; + } { name = "fractional_index___fractional_index_1.0.0.tgz"; path = fetchurl { @@ -8049,6 +8249,14 @@ sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; }; } + { + name = "ftp___ftp_0.3.10.tgz"; + path = fetchurl { + name = "ftp___ftp_0.3.10.tgz"; + url = "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz"; + sha512 = "faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ=="; + }; + } { name = "function_bind___function_bind_1.1.1.tgz"; path = fetchurl { @@ -8121,6 +8329,14 @@ sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; }; } + { + name = "get_nonce___get_nonce_1.0.1.tgz"; + path = fetchurl { + name = "get_nonce___get_nonce_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/get-nonce/-/get-nonce-1.0.1.tgz"; + sha512 = "FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q=="; + }; + } { name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; path = fetchurl { @@ -8153,22 +8369,6 @@ sha512 = "g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ=="; }; } - { - name = "get_stream___get_stream_4.1.0.tgz"; - path = fetchurl { - name = "get_stream___get_stream_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; - sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; - }; - } - { - name = "get_stream___get_stream_5.2.0.tgz"; - path = fetchurl { - name = "get_stream___get_stream_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; - sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; - }; - } { name = "get_stream___get_stream_6.0.1.tgz"; path = fetchurl { @@ -8185,6 +8385,22 @@ sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; }; } + { + name = "get_tsconfig___get_tsconfig_4.2.0.tgz"; + path = fetchurl { + name = "get_tsconfig___get_tsconfig_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.2.0.tgz"; + sha512 = "X8u8fREiYOE6S8hLbq99PeykTDoLVnxvF4DjWKJmz9xy2nNRdUcV8ZN9tniJFeKyTU3qnC9lL8n4Chd6LmVKHg=="; + }; + } + { + name = "get_uri___get_uri_3.0.2.tgz"; + path = fetchurl { + name = "get_uri___get_uri_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/get-uri/-/get-uri-3.0.2.tgz"; + sha512 = "+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg=="; + }; + } { name = "get_value___get_value_2.0.6.tgz"; path = fetchurl { @@ -8233,46 +8449,6 @@ sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; } - { - name = "global_dirs___global_dirs_3.0.0.tgz"; - path = fetchurl { - name = "global_dirs___global_dirs_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz"; - sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; - }; - } - { - name = "global_modules___global_modules_1.0.0.tgz"; - path = fetchurl { - name = "global_modules___global_modules_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz"; - sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; - }; - } - { - name = "global_modules___global_modules_2.0.0.tgz"; - path = fetchurl { - name = "global_modules___global_modules_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; - sha512 = "NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A=="; - }; - } - { - name = "global_prefix___global_prefix_1.0.2.tgz"; - path = fetchurl { - name = "global_prefix___global_prefix_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz"; - sha1 = "2/dDxsFJklk8ZVVoy2btMsASLr4="; - }; - } - { - name = "global_prefix___global_prefix_3.0.0.tgz"; - path = fetchurl { - name = "global_prefix___global_prefix_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz"; - sha512 = "awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg=="; - }; - } { name = "global___global_4.4.0.tgz"; path = fetchurl { @@ -8290,11 +8466,11 @@ }; } { - name = "globals___globals_12.4.0.tgz"; + name = "globals___globals_13.17.0.tgz"; path = fetchurl { - name = "globals___globals_12.4.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; - sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; + name = "globals___globals_13.17.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz"; + sha512 = "1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw=="; }; } { @@ -8305,6 +8481,14 @@ sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; }; } + { + name = "globalyzer___globalyzer_0.1.0.tgz"; + path = fetchurl { + name = "globalyzer___globalyzer_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz"; + sha512 = "40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q=="; + }; + } { name = "globby___globby_11.1.0.tgz"; path = fetchurl { @@ -8313,6 +8497,22 @@ sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; } + { + name = "globby___globby_13.1.2.tgz"; + path = fetchurl { + name = "globby___globby_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-13.1.2.tgz"; + sha512 = "LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ=="; + }; + } + { + name = "globrex___globrex_0.1.2.tgz"; + path = fetchurl { + name = "globrex___globrex_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz"; + sha512 = "uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="; + }; + } { name = "google_closure_compiler_js___google_closure_compiler_js_20170423.0.0.tgz"; path = fetchurl { @@ -8321,14 +8521,6 @@ sha1 = "6ei0Da398OZARMlHm10m0ih3j7w="; }; } - { - name = "got___got_9.6.0.tgz"; - path = fetchurl { - name = "got___got_9.6.0.tgz"; - url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; - sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; - }; - } { name = "graceful_fs___graceful_fs_4.2.10.tgz"; path = fetchurl { @@ -8457,14 +8649,6 @@ sha1 = "lbC2P+whRmGab+V/51Yo1aOe/k8="; }; } - { - name = "has_yarn___has_yarn_2.1.0.tgz"; - path = fetchurl { - name = "has_yarn___has_yarn_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; - sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; - }; - } { name = "has___has_1.0.3.tgz"; path = fetchurl { @@ -8545,6 +8729,14 @@ sha512 = "HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg=="; }; } + { + name = "hexoid___hexoid_1.0.0.tgz"; + path = fetchurl { + name = "hexoid___hexoid_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz"; + sha512 = "QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g=="; + }; + } { name = "hey_listen___hey_listen_1.0.8.tgz"; path = fetchurl { @@ -8578,11 +8770,11 @@ }; } { - name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; + name = "href_content___href_content_2.0.1.tgz"; path = fetchurl { - name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; - sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; + name = "href_content___href_content_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/href-content/-/href-content-2.0.1.tgz"; + sha512 = "5uiAmBCvzCFVu70kli3Hp0BONbAOfwGqR7jKolV+bAh174sIAZBL8DHfg5SnxAhId2mQmYgyL7Y62msnWJ34Xg=="; }; } { @@ -8657,6 +8849,14 @@ sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; } + { + name = "htmlparser2___htmlparser2_8.0.1.tgz"; + path = fetchurl { + name = "htmlparser2___htmlparser2_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz"; + sha512 = "4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA=="; + }; + } { name = "http_assert___http_assert_1.4.1.tgz"; path = fetchurl { @@ -8665,14 +8865,6 @@ sha512 = "rdw7q6GTlibqVVbXr0CKelfV5iY8G2HqEUkhSk297BMbSpSL8crXC+9rjKoMcZZEsksX30le6f/4ul4E28gegw=="; }; } - { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; - path = fetchurl { - name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; - }; - } { name = "http_errors___http_errors_1.7.3.tgz"; path = fetchurl { @@ -8705,6 +8897,14 @@ sha1 = "i1VoC7S+KDoLW/TqLjhYC+HZMg0="; }; } + { + name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; + sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; + }; + } { name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; path = fetchurl { @@ -8722,11 +8922,11 @@ }; } { - name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; } { @@ -8890,27 +9090,11 @@ }; } { - name = "import_in_the_middle___import_in_the_middle_1.2.1.tgz"; + name = "import_in_the_middle___import_in_the_middle_1.3.4.tgz"; path = fetchurl { - name = "import_in_the_middle___import_in_the_middle_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.2.1.tgz"; - sha512 = "KdYqCJbJWBOU9740nr9lrmCDhW7htxY1dHmbP4iUEeCaxupj2fKFhyHixsly2WmxMbRIsxzSWSJMfGNEU7el+w=="; - }; - } - { - name = "import_lazy___import_lazy_2.1.0.tgz"; - path = fetchurl { - name = "import_lazy___import_lazy_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; - sha1 = "BWmOPUXIjo1+nZLLBYTnfwlvPkM="; - }; - } - { - name = "import_local___import_local_2.0.0.tgz"; - path = fetchurl { - name = "import_local___import_local_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz"; - sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; + name = "import_in_the_middle___import_in_the_middle_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.3.4.tgz"; + sha512 = "TUXqqEFacJ2DWAeYOhHwGZTMJtFxFVw0C1pYA+AXmuWXZGnBqUhHdtVrSkSbW5D7k2yriBG45j23iH9TRtI+bQ=="; }; } { @@ -8993,14 +9177,6 @@ sha1 = "Yzwsg+PaQqUC9SRmAiSA9CCCYd4="; }; } - { - name = "ini___ini_2.0.0.tgz"; - path = fetchurl { - name = "ini___ini_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz"; - sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; - }; - } { name = "ini___ini_1.3.7.tgz"; path = fetchurl { @@ -9009,6 +9185,14 @@ sha512 = "iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="; }; } + { + name = "inline_css___inline_css_4.0.1.tgz"; + path = fetchurl { + name = "inline_css___inline_css_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/inline-css/-/inline-css-4.0.1.tgz"; + sha512 = "gzumhrp0waBLF5TtwQcm5bviA9ZNURXeNOs2xVSTsX60FWPFlrPJol4HI8yrozZ6V5udWKUT3LS2tMUDMMdi1Q=="; + }; + } { name = "internal_slot___internal_slot_1.0.3.tgz"; path = fetchurl { @@ -9026,19 +9210,19 @@ }; } { - name = "interpret___interpret_1.4.0.tgz"; + name = "interpret___interpret_2.2.0.tgz"; path = fetchurl { - name = "interpret___interpret_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz"; - sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; + name = "interpret___interpret_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz"; + sha512 = "Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw=="; }; } { - name = "intl_messageformat___intl_messageformat_9.9.1.tgz"; + name = "intl_messageformat___intl_messageformat_10.1.4.tgz"; path = fetchurl { - name = "intl_messageformat___intl_messageformat_9.9.1.tgz"; - url = "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.9.1.tgz"; - sha512 = "cuzS/XKHn//hvKka77JKU2dseiVY2dofQjIOZv6ZFxFt4Z9sPXnZ7KQ9Ak2r+4XBCjI04MqJ1PhKs/3X22AkfA=="; + name = "intl_messageformat___intl_messageformat_10.1.4.tgz"; + url = "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.1.4.tgz"; + sha512 = "tXCmWCXhbeHOF28aIf5b9ce3kwdwGyIiiSXVZsyDwksMiGn5Tp0MrMvyeuHuz4uN1UL+NfGOztHmE+6aLFp1wQ=="; }; } { @@ -9057,6 +9241,22 @@ sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; } + { + name = "ip___ip_1.1.8.tgz"; + path = fetchurl { + name = "ip___ip_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz"; + sha512 = "PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="; + }; + } + { + name = "ip___ip_2.0.0.tgz"; + path = fetchurl { + name = "ip___ip_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz"; + sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; + }; + } { name = "ipaddr.js___ipaddr.js_2.0.1.tgz"; path = fetchurl { @@ -9186,19 +9386,11 @@ }; } { - name = "is_ci___is_ci_2.0.0.tgz"; + name = "is_core_module___is_core_module_2.10.0.tgz"; path = fetchurl { - name = "is_ci___is_ci_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; - sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; - }; - } - { - name = "is_core_module___is_core_module_2.8.0.tgz"; - path = fetchurl { - name = "is_core_module___is_core_module_2.8.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz"; - sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="; + name = "is_core_module___is_core_module_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz"; + sha512 = "Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg=="; }; } { @@ -9249,6 +9441,14 @@ sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; }; } + { + name = "is_docker___is_docker_2.2.1.tgz"; + path = fetchurl { + name = "is_docker___is_docker_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; + sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; + }; + } { name = "is_extendable___is_extendable_0.1.1.tgz"; path = fetchurl { @@ -9273,14 +9473,6 @@ sha1 = "qIwCU1eR8C7TfHahueqXc8gz+MI="; }; } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "o7MKXE8ZkYMWeqq5O+764937ZU8="; - }; - } { name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; path = fetchurl { @@ -9345,14 +9537,6 @@ sha512 = "gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw=="; }; } - { - name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; - path = fetchurl { - name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; - sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; - }; - } { name = "is_module___is_module_1.0.0.tgz"; path = fetchurl { @@ -9377,14 +9561,6 @@ sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; }; } - { - name = "is_npm___is_npm_5.0.0.tgz"; - path = fetchurl { - name = "is_npm___is_npm_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz"; - sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; - }; - } { name = "is_number_object___is_number_object_1.0.5.tgz"; path = fetchurl { @@ -9425,14 +9601,6 @@ sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; } - { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - path = fetchurl { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; - }; - } { name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; path = fetchurl { @@ -9553,14 +9721,6 @@ sha512 = "kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A=="; }; } - { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - path = fetchurl { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "5HnICFjfDBsR3dppQPlgEfzaSpo="; - }; - } { name = "is_unc_path___is_unc_path_1.0.0.tgz"; path = fetchurl { @@ -9618,11 +9778,11 @@ }; } { - name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + name = "is_wsl___is_wsl_2.2.0.tgz"; path = fetchurl { - name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; - sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; + name = "is_wsl___is_wsl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; } { @@ -10025,6 +10185,14 @@ sha512 = "RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A=="; }; } + { + name = "jsdom___jsdom_20.0.0.tgz"; + path = fetchurl { + name = "jsdom___jsdom_20.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.0.tgz"; + sha512 = "x4a6CKCgx00uCmP+QakBDFXwjAJ69IkkIWHmtmjd3wvXPcdOS44hfX2vqkOQrVrq8l9DhNNADZRXaCEWvgXtVA=="; + }; + } { name = "jsesc___jsesc_2.5.2.tgz"; path = fetchurl { @@ -10050,19 +10218,11 @@ }; } { - name = "json_buffer___json_buffer_3.0.0.tgz"; + name = "json_loader___json_loader_0.5.7.tgz"; path = fetchurl { - name = "json_buffer___json_buffer_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; - sha1 = "Wx85evx11ne96Lz8Dkfh+aPZqJg="; - }; - } - { - name = "json_loader___json_loader_0.5.4.tgz"; - path = fetchurl { - name = "json_loader___json_loader_0.5.4.tgz"; - url = "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz"; - sha1 = "i6oTZaYy9Yo8RtIBdfxgAsluN94="; + name = "json_loader___json_loader_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz"; + sha512 = "QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w=="; }; } { @@ -10081,14 +10241,6 @@ sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; }; } - { - name = "json_schema_traverse___json_schema_traverse_0.3.1.tgz"; - path = fetchurl { - name = "json_schema_traverse___json_schema_traverse_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "NJptRMU6Ud6JtAgFxdXlm0F9M0A="; - }; - } { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; path = fetchurl { @@ -10194,11 +10346,11 @@ }; } { - name = "jszip___jszip_3.10.0.tgz"; + name = "jszip___jszip_3.10.1.tgz"; path = fetchurl { - name = "jszip___jszip_3.10.0.tgz"; - url = "https://registry.yarnpkg.com/jszip/-/jszip-3.10.0.tgz"; - sha512 = "LDfVtOLtOxb9RXkYOwPyNBTQDL4eUbqahtoY6x07GiDJHwSYvn8sHHIw8wINImV3MqbMNve2gSuM1DDqEKk09Q=="; + name = "jszip___jszip_3.10.1.tgz"; + url = "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz"; + sha512 = "xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g=="; }; } { @@ -10233,14 +10385,6 @@ sha512 = "iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ=="; }; } - { - name = "keyv___keyv_3.1.0.tgz"; - path = fetchurl { - name = "keyv___keyv_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; - sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; - }; - } { name = "khroma___khroma_2.0.0.tgz"; path = fetchurl { @@ -10409,14 +10553,6 @@ sha512 = "tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ=="; }; } - { - name = "koa_send___koa_send_4.1.3.tgz"; - path = fetchurl { - name = "koa_send___koa_send_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/koa-send/-/koa-send-4.1.3.tgz"; - sha512 = "3UetMBdaXSiw24qM2Mx5mKmxLKw5ZTPRjACjfhK6Haca55RKm9hr/uHDrkrxhSl5/S1CKI/RivZVIopiatZuTA=="; - }; - } { name = "koa_sslify___koa_sslify_2.1.2.tgz"; path = fetchurl { @@ -10425,14 +10561,6 @@ sha1 = "iUf9U5SdadU5YHgUCXhjwezzjzA="; }; } - { - name = "koa_static___koa_static_4.0.3.tgz"; - path = fetchurl { - name = "koa_static___koa_static_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/koa-static/-/koa-static-4.0.3.tgz"; - sha512 = "JGmxTuPWy4bH7bt6gD/OMWkhprawvRmzJSr8TWKmTL4N7+IMv3s0SedeQi5S4ilxM9Bo6ptkCyXj/7wf+VS5tg=="; - }; - } { name = "koa_static___koa_static_5.0.0.tgz"; path = fetchurl { @@ -10513,14 +10641,6 @@ sha1 = "0yHbxNowuovzAk4ED6XBRmH5GTo="; }; } - { - name = "latest_version___latest_version_5.1.0.tgz"; - path = fetchurl { - name = "latest_version___latest_version_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; - sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; - }; - } { name = "lazystream___lazystream_1.0.0.tgz"; path = fetchurl { @@ -10625,6 +10745,14 @@ sha512 = "0+UpNaqIwKRSGAFOCcpuYNIv/j5QGVC+xUVvmSdxHO+IfIGoHbFLo3XcPmV/LLnsVj5EAncNHVtlITSoY5qWGQ=="; }; } + { + name = "list_stylesheets___list_stylesheets_2.0.0.tgz"; + path = fetchurl { + name = "list_stylesheets___list_stylesheets_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/list-stylesheets/-/list-stylesheets-2.0.0.tgz"; + sha512 = "EMhWosVmqftbB3WZb4JWcS3tVj9rhBpkDqB87HaNdOi5gpFZNC+Od7hHPFSSlB99Qt/HxJZs8atINa/z672EDA=="; + }; + } { name = "listr2___listr2_4.0.5.tgz"; path = fetchurl { @@ -10650,11 +10778,11 @@ }; } { - name = "loader_utils___loader_utils_1.4.0.tgz"; + name = "loader_utils___loader_utils_1.4.1.tgz"; path = fetchurl { - name = "loader_utils___loader_utils_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz"; - sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; + name = "loader_utils___loader_utils_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz"; + sha512 = "1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q=="; }; } { @@ -10817,6 +10945,14 @@ sha1 = "hImxyw0p/4gZXM7KRI/21swpXDY="; }; } + { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + path = fetchurl { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; + }; + } { name = "lodash.mergewith___lodash.mergewith_4.6.2.tgz"; path = fetchurl { @@ -10849,6 +10985,14 @@ sha1 = "7dFMgk4sycHgsKG0K7UhBRakJDg="; }; } + { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha512 = "jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="; + }; + } { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; path = fetchurl { @@ -10882,11 +11026,11 @@ }; } { - name = "long___long_4.0.0.tgz"; + name = "long___long_5.2.0.tgz"; path = fetchurl { - name = "long___long_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz"; - sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; + name = "long___long_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/long/-/long-5.2.0.tgz"; + sha512 = "9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w=="; }; } { @@ -10913,22 +11057,6 @@ sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; }; } - { - name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; - path = fetchurl { - name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; - }; - } - { - name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; - path = fetchurl { - name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; - sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; - }; - } { name = "lru_cache___lru_cache_4.1.5.tgz"; path = fetchurl { @@ -10953,6 +11081,14 @@ sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } + { + name = "lru_cache___lru_cache_7.14.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz"; + sha512 = "EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ=="; + }; + } { name = "lru_queue___lru_queue_0.1.0.tgz"; path = fetchurl { @@ -11105,6 +11241,14 @@ sha1 = "hxDXrwqmJvj/+hzgAWhUUmMlV0g="; }; } + { + name = "mediaquery_text___mediaquery_text_1.2.0.tgz"; + path = fetchurl { + name = "mediaquery_text___mediaquery_text_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/mediaquery-text/-/mediaquery-text-1.2.0.tgz"; + sha512 = "cJyRqgYQi+hsYhRkyd5le0s4LsEPvOB7r+6X3jdEELNqVlM9mRIgyUPg9BzF+PuTqQH1ZekgIjYVOeWSXWq35Q=="; + }; + } { name = "memoize_one___memoize_one_5.1.1.tgz"; path = fetchurl { @@ -11154,11 +11298,11 @@ }; } { - name = "mermaid___mermaid_9.1.3.tgz"; + name = "mermaid___mermaid_9.1.7.tgz"; path = fetchurl { - name = "mermaid___mermaid_9.1.3.tgz"; - url = "https://registry.yarnpkg.com/mermaid/-/mermaid-9.1.3.tgz"; - sha512 = "jTIYiqKwsUXVCoxHUVkK8t0QN3zSKIdJlb9thT0J5jCnzXyc+gqTbZE2QmjRfavFTPPn5eRy5zaFp7V+6RhxYg=="; + name = "mermaid___mermaid_9.1.7.tgz"; + url = "https://registry.yarnpkg.com/mermaid/-/mermaid-9.1.7.tgz"; + sha512 = "MRVHXy5FLjnUQUG7YS3UN9jEN6FXCJbFCXVGJQjVIbiR6Vhw0j/6pLIjqsiah9xoHmQU6DEaKOvB3S1g/1nBPA=="; }; } { @@ -11217,6 +11361,14 @@ sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="; }; } + { + name = "mime___mime_2.6.0.tgz"; + path = fetchurl { + name = "mime___mime_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz"; + sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; + }; + } { name = "mime___mime_1.6.0.tgz"; path = fetchurl { @@ -11233,14 +11385,6 @@ sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; } - { - name = "mimic_response___mimic_response_1.0.1.tgz"; - path = fetchurl { - name = "mimic_response___mimic_response_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; - sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; - }; - } { name = "min_document___min_document_2.19.0.tgz"; path = fetchurl { @@ -11274,19 +11418,19 @@ }; } { - name = "minimatch___minimatch_3.0.4.tgz"; + name = "minimatch___minimatch_3.1.2.tgz"; path = fetchurl { - name = "minimatch___minimatch_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + name = "minimatch___minimatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; } { - name = "minimist___minimist_1.2.6.tgz"; + name = "minimist___minimist_1.2.7.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz"; - sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; + name = "minimist___minimist_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz"; + sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; }; } { @@ -11385,6 +11529,14 @@ sha512 = "IOxdJGnRSNSJrL2uGpWO5w9JH5q5HoxEqwOF4gye1gmZYdjoYkkMzSGMDnRCUpN/BNzZcFoMdHXrjvkwO7KgaQ=="; }; } + { + name = "mobx_utils___mobx_utils_4.0.1.tgz"; + path = fetchurl { + name = "mobx_utils___mobx_utils_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-4.0.1.tgz"; + sha512 = "hWYLNJNBoGY/iQbQuOzYkUsTGArpTTutrXaQQrXvxBMefDwhWyNHr7bx/g7syf6KQ1f6aKzgQICqC+zXSvGzJQ=="; + }; + } { name = "mobx___mobx_4.15.7.tgz"; path = fetchurl { @@ -11473,14 +11625,6 @@ sha512 = "bqSQ0DYJbXbrJcrZFmMygUZmqQiDfI2ewFVWcrZY12w5XHWtPuW4WppDT/e63Uu311ajwkRRXSoF0uILroBeTA=="; }; } - { - name = "multer___multer_1.4.2.tgz"; - path = fetchurl { - name = "multer___multer_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/multer/-/multer-1.4.2.tgz"; - sha512 = "xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg=="; - }; - } { name = "mz___mz_2.7.0.tgz"; path = fetchurl { @@ -11490,11 +11634,11 @@ }; } { - name = "nan___nan_2.15.0.tgz"; + name = "nan___nan_2.17.0.tgz"; path = fetchurl { - name = "nan___nan_2.15.0.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz"; - sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; + name = "nan___nan_2.17.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz"; + sha512 = "2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="; }; } { @@ -11545,6 +11689,14 @@ sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; } + { + name = "netmask___netmask_2.0.2.tgz"; + path = fetchurl { + name = "netmask___netmask_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz"; + sha512 = "dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="; + }; + } { name = "next_tick___next_tick_1.1.0.tgz"; path = fetchurl { @@ -11553,14 +11705,6 @@ sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="; }; } - { - name = "nice_try___nice_try_1.0.5.tgz"; - path = fetchurl { - name = "nice_try___nice_try_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; - sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; - }; - } { name = "no_case___no_case_3.0.4.tgz"; path = fetchurl { @@ -11601,6 +11745,14 @@ sha512 = "zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A=="; }; } + { + name = "node_htmldiff___node_htmldiff_0.9.4.tgz"; + path = fetchurl { + name = "node_htmldiff___node_htmldiff_0.9.4.tgz"; + url = "https://registry.yarnpkg.com/node-htmldiff/-/node-htmldiff-0.9.4.tgz"; + sha512 = "Nvnv0bcehOFsH/TD+bi4ls3iWTRQiytqII5+I1iBUypO+GFMYLcyBJfS2U3DMRSIYzfZHysaYLYoCXx6Q148Hg=="; + }; + } { name = "node_int64___node_int64_0.4.0.tgz"; path = fetchurl { @@ -11634,11 +11786,11 @@ }; } { - name = "nodemon___nodemon_2.0.18.tgz"; + name = "nodemon___nodemon_2.0.20.tgz"; path = fetchurl { - name = "nodemon___nodemon_2.0.18.tgz"; - url = "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.18.tgz"; - sha512 = "uAvrKipi2zAz8E7nkSz4qW4F4zd5fs2wNGsTx+xXlP8KXqd9ucE0vY9wankOsPboeDyuUGN9vsXGV1pLn80l/A=="; + name = "nodemon___nodemon_2.0.20.tgz"; + url = "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.20.tgz"; + sha512 = "Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw=="; }; } { @@ -11673,14 +11825,6 @@ sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; } - { - name = "normalize_url___normalize_url_4.5.1.tgz"; - path = fetchurl { - name = "normalize_url___normalize_url_4.5.1.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; - sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; - }; - } { name = "notepack.io___notepack.io_2.2.0.tgz"; path = fetchurl { @@ -11706,11 +11850,11 @@ }; } { - name = "nth_check___nth_check_2.0.0.tgz"; + name = "nth_check___nth_check_2.1.1.tgz"; path = fetchurl { - name = "nth_check___nth_check_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz"; - sha512 = "i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q=="; + name = "nth_check___nth_check_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz"; + sha512 = "lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="; }; } { @@ -11881,6 +12025,14 @@ sha1 = "Kv3oTQPlC5qO3EROMGEKcCle37Q="; }; } + { + name = "open___open_8.4.0.tgz"; + path = fetchurl { + name = "open___open_8.4.0.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz"; + sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; + }; + } { name = "opentracing___opentracing_0.14.5.tgz"; path = fetchurl { @@ -11938,27 +12090,19 @@ }; } { - name = "outline_icons___outline_icons_1.44.0.tgz"; + name = "outline_icons___outline_icons_1.45.2.tgz"; path = fetchurl { - name = "outline_icons___outline_icons_1.44.0.tgz"; - url = "https://registry.yarnpkg.com/outline-icons/-/outline-icons-1.44.0.tgz"; - sha512 = "nkKGXuGbOgZjPkyVpZZu7CIDrfmt2eER+3RWfE1LU/GqHkuUt0c5JpCsEyhxXAPMUW09q4sDvHjLVge7DUWeYg=="; + name = "outline_icons___outline_icons_1.45.2.tgz"; + url = "https://registry.yarnpkg.com/outline-icons/-/outline-icons-1.45.2.tgz"; + sha512 = "BClcM9JhfloM5FlrqWFr4i9Kc+n1rdvL9in5O83oH+1nGY/ZMDOcxaP0G+m7ucaltDMBRjEyaXBrNk5vX1Iorw=="; }; } { - name = "oy_vey___oy_vey_0.11.2.tgz"; + name = "oy_vey___oy_vey_0.12.0.tgz"; path = fetchurl { - name = "oy_vey___oy_vey_0.11.2.tgz"; - url = "https://registry.yarnpkg.com/oy-vey/-/oy-vey-0.11.2.tgz"; - sha512 = "06prDST4MicbAWie4eXcouJbGhAu0r7j3Yta1KFtgs7v2t7goHmY06/GWFjT6lpIsGKJC+7vZtwdecRSYnFtPQ=="; - }; - } - { - name = "p_cancelable___p_cancelable_1.1.0.tgz"; - path = fetchurl { - name = "p_cancelable___p_cancelable_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; - sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; + name = "oy_vey___oy_vey_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/oy-vey/-/oy-vey-0.12.0.tgz"; + sha512 = "NjI+i5jwYeWU5HjpXjUzwNvm3XuaSbGtpU/0uobkk8JH+m+OeAvTpiAcTHldSZ0QiBrulZQeaD1Q/BzzT/4eyQ=="; }; } { @@ -12066,11 +12210,19 @@ }; } { - name = "package_json___package_json_6.5.0.tgz"; + name = "pac_proxy_agent___pac_proxy_agent_5.0.0.tgz"; path = fetchurl { - name = "package_json___package_json_6.5.0.tgz"; - url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; - sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; + name = "pac_proxy_agent___pac_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz"; + sha512 = "CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ=="; + }; + } + { + name = "pac_resolver___pac_resolver_5.0.1.tgz"; + path = fetchurl { + name = "pac_resolver___pac_resolver_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-5.0.1.tgz"; + sha512 = "cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q=="; }; } { @@ -12169,14 +12321,6 @@ sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; }; } - { - name = "parse_passwd___parse_passwd_1.0.0.tgz"; - path = fetchurl { - name = "parse_passwd___parse_passwd_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz"; - sha1 = "bVuTSkVpk7I9N/QKOC1vFmao5cY="; - }; - } { name = "parse5_htmlparser2_tree_adapter___parse5_htmlparser2_tree_adapter_6.0.1.tgz"; path = fetchurl { @@ -12185,6 +12329,14 @@ sha512 = "qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA=="; }; } + { + name = "parse5_htmlparser2_tree_adapter___parse5_htmlparser2_tree_adapter_7.0.0.tgz"; + path = fetchurl { + name = "parse5_htmlparser2_tree_adapter___parse5_htmlparser2_tree_adapter_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz"; + sha512 = "B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g=="; + }; + } { name = "parse5___parse5_6.0.1.tgz"; path = fetchurl { @@ -12193,6 +12345,14 @@ sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; }; } + { + name = "parse5___parse5_7.1.1.tgz"; + path = fetchurl { + name = "parse5___parse5_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz"; + sha512 = "kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg=="; + }; + } { name = "parseqs___parseqs_0.0.6.tgz"; path = fetchurl { @@ -12337,14 +12497,6 @@ sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; }; } - { - name = "path_key___path_key_2.0.1.tgz"; - path = fetchurl { - name = "path_key___path_key_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; - sha1 = "QRyttXTFoUDTpLGRDUDYDMn0C0A="; - }; - } { name = "path_key___path_key_3.1.1.tgz"; path = fetchurl { @@ -12497,6 +12649,14 @@ sha512 = "CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA=="; }; } + { + name = "pick_util___pick_util_1.1.5.tgz"; + path = fetchurl { + name = "pick_util___pick_util_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/pick-util/-/pick-util-1.1.5.tgz"; + sha512 = "H0MaM8T7wpQ/azvB12ChZw7kpSFzjsgv3Z+N7fUWnL1McTGSEeroCngcK4eOPiFQq08rAyKX3hadcAB1kUqfXA=="; + }; + } { name = "picocolors___picocolors_1.0.0.tgz"; path = fetchurl { @@ -12617,14 +12777,6 @@ sha512 = "ZTbXiu6zIggXzIliMi8LGxXBF5ST+wkpXGEjeTUDUOCdSQ356hij/xjeUdv0F8zCQNeqB1+PR5/BB+gC+QLAPw=="; }; } - { - name = "popper.js___popper.js_1.16.1.tgz"; - path = fetchurl { - name = "popper.js___popper.js_1.16.1.tgz"; - url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz"; - sha512 = "Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="; - }; - } { name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; path = fetchurl { @@ -12689,14 +12841,6 @@ sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; }; } - { - name = "prepend_http___prepend_http_2.0.0.tgz"; - path = fetchurl { - name = "prepend_http___prepend_http_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; - sha1 = "6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="; - }; - } { name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; path = fetchurl { @@ -12746,11 +12890,11 @@ }; } { - name = "prismjs___prismjs_1.25.0.tgz"; + name = "prismjs___prismjs_1.27.0.tgz"; path = fetchurl { - name = "prismjs___prismjs_1.25.0.tgz"; - url = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.25.0.tgz"; - sha512 = "WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg=="; + name = "prismjs___prismjs_1.27.0.tgz"; + url = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz"; + sha512 = "t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA=="; }; } { @@ -12834,11 +12978,11 @@ }; } { - name = "prosemirror_commands___prosemirror_commands_1.2.1.tgz"; + name = "prosemirror_commands___prosemirror_commands_1.2.2.tgz"; path = fetchurl { - name = "prosemirror_commands___prosemirror_commands_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.2.1.tgz"; - sha512 = "S/IkpXfpuLFsRynC2HQ5iYROUPiZskKS1+ClcWycGJvj4HMb/mVfeEkQrixYxgTl96EAh+RZQNWPC06GZXk5tQ=="; + name = "prosemirror_commands___prosemirror_commands_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.2.2.tgz"; + sha512 = "TX+KpWudMon06frryfpO/u7hsQv2hu8L4VSVbCpi3/7wXHBgl+35mV85qfa3RpT8xD2f3MdeoTqH0vy5JdbXPg=="; }; } { @@ -12954,11 +13098,19 @@ }; } { - name = "protobufjs___protobufjs_6.11.3.tgz"; + name = "protobufjs___protobufjs_7.1.2.tgz"; path = fetchurl { - name = "protobufjs___protobufjs_6.11.3.tgz"; - url = "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz"; - sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; + name = "protobufjs___protobufjs_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.1.2.tgz"; + sha512 = "4ZPTPkXCdel3+L81yw3dG6+Kq3umdWKh7Dc7GW/CpNk4SX3hK58iPCWeCyhVTDrbkNeKrYNZ7EojM5WDaEWTLQ=="; + }; + } + { + name = "proxy_agent___proxy_agent_5.0.0.tgz"; + path = fetchurl { + name = "proxy_agent___proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-5.0.0.tgz"; + sha512 = "gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g=="; }; } { @@ -13058,27 +13210,27 @@ }; } { - name = "pupa___pupa_2.1.1.tgz"; + name = "qs___qs_6.9.3.tgz"; path = fetchurl { - name = "pupa___pupa_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz"; - sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; + name = "qs___qs_6.9.3.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz"; + sha512 = "EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw=="; }; } { - name = "qs___qs_6.9.4.tgz"; + name = "qs___qs_6.11.0.tgz"; path = fetchurl { - name = "qs___qs_6.9.4.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz"; - sha512 = "A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="; + name = "qs___qs_6.11.0.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz"; + sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; }; } { - name = "query_string___query_string_7.0.1.tgz"; + name = "query_string___query_string_7.1.1.tgz"; path = fetchurl { - name = "query_string___query_string_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/query-string/-/query-string-7.0.1.tgz"; - sha512 = "uIw3iRvHnk9to1blJCG3BTc+Ro56CBowJXKmNNAm3RulvPBzWLRqKSiiDk+IplJhsydwtuNMHi8UGQFcCLVfkA=="; + name = "query_string___query_string_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/query-string/-/query-string-7.1.1.tgz"; + sha512 = "MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w=="; }; } { @@ -13210,11 +13362,11 @@ }; } { - name = "react_avatar_editor___react_avatar_editor_11.1.0.tgz"; + name = "react_avatar_editor___react_avatar_editor_13.0.0.tgz"; path = fetchurl { - name = "react_avatar_editor___react_avatar_editor_11.1.0.tgz"; - url = "https://registry.yarnpkg.com/react-avatar-editor/-/react-avatar-editor-11.1.0.tgz"; - sha512 = "Z89qLKS3skld2Ov80EvCCzZKz87eLiEEhwJRYsGG6k2OM0Bo+V0dFrM2i0yAPeGjyagmTkoOSkQgDUfM+zc1vw=="; + name = "react_avatar_editor___react_avatar_editor_13.0.0.tgz"; + url = "https://registry.yarnpkg.com/react-avatar-editor/-/react-avatar-editor-13.0.0.tgz"; + sha512 = "0xw63MbRRQdDy7YI1IXU9+7tTFxYEFLV8CABvryYOGjZmXRTH2/UA0mafe57ns62uaEFX181kA4XlGlxCaeXKA=="; }; } { @@ -13274,11 +13426,11 @@ }; } { - name = "react_hook_form___react_hook_form_7.31.2.tgz"; + name = "react_hook_form___react_hook_form_7.37.0.tgz"; path = fetchurl { - name = "react_hook_form___react_hook_form_7.31.2.tgz"; - url = "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.31.2.tgz"; - sha512 = "oPudn3YuyzWg//IsT9z2cMEjWocAgHWX/bmueDT8cmsYQnGY5h7/njjvMDfLVv3mbdhYBjslTRnII2MIT7eNCA=="; + name = "react_hook_form___react_hook_form_7.37.0.tgz"; + url = "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.37.0.tgz"; + sha512 = "6NFTxsnw+EXSpNNvLr5nFMjPdYKRryQcelTHg7zwBB6vAzfPIcZq4AExP4heVlwdzntepQgwiOQW4z7Mr99Lsg=="; }; } { @@ -13338,11 +13490,27 @@ }; } { - name = "react_refresh___react_refresh_0.9.0.tgz"; + name = "react_refresh___react_refresh_0.14.0.tgz"; path = fetchurl { - name = "react_refresh___react_refresh_0.9.0.tgz"; - url = "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.9.0.tgz"; - sha512 = "Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ=="; + name = "react_refresh___react_refresh_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz"; + sha512 = "wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ=="; + }; + } + { + name = "react_remove_scroll_bar___react_remove_scroll_bar_2.3.3.tgz"; + path = fetchurl { + name = "react_remove_scroll_bar___react_remove_scroll_bar_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.3.tgz"; + sha512 = "i9GMNWwpz8XpUpQ6QlevUtFjHGqnPG4Hxs+wlIJntu/xcsZVEpJcIV71K3ZkqNy2q3GfgvkD7y6t/Sv8ofYSbw=="; + }; + } + { + name = "react_remove_scroll___react_remove_scroll_2.5.5.tgz"; + path = fetchurl { + name = "react_remove_scroll___react_remove_scroll_2.5.5.tgz"; + url = "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz"; + sha512 = "ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw=="; }; } { @@ -13369,6 +13537,14 @@ sha512 = "2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ=="; }; } + { + name = "react_style_singleton___react_style_singleton_2.2.1.tgz"; + path = fetchurl { + name = "react_style_singleton___react_style_singleton_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.1.tgz"; + sha512 = "ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g=="; + }; + } { name = "react_table___react_table_7.7.0.tgz"; path = fetchurl { @@ -13498,11 +13674,19 @@ }; } { - name = "reakit___reakit_1.3.10.tgz"; + name = "reakit___reakit_1.3.11.tgz"; path = fetchurl { - name = "reakit___reakit_1.3.10.tgz"; - url = "https://registry.yarnpkg.com/reakit/-/reakit-1.3.10.tgz"; - sha512 = "HxHtnegMDwidGU4Ik/fKTZ3coihf4nKeycs0QSIFWcau77qL5wL6xnqZrAxcjjDDPOIANct3LxTiAlf+qGLOlw=="; + name = "reakit___reakit_1.3.11.tgz"; + url = "https://registry.yarnpkg.com/reakit/-/reakit-1.3.11.tgz"; + sha512 = "mYxw2z0fsJNOQKAEn5FJCPTU3rcrY33YZ/HzoWqZX0G7FwySp1wkCYW79WhuYMNIUFQ8s3Baob1RtsEywmZSig=="; + }; + } + { + name = "rechoir___rechoir_0.7.1.tgz"; + path = fetchurl { + name = "rechoir___rechoir_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz"; + sha512 = "/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg=="; }; } { @@ -13570,11 +13754,11 @@ }; } { - name = "refractor___refractor_3.5.0.tgz"; + name = "refractor___refractor_3.6.0.tgz"; path = fetchurl { - name = "refractor___refractor_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/refractor/-/refractor-3.5.0.tgz"; - sha512 = "QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg=="; + name = "refractor___refractor_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/refractor/-/refractor-3.6.0.tgz"; + sha512 = "MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA=="; }; } { @@ -13649,22 +13833,6 @@ sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; }; } - { - name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; - path = fetchurl { - name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; - sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; - }; - } - { - name = "registry_url___registry_url_5.1.0.tgz"; - path = fetchurl { - name = "registry_url___registry_url_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; - sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; - }; - } { name = "regjsgen___regjsgen_0.5.2.tgz"; path = fetchurl { @@ -13689,6 +13857,14 @@ sha1 = "VNvzd+UUQKypCkzSdGANP/LYiKk="; }; } + { + name = "remote_content___remote_content_3.0.0.tgz"; + path = fetchurl { + name = "remote_content___remote_content_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/remote-content/-/remote-content-3.0.0.tgz"; + sha512 = "/hjCYVqWY/jYR07ptEJpClnYrGedSQ5AxCrEeMb3NlrxTgUK/7+iCOReE3z1QMYm3UL7sJX3o7cww/NC6UgyhA=="; + }; + } { name = "remove_accents___remove_accents_0.4.2.tgz"; path = fetchurl { @@ -13777,14 +13953,6 @@ sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; } - { - name = "require_main_filename___require_main_filename_2.0.0.tgz"; - path = fetchurl { - name = "require_main_filename___require_main_filename_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; - }; - } { name = "require_package_name___require_package_name_2.0.1.tgz"; path = fetchurl { @@ -13801,14 +13969,6 @@ sha512 = "i1LgXw8DKSU5qz1EV0ZIKz4yIUHJ7L3bODh+Da6HmVSm9vdL/hG7IpbgzQ3k2XSirzf8/eI7OMEs81gb1VV2fQ=="; }; } - { - name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; - path = fetchurl { - name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; - sha1 = "AKn3OHVW4nA46uIyyqNypqWbZlo="; - }; - } { name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; path = fetchurl { @@ -13817,22 +13977,6 @@ sha512 = "OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg=="; }; } - { - name = "resolve_dir___resolve_dir_1.0.1.tgz"; - path = fetchurl { - name = "resolve_dir___resolve_dir_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz"; - sha1 = "eaQGRMNivoLybv/nOcm7U4IEb0M="; - }; - } - { - name = "resolve_from___resolve_from_3.0.0.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz"; - sha1 = "six699nWiBvItuZTM17rywoYh0g="; - }; - } { name = "resolve_from___resolve_from_4.0.0.tgz"; path = fetchurl { @@ -13890,19 +14034,11 @@ }; } { - name = "resolve___resolve_1.20.0.tgz"; + name = "resolve___resolve_1.22.1.tgz"; path = fetchurl { - name = "resolve___resolve_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; - sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; - }; - } - { - name = "responselike___responselike_1.0.2.tgz"; - path = fetchurl { - name = "responselike___responselike_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; - sha1 = "kYcg7ztjHFZCvgaPFa3lpG9Loec="; + name = "resolve___resolve_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz"; + sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; }; } { @@ -13953,14 +14089,6 @@ sha512 = "V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="; }; } - { - name = "rimraf___rimraf_2.6.3.tgz"; - path = fetchurl { - name = "rimraf___rimraf_2.6.3.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; - sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; - }; - } { name = "rimraf___rimraf_2.7.1.tgz"; path = fetchurl { @@ -14169,6 +14297,14 @@ sha512 = "5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw=="; }; } + { + name = "saxes___saxes_6.0.0.tgz"; + path = fetchurl { + name = "saxes___saxes_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz"; + sha512 = "xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA=="; + }; + } { name = "scheduler___scheduler_0.19.1.tgz"; path = fetchurl { @@ -14185,14 +14321,6 @@ sha512 = "2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ=="; }; } - { - name = "schema_utils___schema_utils_0.3.0.tgz"; - path = fetchurl { - name = "schema_utils___schema_utils_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz"; - sha1 = "9YdyIs4+kx7a4DnxfrNxbnE3+M8="; - }; - } { name = "schema_utils___schema_utils_0.4.7.tgz"; path = fetchurl { @@ -14233,14 +14361,6 @@ sha512 = "8LuxJSuFVc92+0AdNv4QOxRL4Abeo1DgLnGNkn1XlaujPH/3cCFz3QI60r2VNu4obJJROzgnIUw5TKQkZvZI1w=="; }; } - { - name = "semver_diff___semver_diff_3.1.1.tgz"; - path = fetchurl { - name = "semver_diff___semver_diff_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; - sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; - }; - } { name = "semver___semver_7.0.0.tgz"; path = fetchurl { @@ -14329,14 +14449,6 @@ sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; }; } - { - name = "set_blocking___set_blocking_2.0.0.tgz"; - path = fetchurl { - name = "set_blocking___set_blocking_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "BF+XgtARrppoA93TgrJDkrPYkPc="; - }; - } { name = "set_value___set_value_2.0.1.tgz"; path = fetchurl { @@ -14385,6 +14497,14 @@ sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; }; } + { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + path = fetchurl { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz"; + sha512 = "/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA=="; + }; + } { name = "shallowequal___shallowequal_1.1.0.tgz"; path = fetchurl { @@ -14393,14 +14513,6 @@ sha512 = "y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="; }; } - { - name = "shebang_command___shebang_command_1.2.0.tgz"; - path = fetchurl { - name = "shebang_command___shebang_command_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "RKrGW2lbAzmJaMOfNj/uXer98eo="; - }; - } { name = "shebang_command___shebang_command_2.0.0.tgz"; path = fetchurl { @@ -14409,14 +14521,6 @@ sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; } - { - name = "shebang_regex___shebang_regex_1.0.0.tgz"; - path = fetchurl { - name = "shebang_regex___shebang_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "2kL0l0DAtC2yypcoVxyxkMmO/qM="; - }; - } { name = "shebang_regex___shebang_regex_3.0.0.tgz"; path = fetchurl { @@ -14465,6 +14569,14 @@ sha1 = "pNprY1/8zMoz9w0Xy5JZLeleVXo="; }; } + { + name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; + path = fetchurl { + name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz"; + sha512 = "BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew=="; + }; + } { name = "sisteransi___sisteransi_1.0.5.tgz"; path = fetchurl { @@ -14489,6 +14601,14 @@ sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; } + { + name = "slash___slash_4.0.0.tgz"; + path = fetchurl { + name = "slash___slash_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz"; + sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; + }; + } { name = "slate_md_serializer___slate_md_serializer_5.5.4.tgz"; path = fetchurl { @@ -14505,14 +14625,6 @@ sha512 = "1bkfI0Ir5uPTCfHxYTPT/bwA9pkWPmeBk3P6xCB0bukjSnjBf5PryuCee5tDUeachOR8bdicc0DPWN7RPORvhg=="; }; } - { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; - path = fetchurl { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; - sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; - }; - } { name = "slice_ansi___slice_ansi_3.0.0.tgz"; path = fetchurl { @@ -14537,6 +14649,14 @@ sha512 = "FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ=="; }; } + { + name = "slick___slick_1.12.2.tgz"; + path = fetchurl { + name = "slick___slick_1.12.2.tgz"; + url = "https://registry.yarnpkg.com/slick/-/slick-1.12.2.tgz"; + sha512 = "4qdtOGcBjral6YIBCWJ0ljFSKNLz9KkhbWtuGvUyRowl1kxfuE1x/Z/aJcaiilpb3do9bl5K7/1h9XC5wWpY/A=="; + }; + } { name = "slug___slug_5.3.0.tgz"; path = fetchurl { @@ -14553,6 +14673,14 @@ sha512 = "8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ=="; }; } + { + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + path = fetchurl { + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; + sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; + }; + } { name = "smooth_scroll_into_view_if_needed___smooth_scroll_into_view_if_needed_1.1.32.tgz"; path = fetchurl { @@ -14633,6 +14761,22 @@ sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; }; } + { + name = "socks_proxy_agent___socks_proxy_agent_5.0.1.tgz"; + path = fetchurl { + name = "socks_proxy_agent___socks_proxy_agent_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz"; + sha512 = "vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ=="; + }; + } + { + name = "socks___socks_2.7.0.tgz"; + path = fetchurl { + name = "socks___socks_2.7.0.tgz"; + url = "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz"; + sha512 = "scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA=="; + }; + } { name = "sort_keys___sort_keys_5.0.0.tgz"; path = fetchurl { @@ -14665,14 +14809,6 @@ sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; } - { - name = "source_map_resolve___source_map_resolve_0.6.0.tgz"; - path = fetchurl { - name = "source_map_resolve___source_map_resolve_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz"; - sha512 = "KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w=="; - }; - } { name = "source_map_support___source_map_support_0.5.13.tgz"; path = fetchurl { @@ -14769,6 +14905,14 @@ sha1 = "YvXpRmmBwbeW3Fkpk34RycaSG9A="; }; } + { + name = "specificity___specificity_0.4.1.tgz"; + path = fetchurl { + name = "specificity___specificity_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz"; + sha512 = "1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg=="; + }; + } { name = "split_on_first___split_on_first_1.1.0.tgz"; path = fetchurl { @@ -14937,14 +15081,6 @@ sha512 = "gHFfL3px0Kctd6Po0M8TzEvt3De/xu6cnRrjlfYNhwbhLPLwigI2t1nc6jrzNuaYg5C4YF78PPFuQPzRiqn9ew=="; }; } - { - name = "streamsearch___streamsearch_0.1.2.tgz"; - path = fetchurl { - name = "streamsearch___streamsearch_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz"; - sha1 = "gIudDlb8Jz2Am6VzOOkpkZoanxo="; - }; - } { name = "strict_uri_encode___strict_uri_encode_2.0.0.tgz"; path = fetchurl { @@ -14970,19 +15106,11 @@ }; } { - name = "string_replace_to_array___string_replace_to_array_1.0.3.tgz"; + name = "string_replace_to_array___string_replace_to_array_2.1.0.tgz"; path = fetchurl { - name = "string_replace_to_array___string_replace_to_array_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/string-replace-to-array/-/string-replace-to-array-1.0.3.tgz"; - sha1 = "yT66mZpe4k1zGuu69auja18Y978="; - }; - } - { - name = "string_width___string_width_3.1.0.tgz"; - path = fetchurl { - name = "string_width___string_width_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; - sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; + name = "string_replace_to_array___string_replace_to_array_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-replace-to-array/-/string-replace-to-array-2.1.0.tgz"; + sha512 = "xG2w4fE5FsTXS4AFxoF3uctByqTIFBX8lFRNcPcIznTVCMXbYvbatkPVLpAo13tfuWtzbWEV6u5bjoE9bOv87w=="; }; } { @@ -15073,14 +15201,6 @@ sha1 = "ajhfuIU9lS1f8F0Oiq+UJ43GPc8="; }; } - { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; - }; - } { name = "strip_ansi___strip_ansi_6.0.1.tgz"; path = fetchurl { @@ -15145,6 +15265,14 @@ sha1 = "PFMZQukIwml8DsNEhYwobHygpgo="; }; } + { + name = "style_data___style_data_2.0.0.tgz"; + path = fetchurl { + name = "style_data___style_data_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/style-data/-/style-data-2.0.0.tgz"; + sha512 = "8RJ+MnHlwFUrf3B3gUjs9KIrOk0TppHHwfIHfBd6QjYmZcuzN1OGqeMkWA3ZnD6GiRWJjCVouY/l11v4rlfnPA=="; + }; + } { name = "style_value_types___style_value_types_4.1.4.tgz"; path = fetchurl { @@ -15185,6 +15313,22 @@ sha512 = "lVrM/bNdhVX2OgBFNa2YJ9Lxj7kPzylieHd3TNjuGE0Re9JB7joL5VUKOVH1kdNNJTgGPpT8hmwIAPLaSyEVFQ=="; }; } + { + name = "superagent_proxy___superagent_proxy_3.0.0.tgz"; + path = fetchurl { + name = "superagent_proxy___superagent_proxy_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/superagent-proxy/-/superagent-proxy-3.0.0.tgz"; + sha512 = "wAlRInOeDFyd9pyonrkJspdRAxdLrcsZ6aSnS+8+nu4x1aXbz6FWSTT9M6Ibze+eG60szlL7JA8wEIV7bPWuyQ=="; + }; + } + { + name = "superagent___superagent_7.1.6.tgz"; + path = fetchurl { + name = "superagent___superagent_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/superagent/-/superagent-7.1.6.tgz"; + sha512 = "gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g=="; + }; + } { name = "superstruct___superstruct_0.8.4.tgz"; path = fetchurl { @@ -15209,14 +15353,6 @@ sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; } - { - name = "supports_color___supports_color_6.1.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; - sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; - }; - } { name = "supports_color___supports_color_7.2.0.tgz"; path = fetchurl { @@ -15249,6 +15385,14 @@ sha512 = "zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA=="; }; } + { + name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; + path = fetchurl { + name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; + }; + } { name = "symbol_tree___symbol_tree_3.2.4.tgz"; path = fetchurl { @@ -15266,11 +15410,19 @@ }; } { - name = "table___table_5.4.6.tgz"; + name = "synckit___synckit_0.8.4.tgz"; path = fetchurl { - name = "table___table_5.4.6.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz"; - sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; + name = "synckit___synckit_0.8.4.tgz"; + url = "https://registry.yarnpkg.com/synckit/-/synckit-0.8.4.tgz"; + sha512 = "Dn2ZkzMdSX827QbowGbU/4yjWuvNaCoScLLoMo/yKbu+P4GBR6cRGKZH27k6a9bRzdqcyd1DE96pQtQ6uNkmyw=="; + }; + } + { + name = "table___table_6.8.0.tgz"; + path = fetchurl { + name = "table___table_6.8.0.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz"; + sha512 = "s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA=="; }; } { @@ -15282,11 +15434,11 @@ }; } { - name = "tapable___tapable_2.2.0.tgz"; + name = "tapable___tapable_2.2.1.tgz"; path = fetchurl { - name = "tapable___tapable_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz"; - sha512 = "FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw=="; + name = "tapable___tapable_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz"; + sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; }; } { @@ -15473,6 +15625,14 @@ sha512 = "qbymkVh+6+Gc/c9sqnvbG+dOHH6bschjphK3SHgIfT6h/t+63GBL37JXNoXEc6u/+BcwU6XmaWUuf19ouLVtPg=="; }; } + { + name = "tiny_glob___tiny_glob_0.2.9.tgz"; + path = fetchurl { + name = "tiny_glob___tiny_glob_0.2.9.tgz"; + url = "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz"; + sha512 = "g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg=="; + }; + } { name = "tiny_invariant___tiny_invariant_1.2.0.tgz"; path = fetchurl { @@ -15506,11 +15666,11 @@ }; } { - name = "tippy.js___tippy.js_4.3.5.tgz"; + name = "tippy.js___tippy.js_6.3.7.tgz"; path = fetchurl { - name = "tippy.js___tippy.js_4.3.5.tgz"; - url = "https://registry.yarnpkg.com/tippy.js/-/tippy.js-4.3.5.tgz"; - sha512 = "NDq3efte8nGK6BOJ1dDN1/WelAwfmh3UtIYXXck6+SxLzbIQNZE/cmRSnwScZ/FyiKdIcvFHvYUgqmoGx8CcyA=="; + name = "tippy.js___tippy.js_6.3.7.tgz"; + url = "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz"; + sha512 = "E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ=="; }; } { @@ -15569,14 +15729,6 @@ sha1 = "KXWIt7Dn4KwI4E5nL4XB9JmeF68="; }; } - { - name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; - path = fetchurl { - name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; - sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; - }; - } { name = "to_regex_range___to_regex_range_2.1.1.tgz"; path = fetchurl { @@ -15705,14 +15857,6 @@ sha512 = "e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg=="; }; } - { - name = "tslib___tslib_1.14.1.tgz"; - path = fetchurl { - name = "tslib___tslib_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; - sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; - }; - } { name = "tslib___tslib_2.4.0.tgz"; path = fetchurl { @@ -15721,6 +15865,14 @@ sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; }; } + { + name = "tslib___tslib_1.14.1.tgz"; + path = fetchurl { + name = "tslib___tslib_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; + }; + } { name = "tsscmp___tsscmp_1.0.6.tgz"; path = fetchurl { @@ -15809,14 +15961,6 @@ sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; }; } - { - name = "type_fest___type_fest_0.8.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.8.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; - sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; - }; - } { name = "type_is___type_is_1.6.18.tgz"; path = fetchurl { @@ -15849,14 +15993,6 @@ sha512 = "G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA=="; }; } - { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - path = fetchurl { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; - }; - } { name = "typedarray___typedarray_0.0.6.tgz"; path = fetchurl { @@ -16049,14 +16185,6 @@ sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; }; } - { - name = "update_notifier___update_notifier_5.1.0.tgz"; - path = fetchurl { - name = "update_notifier___update_notifier_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz"; - sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; - }; - } { name = "uri_js___uri_js_4.4.0.tgz"; path = fetchurl { @@ -16082,19 +16210,11 @@ }; } { - name = "url_loader___url_loader_0.6.2.tgz"; + name = "url_loader___url_loader_4.1.1.tgz"; path = fetchurl { - name = "url_loader___url_loader_0.6.2.tgz"; - url = "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz"; - sha512 = "h3qf9TNn53BpuXTTcpC+UehiRrl0Cv45Yr/xWayApjw6G8Bg2dGke7rIwDQ39piciWCWrC+WiqLjOh3SUp9n0Q=="; - }; - } - { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - path = fetchurl { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha1 = "FrXK/Afb42dsGxmZF3gj1lA6yww="; + name = "url_loader___url_loader_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz"; + sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; }; } { @@ -16113,6 +16233,22 @@ sha1 = "ODjpfPxgUh63PFJajlW/3Z4uKPE="; }; } + { + name = "use_callback_ref___use_callback_ref_1.3.0.tgz"; + path = fetchurl { + name = "use_callback_ref___use_callback_ref_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.3.0.tgz"; + sha512 = "3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w=="; + }; + } + { + name = "use_sidecar___use_sidecar_1.1.2.tgz"; + path = fetchurl { + name = "use_sidecar___use_sidecar_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.1.2.tgz"; + sha512 = "epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw=="; + }; + } { name = "use___use_3.1.1.tgz"; path = fetchurl { @@ -16305,6 +16441,14 @@ sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; } + { + name = "vm2___vm2_3.9.11.tgz"; + path = fetchurl { + name = "vm2___vm2_3.9.11.tgz"; + url = "https://registry.yarnpkg.com/vm2/-/vm2-3.9.11.tgz"; + sha512 = "PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg=="; + }; + } { name = "void_elements___void_elements_3.1.0.tgz"; path = fetchurl { @@ -16402,11 +16546,11 @@ }; } { - name = "webpack_cli___webpack_cli_3.3.12.tgz"; + name = "webpack_cli___webpack_cli_4.10.0.tgz"; path = fetchurl { - name = "webpack_cli___webpack_cli_3.3.12.tgz"; - url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz"; - sha512 = "NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag=="; + name = "webpack_cli___webpack_cli_4.10.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz"; + sha512 = "NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w=="; }; } { @@ -16441,6 +16585,14 @@ sha512 = "nbORTdky2HxD8XSaaT+zrsHb30AAgyWAWgCLWaAeQO21VGCScGb52ipqlHA/njix1Z8OW8IOlo4+XK0OKr1fkw=="; }; } + { + name = "webpack_merge___webpack_merge_5.8.0.tgz"; + path = fetchurl { + name = "webpack_merge___webpack_merge_5.8.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz"; + sha512 = "/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q=="; + }; + } { name = "webpack_pwa_manifest___webpack_pwa_manifest_4.3.0.tgz"; path = fetchurl { @@ -16537,14 +16689,6 @@ sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; } - { - name = "which_module___which_module_2.0.0.tgz"; - path = fetchurl { - name = "which_module___which_module_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; - sha1 = "2e8H3Od7mQK4o6j6SzHD4/fm6Ho="; - }; - } { name = "which_typed_array___which_typed_array_1.1.8.tgz"; path = fetchurl { @@ -16553,14 +16697,6 @@ sha512 = "Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw=="; }; } - { - name = "which___which_1.3.1.tgz"; - path = fetchurl { - name = "which___which_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; - sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; - }; - } { name = "which___which_2.0.2.tgz"; path = fetchurl { @@ -16570,11 +16706,11 @@ }; } { - name = "widest_line___widest_line_3.1.0.tgz"; + name = "wildcard___wildcard_2.0.0.tgz"; path = fetchurl { - name = "widest_line___widest_line_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; - sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; + name = "wildcard___wildcard_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz"; + sha512 = "JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw=="; }; } { @@ -16753,14 +16889,6 @@ sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; } - { - name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; - }; - } { name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; path = fetchurl { @@ -16785,14 +16913,6 @@ sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; }; } - { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; - path = fetchurl { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; - sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; - }; - } { name = "write_file_atomic___write_file_atomic_4.0.1.tgz"; path = fetchurl { @@ -16801,14 +16921,6 @@ sha512 = "nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ=="; }; } - { - name = "write___write_1.0.3.tgz"; - path = fetchurl { - name = "write___write_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; - sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; - }; - } { name = "ws___ws_7.5.6.tgz"; path = fetchurl { @@ -16833,14 +16945,6 @@ sha512 = "YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="; }; } - { - name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; - path = fetchurl { - name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; - sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; - }; - } { name = "xhr___xhr_2.6.0.tgz"; path = fetchurl { @@ -16921,6 +17025,14 @@ sha512 = "3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q=="; }; } + { + name = "xregexp___xregexp_2.0.0.tgz"; + path = fetchurl { + name = "xregexp___xregexp_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz"; + sha512 = "xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA=="; + }; + } { name = "xtend___xtend_4.0.2.tgz"; path = fetchurl { @@ -16993,14 +17105,6 @@ sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; } - { - name = "yargs_parser___yargs_parser_13.1.2.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_13.1.2.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; - sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; - }; - } { name = "yargs_parser___yargs_parser_20.2.9.tgz"; path = fetchurl { @@ -17017,14 +17121,6 @@ sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; }; } - { - name = "yargs___yargs_13.3.2.tgz"; - path = fetchurl { - name = "yargs___yargs_13.3.2.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; - sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; - }; - } { name = "yargs___yargs_16.2.0.tgz"; path = fetchurl { From f3773f3436e62f483af9344f60b90e9f6388df6b Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 21 Nov 2022 01:22:04 -0800 Subject: [PATCH 735/797] python310Packages.python-datemath: remove unittest2 --- .../python-modules/python-datemath/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-datemath/default.nix b/pkgs/development/python-modules/python-datemath/default.nix index 4b0366ae4da5..0dc6b6034532 100644 --- a/pkgs/development/python-modules/python-datemath/default.nix +++ b/pkgs/development/python-modules/python-datemath/default.nix @@ -2,9 +2,9 @@ , arrow , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , pytestCheckHook -, unittest2 }: buildPythonPackage rec { @@ -21,13 +21,20 @@ buildPythonPackage rec { sha256 = "sha256-WVWGhyBguE1+KEMQu0N5QxO7IC4rPEJ/2L3VWUCQNi4="; }; + patches = [ + (fetchpatch { + name = "remove-unittest2.patch"; + url = "https://github.com/nickmaccarthy/python-datemath/commit/781daa0241ed327d5f211f3b62f553f3ee3d86e0.patch"; + hash = "sha256-WD6fuDaSSNXgYWoaUexiWnofCzEZzercEUlqTvOUT5I="; + }) + ]; + propagatedBuildInputs = [ arrow ]; checkInputs = [ pytestCheckHook - unittest2 ]; pytestFlagsArray = [ From 271d7abb49faa5da0e026c994e33ef42a5932fc1 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 21 Nov 2022 01:39:54 -0800 Subject: [PATCH 736/797] python310Packages.unicode-slugify: remove unittest2 --- .../development/python-modules/unicode-slugify/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unicode-slugify/default.nix b/pkgs/development/python-modules/unicode-slugify/default.nix index 102af56618b8..3d91368dd60a 100644 --- a/pkgs/development/python-modules/unicode-slugify/default.nix +++ b/pkgs/development/python-modules/unicode-slugify/default.nix @@ -3,8 +3,8 @@ , fetchPypi , nose , six -, unittest2 , unidecode +, unittestCheckHook }: buildPythonPackage rec { @@ -18,7 +18,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ six unidecode ]; - checkInputs = [ nose unittest2 ]; + checkInputs = [ + nose + unittestCheckHook + ]; meta = with lib; { description = "Generates unicode slugs"; From 4a0ceec14cf08c558d343194782ddf9aa04dad0a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 21 Nov 2022 11:07:47 +0100 Subject: [PATCH 737/797] elpa: explicity disable the use of SSE assembly on non x86 --- pkgs/development/libraries/elpa/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index b3bde19fed02..11e8ac1309f6 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { ++ lib.optional (!avx2Support) "--disable-avx2" ++ lib.optional (!avx512Support) "--disable-avx512" ++ lib.optional (!stdenv.hostPlatform.isx86_64) "--disable-sse" + ++ lib.optional (!stdenv.hostPlatform.isx86_64) "--disable-sse-assembly" ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-sse-assembly" ++ lib.optionals enableCuda [ "--enable-nvidia-gpu" "--with-NVIDIA-GPU-compute-capability=${nvidiaArch}" ]; From 0a91e1a0e0c379e880418c3a68d278fdabcccc44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 10:33:36 +0000 Subject: [PATCH 738/797] cargo-tarpaulin: 0.22.0 -> 0.23.1 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 890ce162164a..17e8458e7dcf 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.22.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - sha256 = "sha256-NABmCLEJBt+lpe28pgztMmPFja2httg3THlvk9EMbUI="; + sha256 = "sha256-UDUbndsuXZDu7j+JhkS6kkFP6ju88+hXffy42XQY8gQ="; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - cargoSha256 = "sha256-PyY7H7he/LhfhIhZnT13rSc7zNnOWnLMfgwTUfX39bQ="; + cargoSha256 = "sha256-iLqxixUEZhz3Kv7D84RqVyvtoZx69dhdLKTnVnsO0k0="; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; From 17933082cc2c62fb64131764fd38af7577b3a1a2 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 15 Nov 2022 21:45:22 +0300 Subject: [PATCH 739/797] nixos/mastodon: fix emoji import --- nixos/modules/services/web-apps/mastodon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index d159d2ade063..1e9e04dcc055 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -688,7 +688,7 @@ in { inherit (cfg) group; }; }) - (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package mastodonEnv ]) + (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package mastodonEnv pkgs.imagemagick ]) ]; users.groups.${cfg.group}.members = lib.optional cfg.configureNginx config.services.nginx.user; From 2fb3bfb178b2f0002b47b290f2479ea04251875b Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 10 Oct 2022 07:51:11 +0200 Subject: [PATCH 740/797] python3Packages.pymilter: init at 1.0.5 --- .../python-modules/pymilter/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/pymilter/default.nix diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix new file mode 100644 index 000000000000..6362ba2cfb35 --- /dev/null +++ b/pkgs/development/python-modules/pymilter/default.nix @@ -0,0 +1,30 @@ +{ lib, python, buildPythonPackage, fetchFromGitHub, libmilter, bsddb3, pydns }: + +buildPythonPackage rec { + pname = "pymilter"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "sdgathman"; + repo = pname; + rev = "${pname}-${version}"; + hash = "sha256-gZUWEDVZfDRiOOdG3lpiQldHxm/93l8qYVOHOEpHhzQ="; + }; + + buildInputs = [ libmilter ]; + propagatedBuildInputs = [ bsddb3 pydns ]; + + preBuild = '' + sed -i 's/import thread/import _thread as thread/' Milter/greylist.py + ''; + + # requires /etc/resolv.conf + doCheck = false; + + meta = with lib; { + homepage = "http://bmsi.com/python/milter.html"; + description = "Python bindings for libmilter api"; + maintainers = with maintainers; [ yorickvp ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd1dca64c91c..2f94ee98a7b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8142,6 +8142,8 @@ self: super: with self; { pymicrobot = callPackage ../development/python-modules/pymicrobot { }; + pymilter = callPackage ../development/python-modules/pymilter { }; + pymitv = callPackage ../development/python-modules/pymitv { }; pymfy = callPackage ../development/python-modules/pymfy { }; From 37cc873ac8275cc6b5cdbf0f8ac8eab1f01a8038 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sun, 9 Oct 2022 10:40:07 +0200 Subject: [PATCH 741/797] pypolicyd-spf 2.0.2 -> spf-engine 2.9.3 Fixes CVE-2019-20790 --- pkgs/servers/mail/pypolicyd-spf/default.nix | 26 --------------------- pkgs/servers/mail/spf-engine/default.nix | 26 +++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 28 insertions(+), 27 deletions(-) delete mode 100644 pkgs/servers/mail/pypolicyd-spf/default.nix create mode 100644 pkgs/servers/mail/spf-engine/default.nix diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix deleted file mode 100644 index cbc63ff535a1..000000000000 --- a/pkgs/servers/mail/pypolicyd-spf/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonApplication, fetchurl, pyspf }: - -buildPythonApplication rec { - pname = "pypolicyd-spf"; - majorVersion = "2.0"; - version = "${majorVersion}.2"; - - src = fetchurl { - url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "1nm8y1jjgx6mxrbcxrbdnmkf8vglwp0wiw6jipzh641wb24gi76z"; - }; - - propagatedBuildInputs = [ pyspf ]; - - preBuild = '' - substituteInPlace setup.py --replace "'/etc'" "'$out/etc'" - ''; - - meta = with lib; { - homepage = "https://launchpad.net/pypolicyd-spf/"; - description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; - maintainers = with maintainers; [ abbradar ]; - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/servers/mail/spf-engine/default.nix b/pkgs/servers/mail/spf-engine/default.nix new file mode 100644 index 000000000000..9237d735971a --- /dev/null +++ b/pkgs/servers/mail/spf-engine/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonApplication, fetchurl, pyspf, dnspython, authres, pymilter }: + +buildPythonApplication rec { + pname = "spf-engine"; + majorVersion = lib.versions.majorMinor version; + version = "2.9.3"; + + src = fetchurl { + url = "https://launchpad.net/${pname}/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz"; + sha256 = "sha256-w0Nb+L/Os3KPApENoylxCVaCD4FvgmvpfVvwCkt2IDE="; + }; + + propagatedBuildInputs = [ pyspf dnspython authres pymilter ]; + + preBuild = '' + substituteInPlace setup.py --replace "'/etc'" "'$out/etc'" + ''; + + meta = with lib; { + homepage = "https://launchpad.net/${pname}/"; + description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 239794471469..c169dfe53ed8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1232,6 +1232,7 @@ mapAliases ({ pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained"; # Added 2021-03-21 pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd"; # Added 2020-10-24 pyo3-pack = maturin; + pypolicyd-spf = spf-engine; # Added 2022-10-09 pyrex = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcb049f54fc0..daf914cb71fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24406,7 +24406,7 @@ with pkgs; pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; - pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { }; + spf-engine = python3.pkgs.callPackage ../servers/mail/spf-engine { }; pypiserver = with python3Packages; toPythonApplication pypiserver; From 46b4a9d74a1b78978a8058eac07feaea613bf096 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Tue, 11 Oct 2022 13:01:23 +0200 Subject: [PATCH 742/797] pimilter: fix some tests using libredirect --- pkgs/development/python-modules/pymilter/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix index 6362ba2cfb35..46ca3d27c3aa 100644 --- a/pkgs/development/python-modules/pymilter/default.nix +++ b/pkgs/development/python-modules/pymilter/default.nix @@ -1,4 +1,4 @@ -{ lib, python, buildPythonPackage, fetchFromGitHub, libmilter, bsddb3, pydns }: +{ lib, python, buildPythonPackage, fetchFromGitHub, libmilter, bsddb3, pydns, iana-etc, libredirect }: buildPythonPackage rec { pname = "pymilter"; @@ -19,7 +19,15 @@ buildPythonPackage rec { ''; # requires /etc/resolv.conf - doCheck = false; + # testpolicy: requires makemap (#100419) + # using exec -a makemap smtpctl results in "unknown group smtpq" + preCheck = '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) + export LD_PRELOAD=${libredirect}/lib/libredirect.so + sed -i '/testpolicy/d' test.py + rm testpolicy.py + ''; meta = with lib; { homepage = "http://bmsi.com/python/milter.html"; From d316aeccdf0c1c645027354a55872391e2ae6bb8 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Thu, 13 Oct 2022 11:08:36 +0200 Subject: [PATCH 743/797] libmilter: add fixDarwinDylibNames call to fix imports on darwin --- pkgs/development/libraries/libmilter/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index 9287b0a0dea7..38788b3c964b 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, m4 }: +{ lib, stdenv, fetchurl, m4, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libmilter"; @@ -34,7 +34,11 @@ stdenv.mkDerivation rec { patches = [ ./install.patch ./sharedlib.patch ./glibc-2.30.patch ./darwin.patch ]; - nativeBuildInputs = [ m4 ]; + nativeBuildInputs = [ m4 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + postInstall = lib.optionalString stdenv.isDarwin '' + fixDarwinDylibNames $out/lib/libmilter.dylib.1 + ''; meta = with lib; { description = "Sendmail Milter mail filtering API library"; From 3d8ffea12c2932cc355971a68c7bdaf15f6d7e7a Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 21 Nov 2022 11:40:32 +0100 Subject: [PATCH 744/797] spf-engine: apply review comments --- .../python-modules/pymilter/default.nix | 2 ++ pkgs/servers/mail/spf-engine/default.nix | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix index 46ca3d27c3aa..0724161bf423 100644 --- a/pkgs/development/python-modules/pymilter/default.nix +++ b/pkgs/development/python-modules/pymilter/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { rm testpolicy.py ''; + pythonImportsCheck = [ "Milter" ]; + meta = with lib; { homepage = "http://bmsi.com/python/milter.html"; description = "Python bindings for libmilter api"; diff --git a/pkgs/servers/mail/spf-engine/default.nix b/pkgs/servers/mail/spf-engine/default.nix index 9237d735971a..0f2e98582514 100644 --- a/pkgs/servers/mail/spf-engine/default.nix +++ b/pkgs/servers/mail/spf-engine/default.nix @@ -2,25 +2,29 @@ buildPythonApplication rec { pname = "spf-engine"; - majorVersion = lib.versions.majorMinor version; version = "2.9.3"; src = fetchurl { - url = "https://launchpad.net/${pname}/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz"; + url = "https://launchpad.net/${pname}/${lib.versions.majorMinor version}/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "sha256-w0Nb+L/Os3KPApENoylxCVaCD4FvgmvpfVvwCkt2IDE="; }; propagatedBuildInputs = [ pyspf dnspython authres pymilter ]; - preBuild = '' + pythonImportsCheck = [ + "spf_engine" + "spf_engine.milter_spf" + "spf_engine.policyd_spf" + ]; + + postPatch = '' substituteInPlace setup.py --replace "'/etc'" "'$out/etc'" ''; meta = with lib; { - homepage = "https://launchpad.net/${pname}/"; + homepage = "https://launchpad.net/spf-engine/"; description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; - platforms = platforms.all; }; } From 384ed019dfb9bd9499610b0ef5dd095b01dffd97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 10:58:04 +0000 Subject: [PATCH 745/797] eksctl: 0.119.0 -> 0.120.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 1253531a3fcf..87f601d4b4b0 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.119.0"; + version = "0.120.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-eW16B3VSxuqKVqhVmxtyTnm1wItJS5HZMW7a7DDiIVg="; + sha256 = "sha256-XrXT+SivZ240lSiCWmxB4N4miI6xYojqLVmDJbhhWko="; }; - vendorSha256 = "sha256-/WSc6Q/OBxPKuVrdmMczaKCZO7MvQXkzQ2Q1y43w3Hw="; + vendorSha256 = "sha256-S1gnnhI0U7OLd6vEW5qpxGAiOdORYWsEst11Vfj6pdI="; doCheck = false; From 73944c5c5e79d10906c224d688037c34085241a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 11:25:38 +0000 Subject: [PATCH 746/797] dprint: 0.32.2 -> 0.33.0 --- pkgs/development/tools/dprint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index 8f5435f82728..1ff2577b5d9f 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.32.2"; + version = "0.33.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-F7hqSbCGP3p+6khNMfuUABAvtB8MMABcpX7zK9rWhrQ="; + sha256 = "sha256-7UgE8/FPEG3VUtQLdlvfaFx9N6iIci5eu+Z2HBo+7c0="; }; - cargoSha256 = "sha256-Azsky2rst+z33EKfZ+6LSeF+MpSNjNxQrLkqxgLAQ1o="; + cargoSha256 = "sha256-/7YUbbuoN/qUIHk95ndaKjHZdJOPNTqZqOBvM2dHvoc="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 60ae5afd44c901c83190013af1dbead86e43f268 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 21 Nov 2022 15:46:36 +0800 Subject: [PATCH 747/797] xdg-desktop-portal-wlr: fix cross compilation --- .../libraries/xdg-desktop-portal-wlr/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index 5ccd9d6fa49e..a2dc93845c47 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,11 +1,13 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , makeWrapper , meson , ninja , pkg-config , wayland-protocols +, wayland-scanner , grim , inih , libdrm @@ -28,8 +30,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-UztkfvMIbslPd/d262NZFb6WfESc9nBsSSH96BA4Aqw="; }; - nativeBuildInputs = [ meson ninja pkg-config wayland-protocols makeWrapper ]; - buildInputs = [ inih libdrm mesa pipewire scdoc systemd wayland ]; + # scdoc: mark as build-time dependency + # https://github.com/emersion/xdg-desktop-portal-wlr/pull/248 + patches = [(fetchpatch { + url = "https://github.com/emersion/xdg-desktop-portal-wlr/commit/92ccd62428082ba855e359e83730c4370cd1aac7.patch"; + hash = "sha256-mU1whfp7BoSylaS3y+YwfABImZFOeuItSXCon0C7u20="; + })]; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner makeWrapper ]; + buildInputs = [ inih libdrm mesa pipewire systemd wayland wayland-protocols ]; mesonFlags = [ "-Dsd-bus-provider=libsystemd" From 9aa81986de0e0648f969e5b468fdeb25664f40a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 13:25:22 +0000 Subject: [PATCH 748/797] flyctl: 0.0.432 -> 0.0.433 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index c14ef92cf6ae..615e93d75f96 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.432"; + version = "0.0.433"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-nBBvhl5Ls/zKSLFzatCl61Wa1eXDHLwED+Q6o4xMJ5c="; + sha256 = "sha256-1dGsCUMa4FFS88sEH8WJdm6KB40lYe5MnjklAwAtyzs="; }; vendorSha256 = "sha256-8Vf9JRahGkp8/5D5oDt0fnbeeLAD0q656XWdUDtceq8="; From 7ddf10108be968e658dafd0b5de0d4498e056698 Mon Sep 17 00:00:00 2001 From: pacien Date: Wed, 16 Nov 2022 17:14:31 +0100 Subject: [PATCH 749/797] matrix-appservice-discord: 3.1.0 -> 3.1.1 Changelog: https://github.com/matrix-org/matrix-appservice-discord/blob/develop/CHANGELOG.md#311-2022-11-10 --- pkgs/servers/matrix-appservice-discord/package.json | 2 +- pkgs/servers/matrix-appservice-discord/pin.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-appservice-discord/package.json b/pkgs/servers/matrix-appservice-discord/package.json index f3a2026a208d..d382f29c686a 100644 --- a/pkgs/servers/matrix-appservice-discord/package.json +++ b/pkgs/servers/matrix-appservice-discord/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-discord", - "version": "3.1.0", + "version": "3.1.1", "description": "A bridge between Matrix and Discord", "main": "discordas.js", "engines": { diff --git a/pkgs/servers/matrix-appservice-discord/pin.json b/pkgs/servers/matrix-appservice-discord/pin.json index 4f454988f0c6..57b7ffd28a2c 100644 --- a/pkgs/servers/matrix-appservice-discord/pin.json +++ b/pkgs/servers/matrix-appservice-discord/pin.json @@ -1,5 +1,5 @@ { - "version": "3.1.0", - "srcSha256": "gJ093wPP0ZniOP73ZrfZzqWXNowjo/Ire8DwlgHnM1A=", + "version": "3.1.1", + "srcSha256": "g681w7RD96/xKP+WnIyY4bcVHVQhysgDPZo4TgCRiuY=", "yarnSha256": "0cm9yprj0ajmrdpap3p2lx3xrrkar6gghlxnj9127ks6p5c1ji3r" } From 4a8f6ceb6650d818d893a86d2216beea0cd2f0d1 Mon Sep 17 00:00:00 2001 From: CRTified Date: Tue, 10 Nov 2020 22:24:27 +0100 Subject: [PATCH 750/797] nixos/mautrix-telegram: add documentation for setting arbitrary secrets The change that allows setting the secrets by an environment file had the undocumented side effect of allowing to set any key by the environment file (Related PR: https://github.com/tulir/mautrix-telegram/pull/332). This is required to e.g. set `bridge.login_shared_secret`, which was not documented before. GitHub: closes #103347 --- nixos/modules/services/matrix/mautrix-telegram.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix index fc8b95051ddb..0611f21367be 100644 --- a/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/nixos/modules/services/matrix/mautrix-telegram.nix @@ -97,12 +97,18 @@ in { default = null; description = lib.mdDoc '' File containing environment variables to be passed to the mautrix-telegram service, - in which secret tokens can be specified securely by defining values for + in which secret tokens can be specified securely by defining values for e.g. `MAUTRIX_TELEGRAM_APPSERVICE_AS_TOKEN`, `MAUTRIX_TELEGRAM_APPSERVICE_HS_TOKEN`, `MAUTRIX_TELEGRAM_TELEGRAM_API_ID`, `MAUTRIX_TELEGRAM_TELEGRAM_API_HASH` and optionally `MAUTRIX_TELEGRAM_TELEGRAM_BOT_TOKEN`. + + These environment variables can also be used to set other options by + replacing hierachy levels by `.`, converting the name to uppercase + and prepending `MAUTRIX_TELEGRAM_`. + For example, the first value above maps to + {option}`settings.appservice.as_token`. ''; }; From e14bdbb997707333de2114c56ab0fe764dbe9ca7 Mon Sep 17 00:00:00 2001 From: pacien Date: Wed, 16 Nov 2022 22:20:01 +0100 Subject: [PATCH 751/797] Revert "nixos/mautrix-telegram: substitute secrets in config file at runtime (#112966)" This is no longer necessary since mautrix-telegram v0.12.1, which supports JSON-formatted environment variable and therefore maps natively. See: https://github.com/mautrix/telegram/issues/584#issuecomment-1250027272 See: https://github.com/mautrix/telegram/releases/tag/v0.12.1 This partially reverts commit 24133ead28dc4ece7ba016bc8f7624db0478e977. --- .../modules/services/matrix/mautrix-telegram.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix index 0611f21367be..544e9d10c361 100644 --- a/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/nixos/modules/services/matrix/mautrix-telegram.nix @@ -7,8 +7,8 @@ let registrationFile = "${dataDir}/telegram-registration.yaml"; cfg = config.services.mautrix-telegram; settingsFormat = pkgs.formats.json {}; - settingsFileUnsubstituted = settingsFormat.generate "mautrix-telegram-config-unsubstituted.json" cfg.settings; - settingsFile = "${dataDir}/config.json"; + settingsFile = + settingsFormat.generate "mautrix-telegram-config.json" cfg.settings; in { options = { @@ -147,16 +147,6 @@ in { environment.HOME = dataDir; preStart = '' - # Not all secrets can be passed as environment variable (yet) - # https://github.com/tulir/mautrix-telegram/issues/584 - [ -f ${settingsFile} ] && rm -f ${settingsFile} - old_umask=$(umask) - umask 0177 - ${pkgs.envsubst}/bin/envsubst \ - -o ${settingsFile} \ - -i ${settingsFileUnsubstituted} - umask $old_umask - # generate the appservice's registration file if absent if [ ! -f '${registrationFile}' ]; then ${pkgs.mautrix-telegram}/bin/mautrix-telegram \ @@ -192,8 +182,6 @@ in { --config='${settingsFile}' ''; }; - - restartTriggers = [ settingsFileUnsubstituted ]; }; }; From 4cdc08f9252c8323fdaecf047bf11cd79b835935 Mon Sep 17 00:00:00 2001 From: pacien Date: Wed, 16 Nov 2022 23:17:30 +0100 Subject: [PATCH 752/797] nixos/mautrix-telegram: document JSON env var config This was introduced in mautrix-telegram v0.12.1. See: https://github.com/mautrix/telegram/issues/584#issuecomment-1250027272 See: https://github.com/mautrix/telegram/releases/tag/v0.12.1 --- nixos/modules/services/matrix/mautrix-telegram.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix index 544e9d10c361..2d9c2dc76c29 100644 --- a/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/nixos/modules/services/matrix/mautrix-telegram.nix @@ -109,6 +109,11 @@ in { and prepending `MAUTRIX_TELEGRAM_`. For example, the first value above maps to {option}`settings.appservice.as_token`. + + The environment variable values can be prefixed with `json::` to have + them be parsed as JSON. For example, `login_shared_secret_map` can be + set as follows: + `MAUTRIX_TELEGRAM_BRIDGE_LOGIN_SHARED_SECRET_MAP=json::{"example.com":"secret"}`. ''; }; From 61530287678617cd583a9acbff16ce4f374027f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 13:59:59 +0000 Subject: [PATCH 753/797] grype: 0.52.0 -> 0.53.0 --- pkgs/tools/security/grype/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index c690c0f62941..e55b72103433 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "grype"; - version = "0.52.0"; + version = "0.53.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RZBO8TpFwRwr1CkGSX06jtAtLiNVHhe+8AJsHwNyPMY="; + sha256 = "sha256-um+uyY8kPkouF/9Kms0xZYhgYeZC/pE6w+JCVcKWdpI="; # 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; @@ -27,7 +27,7 @@ buildGoModule rec { ''; }; proxyVendor = true; - vendorSha256 = "sha256-tRux9M9vFPj3TqhsF1zSV4V1YKnLVViuQjum9YFr5FU="; + vendorSha256 = "sha256-BP5Tvv5s74uxjVcEC0QPaw2tGPmkOjZmyCrPwwoz7o4="; nativeBuildInputs = [ installShellFiles From ceecc713047e3dc8aa39ea9ebeda34b9ff6c4a67 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 21 Nov 2022 06:07:05 -0800 Subject: [PATCH 754/797] nano: 6.4 -> 7.0 (#201570) --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 5d4d84e6fe9b..d7b1f54d3912 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "6.4"; + version = "7.0"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "QZmujKeKd5beVt4aQbgh3EeRLAMH6YFrVswxffNGYcA="; + sha256 = "jdbqw4srh4bYJoHw4a/YT2t1IQ0XORtkQ8Q35FFVIUk="; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; From 2500c9270b8644f2456d0821f39b25d42a8e7f22 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 21 Nov 2022 09:17:33 -0500 Subject: [PATCH 755/797] vimPlugins.nvim-treesitter: remove parser directory --- .../editors/vim/plugins/nvim-treesitter/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 0272c73b1730..284495bbc3d7 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -62,6 +62,10 @@ let in { + postPatch = '' + rm -r parser + ''; + passthru = { inherit builtGrammars allGrammars withPlugins withAllGrammars; From 263a1252f95b3517bbc36497b7b24d84a4b52a6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 14:19:42 +0000 Subject: [PATCH 756/797] appthreat-depscan: 3.0.2 -> 3.0.3 --- pkgs/development/tools/appthreat-depscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index c4ba4b27939f..fc8f3a9bd528 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-AxdtphC9dVd/o52hW8L+5gaEDeP9wvR0vSZS3XY9sAw="; + hash = "sha256-JxaimM9sL6khTGJoSUFO2Dzlki6uoyqXEJznk6UHK/0="; }; propagatedBuildInputs = with python3.pkgs; [ From 9c128026bd193f1abbf79448782f0dc4b20f83a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Mon, 21 Nov 2022 11:47:00 -0300 Subject: [PATCH 757/797] vulkan-caps-viewer: 3.25 -> 3.27 --- pkgs/tools/graphics/vulkan-caps-viewer/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index 291c70d8eccf..cf13c3b5b3ee 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.25"; + version = "3.27"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; - rev = if version == "3.25" then "${version}_fixed" else version; - hash = "sha256-JQMnR9WNR8OtcgVfE5iZebdvZ/JmZNDchET5cK/Bruc="; + rev = version; + hash = "sha256-B/FBX63JnBdshNLVMPA0qGnm0c/RGilIahX3VjJnpkI="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. - # To help they put in a git-submodule. - # It works with older vulkan-loaders. + # To help us, they've put it in a git-submodule. + # The result will work with any vulkan-loader version. fetchSubmodules = true; }; From edf1f46af87eb6d9a19da33efe693fe649630a9a Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 16 Nov 2022 08:58:25 -0500 Subject: [PATCH 758/797] libxcrypt: Fix the build on Android by allowing warnings This fixes: ``` lib/util-xbzero.c:61:3: error: extension used [-Werror,-Wlanguage-extension-token] OBSERVE_MEM (s, len); ^ lib/util-xbzero.c:45:3: note: expanded from macro 'OBSERVE_MEM' asm volatile ("" : : "m" (*(const char (*)[len]) s)) ^ ``` --- pkgs/development/libraries/libxcrypt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index d4ce1f8bc735..8fe6a7ee0a99 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--enable-hashes=all" "--enable-obsolete-api=glibc" "--disable-failure-tokens" - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + ] ++ lib.optionals (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.libc == "bionic") [ "--disable-werror" ]; From f2918bea1181e82e72a80bf10d9a74c65220c297 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 15:59:32 +0000 Subject: [PATCH 759/797] aocd: 1.1.3 -> 1.2.1 --- pkgs/development/python-modules/aocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix index bc6b62dae8c3..3202ac66f862 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/aocd/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "aocd"; - version = "1.1.3"; + version = "1.2.1"; src = fetchFromGitHub { owner = "wimglenn"; repo = "advent-of-code-data"; rev = "refs/tags/v${version}"; - sha256 = "sha256-V6byleGCgXc2xfceb+aO0sYwGD6uThE6/8s5NDEjerw="; + sha256 = "sha256-Oz1sy+BHekI0ApDKn7hNMDvQrog6EB0JPry7SV5fxig="; }; propagatedBuildInputs = [ From 7ed6d28f5c069724534854e92d3c71c79af28971 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Nov 2022 17:29:04 +0100 Subject: [PATCH 760/797] python310Packages.niapy: add changelog to meta --- pkgs/development/python-modules/niapy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index 65bc3d472886..bad77441d0b2 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Micro framework for building nature-inspired algorithms"; homepage = "https://niapy.org/"; + changelog = "https://github.com/NiaOrg/NiaPy/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 195aa5350908e039cce5c01b6f3f1e2e3bd91ef3 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 21 Nov 2022 18:00:12 +0100 Subject: [PATCH 761/797] nixos/redis: fix requirepass --- nixos/modules/services/databases/redis.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 1f143f9c66f6..95c0afb8f835 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -361,8 +361,10 @@ in { fi echo 'include "${redisConfStore}"' > "${redisConfRun}" ${optionalString (conf.requirePassFile != null) '' - {echo -n "requirepass " - cat ${escapeShellArg conf.requirePassFile}} >> "${redisConfRun}" + { + echo -n "requirepass " + cat ${escapeShellArg conf.requirePassFile} + } >> "${redisConfRun}" ''} ''); Type = "notify"; From 3fda065c6a11665ed9ff27984a565dcd4219c12a Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 21 Nov 2022 19:50:48 +0200 Subject: [PATCH 762/797] gobject-introspection: inherit meta in the wrapper meta isn't in drvAttrs because its a "passthru" attribute --- pkgs/development/libraries/gobject-introspection/wrapper.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix index 518dda781a64..d59cbe6faffa 100644 --- a/pkgs/development/libraries/gobject-introspection/wrapper.nix +++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -33,6 +33,8 @@ then stdenv.mkDerivation (builtins.removeAttrs overridenUnwrappedGir.drvAttrs [ "name" ] # so we can get a fresh name generated from the pname // { + + inherit (overridenUnwrappedGir) meta; pname = "gobject-introspection-wrapped"; passthru = overridenUnwrappedGir.passthru // { unwrapped = overridenUnwrappedGir; @@ -88,6 +90,7 @@ then else stdenv.mkDerivation (builtins.removeAttrs overridenUnwrappedGir.drvAttrs [ "name" ] # so we can get a fresh name generated from the pname // { + inherit (overridenUnwrappedGir) meta; pname = "gobject-introspection-wrapped"; passthru = overridenUnwrappedGir.passthru // { unwrapped = overridenUnwrappedGir; From 09ff14cdbf3a08ac264da8adbf6fdfc139ddc867 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Tue, 22 Nov 2022 07:21:16 +1300 Subject: [PATCH 763/797] tailscale: 1.32.2 -> 1.32.3 --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index b3f1e03f6cfb..3cd302c6bf75 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.32.2"; + version = "1.32.3"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-CYNHD6TS9KTRftzSn9vAH4QlinqNgU/yZuUYxSvsl/M="; + sha256 = "sha256-mM9+qumB7pbP1LIN3ZJRNYHywwASKL4jmsmz5jQGRtg="; }; vendorSha256 = "sha256-VW6FvbgLcokVGunTCHUXKuH5+O6T55hGIP2g5kFfBsE="; From 4ef32c251a5f2d478d11e3e45a56dc8927ce9b84 Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Fri, 11 Nov 2022 17:06:11 -0500 Subject: [PATCH 764/797] whipper: install man pages --- pkgs/applications/audio/whipper/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index dfe540f04e65..e3c4b4522489 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -2,6 +2,7 @@ , python3 , fetchFromGitHub , fetchpatch +, installShellFiles , libcdio-paranoia , cdrdao , libsndfile @@ -35,6 +36,8 @@ in python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = with python3.pkgs; [ + installShellFiles + setuptools-scm docutils setuptoolsCheckHook @@ -65,6 +68,11 @@ in python3.pkgs.buildPythonApplication rec { export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" ''; + outputs = [ "out" "man" ]; + postBuild = '' + make -C man + ''; + preCheck = '' # disable tests that require internet access # https://github.com/JoeLametta/whipper/issues/291 @@ -73,6 +81,10 @@ in python3.pkgs.buildPythonApplication rec { export HOME=$TMPDIR ''; + postInstall = '' + installManPage man/*.1 + ''; + passthru.tests.version = testers.testVersion { package = whipper; command = "HOME=$TMPDIR whipper --version"; From e7fd02bec1c4678f20aad3824a310024036a01d1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 21 Nov 2022 20:29:27 +0100 Subject: [PATCH 765/797] ntirpc: 4.0 -> 4.1 --- pkgs/development/libraries/ntirpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix index 55f1edf490b4..95003a0b00ef 100644 --- a/pkgs/development/libraries/ntirpc/default.nix +++ b/pkgs/development/libraries/ntirpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ntirpc"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "ntirpc"; rev = "v${version}"; - sha256 = "0hffma57b4c7g7862yvfr8bvbsbxh5w383mvjkjv3jpzi01l79yv"; + sha256 = "sha256-RTuWj795YrXVo3TIiEr3Dy/QmSL5Ch0VVc4gRlDhNTM="; }; postPatch = '' From 3f1058adb1ac9df62f97a1e8fe59c31d3bfa4787 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 14 Nov 2022 17:03:41 +0100 Subject: [PATCH 766/797] =?UTF-8?q?ocamlPackages.linenoise:=201.3.1=20?= =?UTF-8?q?=E2=86=92=201.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/linenoise/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/pkgs/development/ocaml-modules/linenoise/default.nix index 32cbc268e76f..dfd8d585e9b8 100644 --- a/pkgs/development/ocaml-modules/linenoise/default.nix +++ b/pkgs/development/ocaml-modules/linenoise/default.nix @@ -2,17 +2,15 @@ buildDunePackage rec { pname = "linenoise"; - version = "1.3.1"; + version = "1.4.0"; - useDune2 = true; - - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.03"; src = fetchFromGitHub { owner = "fxfactorial"; repo = "ocaml-${pname}"; rev = "v${version}"; - sha256 = "sha256-5DlF56reh52Tvbi3wGK8ZrPBAYK0ZTBV3jz8qUsyKGk="; + sha256 = "sha256-bIpZ9TO4/j24nQw5nsW7fUF7af5lhd/EmwhQRd0NYb4="; }; propagatedBuildInputs = [ result ]; From cc5756b1712cc1341781b6dc019f9483332c863c Mon Sep 17 00:00:00 2001 From: Winter Date: Wed, 9 Nov 2022 22:36:54 -0500 Subject: [PATCH 767/797] prefetch-npm-deps: add support for link dependencies in v2 lockfiles --- .../node/fetch-npm-deps/default.nix | 11 +++++ .../node/fetch-npm-deps/src/main.rs | 43 +++++++++++++------ 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index d6ee0124d285..128669b89000 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -81,6 +81,17 @@ hash = "sha256-oIM05TGHstX1D4k2K4TJ+SHB7H/tNKzxzssqf0GJwvY="; }; + + linkDependencies = makeTest { + name = "link-dependencies"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/evcc-io/evcc/0.106.3/package-lock.json"; + hash = "sha256-6ZTBMyuyPP/63gpQugggHhKVup6OB4hZ2rmSvPJ0yEs="; + }; + + hash = "sha256-uQx8F5OXKm+fqx6hP6obVYTlQIYcJwtO52j6VQNo7Sk="; + }; }; meta = with lib; { diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index 097148fef82a..d23e41a7f9fc 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -6,7 +6,7 @@ use rayon::prelude::*; use serde::Deserialize; use std::{ collections::HashMap, - env, fs, + env, fmt, fs, path::Path, process::{self, Command}, }; @@ -25,18 +25,34 @@ struct PackageLock { #[derive(Deserialize)] struct OldPackage { - version: String, - resolved: Option, + version: UrlOrString, + resolved: Option, integrity: Option, dependencies: Option>, } #[derive(Deserialize)] struct Package { - resolved: Option, + resolved: Option, integrity: Option, } +#[derive(Debug, Deserialize, PartialEq, Eq)] +#[serde(untagged)] +enum UrlOrString { + Url(Url), + String(String), +} + +impl fmt::Display for UrlOrString { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + UrlOrString::Url(url) => url.fmt(f), + UrlOrString::String(string) => string.fmt(f), + } + } +} + fn to_new_packages( old_packages: HashMap, ) -> anyhow::Result> { @@ -46,10 +62,10 @@ fn to_new_packages( new.insert( format!("{name}-{}", package.version), Package { - resolved: if let Ok(url) = Url::parse(&package.version) { - Some(url) + resolved: if matches!(package.version, UrlOrString::Url(_)) { + Some(package.version) } else { - package.resolved.as_deref().map(Url::parse).transpose()? + package.resolved }, integrity: package.integrity, }, @@ -230,14 +246,15 @@ fn main() -> anyhow::Result<()> { packages .unwrap() .into_par_iter() + .filter(|(dep, _)| !dep.is_empty()) + .filter(|(_, package)| matches!(package.resolved, Some(UrlOrString::Url(_)))) .try_for_each(|(dep, package)| { - if dep.is_empty() || package.resolved.is_none() { - return Ok::<_, anyhow::Error>(()); - } - eprintln!("{dep}"); - let mut resolved = package.resolved.unwrap(); + let mut resolved = match package.resolved { + Some(UrlOrString::Url(url)) => url, + _ => unreachable!(), + }; if let Some(hosted_git_url) = get_hosted_git_url(&resolved) { resolved = hosted_git_url; @@ -263,7 +280,7 @@ fn main() -> anyhow::Result<()> { ) .map_err(|e| anyhow!("couldn't insert cache entry for {dep}: {e:?}"))?; - Ok(()) + Ok::<_, anyhow::Error>(()) })?; fs::write(out.join("package-lock.json"), lock_content)?; From 276982bd5e389e11c6051ac47f2647b0e860494c Mon Sep 17 00:00:00 2001 From: Winter Date: Wed, 9 Nov 2022 22:10:35 -0500 Subject: [PATCH 768/797] prefetch-npm-deps: add support for hosted git shorthands --- .../node/fetch-npm-deps/src/main.rs | 88 +++++++++++++++++-- 1 file changed, 82 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index d23e41a7f9fc..9ad1c3874206 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -1,7 +1,7 @@ #![warn(clippy::pedantic)] use crate::cacache::Cache; -use anyhow::anyhow; +use anyhow::{anyhow, Context}; use rayon::prelude::*; use serde::Deserialize; use std::{ @@ -31,7 +31,7 @@ struct OldPackage { dependencies: Option>, } -#[derive(Deserialize)] +#[derive(Debug, Deserialize, PartialEq, Eq)] struct Package { resolved: Option, integrity: Option, @@ -53,12 +53,42 @@ impl fmt::Display for UrlOrString { } } +#[allow(clippy::case_sensitive_file_extension_comparisons)] fn to_new_packages( old_packages: HashMap, + initial_url: &Url, ) -> anyhow::Result> { let mut new = HashMap::new(); - for (name, package) in old_packages { + for (name, mut package) in old_packages { + if let UrlOrString::Url(v) = &package.version { + for (scheme, host) in [ + ("github", "github.com"), + ("bitbucket", "bitbucket.org"), + ("gitlab", "gitlab.com"), + ] { + if v.scheme() == scheme { + package.version = { + let mut new_url = initial_url.clone(); + + new_url.set_host(Some(host))?; + + if v.path().ends_with(".git") { + new_url.set_path(v.path()); + } else { + new_url.set_path(&format!("{}.git", v.path())); + } + + new_url.set_fragment(v.fragment()); + + UrlOrString::Url(new_url) + }; + + break; + } + } + } + new.insert( format!("{name}-{}", package.version), Package { @@ -72,7 +102,7 @@ fn to_new_packages( ); if let Some(dependencies) = package.dependencies { - new.extend(to_new_packages(dependencies)?); + new.extend(to_new_packages(dependencies, initial_url)?); } } @@ -200,6 +230,10 @@ fn get_ideal_hash(integrity: &str) -> anyhow::Result<&str> { } } +fn get_initial_url() -> anyhow::Result { + Url::parse("git+ssh://git@a.b").context("initial url should be valid") +} + fn main() -> anyhow::Result<()> { let args = env::args().collect::>(); @@ -229,7 +263,13 @@ fn main() -> anyhow::Result<()> { eprintln!("lockfile version: {}", lock.version); let packages = match lock.version { - 1 => lock.dependencies.map(to_new_packages).transpose()?, + 1 => { + let initial_url = get_initial_url()?; + + lock.dependencies + .map(|p| to_new_packages(p, &initial_url)) + .transpose()? + } 2 | 3 => lock.packages, _ => panic!( "We don't support lockfile version {}, please file an issue.", @@ -297,7 +337,11 @@ fn main() -> anyhow::Result<()> { #[cfg(test)] mod tests { - use super::{get_hosted_git_url, get_ideal_hash}; + use super::{ + get_hosted_git_url, get_ideal_hash, get_initial_url, to_new_packages, OldPackage, Package, + UrlOrString, + }; + use std::collections::HashMap; use url::Url; #[test] @@ -348,4 +392,36 @@ mod tests { assert_eq!(get_ideal_hash(input).ok(), expected); } } + + #[test] + fn git_shorthand_v1() -> anyhow::Result<()> { + let old = + { + let mut o = HashMap::new(); + o.insert( + String::from("sqlite3"), + OldPackage { + version: UrlOrString::Url(Url::parse( + "github:mapbox/node-sqlite3#593c9d498be2510d286349134537e3bf89401c4a", + ).unwrap()), + resolved: None, + integrity: None, + dependencies: None, + }, + ); + o + }; + + let initial_url = get_initial_url()?; + + let new = to_new_packages(old, &initial_url)?; + + assert_eq!(new.len(), 1, "new packages map should contain 1 value"); + assert_eq!(new.into_values().next().unwrap(), Package { + resolved: Some(UrlOrString::Url(Url::parse("git+ssh://git@github.com/mapbox/node-sqlite3.git#593c9d498be2510d286349134537e3bf89401c4a").unwrap())), + integrity: None + }); + + Ok(()) + } } From 03a7739d75285320d7ebff7626a122c6a6592878 Mon Sep 17 00:00:00 2001 From: Winter Date: Wed, 9 Nov 2022 22:13:12 -0500 Subject: [PATCH 769/797] prefetch-npm-deps: skip bundled dependencies in v1 lockfiles --- pkgs/build-support/node/fetch-npm-deps/src/main.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index 9ad1c3874206..5f1e0096d570 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -26,6 +26,8 @@ struct PackageLock { #[derive(Deserialize)] struct OldPackage { version: UrlOrString, + #[serde(default)] + bundled: bool, resolved: Option, integrity: Option, dependencies: Option>, @@ -61,6 +63,13 @@ fn to_new_packages( let mut new = HashMap::new(); for (name, mut package) in old_packages { + // In some cases, a bundled dependency happens to have the same version as a non-bundled one, causing + // the bundled one without a URL to override the entry for the non-bundled instance, which prevents the + // dependency from being downloaded. + if package.bundled { + continue; + } + if let UrlOrString::Url(v) = &package.version { for (scheme, host) in [ ("github", "github.com"), @@ -404,6 +413,7 @@ mod tests { version: UrlOrString::Url(Url::parse( "github:mapbox/node-sqlite3#593c9d498be2510d286349134537e3bf89401c4a", ).unwrap()), + bundled: false, resolved: None, integrity: None, dependencies: None, From c6903a01e71f77ecd2000397d081ce1447fe0615 Mon Sep 17 00:00:00 2001 From: Winter Date: Wed, 9 Nov 2022 22:17:53 -0500 Subject: [PATCH 770/797] prefetch-npm-deps: add etherpad-lite v1.8.18 as a test --- pkgs/build-support/node/fetch-npm-deps/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index 128669b89000..24c1d016b090 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -92,6 +92,18 @@ hash = "sha256-uQx8F5OXKm+fqx6hP6obVYTlQIYcJwtO52j6VQNo7Sk="; }; + + # This package contains both hosted Git shorthand, and a bundled dependency that happens to override an existing one. + etherpadLite1818 = makeTest { + name = "etherpad-lite-1.8.18"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/ether/etherpad-lite/1.8.18/src/package-lock.json"; + hash = "sha256-1fGNxYJi1I4cXK/jinNG+Y6tPEOhP3QAqWOBEQttS9E="; + }; + + hash = "sha256-TzUFykASDjXlfmgq2bUIJjUkfLlGLUkRTVFPIYPCmyc="; + }; }; meta = with lib; { From 8e651111b77e590a933d525563daa2a3e14bb0e2 Mon Sep 17 00:00:00 2001 From: Winter Date: Wed, 9 Nov 2022 22:39:32 -0500 Subject: [PATCH 771/797] npmHooks.npmBuildHook: mention dontNpmBuild if script fails to run --- .../build-support/node/build-npm-package/hooks/npm-build-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-build-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-build-hook.sh index b99c9d94faff..7f601512c7e7 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-build-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-build-hook.sh @@ -20,6 +20,7 @@ npmBuildHook() { echo echo "Here are a few things you can try, depending on the error:" echo "1. Make sure your build script ($npmBuildScript) exists" + echo " If there is none, set `dontNpmBuild = true`." echo '2. If the error being thrown is something similar to "error:0308010C:digital envelope routines::unsupported", add `NODE_OPTIONS = "--openssl-legacy-provider"` to your derivation' echo " See https://github.com/webpack/webpack/issues/14532 for more information." echo From 68d5b19fca6f18bb2df7b287eb512b1c7b2c335a Mon Sep 17 00:00:00 2001 From: Winter Date: Wed, 9 Nov 2022 22:52:52 -0500 Subject: [PATCH 772/797] npmHooks.npmConfigHook: also patch shebangs after rebuilding --- .../node/build-npm-package/hooks/npm-config-hook.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh index 723d8c1a4643..accf5abd5b22 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh @@ -96,6 +96,8 @@ npmConfigHook() { rm node_modules/.meow fi + patchShebangs node_modules + echo "Finished npmConfigHook" } From c0e7124bcc4421d5ce9d2e5d4d0f7eec7ce798cc Mon Sep 17 00:00:00 2001 From: Winter Date: Wed, 9 Nov 2022 22:57:32 -0500 Subject: [PATCH 773/797] npmHooks.npmConfigHook: add some missing quotes around variable assignments --- .../node/build-npm-package/hooks/npm-config-hook.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh index accf5abd5b22..d2906d28ca2f 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh @@ -5,7 +5,7 @@ npmConfigHook() { echo "Configuring npm" - export HOME=$TMPDIR + export HOME="$TMPDIR" export npm_config_nodedir="@nodeSrc@" local -r cacheLockfile="$npmDeps/package-lock.json" @@ -50,12 +50,12 @@ npmConfigHook() { local cachePath if [ -z "${makeCacheWritable-}" ]; then - cachePath=$npmDeps + cachePath="$npmDeps" else echo "Making cache writable" cp -r "$npmDeps" "$TMPDIR/cache" chmod -R 700 "$TMPDIR/cache" - cachePath=$TMPDIR/cache + cachePath="$TMPDIR/cache" fi npm config set cache "$cachePath" From 80ecb954e988a135422677f32b341718fe271289 Mon Sep 17 00:00:00 2001 From: Winter Date: Wed, 9 Nov 2022 23:00:06 -0500 Subject: [PATCH 774/797] npmHooks.npmConfigHook: add diagnostic for when dependencies aren't provided --- .../node/build-npm-package/hooks/npm-config-hook.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh index d2906d28ca2f..a8b0fca27998 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh @@ -8,6 +8,15 @@ npmConfigHook() { export HOME="$TMPDIR" export npm_config_nodedir="@nodeSrc@" + if [ -z "${npmDeps-}" ]; then + echo + echo "ERROR: no dependencies were specified" + echo 'Hint: set `npmDeps` if using these hooks individually. If this is happening with `buildNpmPackage`, please open an issue.' + echo + + exit 1 + fi + local -r cacheLockfile="$npmDeps/package-lock.json" local -r srcLockfile="$PWD/package-lock.json" From 93334f5234211e2cb17c58bb1f9dfe4963f7fb82 Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 10 Nov 2022 11:11:29 -0500 Subject: [PATCH 775/797] npmHooks.npmInstallHook: pass install flags to prune --- doc/languages-frameworks/javascript.section.md | 2 +- pkgs/build-support/node/build-npm-package/default.nix | 2 +- .../node/build-npm-package/hooks/npm-install-hook.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 490daf991588..fa10747dacc4 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -196,7 +196,7 @@ buildNpmPackage rec { * `makeCacheWritable`: Whether to make the cache writable prior to installing dependencies. Don't set this unless npm tries to write to the cache directory, as it can slow down the build. * `npmBuildScript`: The script to run to build the project. Defaults to `"build"`. * `npmFlags`: Flags to pass to all npm commands. -* `npmInstallFlags`: Flags to pass to `npm ci`. +* `npmInstallFlags`: Flags to pass to `npm ci` and `npm prune`. * `npmBuildFlags`: Flags to pass to `npm run ${npmBuildScript}`. * `npmPackFlags`: Flags to pass to `npm pack`. diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 1038bb2abcb4..5ab86996e56b 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -17,7 +17,7 @@ , npmBuildScript ? "build" # Flags to pass to all npm commands. , npmFlags ? [ ] - # Flags to pass to `npm ci`. + # Flags to pass to `npm ci` and `npm prune`. , npmInstallFlags ? [ ] # Flags to pass to `npm rebuild`. , npmRebuildFlags ? [ ] diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh index 4a222de26bbf..c3983e289568 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh @@ -27,7 +27,7 @@ npmInstallHook() { local -r nodeModulesPath="$packageOut/node_modules" if [ ! -d "$nodeModulesPath" ]; then - npm prune --omit dev + npm prune --omit dev $npmInstallFlags "${npmInstallFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}" find node_modules -maxdepth 1 -type d -empty -delete cp -r node_modules "$nodeModulesPath" From 3d5f77f496147a4ae553154a2fb66c4a88066325 Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 10 Nov 2022 16:41:25 -0500 Subject: [PATCH 776/797] npmHooks.npmConfigHook: sugget specifying legacy peer deps option for all commands --- .../node/build-npm-package/hooks/npm-config-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh index a8b0fca27998..17244cecb285 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh @@ -80,7 +80,7 @@ npmConfigHook() { echo "Here are a few things you can try, depending on the error:" echo '1. Set `makeCacheWritable = true`' echo " Note that this won't help if npm is complaining about not being able to write to the logs directory -- look above that for the actual error." - echo '2. Set `npmInstallFlags = [ "--legacy-peer-deps" ]`' + echo '2. Set `npmFlags = [ "--legacy-peer-deps" ]`' echo exit 1 From b117b359db1610173c81737a3f79da1b39032551 Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 13 Nov 2022 21:10:27 -0500 Subject: [PATCH 777/797] prefetch-npm-deps: move tests to separate file --- .../node/fetch-npm-deps/src/main.rs | 94 +------------------ .../node/fetch-npm-deps/src/tests.rs | 90 ++++++++++++++++++ 2 files changed, 92 insertions(+), 92 deletions(-) create mode 100644 pkgs/build-support/node/fetch-npm-deps/src/tests.rs diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index 5f1e0096d570..070f16f45a31 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -14,6 +14,8 @@ use tempfile::tempdir; use url::Url; mod cacache; +#[cfg(test)] +mod tests; #[derive(Deserialize)] struct PackageLock { @@ -343,95 +345,3 @@ fn main() -> anyhow::Result<()> { Ok(()) } - -#[cfg(test)] -mod tests { - use super::{ - get_hosted_git_url, get_ideal_hash, get_initial_url, to_new_packages, OldPackage, Package, - UrlOrString, - }; - use std::collections::HashMap; - use url::Url; - - #[test] - fn hosted_git_urls() { - for (input, expected) in [ - ( - "git+ssh://git@github.com/castlabs/electron-releases.git#fc5f78d046e8d7cdeb66345a2633c383ab41f525", - Some("https://codeload.github.com/castlabs/electron-releases/tar.gz/fc5f78d046e8d7cdeb66345a2633c383ab41f525"), - ), - ( - "https://user@github.com/foo/bar#fix/bug", - Some("https://codeload.github.com/foo/bar/tar.gz/fix/bug") - ), - ( - "https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz", - None - ), - ( - "git+ssh://bitbucket.org/foo/bar#branch", - Some("https://bitbucket.org/foo/bar/get/branch.tar.gz") - ), - ( - "ssh://git@gitlab.com/foo/bar.git#fix/bug", - Some("https://gitlab.com/foo/bar/repository/archive.tar.gz?ref=fix/bug") - ), - ( - "git+ssh://git.sr.ht/~foo/bar#branch", - Some("https://git.sr.ht/~foo/bar/archive/branch.tar.gz") - ), - ] { - assert_eq!( - get_hosted_git_url(&Url::parse(input).unwrap()), - expected.map(|u| Url::parse(u).unwrap()) - ); - } - } - - #[test] - fn ideal_hashes() { - for (input, expected) in [ - ("sha512-foo sha1-bar", Some("sha512-foo")), - ("sha1-bar md5-foo", Some("sha1-bar")), - ("sha1-bar", Some("sha1-bar")), - ("sha512-foo", Some("sha512-foo")), - ("foo-bar sha1-bar", Some("sha1-bar")), - ("foo-bar baz-foo", None), - ] { - assert_eq!(get_ideal_hash(input).ok(), expected); - } - } - - #[test] - fn git_shorthand_v1() -> anyhow::Result<()> { - let old = - { - let mut o = HashMap::new(); - o.insert( - String::from("sqlite3"), - OldPackage { - version: UrlOrString::Url(Url::parse( - "github:mapbox/node-sqlite3#593c9d498be2510d286349134537e3bf89401c4a", - ).unwrap()), - bundled: false, - resolved: None, - integrity: None, - dependencies: None, - }, - ); - o - }; - - let initial_url = get_initial_url()?; - - let new = to_new_packages(old, &initial_url)?; - - assert_eq!(new.len(), 1, "new packages map should contain 1 value"); - assert_eq!(new.into_values().next().unwrap(), Package { - resolved: Some(UrlOrString::Url(Url::parse("git+ssh://git@github.com/mapbox/node-sqlite3.git#593c9d498be2510d286349134537e3bf89401c4a").unwrap())), - integrity: None - }); - - Ok(()) - } -} diff --git a/pkgs/build-support/node/fetch-npm-deps/src/tests.rs b/pkgs/build-support/node/fetch-npm-deps/src/tests.rs new file mode 100644 index 000000000000..99e091cbc2c2 --- /dev/null +++ b/pkgs/build-support/node/fetch-npm-deps/src/tests.rs @@ -0,0 +1,90 @@ +use super::{ + get_hosted_git_url, get_ideal_hash, get_initial_url, to_new_packages, OldPackage, Package, + UrlOrString, +}; +use std::collections::HashMap; +use url::Url; + +#[test] +fn hosted_git_urls() { + for (input, expected) in [ + ( + "git+ssh://git@github.com/castlabs/electron-releases.git#fc5f78d046e8d7cdeb66345a2633c383ab41f525", + Some("https://codeload.github.com/castlabs/electron-releases/tar.gz/fc5f78d046e8d7cdeb66345a2633c383ab41f525"), + ), + ( + "https://user@github.com/foo/bar#fix/bug", + Some("https://codeload.github.com/foo/bar/tar.gz/fix/bug") + ), + ( + "https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz", + None + ), + ( + "git+ssh://bitbucket.org/foo/bar#branch", + Some("https://bitbucket.org/foo/bar/get/branch.tar.gz") + ), + ( + "ssh://git@gitlab.com/foo/bar.git#fix/bug", + Some("https://gitlab.com/foo/bar/repository/archive.tar.gz?ref=fix/bug") + ), + ( + "git+ssh://git.sr.ht/~foo/bar#branch", + Some("https://git.sr.ht/~foo/bar/archive/branch.tar.gz") + ), + ] { + assert_eq!( + get_hosted_git_url(&Url::parse(input).unwrap()), + expected.map(|u| Url::parse(u).unwrap()) + ); + } +} + +#[test] +fn ideal_hashes() { + for (input, expected) in [ + ("sha512-foo sha1-bar", Some("sha512-foo")), + ("sha1-bar md5-foo", Some("sha1-bar")), + ("sha1-bar", Some("sha1-bar")), + ("sha512-foo", Some("sha512-foo")), + ("foo-bar sha1-bar", Some("sha1-bar")), + ("foo-bar baz-foo", None), + ] { + assert_eq!(get_ideal_hash(input).ok(), expected); + } +} + +#[test] +fn git_shorthand_v1() -> anyhow::Result<()> { + let old = { + let mut o = HashMap::new(); + o.insert( + String::from("sqlite3"), + OldPackage { + version: UrlOrString::Url( + Url::parse( + "github:mapbox/node-sqlite3#593c9d498be2510d286349134537e3bf89401c4a", + ) + .unwrap(), + ), + bundled: false, + resolved: None, + integrity: None, + dependencies: None, + }, + ); + o + }; + + let initial_url = get_initial_url()?; + + let new = to_new_packages(old, &initial_url)?; + + assert_eq!(new.len(), 1, "new packages map should contain 1 value"); + assert_eq!(new.into_values().next().unwrap(), Package { + resolved: Some(UrlOrString::Url(Url::parse("git+ssh://git@github.com/mapbox/node-sqlite3.git#593c9d498be2510d286349134537e3bf89401c4a").unwrap())), + integrity: None + }); + + Ok(()) +} From 091d039b12a485bd3b677d862da5b35da4b19f36 Mon Sep 17 00:00:00 2001 From: Winter Date: Tue, 15 Nov 2022 19:52:50 -0500 Subject: [PATCH 778/797] prefetch-npm-deps: deduplicate dependencies when parsing lockfile A `package-lock.json` file can contain multiple instances of the same dependency, which caused unnecessary downloads and duplicate index entries in the generated cache. --- .../node/fetch-npm-deps/default.nix | 12 +-- .../node/fetch-npm-deps/src/cacache.rs | 2 +- .../node/fetch-npm-deps/src/main.rs | 79 +++++++++++-------- 3 files changed, 52 insertions(+), 41 deletions(-) diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index 24c1d016b090..d1e847c8a12e 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -46,7 +46,7 @@ hash = "sha256-uQmc+S+V1co1Rfc4d82PpeXjmd1UqdsG492ADQFcZGA="; }; - hash = "sha256-fk7L9vn8EHJsGJNMAjYZg9h0PT6dAwiahdiEeXVrMB8="; + hash = "sha256-wca1QvxUw3OrLStfYN9Co6oVBR1LbfcNUKlDqvObps4="; }; lockfileV2 = makeTest { @@ -57,7 +57,7 @@ hash = "sha256-qS29tq5QPnGxV+PU40VgMAtdwVLtLyyhG2z9GMeYtC4="; }; - hash = "sha256-s8SpZY/1tKZVd3vt7sA9vsqHvEaNORQBMrSyhWpj048="; + hash = "sha256-tuEfyePwlOy2/mOPdXbqJskO6IowvAP4DWg8xSZwbJw="; }; hashPrecedence = makeTest { @@ -68,7 +68,7 @@ hash = "sha256-1+0AQw9EmbHiMPA/H8OP8XenhrkhLRYBRhmd1cNPFjk="; }; - hash = "sha256-KRxwrEij3bpZ5hbQhX67KYpnY2cRS7u2EVZIWO1FBPM="; + hash = "sha256-oItUls7AXcCECuyA+crQO6B0kv4toIr8pBubNwB7kAM="; }; hostedGitDeps = makeTest { @@ -79,7 +79,7 @@ hash = "sha256-X9mCwPqV5yP0S2GonNvpYnLSLJMd/SUIked+hMRxDpA="; }; - hash = "sha256-oIM05TGHstX1D4k2K4TJ+SHB7H/tNKzxzssqf0GJwvY="; + hash = "sha256-ri8qvYjn420ykmCC2Uy5P3jxVVrKWJG3ug/qLIGcR7o="; }; linkDependencies = makeTest { @@ -90,7 +90,7 @@ hash = "sha256-6ZTBMyuyPP/63gpQugggHhKVup6OB4hZ2rmSvPJ0yEs="; }; - hash = "sha256-uQx8F5OXKm+fqx6hP6obVYTlQIYcJwtO52j6VQNo7Sk="; + hash = "sha256-VzQhArHoznYSXUT7l9HkJV4yoSOmoP8eYTLel1QwmB4="; }; # This package contains both hosted Git shorthand, and a bundled dependency that happens to override an existing one. @@ -102,7 +102,7 @@ hash = "sha256-1fGNxYJi1I4cXK/jinNG+Y6tPEOhP3QAqWOBEQttS9E="; }; - hash = "sha256-TzUFykASDjXlfmgq2bUIJjUkfLlGLUkRTVFPIYPCmyc="; + hash = "sha256-73rLcSBgsZRJFELaKK++62hVbt1QT8JgLu2hyDSmIZE="; }; }; diff --git a/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs b/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs index 865a320954b5..715e115e7235 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs @@ -109,7 +109,7 @@ impl Cache { let mut file = File::options().append(true).create(true).open(index_path)?; - write!(file, "\n{:x}\t{data}", Sha1::new().chain(&data).finalize())?; + write!(file, "{:x}\t{data}", Sha1::new().chain(&data).finalize())?; Ok(()) } diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index 070f16f45a31..7189969b84d5 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -5,7 +5,7 @@ use anyhow::{anyhow, Context}; use rayon::prelude::*; use serde::Deserialize; use std::{ - collections::HashMap, + collections::{HashMap, HashSet}, env, fmt, fs, path::Path, process::{self, Command}, @@ -292,47 +292,58 @@ fn main() -> anyhow::Result<()> { return Ok(()); } + let packages = { + let mut seen = HashSet::new(); + let mut new_packages = HashMap::new(); + + for (dep, package) in packages.unwrap().drain() { + if let (false, Some(UrlOrString::Url(resolved))) = (dep.is_empty(), &package.resolved) { + if !seen.contains(resolved) { + seen.insert(resolved.clone()); + new_packages.insert(dep, package); + } + } + } + + new_packages + }; + let cache = Cache::new(out.join("_cacache")); - packages - .unwrap() - .into_par_iter() - .filter(|(dep, _)| !dep.is_empty()) - .filter(|(_, package)| matches!(package.resolved, Some(UrlOrString::Url(_)))) - .try_for_each(|(dep, package)| { - eprintln!("{dep}"); + packages.into_par_iter().try_for_each(|(dep, package)| { + eprintln!("{dep}"); - let mut resolved = match package.resolved { - Some(UrlOrString::Url(url)) => url, - _ => unreachable!(), - }; + let mut resolved = match package.resolved { + Some(UrlOrString::Url(url)) => url, + _ => unreachable!(), + }; - if let Some(hosted_git_url) = get_hosted_git_url(&resolved) { - resolved = hosted_git_url; - } + if let Some(hosted_git_url) = get_hosted_git_url(&resolved) { + resolved = hosted_git_url; + } - let mut data = Vec::new(); + let mut data = Vec::new(); - agent - .get(resolved.as_str()) - .call()? - .into_reader() - .read_to_end(&mut data)?; + agent + .get(resolved.as_str()) + .call()? + .into_reader() + .read_to_end(&mut data)?; - cache - .put( - format!("make-fetch-happen:request-cache:{resolved}"), - resolved, - &data, - package - .integrity - .map(|i| Ok::(get_ideal_hash(&i)?.to_string())) - .transpose()?, - ) - .map_err(|e| anyhow!("couldn't insert cache entry for {dep}: {e:?}"))?; + cache + .put( + format!("make-fetch-happen:request-cache:{resolved}"), + resolved, + &data, + package + .integrity + .map(|i| Ok::(get_ideal_hash(&i)?.to_string())) + .transpose()?, + ) + .map_err(|e| anyhow!("couldn't insert cache entry for {dep}: {e:?}"))?; - Ok::<_, anyhow::Error>(()) - })?; + Ok::<_, anyhow::Error>(()) + })?; fs::write(out.join("package-lock.json"), lock_content)?; From 009a234bdd91d91008e95c7e8b9de16439114635 Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 13 Nov 2022 22:14:46 -0500 Subject: [PATCH 779/797] prefetch-npm-deps: repack hosted git deps Previously, we stored the tarballs from the hosted Git providers directly in the cache. However, as we've seen with `fetchFromGitHub` etc, these files may change subtly. Given this, this commit repacks the dependencies before storing them in the cache. --- .../node/build-npm-package/hooks/default.nix | 3 +- .../hooks/npm-config-hook.sh | 2 + .../node/fetch-npm-deps/default.nix | 11 +- .../node/fetch-npm-deps/src/main.rs | 169 ++++++++++++++---- .../node/fetch-npm-deps/src/tests.rs | 55 +++++- 5 files changed, 204 insertions(+), 36 deletions(-) diff --git a/pkgs/build-support/node/build-npm-package/hooks/default.nix b/pkgs/build-support/node/build-npm-package/hooks/default.nix index 4ac981af916c..ff0930426d4e 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/default.nix +++ b/pkgs/build-support/node/build-npm-package/hooks/default.nix @@ -7,10 +7,11 @@ substitutions = { nodeSrc = srcOnly nodejs; - # Specify the stdenv's `diff` and `jq` by abspath to ensure that the user's build + # Specify `diff`, `jq`, and `prefetch-npm-deps` by abspath to ensure that the user's build # inputs do not cause us to find the wrong binaries. diff = "${buildPackages.diffutils}/bin/diff"; jq = "${buildPackages.jq}/bin/jq"; + prefetchNpmDeps = "${buildPackages.prefetch-npm-deps}/bin/prefetch-npm-deps"; nodeVersion = nodejs.version; nodeVersionMajor = lib.versions.major nodejs.version; diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh index 17244cecb285..6fa6a0f940b1 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh @@ -56,6 +56,8 @@ npmConfigHook() { exit 1 fi + @prefetchNpmDeps@ --fixup-lockfile "$srcLockfile" + local cachePath if [ -z "${makeCacheWritable-}" ]; then diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index d1e847c8a12e..7d5ea7cbfbe8 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, rustPlatform, Security, testers, fetchurl, prefetch-npm-deps, fetchNpmDeps }: +{ lib, stdenvNoCC, rustPlatform, makeWrapper, Security, gnutar, gzip, testers, fetchurl, prefetch-npm-deps, fetchNpmDeps }: { prefetch-npm-deps = rustPlatform.buildRustPackage { @@ -16,8 +16,13 @@ cargoLock.lockFile = ./Cargo.lock; + nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional stdenvNoCC.isDarwin Security; + postInstall = '' + wrapProgram "$out/bin/prefetch-npm-deps" --prefix PATH : ${lib.makeBinPath [ gnutar gzip ]} + ''; + passthru.tests = let makeTestSrc = { name, src }: stdenvNoCC.mkDerivation { @@ -79,7 +84,7 @@ hash = "sha256-X9mCwPqV5yP0S2GonNvpYnLSLJMd/SUIked+hMRxDpA="; }; - hash = "sha256-ri8qvYjn420ykmCC2Uy5P3jxVVrKWJG3ug/qLIGcR7o="; + hash = "sha256-5Mg7KDJLMM5e/7BCHGinGAnBRft2ySQzvKW06p3u/0o="; }; linkDependencies = makeTest { @@ -102,7 +107,7 @@ hash = "sha256-1fGNxYJi1I4cXK/jinNG+Y6tPEOhP3QAqWOBEQttS9E="; }; - hash = "sha256-73rLcSBgsZRJFELaKK++62hVbt1QT8JgLu2hyDSmIZE="; + hash = "sha256-8xF8F74nHwL9KPN2QLsxnfvsk0rNCKOZniYJQCD5u/I="; }; }; diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index 7189969b84d5..cf9651d42d64 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -4,11 +4,12 @@ use crate::cacache::Cache; use anyhow::{anyhow, Context}; use rayon::prelude::*; use serde::Deserialize; +use serde_json::{Map, Value}; use std::{ collections::{HashMap, HashSet}, - env, fmt, fs, + env, fmt, fs, io, path::Path, - process::{self, Command}, + process::{self, Command, Stdio}, }; use tempfile::tempdir; use url::Url; @@ -245,6 +246,55 @@ fn get_initial_url() -> anyhow::Result { Url::parse("git+ssh://git@a.b").context("initial url should be valid") } +/// `fixup_lockfile` removes the `integrity` field from Git dependencies. +/// +/// Git dependencies from specific providers can be retrieved from those providers' automatic tarball features. +/// When these dependencies are specified with a commit identifier, npm generates a tarball, and inserts the integrity hash of that +/// tarball into the lockfile. +/// +/// Thus, we remove this hash, to replace it with our own determinstic copies of dependencies from hosted Git providers. +fn fixup_lockfile(mut lock: Map) -> anyhow::Result>> { + if lock + .get("lockfileVersion") + .ok_or_else(|| anyhow!("couldn't get lockfile version"))? + .as_i64() + .ok_or_else(|| anyhow!("lockfile version isn't an int"))? + < 2 + { + return Ok(None); + } + + let mut fixed = false; + + for package in lock + .get_mut("packages") + .ok_or_else(|| anyhow!("couldn't get packages"))? + .as_object_mut() + .ok_or_else(|| anyhow!("packages isn't a map"))? + .values_mut() + { + if let Some(Value::String(resolved)) = package.get("resolved") { + if resolved.starts_with("git+ssh://") && package.get("integrity").is_some() { + fixed = true; + + package + .as_object_mut() + .ok_or_else(|| anyhow!("package isn't a map"))? + .remove("integrity"); + } + } + } + + if fixed { + lock.remove("dependencies"); + + Ok(Some(lock)) + } else { + Ok(None) + } +} + +#[allow(clippy::too_many_lines)] fn main() -> anyhow::Result<()> { let args = env::args().collect::>(); @@ -256,6 +306,18 @@ fn main() -> anyhow::Result<()> { process::exit(1); } + if args[1] == "--fixup-lockfile" { + let lock = serde_json::from_str(&fs::read_to_string(&args[2])?)?; + + if let Some(fixed) = fixup_lockfile(lock)? { + println!("Fixing lockfile"); + + fs::write(&args[2], serde_json::to_string(&fixed)?)?; + } + + return Ok(()); + } + let lock_content = fs::read_to_string(&args[1])?; let lock: PackageLock = serde_json::from_str(&lock_content)?; @@ -310,40 +372,87 @@ fn main() -> anyhow::Result<()> { let cache = Cache::new(out.join("_cacache")); - packages.into_par_iter().try_for_each(|(dep, package)| { - eprintln!("{dep}"); + packages + .into_par_iter() + .try_for_each(|(dep, mut package)| { + eprintln!("{dep}"); - let mut resolved = match package.resolved { - Some(UrlOrString::Url(url)) => url, - _ => unreachable!(), - }; + let mut resolved = match package.resolved { + Some(UrlOrString::Url(url)) => url, + _ => unreachable!(), + }; - if let Some(hosted_git_url) = get_hosted_git_url(&resolved) { - resolved = hosted_git_url; - } + let mut hosted = false; - let mut data = Vec::new(); + if let Some(hosted_git_url) = get_hosted_git_url(&resolved) { + resolved = hosted_git_url; + package.integrity = None; + hosted = true; + } - agent - .get(resolved.as_str()) - .call()? - .into_reader() - .read_to_end(&mut data)?; + let mut data = Vec::new(); - cache - .put( - format!("make-fetch-happen:request-cache:{resolved}"), - resolved, - &data, - package - .integrity - .map(|i| Ok::(get_ideal_hash(&i)?.to_string())) - .transpose()?, - ) - .map_err(|e| anyhow!("couldn't insert cache entry for {dep}: {e:?}"))?; + let mut body = agent.get(resolved.as_str()).call()?.into_reader(); - Ok::<_, anyhow::Error>(()) - })?; + if hosted { + let workdir = tempdir()?; + + let tar_path = workdir.path().join("package"); + + fs::create_dir(&tar_path)?; + + let mut cmd = Command::new("tar") + .args(["--extract", "--gzip", "--strip-components=1", "-C"]) + .arg(&tar_path) + .stdin(Stdio::piped()) + .spawn()?; + + io::copy(&mut body, &mut cmd.stdin.take().unwrap())?; + + let exit = cmd.wait()?; + + if !exit.success() { + return Err(anyhow!( + "failed to extract tarball for {dep}: tar exited with status code {}", + exit.code().unwrap() + )); + } + + data = Command::new("tar") + .args([ + "--sort=name", + "--mtime=0", + "--owner=0", + "--group=0", + "--numeric-owner", + "--format=gnu", + "-I", + "gzip -n -9", + "--create", + "-C", + ]) + .arg(workdir.path()) + .arg("package") + .output()? + .stdout; + } else { + body.read_to_end(&mut data)?; + } + + cache + .put( + format!("make-fetch-happen:request-cache:{resolved}"), + resolved, + &data, + package + .integrity + .map(|i| Ok::(get_ideal_hash(&i)?.to_string())) + .transpose()?, + ) + .map_err(|e| anyhow!("couldn't insert cache entry for {dep}: {e:?}"))?; + + Ok::<_, anyhow::Error>(()) + })?; fs::write(out.join("package-lock.json"), lock_content)?; diff --git a/pkgs/build-support/node/fetch-npm-deps/src/tests.rs b/pkgs/build-support/node/fetch-npm-deps/src/tests.rs index 99e091cbc2c2..a3317207c42e 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/tests.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/tests.rs @@ -1,7 +1,8 @@ use super::{ - get_hosted_git_url, get_ideal_hash, get_initial_url, to_new_packages, OldPackage, Package, - UrlOrString, + fixup_lockfile, get_hosted_git_url, get_ideal_hash, get_initial_url, to_new_packages, + OldPackage, Package, UrlOrString, }; +use serde_json::json; use std::collections::HashMap; use url::Url; @@ -88,3 +89,53 @@ fn git_shorthand_v1() -> anyhow::Result<()> { Ok(()) } + +#[test] +fn lockfile_fixup() -> anyhow::Result<()> { + let input = json!({ + "lockfileVersion": 2, + "name": "foo", + "packages": { + "": { + + }, + "foo": { + "resolved": "https://github.com/NixOS/nixpkgs", + "integrity": "aaa" + }, + "bar": { + "resolved": "git+ssh://git@github.com/NixOS/nixpkgs.git", + "integrity": "bbb" + } + } + }); + + let expected = json!({ + "lockfileVersion": 2, + "name": "foo", + "packages": { + "": { + + }, + "foo": { + "resolved": "https://github.com/NixOS/nixpkgs", + "integrity": "aaa" + }, + "bar": { + "resolved": "git+ssh://git@github.com/NixOS/nixpkgs.git", + } + } + }); + + assert_eq!( + fixup_lockfile(input.as_object().unwrap().clone())?, + Some(expected.as_object().unwrap().clone()) + ); + + assert_eq!( + fixup_lockfile(json!({"lockfileVersion": 1}).as_object().unwrap().clone())?, + None + ); + + Ok(()) +} From 814a0bc6b71af6928134898be2958adc603f76bf Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 20 Nov 2022 13:07:20 -0500 Subject: [PATCH 780/797] open-stage-control: update deps hash --- pkgs/applications/audio/open-stage-control/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 11b5f26ee035..015265774507 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -16,7 +16,7 @@ buildNpmPackage rec { ./package-lock.json.patch ]; - npmDepsHash = "sha256-UF3pZ+SlrgDLqntciXRNbWfpPMtQw1DXl41x9r37QN4="; + npmDepsHash = "sha256-SGLcFjPnmhFoeXtP4gfGr4Qa1dTaXwSnzkweEvYW/1k="; nativeBuildInputs = [ copyDesktopItems From 361cab5bb53a6c7c86525b62a4e783857091ee38 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 21 Nov 2022 21:08:04 +0100 Subject: [PATCH 781/797] nfs-ganesha: 4.0.12 -> 4.1 --- pkgs/servers/nfs-ganesha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index 1af14ded947d..a434b48388ac 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "4.0.12"; + version = "4.1"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-s6iZcZObBEHvIqyD0niNzuPJf4ENZGw3mhgZZZdj2zc="; + sha256 = "sha256-M7lQkO36I4Cwxs49XdxsUVVI2/Nz7fhU36j9fxUuMfM="; }; preConfigure = "cd src"; From b68bd2ee52051aaf983a268494cb4fc6c485b646 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Nov 2022 21:20:24 +0100 Subject: [PATCH 782/797] 23.05 is Stoat --- .version | 2 +- lib/trivial.nix | 2 +- .../from_md/release-notes/rl-2305.section.xml | 51 +++++++++++++++++++ .../manual/release-notes/release-notes.xml | 1 + .../manual/release-notes/rl-2305.section.md | 29 +++++++++++ 5 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 nixos/doc/manual/from_md/release-notes/rl-2305.section.xml create mode 100644 nixos/doc/manual/release-notes/rl-2305.section.md diff --git a/.version b/.version index f07cdfac44f1..f8c860969712 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -22.11 \ No newline at end of file +23.05 diff --git a/lib/trivial.nix b/lib/trivial.nix index 142ed32c9e5a..70bc53016456 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -195,7 +195,7 @@ rec { On each release the first letter is bumped and a new animal is chosen starting with that new letter. */ - codeName = "Raccoon"; + codeName = "Stoat"; /* Returns the current nixpkgs version suffix as string. */ versionSuffix = diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml new file mode 100644 index 000000000000..51dafd38c1ac --- /dev/null +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -0,0 +1,51 @@ +
+ 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: + + + + + Create the first release note entry in this section! + + + +
+
+ New Services + + + + Create the first release note entry in this section! + + + +
+
+ Backward Incompatibilities + + + + Create the first release note entry in this section! + + + +
+
+ Other Notable Changes + + + + Create the first release note entry in this section! + + + +
+
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index ee5009faf6f4..bb5cc677afb8 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -8,6 +8,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. + diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md new file mode 100644 index 000000000000..5bc6c8614895 --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -0,0 +1,29 @@ +# Release 23.05 (“Stoat”, 2023.05/??) {#sec-release-23.05} + +Support is planned until the end of December 2023, handing over to 23.11. + +## Highlights {#sec-release-23.05-highlights} + +In addition to numerous new and upgraded packages, this release has the following highlights: + + + +- Create the first release note entry in this section! + +## New Services {#sec-release-23.05-new-services} + + + +- Create the first release note entry in this section! + +## Backward Incompatibilities {#sec-release-23.05-incompatibilities} + + + +- Create the first release note entry in this section! + +## Other Notable Changes {#sec-release-23.05-notable-changes} + + + +- Create the first release note entry in this section! From aee7510bf1c4942b3ce0f73ed69476c21b896fc4 Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 21 Nov 2022 21:48:48 +0100 Subject: [PATCH 783/797] xpaste: init at 1.5 (#201602) Co-authored-by: Sandro --- pkgs/tools/text/xpaste/default.nix | 41 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/text/xpaste/default.nix diff --git a/pkgs/tools/text/xpaste/default.nix b/pkgs/tools/text/xpaste/default.nix new file mode 100644 index 000000000000..4c3bb82b7161 --- /dev/null +++ b/pkgs/tools/text/xpaste/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, python3Packages +, fetchpatch +}: + +python3Packages.buildPythonApplication rec { + pname = "xpaste"; + version = "1.5"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "ossobv"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Z9YxhVP+FUvWET91ob4SPSW+XX7/wzlgPr53vO517L4="; + }; + + propagatedBuildInputs = with python3Packages; [ + xlib + ]; + + patches = [ + (fetchpatch { + # https://github.com/ossobv/xpaste/pull/6 + name = "fix-function-call-after-wayland-update.patch"; + url = "https://github.com/ossobv/xpaste/commit/47412738dad4b5fc8bc287ead23c8440bfdc547d.patch"; + hash = "sha256-t4LZG600AsFTtKjXCxioGcAP4YcHIdQ/fVMIYjsunuA="; + }) + ]; + + # no tests, no python module to import, no version output to check + doCheck = false; + + meta = with lib; { + description = "Paste text into X windows that don't work with selections"; + homepage = "https://github.com/ossobv/xpaste"; + license = licenses.gpl3; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47fee83a9ae5..4f48ad8215f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1479,6 +1479,8 @@ with pkgs; xcd = callPackage ../tools/misc/xcd { }; + xpaste = callPackage ../tools/text/xpaste { }; + xrootd = callPackage ../tools/networking/xrootd { }; xtrt = callPackage ../tools/archivers/xtrt { }; From 45c65058c03ff13f9e242be565a8222f16c70969 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 14 Nov 2022 00:43:24 +0100 Subject: [PATCH 784/797] enumer: init at 1.5.7 --- pkgs/tools/misc/enumer/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/enumer/default.nix diff --git a/pkgs/tools/misc/enumer/default.nix b/pkgs/tools/misc/enumer/default.nix new file mode 100644 index 000000000000..c7e7818d09ef --- /dev/null +++ b/pkgs/tools/misc/enumer/default.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "enumer"; + version = "1.5.7"; + + src = fetchFromGitHub { + owner = "dmarkham"; + repo = "enumer"; + rev = "refs/tags/v${version}"; + hash = "sha256-2fVWrrWOiCtg7I3Lul2PgQ2u/qDEDioPSB61Tp0rfEo="; + }; + + vendorSha256 = "sha256-BmFv0ytRnjaB7z7Gb+38Fw2ObagnaFMnMhlejhaGxsk="; + + meta = with lib; { + description = "Go tool to auto generate methods for enums"; + homepage = "https://github.com/dmarkham/enumer"; + license = licenses.bsd2; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f48ad8215f6..d7f643caa002 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -480,6 +480,8 @@ with pkgs; efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { }; + enumer = callPackage ../tools/misc/enumer { }; + evans = callPackage ../development/tools/evans { }; expressvpn = callPackage ../applications/networking/expressvpn { }; From 74b39464975dfaa92194e8cec27f4699a75ea1a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 21:33:13 +0000 Subject: [PATCH 785/797] cargo-expand: 1.0.32 -> 1.0.35 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index b7235356b539..07fb95f8729c 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.32"; + version = "1.0.35"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-5zWJsc0OKgQMp0PeCuL99RE/Uj5sudXRMITjoKniPqQ="; + sha256 = "sha256-hJb4FLL3+AMNLL05eQc7Mkhp0KEGxmHg8/ETDoZiLV4="; }; - cargoSha256 = "sha256-/euiu7WNFY89QU1BKFfOAn7k93dZpuwbS6u2A6MDsoM="; + cargoSha256 = "sha256-wKVlmO2/ugAb7vUSIGMz0WGnjEVEsm459DV9FaM28Mk="; buildInputs = lib.optional stdenv.isDarwin libiconv; From cc8681b2c718472614196b0424cdc47761c5d5a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 25 Jul 2021 10:59:01 +0200 Subject: [PATCH 786/797] evcc: init at 0.107.1 --- pkgs/servers/home-automation/evcc/default.nix | 92 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 94 insertions(+) create mode 100644 pkgs/servers/home-automation/evcc/default.nix diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix new file mode 100644 index 000000000000..feb0180cc4cb --- /dev/null +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -0,0 +1,92 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, fetchNpmDeps +, cacert +, go +, git +, enumer +, mockgen +, nodejs +, npmHooks +, nix-update-script +, stdenv +}: + +buildGoModule rec { + pname = "evcc"; + version = "0.107.1"; + + src = fetchFromGitHub { + owner = "evcc-io"; + repo = pname; + rev = version; + hash = "sha256-Yu7ebZ6WkLpdvmg7H9A1Sveyu9SRuQ+78gFrCZrYhCU="; + }; + + vendorHash = "sha256-10W1BNHcdP77m7lJ/mc+jQeUigoUid3K0wI4bUm5y+s="; + + npmDeps = fetchNpmDeps { + inherit src; + hash = "sha256-+l5LuxJAjrTvOL5XEQ4OIktdupSpn6IqrNX5x4MRmNw="; + }; + + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; + + overrideModAttrs = _: { + nativeBuildInputs = [ + enumer + go + git + cacert + mockgen + ]; + + preBuild = '' + make assets + ''; + }; + + tags = [ + "release" + ]; + + ldflags = [ + "-X github.com/evcc-io/evcc/server.Version=${version}" + "-X github.com/evcc-io/evcc/server.Commit=${src.rev}" + "-s" + "-w" + ]; + + npmInstallFlags = [ + "--legacy-peer-deps" + ]; + + preBuild = '' + make ui + ''; + + doCheck = !stdenv.isDarwin; # tries to bind to local network, doesn't work in darwin sandbox + + preCheck = '' + # requires network access + rm meter/template_test.go + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "EV Charge Controller"; + homepage = "https://evcc.io"; + changelog = "https://github.com/andig/evcc/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7f643caa002..826da64315fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6452,6 +6452,8 @@ with pkgs; ettercap = callPackage ../applications/networking/sniffers/ettercap { }; + evcc = callPackage ../servers/home-automation/evcc { }; + eventstat = callPackage ../os-specific/linux/eventstat { }; evillimiter = python3Packages.callPackage ../tools/networking/evillimiter { }; From 36f58b687c48494e6f849f0bb816b5d4fcdc30f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Jul 2021 15:13:24 +0200 Subject: [PATCH 787/797] nixos/evcc: init --- .../from_md/release-notes/rl-2211.section.xml | 10 ++ .../manual/release-notes/rl-2211.section.md | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/home-automation/evcc.nix | 92 +++++++++++++++++++ 4 files changed, 105 insertions(+) create mode 100644 nixos/modules/services/home-automation/evcc.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 3ab35fe84bbf..763010ae82a3 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -278,6 +278,16 @@ services.prometheus.sachet. + + + 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. + + infnoise, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 81aef68a716f..b8aa0cc09fa9 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -98,6 +98,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [Sachet](https://github.com/messagebird/sachet/), an SMS alerting tool for the Prometheus Alertmanager. Available as [services.prometheus.sachet](#opt-services.prometheus.sachet.enable). +- [EVCC](https://evcc.io) 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](#opt-services.evcc.enable). + - [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. Available as [services.infnoise](options.html#opt-services.infnoise.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2a23a32eaba6..bc5f6f1d76cd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -491,6 +491,7 @@ ./services/hardware/vdr.nix ./services/home-automation/home-assistant.nix ./services/home-automation/zigbee2mqtt.nix + ./services/home-automation/evcc.nix ./services/logging/SystemdJournal2Gelf.nix ./services/logging/awstats.nix ./services/logging/filebeat.nix diff --git a/nixos/modules/services/home-automation/evcc.nix b/nixos/modules/services/home-automation/evcc.nix new file mode 100644 index 000000000000..c12ba9d0c1e2 --- /dev/null +++ b/nixos/modules/services/home-automation/evcc.nix @@ -0,0 +1,92 @@ +{ lib +, pkgs +, config +, ... +}: + +with lib; + +let + cfg = config.services.evcc; + + format = pkgs.formats.yaml {}; + configFile = format.generate "evcc.yml" cfg.settings; + + package = pkgs.evcc; +in + +{ + meta.maintainers = with lib.maintainers; [ hexa ]; + + options.services.evcc = with types; { + enable = mkEnableOption (lib.mdDoc "EVCC, the extensible EV Charge Controller with PV integration"); + + extraArgs = mkOption { + type = listOf str; + default = []; + description = lib.mdDoc '' + Extra arguments to pass to the evcc executable. + ''; + }; + + settings = mkOption { + type = format.type; + description = lib.mdDoc '' + evcc configuration as a Nix attribute set. + + Check for possible options in the sample [evcc.dist.yaml](https://github.com/andig/evcc/blob/${package.version}/evcc.dist.yaml]. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.evcc = { + after = [ + "network-online.target" + "mosquitto.target" + ]; + wantedBy = [ + "multi-user.target" + ]; + + serviceConfig = { + ExecStart = "${package}/bin/evcc --config ${configFile} ${escapeShellArgs cfg.extraArgs}"; + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ + "char-ttyUSB" + ]; + DevicePolicy = "closed"; + DynamicUser = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups= true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + UMask = "0077"; + User = "evcc"; + }; + }; + }; + + meta.buildDocsInSandbox = false; +} From 005233baa29a7da3aa2e76ce0bd36bf286aaac4f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Jul 2021 15:14:24 +0200 Subject: [PATCH 788/797] nixos/tests/evcc: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/evcc.nix | 96 +++++++++++++++++++ pkgs/servers/home-automation/evcc/default.nix | 4 + 3 files changed, 101 insertions(+) create mode 100644 nixos/tests/evcc.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d3dc8b9ca08a..7b1006ba6015 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -198,6 +198,7 @@ in { etebase-server = handleTest ./etebase-server.nix {}; etesync-dav = handleTest ./etesync-dav.nix {}; extra-python-packages = handleTest ./extra-python-packages.nix {}; + evcc = handleTest ./evcc.nix {}; fancontrol = handleTest ./fancontrol.nix {}; fcitx = handleTest ./fcitx {}; fenics = handleTest ./fenics.nix {}; diff --git a/nixos/tests/evcc.nix b/nixos/tests/evcc.nix new file mode 100644 index 000000000000..0fc261142f78 --- /dev/null +++ b/nixos/tests/evcc.nix @@ -0,0 +1,96 @@ +import ./make-test-python.nix ({ pkgs, lib, ...} : + +{ + name = "evcc"; + meta.maintainers = with lib.maintainers; [ hexa ]; + + nodes = { + machine = { config, ... }: { + services.evcc = { + enable = true; + settings = { + network = { + schema = "http"; + host = "localhost"; + port = 7070; + }; + + log = "info"; + + site = { + title = "NixOS Test"; + meters = { + grid = "grid"; + pv = "pv"; + }; + }; + + meters = [ { + type = "custom"; + name = "grid"; + power = { + source = "script"; + cmd = "/bin/sh -c 'echo -4500'"; + }; + } { + type = "custom"; + name = "pv"; + power = { + source = "script"; + cmd = "/bin/sh -c 'echo 7500'"; + }; + } ]; + + chargers = [ { + name = "dummy-charger"; + type = "custom"; + status = { + source = "script"; + cmd = "/bin/sh -c 'echo charger status F'"; + }; + enabled = { + source = "script"; + cmd = "/bin/sh -c 'echo charger enabled state false'"; + }; + enable = { + source = "script"; + cmd = "/bin/sh -c 'echo set charger enabled state true'"; + }; + maxcurrent = { + source = "script"; + cmd = "/bin/sh -c 'echo set charger max current 7200'"; + }; + } ]; + + loadpoints = [ { + title = "Dummy"; + charger = "dummy-charger"; + } ]; + }; + }; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("evcc.service") + machine.wait_for_open_port(7070) + + with subtest("Check package version propagates into frontend"): + machine.fail( + "curl --fail http://localhost:7070 | grep '0.0.1-alpha'" + ) + machine.succeed( + "curl --fail http://localhost:7070 | grep '${pkgs.evcc.version}'" + ) + + with subtest("Check journal for errors"): + _, output = machine.execute("journalctl -o cat -u evcc.service") + assert "ERROR" not in output + + with subtest("Check systemd hardening"): + _, output = machine.execute("systemd-analyze security evcc.service | grep -v '✓'") + machine.log(output) + ''; +}) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index feb0180cc4cb..a242f9d1cc3a 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -10,6 +10,7 @@ , nodejs , npmHooks , nix-update-script +, nixosTests , stdenv }: @@ -77,6 +78,9 @@ buildGoModule rec { ''; passthru = { + tests = { + inherit (nixosTests) evcc; + }; updateScript = nix-update-script { attrPath = pname; }; From 802115d0227228b66b691f3b85b30b868976e8eb Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 21 Nov 2022 17:39:26 +0100 Subject: [PATCH 789/797] dar: unbreak on Darwin Error with LLVM stdenv on aarch64-darwin: libtool: compile: clang++ -DHAVE_CONFIG_H -I. -I../.. -DLIBDAR_MODE=64 -DDAR_LOCALEDIR=\"/nix/store/waclhq32gacp2010gyjx17f9h6xpsf8d-dar-2.7.7/share/locale\" -I/nix/store/1m4gsx4p4fl5xpg0h8splmwz7j2y3cbp-gpgme-1.18.0-dev/include -I/nix/store/fpc4g6ql1mx4na5rkjhik5f2wixymzhy-libassuan-2.5.5-dev/include -I/nix/store/qhznxypyfh3w5xdbxxd2n47d9c8jr2bx-libgpg-error-1.45-dev/include -g -O2 -c parallel_block_compressor.cpp -D__DYNAMIC__ -fno-common -DPIC -o .libs/parallel_block_compressor.o In file included from parallel_tronconneuse.cpp:28: In file included from ./parallel_tronconneuse.hpp:39: In file included from /nix/store/3lsnbsiwzy2gzga1m2bszb7r9d6wraz2-libcxx-11.1.0-dev/include/c++/v1/string:506: In file included from /nix/store/3lsnbsiwzy2gzga1m2bszb7r9d6wraz2-libcxx-11.1.0-dev/include/c++/v1/string_view:175: In file included from /nix/store/3lsnbsiwzy2gzga1m2bszb7r9d6wraz2-libcxx-11.1.0-dev/include/c++/v1/__string:57: In file included from /nix/store/3lsnbsiwzy2gzga1m2bszb7r9d6wraz2-libcxx-11.1.0-dev/include/c++/v1/algorithm:643: /nix/store/3lsnbsiwzy2gzga1m2bszb7r9d6wraz2-libcxx-11.1.0-dev/include/c++/v1/memory:3455:7: error: exception specification of overriding function is more lax than base version class __shared_ptr_emplace ^ /nix/store/3lsnbsiwzy2gzga1m2bszb7r9d6wraz2-libcxx-11.1.0-dev/include/c++/v1/memory:4291:26: note: in instantiation of template class 'std::__1::__shared_ptr_emplace>' requested here ::new(__hold2.get()) _CntrlBlk(__a2, _VSTD::forward<_Args>(__args)...); ^ parallel_tronconneuse.cpp:102:15: note: in instantiation of function template specialization 'std::__1::make_shared' requested here waiter = make_shared(num_workers + 2); // +1 for crypto_reade thread, +1 this thread ^ /nix/store/3lsnbsiwzy2gzga1m2bszb7r9d6wraz2-libcxx-11.1.0-dev/include/c++/v1/memory:3364:13: note: overridden virtual function is here virtual ~__shared_weak_count(); ^ 1 error generated. make[3]: *** [Makefile:1383: parallel_tronconneuse.lo] Error 1 --- pkgs/tools/backup/dar/default.nix | 17 ++++++++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 41ecdd1ea780..3652529805c6 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -1,13 +1,20 @@ -{ lib, stdenv, fetchurl +{ lib, gccStdenv, fetchurl , which , attr, e2fsprogs , curl, libargon2, librsync, libthreadar , gpgme, libgcrypt, openssl , bzip2, lz4, lzo, xz, zlib +, CoreFoundation }: with lib; +let + # Fails to build with clang on Darwin: + # error: exception specification of overriding function is more lax than base version + stdenv = gccStdenv; +in + stdenv.mkDerivation rec { version = "2.7.7"; pname = "dar"; @@ -25,7 +32,12 @@ stdenv.mkDerivation rec { curl librsync libthreadar gpgme libargon2 libgcrypt openssl bzip2 lz4 lzo xz zlib - ] ++ optionals stdenv.isLinux [ attr e2fsprogs ]; + ] ++ optionals stdenv.isLinux [ + attr + e2fsprogs + ] ++ optionals stdenv.isDarwin [ + CoreFoundation + ]; configureFlags = [ "--disable-birthtime" @@ -45,7 +57,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - broken = stdenv.isDarwin; homepage = "http://dar.linux.free.fr"; description = "Disk ARchiver, allows backing up files into indexed archives"; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f48ad8215f6..bb7b2bfd548d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5780,7 +5780,9 @@ with pkgs; daq = callPackage ../applications/networking/ids/daq { }; - dar = callPackage ../tools/backup/dar { }; + dar = callPackage ../tools/backup/dar { + inherit (darwin.apple_sdk.frameworks) CoreFoundation; + }; darkhttpd = callPackage ../servers/http/darkhttpd { }; From 3761ba2119fde0972cf4aac48d0b4ccc87c53ab1 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 21 Nov 2022 23:09:58 +0100 Subject: [PATCH 790/797] awscli2: 2.8.12 -> 2.9.0 (#201978) --- pkgs/tools/admin/awscli2/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index a04ebf85ea7f..463063e6a664 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -4,6 +4,8 @@ , less , fetchFromGitHub , nix-update-script +, testers +, awscli2 }: let @@ -32,14 +34,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.8.12"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.9.0"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-OeOSSB0WgVJEszmkXmMkmJNq37sPID7HFaTbXkBUwlI="; + sha256 = "sha256-kPMoGOn6ws4DjA9fR9gci7vHPIqOSsgMXa1wCiwN8yU="; }; nativeBuildInputs = [ @@ -121,6 +123,11 @@ with py.pkgs; buildPythonApplication rec { updateScript = nix-update-script { attrPath = pname; }; + tests.version = testers.testVersion { + package = awscli2; + command = "aws --version"; + version = version; + }; }; meta = with lib; { @@ -129,5 +136,6 @@ with py.pkgs; buildPythonApplication rec { description = "Unified tool to manage your AWS services"; license = licenses.asl20; maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb anthonyroussel ]; + mainProgram = "aws"; }; } From 2ad8652ef2b6b6e2b9f4ada245136bdc502fdbb1 Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Mon, 21 Nov 2022 14:13:36 -0500 Subject: [PATCH 791/797] beets: install man pages --- pkgs/tools/audio/beets/common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index 968544f2790e..a79c16fe695c 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -6,6 +6,7 @@ , gst_all_1 , lib , python3Packages +, sphinxHook , runtimeShell , writeScript @@ -70,6 +71,7 @@ python3Packages.buildPythonApplication rec { # see: https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663 nativeBuildInputs = [ gobject-introspection + sphinxHook ]; buildInputs = [ @@ -79,6 +81,9 @@ python3Packages.buildPythonApplication rec { gst-plugins-ugly ]); + outputs = [ "out" "doc" "man" ]; + sphinxBuilders = [ "html" "man" ]; + postInstall = '' mkdir -p $out/share/zsh/site-functions cp extra/_beet $out/share/zsh/site-functions/ From ead322b582033bb5cc4787908c04d0069c30e2f0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 18 Nov 2022 17:54:06 +0800 Subject: [PATCH 792/797] wlroots: deduplicate builders --- pkgs/development/libraries/wlroots/0.14.nix | 64 --------- pkgs/development/libraries/wlroots/0.15.nix | 69 ---------- .../development/libraries/wlroots/default.nix | 124 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 +- 4 files changed, 128 insertions(+), 136 deletions(-) delete mode 100644 pkgs/development/libraries/wlroots/0.14.nix delete mode 100644 pkgs/development/libraries/wlroots/0.15.nix create mode 100644 pkgs/development/libraries/wlroots/default.nix diff --git a/pkgs/development/libraries/wlroots/0.14.nix b/pkgs/development/libraries/wlroots/0.14.nix deleted file mode 100644 index db10e57443cc..000000000000 --- a/pkgs/development/libraries/wlroots/0.14.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner -, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman -, libcap, mesa, xorg -, libpng, ffmpeg_4, seatd - -, enableXWayland ? true, xwayland ? null -}: - -stdenv.mkDerivation rec { - pname = "wlroots"; - version = "0.14.1"; - - src = fetchFromGitHub { - owner = "swaywm"; - repo = "wlroots"; - rev = version; - sha256 = "1sshp3lvlkl1i670kxhwsb4xzxl8raz6769kqvgmxzcb63ns9ay1"; - }; - - # $out for the library and $examples for the example programs (in examples): - outputs = [ "out" "examples" ]; - - strictDeps = true; - depsBuildBuild = [ pkg-config ]; - - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; - - buildInputs = [ - libGL wayland wayland-protocols libinput libxkbcommon pixman - xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa - libpng ffmpeg_4 xorg.xcbutilrenderutil seatd - ] - ++ lib.optional enableXWayland xwayland - ; - - mesonFlags = - lib.optional (!enableXWayland) "-Dxwayland=disabled" - ; - - postFixup = '' - # Install ALL example programs to $examples: - # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle - # screenshot output-layout multi-pointer rotation tablet touch pointer - # simple - mkdir -p $examples/bin - cd ./examples - for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do - cp "$binary" "$examples/bin/wlroots-$binary" - done - ''; - - meta = with lib; { - description = "A modular Wayland compositor library"; - longDescription = '' - Pluggable, composable, unopinionated modules for building a Wayland - compositor; or about 50,000 lines of code you were going to write anyway. - ''; - inherit (src.meta) homepage; - changelog = "https://github.com/swaywm/wlroots/releases/tag/${version}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; - }; -} diff --git a/pkgs/development/libraries/wlroots/0.15.nix b/pkgs/development/libraries/wlroots/0.15.nix deleted file mode 100644 index 117b7ebdc5d5..000000000000 --- a/pkgs/development/libraries/wlroots/0.15.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, wayland-scanner -, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman -,libcap, mesa, xorg -, libpng, ffmpeg_4, seatd, vulkan-loader, glslang -, nixosTests - -, enableXWayland ? true, xwayland ? null -}: - -stdenv.mkDerivation rec { - pname = "wlroots"; - version = "0.15.1"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "wlroots"; - repo = "wlroots"; - rev = version; - sha256 = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; - }; - - # $out for the library and $examples for the example programs (in examples): - outputs = [ "out" "examples" ]; - - strictDeps = true; - depsBuildBuild = [ pkg-config ]; - - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ]; - - buildInputs = [ - libGL wayland wayland-protocols libinput libxkbcommon pixman - xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa - libpng ffmpeg_4 xorg.xcbutilrenderutil seatd vulkan-loader - ] - ++ lib.optional enableXWayland xwayland - ; - - mesonFlags = - lib.optional (!enableXWayland) "-Dxwayland=disabled" - ; - - postFixup = '' - # Install ALL example programs to $examples: - # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle - # screenshot output-layout multi-pointer rotation tablet touch pointer - # simple - mkdir -p $examples/bin - cd ./examples - for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do - cp "$binary" "$examples/bin/wlroots-$binary" - done - ''; - - # Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots): - passthru.tests.tinywl = nixosTests.tinywl; - - meta = with lib; { - description = "A modular Wayland compositor library"; - longDescription = '' - Pluggable, composable, unopinionated modules for building a Wayland - compositor; or about 50,000 lines of code you were going to write anyway. - ''; - inherit (src.meta) homepage; - changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; - }; -} diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix new file mode 100644 index 000000000000..3d35828f289b --- /dev/null +++ b/pkgs/development/libraries/wlroots/default.nix @@ -0,0 +1,124 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, wayland-scanner +, libGL +, wayland +, wayland-protocols +, libinput +, libxkbcommon +, pixman +, libcap +, mesa +, xorg +, libpng +, ffmpeg_4 +, hwdata +, seatd +, vulkan-loader +, glslang +, nixosTests + +, enableXWayland ? true +, xwayland ? null +}: + +let + generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }: + stdenv.mkDerivation rec { + pname = "wlroots"; + inherit version; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "wlroots"; + repo = "wlroots"; + rev = version; + inherit hash; + }; + + postPatch = extraPatch; + + # $out for the library and $examples for the example programs (in examples): + outputs = [ "out" "examples" ]; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ] + ++ extraNativeBuildInputs; + + buildInputs = [ + ffmpeg_4 + libGL + libcap + libinput + libpng + libxkbcommon + mesa + pixman + seatd + vulkan-loader + wayland + wayland-protocols + xorg.libX11 + xorg.xcbutilerrors + xorg.xcbutilimage + xorg.xcbutilrenderutil + xorg.xcbutilwm + ] + ++ lib.optional enableXWayland xwayland + ++ extraBuildInputs; + + mesonFlags = + lib.optional (!enableXWayland) "-Dxwayland=disabled" + ; + + postFixup = '' + # Install ALL example programs to $examples: + # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle + # screenshot output-layout multi-pointer rotation tablet touch pointer + # simple + mkdir -p $examples/bin + cd ./examples + for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do + cp "$binary" "$examples/bin/wlroots-$binary" + done + ''; + + # Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots): + passthru.tests.tinywl = nixosTests.tinywl; + + meta = with lib; { + description = "A modular Wayland compositor library"; + longDescription = '' + Pluggable, composable, unopinionated modules for building a Wayland + compositor; or about 50,000 lines of code you were going to write anyway. + ''; + inherit (src.meta) homepage; + changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos synthetica ]; + }; + }; + +in +rec { + wlroots_0_14 = generic { + version = "0.14.1"; + hash = "sha256-wauk7TCL/V7fxjOZY77KiPbfydIc9gmOiYFOuum4UOs="; + }; + + wlroots_0_15 = generic { + version = "0.15.1"; + hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; + extraBuildInputs = [ vulkan-loader ]; + extraNativeBuildInputs = [ glslang ]; + }; + + wlroots = wlroots_0_15; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a4a31df2778..d75cefbeb211 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29397,9 +29397,10 @@ with pkgs; electron = electron_17; }; - wlroots = wlroots_0_15; - wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix { }; - wlroots_0_15 = callPackage ../development/libraries/wlroots/0.15.nix { }; + inherit (callPackages ../development/libraries/wlroots {}) + wlroots_0_14 + wlroots_0_15 + wlroots; sway-unwrapped = callPackage ../applications/window-managers/sway { }; sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; From d2596de25e49d613b5eaf3d43d64f5ba216573c4 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 18 Nov 2022 17:54:58 +0800 Subject: [PATCH 793/797] wlroots_0_16: init at 0.16 --- pkgs/development/libraries/wlroots/default.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 3d35828f289b..761e97784013 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -120,5 +120,16 @@ rec { extraNativeBuildInputs = [ glslang ]; }; + wlroots_0_16 = generic { + version = "0.16.0"; + hash = "sha256-k7BFx1xvvsdCXNWX0XeZYwv8H/myk4p42i2Y6vjILqM="; + extraBuildInputs = [ vulkan-loader ]; + extraNativeBuildInputs = [ glslang ]; + extraPatch = '' + substituteInPlace backend/drm/meson.build \ + --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/ + ''; + }; + wlroots = wlroots_0_15; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d75cefbeb211..5efe67baaa0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29400,6 +29400,7 @@ with pkgs; inherit (callPackages ../development/libraries/wlroots {}) wlroots_0_14 wlroots_0_15 + wlroots_0_16 wlroots; sway-unwrapped = callPackage ../applications/window-managers/sway { }; From 408131fde1a95ce6944dae686da02cf9ad10f99b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 21 Nov 2022 23:53:36 +0100 Subject: [PATCH 794/797] fnott: Drop the unnecessary wlroots dependency Fnott doesn't depend on wlroots and this produces the exact same binaries. --- pkgs/applications/misc/fnott/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index f01a2b5595a3..8c730a2b48b7 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -12,7 +12,6 @@ , pixman , libpng , wayland -, wlroots , dbus , fcft }: @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { pixman libpng wayland - wlroots dbus fcft ]; From 4c5f7afb5f25d1404e79c87009abb5d6fffcf0cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Nov 2022 15:07:04 +0000 Subject: [PATCH 795/797] broadlink-cli: 0.18.2 -> 0.18.3 --- pkgs/tools/misc/broadlink-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix index 1d9a45cb5610..087b56c9d1a3 100644 --- a/pkgs/tools/misc/broadlink-cli/default.nix +++ b/pkgs/tools/misc/broadlink-cli/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "broadlink-cli"; - version = "0.18.2"; + version = "0.18.3"; # the tools are available as part of the source distribution from GH but # not pypi, so we have to fetch them here. @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { owner = "mjg59"; repo = "python-broadlink"; rev = "refs/tags/${version}"; - sha256 = "sha256-JX+Io5EP1OgtP7T+UQtkfCPWE1rd3MTrCYRhU9C0+0c="; + sha256 = "sha256-8bSlMA5Nb3hqpVMeHlgb8AkKt5JrfEiyKjobxRBdmNM="; }; format = "other"; From 3be2a76832fa540b32cefd8bf8e9095037f97391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 20 Nov 2022 14:15:47 -0600 Subject: [PATCH 796/797] =?UTF-8?q?zeal:=20unstable-2021-12-25=20=E2=86=92?= =?UTF-8?q?=20unstable-2022-10-02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/data/documentation/zeal/default.nix | 46 +++++++++++++++++------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index de3d7638eb9b..3a8b7122c7ff 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,16 +1,31 @@ -{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config -, qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation -, libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, pkg-config +, qtbase +, qtimageformats +, qtwebengine +, qtx11extras ? null # qt5 only +, libarchive +, libXdmcp +, libpthreadstubs +, wrapQtAppsHook +, xcbutilkeysyms +}: -mkDerivation rec { +let + isQt5 = lib.versions.major qtbase.version == "5"; +in stdenv.mkDerivation rec { pname = "zeal"; - version = "0.6.999"; + version = "0.6.20221022"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; - rev = "763edca12ccd6c67e51f10891d1ced8b2510904f"; - sha256 = "sha256-1/wQXkRWvpRia8UDvvvmzHinPG8q2Tz9Uoeegej9uC8="; + rev = "7ea03e4bb9754020e902a2989f56f4bc42b85c82"; + sha256 = "sha256-BozRLlws56i9P7Qtc5qPZWgJR5yhYqnLQsEdsymt5us="; }; # we only need this if we are using a version that hasn't been released. We @@ -22,13 +37,18 @@ mkDerivation rec { -e 's@^project.*@project(Zeal VERSION ${version})@' ''; - nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config wrapQtAppsHook ]; - buildInputs = [ - qtbase qtimageformats qtwebengine qtx11extras - libarchive - libXdmcp libpthreadstubs xcbutilkeysyms - ]; + buildInputs = + [ + qtbase + qtimageformats + qtwebengine + libarchive + libXdmcp + libpthreadstubs + xcbutilkeysyms + ] ++ lib.optionals isQt5 [ qtx11extras ]; meta = with lib; { description = "A simple offline API documentation browser"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5efe67baaa0d..c841d8b933da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27163,7 +27163,9 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; - zeal = libsForQt5.callPackage ../data/documentation/zeal { }; + zeal-qt5 = libsForQt5.callPackage ../data/documentation/zeal { }; + zeal-qt6 = qt6Packages.callPackage ../data/documentation/zeal { }; + zeal = zeal-qt5; zilla-slab = callPackage ../data/fonts/zilla-slab { }; From de6f2b0a0701954a35bd7de525f7baadeda1812e Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Fri, 12 Feb 2021 04:36:23 -0500 Subject: [PATCH 797/797] nixos/dbus: support dbus-broker --- nixos/modules/services/system/dbus.nix | 172 +++++++++++++++++-------- 1 file changed, 116 insertions(+), 56 deletions(-) diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index b87e48f2945d..c677088101f0 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -14,7 +14,7 @@ let serviceDirectories = cfg.packages; }; - inherit (lib) mkOption types; + inherit (lib) mkOption mkIf mkMerge types; in @@ -33,6 +33,18 @@ in ''; }; + implementation = mkOption { + type = types.enum [ "dbus" "broker" ]; + default = "dbus"; + description = lib.mdDoc '' + The implementation to use for the message bus defined by the D-Bus specification. + Can be either the classic dbus daemon or dbus-broker, which aims to provide high + performance and reliability, while keeping compatibility to the D-Bus + reference implementation. + ''; + + }; + packages = mkOption { type = types.listOf types.path; default = [ ]; @@ -66,66 +78,114 @@ in }; }; - config = lib.mkIf cfg.enable { - environment.systemPackages = [ - pkgs.dbus - ]; + config = mkIf cfg.enable (mkMerge [ + { + environment.etc."dbus-1".source = configDir; - environment.etc."dbus-1".source = configDir; - - users.users.messagebus = { - uid = config.ids.uids.messagebus; - description = "D-Bus system message bus daemon user"; - home = homeDir; - group = "messagebus"; - }; - - users.groups.messagebus.gid = config.ids.gids.messagebus; - - systemd.packages = [ - pkgs.dbus - ]; - - security.wrappers.dbus-daemon-launch-helper = { - source = "${pkgs.dbus}/libexec/dbus-daemon-launch-helper"; - owner = "root"; - group = "messagebus"; - setuid = true; - setgid = false; - permissions = "u+rx,g+rx,o-rx"; - }; - - services.dbus.packages = [ - pkgs.dbus - config.system.path - ]; - - systemd.services.dbus = { - # Don't restart dbus-daemon. Bad things tend to happen if we do. - reloadIfChanged = true; - restartTriggers = [ - configDir + environment.pathsToLink = [ + "/etc/dbus-1" + "/share/dbus-1" ]; - environment = { - LD_LIBRARY_PATH = config.system.nssModules.path; + + users.users.messagebus = { + uid = config.ids.uids.messagebus; + description = "D-Bus system message bus daemon user"; + home = homeDir; + group = "messagebus"; }; - }; - systemd.user.services.dbus = { - # Don't restart dbus-daemon. Bad things tend to happen if we do. - reloadIfChanged = true; - restartTriggers = [ - configDir + users.groups.messagebus.gid = config.ids.gids.messagebus; + + # You still need the dbus reference implementation installed to use dbus-broker + systemd.packages = [ + pkgs.dbus ]; - }; - systemd.user.sockets.dbus.wantedBy = [ - "sockets.target" - ]; + services.dbus.packages = [ + pkgs.dbus + config.system.path + ]; - environment.pathsToLink = [ - "/etc/dbus-1" - "/share/dbus-1" - ]; - }; + systemd.user.sockets.dbus.wantedBy = [ + "sockets.target" + ]; + } + + (mkIf (cfg.implementation == "dbus") { + environment.systemPackages = [ + pkgs.dbus + ]; + + security.wrappers.dbus-daemon-launch-helper = { + source = "${pkgs.dbus}/libexec/dbus-daemon-launch-helper"; + owner = "root"; + group = "messagebus"; + setuid = true; + setgid = false; + permissions = "u+rx,g+rx,o-rx"; + }; + + systemd.services.dbus = { + # Don't restart dbus-daemon. Bad things tend to happen if we do. + reloadIfChanged = true; + restartTriggers = [ + configDir + ]; + environment = { + LD_LIBRARY_PATH = config.system.nssModules.path; + }; + }; + + systemd.user.services.dbus = { + # Don't restart dbus-daemon. Bad things tend to happen if we do. + reloadIfChanged = true; + restartTriggers = [ + configDir + ]; + }; + + }) + + (mkIf (cfg.implementation == "broker") { + environment.systemPackages = [ + pkgs.dbus-broker + ]; + + systemd.packages = [ + pkgs.dbus-broker + ]; + + # Just to be sure we don't restart through the unit alias + systemd.services.dbus.reloadIfChanged = true; + systemd.user.services.dbus.reloadIfChanged = true; + + # NixOS Systemd Module doesn't respect 'Install' + # https://github.com/NixOS/nixpkgs/issues/108643 + systemd.services.dbus-broker = { + aliases = [ + "dbus.service" + ]; + # Don't restart dbus. Bad things tend to happen if we do. + reloadIfChanged = true; + restartTriggers = [ + configDir + ]; + environment = { + LD_LIBRARY_PATH = config.system.nssModules.path; + }; + }; + + systemd.user.services.dbus-broker = { + aliases = [ + "dbus.service" + ]; + # Don't restart dbus. Bad things tend to happen if we do. + reloadIfChanged = true; + restartTriggers = [ + configDir + ]; + }; + }) + + ]); }