From 343f7f8f07dcb376cf05658f6e80e3826ef6a470 Mon Sep 17 00:00:00 2001 From: coolneng Date: Tue, 24 May 2022 14:54:24 +0200 Subject: [PATCH 001/121] mopidy-somafm: 2.0.0 -> 2.0.2 --- pkgs/applications/audio/mopidy/somafm.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/mopidy/somafm.nix b/pkgs/applications/audio/mopidy/somafm.nix index 81c689a343d..a83a3b019aa 100644 --- a/pkgs/applications/audio/mopidy/somafm.nix +++ b/pkgs/applications/audio/mopidy/somafm.nix @@ -2,17 +2,15 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-somafm"; - version = "2.0.0"; + version = "2.0.2"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-SomaFM"; - sha256 = "1j88rrliys8hqvnb35k1xqw88bvrllcb4rb53lgh82byhscsxlf3"; + sha256 = "DC0emxkoWfjGHih2C8nINBFByf521Xf+3Ks4JRxNPLM="; }; - propagatedBuildInputs = [ - mopidy - ]; + propagatedBuildInputs = [ mopidy ]; doCheck = false; From 66810822f941e94340f87eba3ff78efcc3a7f5b6 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 19 Sep 2022 19:12:19 -0700 Subject: [PATCH 002/121] lib/systems/inspect.nix: explanatory comment --- lib/systems/inspect.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index ee213438e04..179034eb7dd 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -8,6 +8,14 @@ let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis rec { patterns = rec { + # The patterns below are lists in sum-of-products form. + # + # Each attribute is list of product conditions; non-list values are treated + # as a singleton list. If *any* product condition in the list matches then + # the predicate matches. Each product condition is tested by + # `lib.attrsets.matchAttrs`, which requires a match on *all* attributes of + # the product. + isi686 = { cpu = cpuTypes.i686; }; isx86_32 = { cpu = { family = "x86"; bits = 32; }; }; isx86_64 = { cpu = { family = "x86"; bits = 64; }; }; From 8fbe036fb2bf56ac5f1195a1c68d7a1641931ddf Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 20 Sep 2022 23:39:40 -0700 Subject: [PATCH 003/121] mercury: use jdk_headless to allow non-gui builds --- pkgs/development/compilers/mercury/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index 472788bcc70..d79c487bb2e 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gcc, flex, bison, texinfo, jdk, erlang, makeWrapper +{ lib, stdenv, fetchurl, gcc, flex, bison, texinfo, jdk_headless, erlang, makeWrapper , readline }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ gcc flex bison texinfo jdk erlang readline ]; + buildInputs = [ gcc flex bison texinfo jdk_headless erlang readline ]; patchPhase = '' # Fix calls to programs in /bin @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { for e in $(ls $out/bin) ; do wrapProgram $out/bin/$e \ --prefix PATH ":" "${gcc}/bin" \ - --prefix PATH ":" "${jdk}/bin" \ + --prefix PATH ":" "${jdk_headless}/bin" \ --prefix PATH ":" "${erlang}/bin" done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4be409086eb..6dd37ee727b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15024,7 +15024,9 @@ with pkgs; marst = callPackage ../development/compilers/marst { }; - mercury = callPackage ../development/compilers/mercury { }; + mercury = callPackage ../development/compilers/mercury { + jdk_headless = openjdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; microscheme = callPackage ../development/compilers/microscheme { }; From 6ed55eaa191146ffda72cda307ef86a2aef2cd06 Mon Sep 17 00:00:00 2001 From: Pawel Peregud Date: Mon, 13 Mar 2023 16:15:44 +0100 Subject: [PATCH 004/121] framesh: 0.5.0 -> 0.6.2 --- pkgs/applications/blockchains/framesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/framesh/default.nix b/pkgs/applications/blockchains/framesh/default.nix index a1ded4cc7cc..bb6068ca55d 100644 --- a/pkgs/applications/blockchains/framesh/default.nix +++ b/pkgs/applications/blockchains/framesh/default.nix @@ -2,10 +2,10 @@ let pname = "framesh"; - version = "0.5.0-beta.22"; + version = "0.6.2"; src = fetchurl { url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage"; - sha256 = "sha256-/y7Pf1ADtz0CBeKKCHtSPOYvU7HCpq7hM/J4Ddq1XiA="; + sha256 = "sha256-nN5+6SwfHcwhePlbsXjT3qNd/d6Xqnd85NVC8vw3ehk="; }; appimageContents = appimageTools.extractType2 { From 138983c60019183a6f0cb96623f44032f8b51b37 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 13 Mar 2023 00:22:39 +0100 Subject: [PATCH 005/121] xp-pen-deco-01-v2-driver: 3.2.3 -> 3.3.9 --- pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix index 32804afa9ff..46a5bca7903 100644 --- a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix +++ b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix @@ -20,12 +20,12 @@ let in stdenv.mkDerivation rec { pname = "xp-pen-deco-01-v2-driver"; - version = "3.2.3.220323-1"; + version = "3.3.9.230222-1"; src = fetchzip { url = "https://www.xp-pen.com/download/file/id/1936/pid/440/ext/gz.html#.tar.gz"; name = "xp-pen-deco-01-v2-driver-${version}.tar.gz"; - sha256 = "sha256-n/yutkRsjcIRRhB4q1yqEmaa03/1SO8RigJi/ZkfLbk="; + sha256 = "sha256-xrRDxH7e00dISXb+lTtrnui+fNFpX7bLke2o+aTjJNk="; }; nativeBuildInputs = [ From 15399cff6d678b035e1b2b97542203f641bb8f42 Mon Sep 17 00:00:00 2001 From: enc0urage <127197575+enc0urage@users.noreply.github.com> Date: Tue, 28 Mar 2023 18:31:48 +0000 Subject: [PATCH 006/121] gsocket: 1.4.39 -> 1.4.40 --- pkgs/tools/networking/gsocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/gsocket/default.nix b/pkgs/tools/networking/gsocket/default.nix index e25a31a0a1d..28188431631 100644 --- a/pkgs/tools/networking/gsocket/default.nix +++ b/pkgs/tools/networking/gsocket/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gsocket"; - version = "1.4.39"; + version = "1.4.40"; src = fetchFromGitHub { owner = "hackerschoice"; repo = "gsocket"; rev = "v${version}"; - sha256 = "sha256-iSII21X3F4Cb1UqF0aYw23N7CyeTQMmziRioEULx9Zk="; + hash = "sha256-pY4tjrMbx+OxkJfr8czo5fbhfcmJbiNX4B+FibzUc7w="; }; nativeBuildInputs = [ autoreconfHook ]; From 491667f8a95d89d3401bd9cfa99021cf7a7eb7b5 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 5 Apr 2023 19:21:22 -0700 Subject: [PATCH 007/121] dante: autoreconfHook unconditionally --- pkgs/servers/dante/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index f5b2e5a785f..571572baca2 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0pbahkj43rx7rmv2x40mf5p3g3x9d6i2sz7pzglarf54w5ghd2j1"; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isMips64 autoreconfHook; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc libxcrypt ]; configureFlags = if !stdenv.isDarwin From e22e3f4c62340456ab84d285422ff87f10591524 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 31 Mar 2023 12:00:17 -0400 Subject: [PATCH 008/121] bitwarden: 2023.2.0 -> 2023.3.2 Additionally, remove unused `rec`. --- pkgs/tools/security/bitwarden/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 3cbf1c46e64..b7434491ba9 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -24,19 +24,19 @@ let buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; - version = "2023.2.0"; + version = "2023.3.2"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - sha256 = "/k2r+TikxVGlz8cnOq5zF3oUYw4zj31vDAD7OQFQlC4="; + sha256 = "sha256-KQDM7XDUA+yRv8y1K//rMCs4J36df42RVsiAXazJeYQ="; }; - desktop-native = rustPlatform.buildRustPackage rec { + desktop-native = rustPlatform.buildRustPackage { pname = "bitwarden-desktop-native"; inherit src version; sourceRoot = "source/apps/desktop/desktop_native"; - cargoSha256 = "sha256-zLftfmWYYUAaMvIT21qhVsHzxnNdQhFBH0fRBwVduAc="; + cargoSha256 = "sha256-XsAmVYWPPnY0cgBzpO2aWx/fh85fKr8kMO98cDMzOKk="; patchFlags = [ "-p4" ]; @@ -91,7 +91,7 @@ buildNpmPackage' { npmBuildFlags = [ "--workspace apps/desktop" ]; - npmDepsHash = "sha256-aFjN1S0+lhHjK3VSYfx0F5X8wSJwRRr6zQpPGt2VpxE="; + npmDepsHash = "sha256-RmkTWhakZstCCMLQ3iJ8KD5Yt5ZafXc8NDgncJMLaxs="; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; From 19d48a925778a524a970ca06cabc45ade3f82474 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 8 Apr 2023 00:33:11 -0700 Subject: [PATCH 009/121] doc/stdenv/meta.chapter.md: explain difference between broken and badPlatforms There has been a longstanding ambiguity between `broken` and `badPlatforms`, which seem to serve overlapping purposes. This commit adds to the documentation two examples of constraints which cannot be expressed by `platforms` and `badPlatforms`. This commit also mentions `NIXPKGS_ALLOW_BROKEN=1` for overriding `broken`. --- doc/stdenv/meta.chapter.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index 0b4777efdb8..f4e9a5d4f9b 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -182,7 +182,9 @@ meta.hydraPlatforms = []; ### `broken` {#var-meta-broken} -If set to `true`, the package is marked as "broken", meaning that it won’t show up in `nix-env -qa`, and cannot be built or installed. Such packages should be removed from Nixpkgs eventually unless they are fixed. +If set to `true`, the package is marked as "broken", meaning that it won’t show up in `nix-env -qa`, and cannot be built or installed unless the environment variable `NIXPKGS_ALLOW_BROKEN` is set. Such unconditionally-broken packages should be removed from Nixpkgs eventually unless they are fixed. + +The value of this attribute can depend on a package's arguments, including `stdenv`. This means that `broken` can be used to express constraints such as "does not cross compile" (`meta.broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)`) or "broken if all of a certain set of its dependencies are broken". This makes `broken` strictly more powerful than `meta.badPlatforms`. However `meta.availableOn` currently examines only `meta.platforms` and `meta.badPlatforms`, so `meta.broken` does not influence the default values for optional dependencies. ## Licenses {#sec-meta-license} From e396a4ec1f9a484e95eb685e0d877869b5edb753 Mon Sep 17 00:00:00 2001 From: apfelkuchen06 Date: Thu, 13 Apr 2023 19:24:41 +0200 Subject: [PATCH 010/121] rocdbgapi: fix build changepage.sty is no longer pulled in my texlive's basic scheme, so it must be added explicitly --- pkgs/development/libraries/rocdbgapi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/rocdbgapi/default.nix b/pkgs/development/libraries/rocdbgapi/default.nix index 7a2afc79f54..dfeb9249914 100644 --- a/pkgs/development/libraries/rocdbgapi/default.nix +++ b/pkgs/development/libraries/rocdbgapi/default.nix @@ -16,6 +16,7 @@ let latex = lib.optionalAttrs buildDocs texlive.combine { inherit (texlive) scheme-small + changepage latexmk varwidth multirow From bd80d99a616f37bbf4928b574e5c106a70047932 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 15 Apr 2023 08:35:42 +0200 Subject: [PATCH 011/121] galene: add erdnaxe as maintainer --- pkgs/servers/web-apps/galene/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index 0348883035f..5fdc04e8fb9 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -29,6 +29,6 @@ buildGoModule rec { changelog = "https://github.com/jech/galene/raw/galene-${version}/CHANGES"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ rgrunbla ]; + maintainers = with maintainers; [ rgrunbla erdnaxe ]; }; } From 4be94ba44b43a661a55d19e8a9e77030d3424ee6 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 15 Apr 2023 08:35:56 +0200 Subject: [PATCH 012/121] galene: 0.6.1 -> 0.7.0 --- pkgs/servers/web-apps/galene/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index 5fdc04e8fb9..4863eb93319 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "galene"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - hash = "sha256-Bnx0GqgkOHfoDYLJqVAz/tKyF+cZ0BQTRTGO2pDv7tM="; + hash = "sha256-P1KW9JUHzH/aK3wehVMSVJcUmMqDEGc8zVg8P6F828s="; }; - vendorSha256 = "sha256-HZQeVa4UB/1jpPbfrh3XgWQe2S3qA8CM268KghgJA0w="; + vendorSha256 = "sha256-+itNqxEy0S2g5UGpUIthJE2ILQzToISref/8F4zTmYg="; ldflags = [ "-s" "-w" ]; preCheck = "export TZ=UTC"; From 6024b58745f465b1cb3db3dd9248c9ee93fff0f3 Mon Sep 17 00:00:00 2001 From: zendo Date: Sun, 16 Apr 2023 09:52:28 +0800 Subject: [PATCH 013/121] deadbeef: 1.9.4 -> 1.9.5 --- pkgs/applications/audio/deadbeef/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index d86d8c6c1ad..34b4b7ab188 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -28,6 +28,7 @@ # output plugins , alsaSupport ? true, alsa-lib , pulseSupport ? config.pulseaudio or true, libpulseaudio +, pipewireSupport ? true, pipewire # effect plugins , resamplerSupport ? true, libsamplerate , overloadSupport ? true, zlib @@ -40,7 +41,7 @@ assert gtk2Support || gtk3Support; let inherit (lib) optionals; - version = "1.9.4"; + version = "1.9.5"; in clangStdenv.mkDerivation { pname = "deadbeef"; inherit version; @@ -50,7 +51,7 @@ in clangStdenv.mkDerivation { repo = "deadbeef"; fetchSubmodules = true; rev = version; - sha256 = "sha256-ow+Aw/lp+oe9GhbOWM7XcX/tJjfAAu7KOUY1us7+f84="; + hash = "sha256-dSSIaJxHYUVOmuJN2t5UZSC3ZP5732/qVXSZAuWYr0Q="; }; buildInputs = [ @@ -92,6 +93,8 @@ in clangStdenv.mkDerivation { alsa-lib ] ++ optionals pulseSupport [ libpulseaudio + ] ++ optionals pipewireSupport [ + pipewire ] ++ optionals resamplerSupport [ libsamplerate ] ++ optionals overloadSupport [ @@ -121,6 +124,7 @@ in clangStdenv.mkDerivation { meta = with lib; { description = "Ultimate Music Player for GNU/Linux"; homepage = "http://deadbeef.sourceforge.net/"; + downloadPage = "https://github.com/DeaDBeeF-Player/deadbeef"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.abbradar ]; From 04d6287399338b864d068c486808d9070f4f5847 Mon Sep 17 00:00:00 2001 From: zendo Date: Sun, 16 Apr 2023 09:52:54 +0800 Subject: [PATCH 014/121] deadbeefPlugins.mpris2: 1.14 -> 1.16 --- pkgs/applications/audio/deadbeef/plugins/mpris2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index d0b0d0a8656..a6d6409f9f8 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -9,7 +9,7 @@ let pname = "deadbeef-mpris2-plugin"; - version = "1.14"; + version = "1.16"; in stdenv.mkDerivation { inherit pname version; @@ -17,7 +17,7 @@ in stdenv.mkDerivation { owner = "DeaDBeeF-Player"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w7ccIhcPjbjs18kb3ZdM9JtSail9ik3uyAc40T8lHho="; + hash = "sha256-f6iHgwLdzQJJEquyuUQGWFfOfpjH/Hxh9IqQ5HkYrog="; }; nativeBuildInputs = [ From 839070670e7a32d2785ca590a4a4bd28ec183918 Mon Sep 17 00:00:00 2001 From: lasers Date: Sun, 16 Apr 2023 04:32:44 -0500 Subject: [PATCH 015/121] cen64: unstable-2021-03-12 -> unstable-2022-10-02 --- pkgs/applications/emulators/cen64/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/cen64/default.nix b/pkgs/applications/emulators/cen64/default.nix index ddf45547337..bd7c84402cf 100644 --- a/pkgs/applications/emulators/cen64/default.nix +++ b/pkgs/applications/emulators/cen64/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cen64"; - version = "unstable-2021-03-12"; + version = "unstable-2022-10-02"; src = fetchFromGitHub { owner = "n64dev"; repo = "cen64"; - rev = "1b31ca9b3c3bb783391ab9773bd26c50db2056a8"; - sha256 = "0x1fz3z4ffl5xssiyxnmbhpjlf0k0fxsqn4f2ikrn17742dx4c0z"; + rev = "ee6db7d803a77b474e73992fdc25d76b9723d806"; + sha256 = "sha256-/CraSu/leNA0dl8NVgFjvKdOWrC9/namAz5NSxtPr+I="; }; nativeBuildInputs = [ cmake ]; From cffe87b9f509e0dfe7aeedff950dcc74ceca785a Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 16 Apr 2023 13:44:01 +0400 Subject: [PATCH 016/121] =?UTF-8?q?gpxsee:=2012.2=20=E2=86=92=2012.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index a5eccb239e3..f2b70f6654b 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "gpxsee"; - version = "12.2"; + version = "12.4"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - hash = "sha256-d+hQNI+eCSMRFMzq09wL+GN9TgOIt245Z8GlPe7nY8E="; + hash = "sha256-/a6c30jv/sI0QbCXYCq9JrMpmZRk33lQBwbd0yjnxsQ="; }; patches = (substituteAll { From ad7996abce1894cd3c6cd46eb0b5bf3036753e43 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 16 Apr 2023 17:44:09 +0200 Subject: [PATCH 017/121] apfsprogs: link to apfs NixOS test --- pkgs/tools/filesystems/apfsprogs/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/filesystems/apfsprogs/default.nix b/pkgs/tools/filesystems/apfsprogs/default.nix index f35c9a696d1..75a0bd7da2f 100644 --- a/pkgs/tools/filesystems/apfsprogs/default.nix +++ b/pkgs/tools/filesystems/apfsprogs/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, nixosTests }: stdenv.mkDerivation { @@ -28,6 +29,10 @@ stdenv.mkDerivation { runHook postInstall ''; + passthru.tests = { + apfs = nixosTests.apfs; + }; + meta = with lib; { description = "Experimental APFS tools for linux"; homepage = "https://github.com/linux-apfs/apfsprogs"; From a837020120f58d3ef446a84014a34a7611274e33 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 16 Apr 2023 17:49:13 +0200 Subject: [PATCH 018/121] apfsprogs: unstable-2022-10-15 -> unstable-2023-03-21 --- pkgs/tools/filesystems/apfsprogs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/apfsprogs/default.nix b/pkgs/tools/filesystems/apfsprogs/default.nix index 75a0bd7da2f..8ed9f3b2c04 100644 --- a/pkgs/tools/filesystems/apfsprogs/default.nix +++ b/pkgs/tools/filesystems/apfsprogs/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "apfsprogs"; - version = "unstable-2022-10-15"; + version = "unstable-2023-03-21"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "apfsprogs"; - rev = "e3d5eec21da31107457f868f7f37c48c6809b7fa"; - hash = "sha256-gxcsWLIs2+28SOLLeAP7iP6MaLE445CKTlD+gVE6V5g="; + rev = "be41cc38194bd41a41750631577e6d8b31953103"; + hash = "sha256-9o8DKXyK5qIoVGVKMJxsinEkbJImyuDglf534kanzFE="; }; buildPhase = '' From e0caa91427d6d06e86f6a812accdf073f77b3a1a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 16 Apr 2023 11:20:44 -0700 Subject: [PATCH 019/121] at-spi2-core: use availableOn Commit 221f2fe6938fec92700e3577419d442e58b4a21f used `isLinux` to control systemd inclusion; let's use `availableOn` for more accurate results. --- pkgs/development/libraries/at-spi2-core/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 4502b4afa38..926dd9b04fb 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libXi # libXext is a transitive dependency of libXi libXext - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform systemd) [ # libsystemd is a needed for dbus-broker support systemd ]; From babf09839cfd263f2d4631b8eb207e85d4452921 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 02:11:22 +0000 Subject: [PATCH 020/121] libsForQt5.libqglviewer: 2.8.0 -> 2.9.1 --- pkgs/development/libraries/libqglviewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index d69daee07bd..fd10ccc5375 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqglviewer"; - version = "2.8.0"; + version = "2.9.1"; src = fetchurl { url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz"; - sha256 = "sha256-A9LTOUhmzcQZ9DcTrtgnJixxTMT6zd6nw7odk9rjxMw="; + sha256 = "sha256-J4+DKgstPvvg1pUhGd+8YFh5C3oPGHaQmDfLZzzkP/M="; }; nativeBuildInputs = [ qmake ]; From d07b21106c74b4dfceef18ce3b17a47e7993eb14 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 18 Apr 2023 23:15:45 +0000 Subject: [PATCH 021/121] snipe-it: 6.0.14 -> 6.1.0 https://github.com/snipe/snipe-it/releases/tag/v6.1.0 --- pkgs/servers/web-apps/snipe-it/default.nix | 4 +-- .../web-apps/snipe-it/php-packages.nix | 34 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/servers/web-apps/snipe-it/default.nix index 7593621211c..bd47f57e9b7 100644 --- a/pkgs/servers/web-apps/snipe-it/default.nix +++ b/pkgs/servers/web-apps/snipe-it/default.nix @@ -33,13 +33,13 @@ let in package.override rec { pname = "snipe-it"; - version = "6.0.14"; + version = "6.1.0"; src = fetchFromGitHub { owner = "snipe"; repo = pname; rev = "v${version}"; - hash = "sha256-c2hzuNOpvVl+ZriCo3TRl/GHY+LCrIb2GO2U894S2yk="; + sha256 = "0c8cjywhyiywfav2syjkah777qj5f1jrckgri70ypqyxbwgb4rpm"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/snipe-it/php-packages.nix b/pkgs/servers/web-apps/snipe-it/php-packages.nix index 28a69dba7d5..890331d5b50 100644 --- a/pkgs/servers/web-apps/snipe-it/php-packages.nix +++ b/pkgs/servers/web-apps/snipe-it/php-packages.nix @@ -15,10 +15,10 @@ let "arietimmerman/laravel-scim-server" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "arietimmerman-laravel-scim-server-d0e3d7c0b5da2ec76283b8a2fa2e672a91596509"; + name = "arietimmerman-laravel-scim-server-9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419"; src = fetchurl { - url = "https://api.github.com/repos/grokability/laravel-scim-server/zipball/d0e3d7c0b5da2ec76283b8a2fa2e672a91596509"; - sha256 = "0xznsbdph32q1nx5ibl90gfqa7j0bj0ikcvz8hfpxxk967k1ayfj"; + url = "https://api.github.com/repos/grokability/laravel-scim-server/zipball/9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419"; + sha256 = "02if4yvnqagpwgrq8b0371nva24lsk0h3h06q51vjxyqjhqvc2nr"; }; }; }; @@ -245,10 +245,10 @@ let "dompdf/dompdf" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dompdf-dompdf-79573d8b8a141ec8a17312515de8740eed014fa9"; + name = "dompdf-dompdf-e8d2d5e37e8b0b30f0732a011295ab80680d7e85"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/dompdf/zipball/79573d8b8a141ec8a17312515de8740eed014fa9"; - sha256 = "0glv4fhzk674jgk1v9rkhb4859x5h1aspr63qdn7ajls27c582l5"; + url = "https://api.github.com/repos/dompdf/dompdf/zipball/e8d2d5e37e8b0b30f0732a011295ab80680d7e85"; + sha256 = "0a2qk57c3qwg7j8gp1hwyd8y8dwm5pb8lg1npb49sijig8kyjlv3"; }; }; }; @@ -705,10 +705,10 @@ let "masterminds/html5" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "masterminds-html5-f640ac1bdddff06ea333a920c95bbad8872429ab"; + name = "masterminds-html5-897eb517a343a2281f11bc5556d6548db7d93947"; src = fetchurl { - url = "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab"; - sha256 = "1v9sn44z710wha5jrzy0alx1ayj3d0fcin1xpx6c6fdhlksbqc6z"; + url = "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947"; + sha256 = "12fmcgsrmh0f0llnpcvk33mrs4067nw246ci5619rr79ijy3yc0k"; }; }; }; @@ -838,7 +838,7 @@ let name = "onelogin-php-saml-a7328b11887660ad248ea10952dd67a5aa73ba3b"; src = fetchurl { url = "https://api.github.com/repos/onelogin/php-saml/zipball/a7328b11887660ad248ea10952dd67a5aa73ba3b"; - sha256 = "0ycj3n22k5i3h8p7gn0xff6a7smjypazl2k5qvyzg86fjr7s3vfv"; + sha256 = "1df8mxmdh14y2scw80yhh1l90lvdnxq1pjlli3is1cakc0cdw90z"; }; }; }; @@ -872,13 +872,13 @@ let }; }; }; - "patchwork/utf8" = { + "paragonie/sodium_compat" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "patchwork-utf8-e1fa4d4a57896d074c9a8d01742b688d5db4e9d5"; + name = "paragonie-sodium_compat-cb15e403ecbe6a6cc515f855c310eb6b1872a933"; src = fetchurl { - url = "https://api.github.com/repos/tchwork/utf8/zipball/e1fa4d4a57896d074c9a8d01742b688d5db4e9d5"; - sha256 = "0rarkg8v23y58bc4n6j39wdi6is0p1rgqxnixqlgavcm35xjgnw0"; + url = "https://api.github.com/repos/paragonie/sodium_compat/zipball/cb15e403ecbe6a6cc515f855c310eb6b1872a933"; + sha256 = "01jxl868i8bkx5szgp2fp6mi438ani80bqkdcc7rnn9z22lrsm78"; }; }; }; @@ -895,10 +895,10 @@ let "phenx/php-svg-lib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phenx-php-svg-lib-4498b5df7b08e8469f0f8279651ea5de9626ed02"; + name = "phenx-php-svg-lib-76876c6cf3080bcb6f249d7d59705108166a6685"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/4498b5df7b08e8469f0f8279651ea5de9626ed02"; - sha256 = "01w65haq96sfyjl8ahm9nb95wasgl66ymv5lycx1cbagy653xdin"; + url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/76876c6cf3080bcb6f249d7d59705108166a6685"; + sha256 = "0bjynrs81das9f9jwd5jgsxx9gjv2m6c0mkvlgx4w1f4pgbvwsf5"; }; }; }; From b6a6c4a96f47e611850c37492bd7a8ba4694341b Mon Sep 17 00:00:00 2001 From: b3nj5m1n Date: Thu, 20 Apr 2023 06:20:44 +0200 Subject: [PATCH 022/121] swww: 0.7.2 -> 0.7.3 --- pkgs/tools/wayland/swww/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix index a766a51188d..34b43347afb 100644 --- a/pkgs/tools/wayland/swww/default.nix +++ b/pkgs/tools/wayland/swww/default.nix @@ -1,16 +1,16 @@ { config, lib, pkgs, fetchFromGitHub, rustPlatform, pkg-config, lz4, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "swww"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "Horus645"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1SmCeIlcjOX3yCvpfqQ82uq4h2xlGhX9OCwKb6jGK78="; + hash = "sha256-58zUi6tftTvNoc/R/HO4RDC7n+NODKOrBCHH8QntKSY="; }; - cargoSha256 = "sha256-08YM9yTCRJPHdOc1+7F3guYiP3y1WSi3/hzlDRVpitc="; + cargoSha256 = "sha256-hL5rOf0G+UBO8kyRXA1TqMCta00jGSZtF7n8ibjGi9k="; buildInputs = [ lz4 libxkbcommon ]; doCheck = false; # Integration tests do not work in sandbox environment nativeBuildInputs = [ pkg-config ]; From 1e68ff3ee9d30565b684d9d93a89cc6f87485723 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 20 Apr 2023 15:43:22 +0900 Subject: [PATCH 023/121] kent: 404 -> 446 https://github.com/ucscGenomeBrowser/kent/compare/v404_base...v446_base --- pkgs/applications/science/biology/kent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index 12bbfa09c25..d59ad3b2ad0 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "kent"; - version = "404"; + version = "446"; src = fetchFromGitHub { owner = "ucscGenomeBrowser"; repo = pname; rev = "v${version}_base"; - sha256 = "0l5lmqqc6sqkf4hyk3z4825ly0vdlj5xdfad6zd0708cb1v81nbx"; + hash = "sha256-d8gcoyMwINdHoD6xaNKt4rCKrKir99+i4KIzJ2YnxRw="; }; buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; From 5b62152599b15c85a8b7420c9fed2eeff6838aa3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 20 Apr 2023 15:45:38 +0900 Subject: [PATCH 024/121] kent: add runHooks --- pkgs/applications/science/biology/kent/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index d59ad3b2ad0..8f3e312b20c 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -25,14 +25,20 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; patchPhase = '' + runHook prePatch + substituteInPlace ./src/checkUmask.sh \ --replace "/bin/bash" "${bash}/bin/bash" substituteInPlace ./src/hg/sqlEnvTest.sh \ --replace "which mysql_config" "${which}/bin/which ${libmysqlclient}/bin/mysql_config" + + runHook postPatch ''; buildPhase = '' + runHook preBuild + export MACHTYPE=$(uname -m) export CFLAGS="-fPIC" export MYSQLINC=$(mysql_config --include | sed -e 's/^-I//g') @@ -56,14 +62,20 @@ stdenv.mkDerivation rec { cd ../utils make + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin mkdir -p $out/lib cp $NIX_BUILD_TOP/lib/jkOwnLib.a $out/lib cp $NIX_BUILD_TOP/lib/jkweb.a $out/lib cp $NIX_BUILD_TOP/bin/x86_64/* $out/bin + + runHook postInstall ''; meta = with lib; { From 23205d28d2c0d134508ae0b6d79ba0f9a53835ab Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 20 Apr 2023 15:50:30 +0900 Subject: [PATCH 025/121] kent: add missing information to the meta --- pkgs/applications/science/biology/kent/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index 8f3e312b20c..a41cdfc5dee 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -80,6 +80,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "UCSC Genome Bioinformatics Group's suite of biological analysis tools, i.e. the kent utilities"; + homepage = "http://genome.ucsc.edu"; + changelog = "https://github.com/ucscGenomeBrowser/kent/releases/tag/v${version}_base"; license = licenses.unfree; maintainers = with maintainers; [ scalavision ]; platforms = platforms.linux; From 2890af5e4bf5badd939e30651e2328ddb4e7647c Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Thu, 20 Apr 2023 11:52:57 +0200 Subject: [PATCH 026/121] nixos/acme: fix options type null is a possible default so the type must reflect that. --- nixos/modules/security/acme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index ef063625899..a9b52b71777 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -487,7 +487,7 @@ let }; email = mkOption { - type = types.str; + type = types.nullOr types.str; inherit (defaultAndText "email" null) default defaultText; description = lib.mdDoc '' Email address for account creation and correspondence from the CA. @@ -555,7 +555,7 @@ let }; credentialsFile = mkOption { - type = types.path; + type = types.nullOr types.path; inherit (defaultAndText "credentialsFile" null) default defaultText; description = lib.mdDoc '' Path to an EnvironmentFile for the cert's service containing any required and From 1425758d4c36ae6265fbe0ed8ce7a8bb1572cdee Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 20 Apr 2023 14:58:00 +0200 Subject: [PATCH 027/121] warzone2100: 4.3.4 -> 4.3.5 --- pkgs/games/warzone2100/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index b1adf5b956a..c312753763b 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.3.4"; + version = "4.3.5"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-l4QAF+mTaWi/BNPizqpTPw0KdcrYjw71K+D325/BKdo="; + sha256 = "sha256-AdYI9vljjhTXyFffQK0znBv8IHoF2q/nFXrYZSo0BcM="; }; buildInputs = [ From 52cb2d2cdd436834d0bb5b62d2c73038ad1b1650 Mon Sep 17 00:00:00 2001 From: lasers Date: Sat, 15 Apr 2023 22:46:02 -0500 Subject: [PATCH 028/121] cemu: 2.0-32 -> 2.0-36 --- pkgs/applications/emulators/cemu/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 3d034f7c736..45b4736b3d9 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-32"; + version = "2.0-36"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-47uCGN1wFVx3ph/q3+BG+pwJ7nisbmRPUEatOIq0i9M="; + hash = "sha256-RO8c9gLK00LLwDzcD8UOS3kh3kwTwFyrpuRlIXcInPo="; }; patches = [ @@ -86,9 +86,12 @@ stdenv.mkDerivation rec { "-DPORTABLE=OFF" ]; - preConfigure = '' + preConfigure = with lib; let + tag = last (splitString "-" version); + in '' rm -rf dependencies/imgui ln -s ${imgui}/include/imgui dependencies/imgui + sed 's/\(EMULATOR_VERSION_SUFFIX\).*experimental.*/\1 "-${tag} (experimental)"/' -i src/Common/version.h ''; installPhase = '' From a9f4dfc8950b7e98a395c34cb9a9562664740ffc Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 21 Apr 2023 09:58:17 +0200 Subject: [PATCH 029/121] linux_xanmod_latest: 6.2.11 -> 6.2.12 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 74977ea96de..53f24233b2a 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -9,8 +9,8 @@ let }; mainVariant = { - version = "6.2.11"; - hash = "sha256-rwFlSv5SUwhr8U4mvOGCMKYuU5xVKC7UYRemf7DKwr0="; + version = "6.2.12"; + hash = "sha256-K/s1nSLOrzZ/A3pnv9qFs8SkI9R6keG0WGV1o7K6jUQ="; variant = "main"; }; From 40a5c0a05841641225c8e77bb5eae0ca23d67898 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 21 Apr 2023 09:58:52 +0200 Subject: [PATCH 030/121] linux_xanmod: 6.1.24 -> 6.1.25 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 53f24233b2a..5fbce0534cf 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,8 +3,8 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "6.1.24"; - hash = "sha256-mLhuyASE/3kv5MD1v5pwHDkL0m7bTaRuAitG3junRyU="; + version = "6.1.25"; + hash = "sha256-Cn8NAVdfL2VJIPuZ3tANxB3VyQI0X2/YZG0/4r/ccYg="; variant = "lts"; }; From 9536dd12465613013c15dbd2496438b6c046a693 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 18 Apr 2023 10:30:14 -0700 Subject: [PATCH 031/121] signalbackup-tools: 20230414 -> 20230421-1 Diff: https://github.com/bepaald/signalbackup-tools/compare/20230414...20230421-1 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index b352f4b7322..34d06f9fd1e 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230414"; + version = "20230421-1"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-0pCItZCYdwX/Bl20HHc/FhIF4ZHsqz9aadfFYNdQ71M="; + hash = "sha256-ZQFoajkD7vvz74TXVT7I4D0Qjknt5YxfHYpGi3i01Ns="; }; postPatch = '' From 61939b04276d218935da2640e734f27cc44435b1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 22 Apr 2023 04:20:00 +0000 Subject: [PATCH 032/121] millet: 0.9.3 -> 0.9.4 --- .../tools/language-servers/millet/Cargo.lock | 144 ++++++++++-------- .../tools/language-servers/millet/default.nix | 8 +- 2 files changed, 81 insertions(+), 71 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index 3e9cbaece14..2b6cfefa303 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -19,16 +19,16 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] [[package]] name = "analysis" -version = "0.9.3" +version = "0.9.4" dependencies = [ "config", "diagnostic", @@ -107,7 +107,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.9.3" +version = "0.9.4" dependencies = [ "fast-hash", "str-util", @@ -116,11 +116,11 @@ dependencies = [ [[package]] name = "char-name" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" [[package]] name = "cm-syntax" -version = "0.9.3" +version = "0.9.4" dependencies = [ "lex-util", "paths", @@ -132,14 +132,14 @@ dependencies = [ [[package]] name = "code-h2-md-map" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" dependencies = [ "fast-hash", ] [[package]] name = "config" -version = "0.9.3" +version = "0.9.4" dependencies = [ "fast-hash", "serde", @@ -206,7 +206,7 @@ dependencies = [ [[package]] name = "diagnostic" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" [[package]] name = "diff" @@ -223,7 +223,7 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" [[package]] name = "elapsed" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" dependencies = [ "log", ] @@ -271,7 +271,7 @@ dependencies = [ [[package]] name = "event-parse" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" dependencies = [ "drop_bomb", "rowan", @@ -281,7 +281,7 @@ dependencies = [ [[package]] name = "fast-hash" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" dependencies = [ "rustc-hash", ] @@ -299,7 +299,7 @@ dependencies = [ [[package]] name = "fmt-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" [[package]] name = "form_urlencoded" @@ -352,7 +352,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "identifier-case" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" [[package]] name = "idna" @@ -367,7 +367,7 @@ dependencies = [ [[package]] name = "idx" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" [[package]] name = "indexmap" @@ -381,7 +381,7 @@ dependencies = [ [[package]] name = "input" -version = "0.9.3" +version = "0.9.4" dependencies = [ "cm-syntax", "config", @@ -440,7 +440,7 @@ checksum = "1dabfe0d01e15fde0eba33b9de62475c59e681a47ce4ffe0534af2577a3f8524" [[package]] name = "lang-srv" -version = "0.9.3" +version = "0.9.4" dependencies = [ "analysis", "anyhow", @@ -468,19 +468,19 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.9.3" +version = "0.9.4" [[package]] name = "libc" -version = "0.2.141" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "9b085a4f2cde5781fc4b1717f2e86c62f5cda49de7ba99a7c2eae02b61c9064c" [[package]] name = "log" @@ -533,7 +533,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.9.3" +version = "0.9.4" dependencies = [ "analysis", "config", @@ -543,11 +543,12 @@ dependencies = [ "panic-hook", "paths", "pico-args", + "sml-naive-fmt", ] [[package]] name = "millet-ls" -version = "0.9.3" +version = "0.9.4" dependencies = [ "anyhow", "env_logger", @@ -567,7 +568,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.9.3" +version = "0.9.4" dependencies = [ "fast-hash", "paths", @@ -578,7 +579,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.9.3" +version = "0.9.4" dependencies = [ "config", "diagnostic", @@ -602,7 +603,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.9.3" +version = "0.9.4" dependencies = [ "lex-util", "paths", @@ -668,7 +669,7 @@ dependencies = [ [[package]] name = "panic-hook" -version = "0.9.3" +version = "0.9.4" dependencies = [ "better-panic", ] @@ -676,7 +677,7 @@ dependencies = [ [[package]] name = "paths" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" dependencies = [ "fast-hash", "glob", @@ -687,7 +688,7 @@ dependencies = [ [[package]] name = "pattern-match" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" dependencies = [ "fast-hash", ] @@ -748,9 +749,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "ac6cf59af1067a3fb53fbe5c88c053764e930f932be1d71d3ffe032cbe147f59" dependencies = [ "aho-corasick", "memchr", @@ -759,9 +760,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "b6868896879ba532248f33598de5181522d8b3d9d724dfd230911e1a7d4822f5" [[package]] name = "rowan" @@ -778,9 +779,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -790,9 +791,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.11" +version = "0.37.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0" dependencies = [ "bitflags", "errno", @@ -861,7 +862,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.9.3" +version = "0.9.4" dependencies = [ "fast-hash", "str-util", @@ -869,14 +870,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.9.3" +version = "0.9.4" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.9.3" +version = "0.9.4" dependencies = [ "fast-hash", "sml-mir", @@ -885,7 +886,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.9.3" +version = "0.9.4" dependencies = [ "config", "elapsed", @@ -899,7 +900,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.9.3" +version = "0.9.4" dependencies = [ "fast-hash", "once_cell", @@ -908,7 +909,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.9.3" +version = "0.9.4" dependencies = [ "la-arena", "sml-lab", @@ -919,7 +920,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.9.3" +version = "0.9.4" dependencies = [ "config", "diagnostic", @@ -933,14 +934,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.9.3" +version = "0.9.4" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.9.3" +version = "0.9.4" dependencies = [ "diagnostic", "lex-util", @@ -950,20 +951,29 @@ dependencies = [ [[package]] name = "sml-libs" version = "0.1.0" -source = "git+https://github.com/azdavis/sml-libs.git#360d865bfe1e8afc4f8e483e0ac8f53da0593041" +source = "git+https://github.com/azdavis/sml-libs.git#7ae671a607a143fd8529e34019f96f6fb275df45" [[package]] name = "sml-mir" -version = "0.9.3" +version = "0.9.4" dependencies = [ "sml-lab", "sml-scon", "uniq", ] +[[package]] +name = "sml-mir-lower" +version = "0.9.4" +dependencies = [ + "sml-hir", + "sml-mir", + "uniq", +] + [[package]] name = "sml-naive-fmt" -version = "0.9.3" +version = "0.9.4" dependencies = [ "fast-hash", "sml-comment", @@ -972,11 +982,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.9.3" +version = "0.9.4" [[package]] name = "sml-parse" -version = "0.9.3" +version = "0.9.4" dependencies = [ "diagnostic", "event-parse", @@ -988,14 +998,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.9.3" +version = "0.9.4" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.9.3" +version = "0.9.4" dependencies = [ "num-bigint", "num-traits", @@ -1004,7 +1014,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.9.3" +version = "0.9.4" dependencies = [ "chain-map", "config", @@ -1025,7 +1035,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.9.3" +version = "0.9.4" dependencies = [ "chain-map", "code-h2-md-map", @@ -1042,7 +1052,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.9.3" +version = "0.9.4" dependencies = [ "char-name", "code-h2-md-map", @@ -1055,7 +1065,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.9.3" +version = "0.9.4" dependencies = [ "fast-hash", "sml-hir", @@ -1073,7 +1083,7 @@ dependencies = [ [[package]] name = "str-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" dependencies = [ "smol_str", ] @@ -1103,7 +1113,7 @@ dependencies = [ [[package]] name = "syntax-gen" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" dependencies = [ "fast-hash", "identifier-case", @@ -1123,7 +1133,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.9.3" +version = "0.9.4" dependencies = [ "analysis", "cm-syntax", @@ -1148,7 +1158,7 @@ dependencies = [ [[package]] name = "text-pos" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" dependencies = [ "fast-hash", "text-size-util", @@ -1163,7 +1173,7 @@ checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a" [[package]] name = "text-size-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" dependencies = [ "text-size", ] @@ -1186,7 +1196,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" [[package]] name = "toml" @@ -1225,7 +1235,7 @@ dependencies = [ [[package]] name = "topo-sort" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" [[package]] name = "ungrammar" @@ -1272,7 +1282,7 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "uniq" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#48188e47909b733e5532d3dd70bc5dfa88394f9b" +source = "git+https://github.com/azdavis/language-util.git#d0882b43cfeb7efc3d33b686629ae060360fe032" [[package]] name = "url" @@ -1457,7 +1467,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.9.3" +version = "0.9.4" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 956e3c4f9df..cb84a7e01e5 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-swT16F/gOHiAeZGrD9O4THIHMXDQOpsaUsSjhpkw3fU="; + hash = "sha256-wupTEZGsfqH7Ekqr5eiQ5Ne1cD8Fw3cpaZJVsOlXJyw="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "char-name-0.1.0" = "sha256-hO7SO1q5hPY5wJJ8A+OxxCI7GeHtdMz34OWu9ViVny0="; - "sml-libs-0.1.0" = "sha256-+sxaPBG5qBIC195BFQYH8Yo6juuelGZzztCUiS45WRg="; + "char-name-0.1.0" = "sha256-IisHUxD6YQIb7uUZ1kYd3hnH1v87OhMBYDqJpBGmwfQ="; + "sml-libs-0.1.0" = "sha256-0gRiXJAGddrrbgI3AhlWqVKipNZI0OxMTrkWdcSbG7A="; }; }; From b8b706b0708e7c61b7dd715f0fab9bd7b9e627c7 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 29 Mar 2023 23:27:37 +0800 Subject: [PATCH 033/121] python3Packages.uamqp: use github source, unpin openssl_1_1, enable tests --- .../python-modules/uamqp/default.nix | 37 +++++++++++-------- pkgs/top-level/python-packages.nix | 1 - 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index e60d5509478..24d2b7b3463 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -1,27 +1,28 @@ { lib , stdenv , buildPythonPackage +, fetchFromGitHub +, cython , certifi , CFNetwork , cmake , CoreFoundation -, enum34 -, fetchpatch -, fetchPypi -, isPy3k , libcxxabi , openssl , Security -, six +, pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { pname = "uamqp"; version = "1.6.4"; - src = fetchPypi { - inherit pname version; - hash = "sha256-IYMzJDXveIL60ick4/L2PT/VpRx/DGNdY0h5SLAuN0k="; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-uamqp-python"; + rev = "refs/tags/v.${version}"; + hash = "sha256-OjZTroaBuUB/dakl5gAYigJkim9EFiCwUEBo7z35vhQ="; }; patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ @@ -43,9 +44,12 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake + cython ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation CFNetwork Security @@ -53,10 +57,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ certifi - openssl - six - ] ++ lib.optionals (!isPy3k) [ - enum34 ]; LDFLAGS = lib.optionals stdenv.isDarwin [ @@ -65,8 +65,15 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - # Project has no tests - doCheck = false; + preCheck = '' + # remove src module, so tests use the installed module instead + rm -r uamqp + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "uamqp" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a784017465..ad3822ea8ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12204,7 +12204,6 @@ self: super: with self; { rustworkx = callPackage ../development/python-modules/rustworkx { }; uamqp = callPackage ../development/python-modules/uamqp { - openssl = pkgs.openssl_1_1; inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork CoreFoundation Security; }; From 5e89f7044484b0e86fe06637fe5d187ea32e169f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 22 Apr 2023 20:16:11 +0800 Subject: [PATCH 034/121] telegram-desktop: 4.7.1 -> 4.8.0 Release note: https://github.com/telegramdesktop/tdesktop/releases/tag/v4.8.0 --- .../telegram/telegram-desktop/default.nix | 12 ++++++------ .../telegram/telegram-desktop/tg_owt.nix | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index ab8a24bb093..03465c8ee3e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -29,7 +29,7 @@ , tl-expected , hunspell , glibmm_2_68 -, webkitgtk_4_1 +, webkitgtk_6_0 , jemalloc , rnnoise , protobuf @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.7.1"; + version = "4.8.0"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py src = fetchFromGitHub { @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1qv8029xzp2j1j58b1lkw3q53cwaaazvp2la80mfbjv348c29iyk"; + sha256 = "1ari4kdjd99klrla0rn4cjjc54d6glf17s0q881f67vh2v5zdwf0"; }; patches = [ @@ -101,8 +101,8 @@ stdenv.mkDerivation rec { --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' - substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \ - --replace '"libwebkit2gtk-4.1.so.0"' '"${webkitgtk_4_1}/lib/libwebkit2gtk-4.1.so.0"' + substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \ + --replace '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"' ''; # We want to run wrapProgram manually (with additional parameters) @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { tl-expected hunspell glibmm_2_68 - webkitgtk_4_1 + webkitgtk_6_0 jemalloc rnnoise protobuf diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 6e57a81dc29..6dbff9e8095 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2023-03-14"; + version = "unstable-2023-04-18"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "1a18da2ed4d5ce134e984d1586b915738e0da257"; - sha256 = "18srnl688ng8grfpmgcjpdyr4cw87yjdvyw94b2jjq5jmnq9n3a3"; + rev = "fe316b0c5a155cceb2ddecee70d7b582cadfa225"; + sha256 = "0wl2d1ycvf32prqjxxh6a14zgaqkk7s545cv2pn4dryn6lf7bfsp"; fetchSubmodules = true; }; From 17ceaffab1a67a0e76c11ae88e68711cd9c06104 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 5 Apr 2023 19:01:07 -0700 Subject: [PATCH 035/121] dante: disable getaddrinfo() checks if cross Prior to this commit, dante's configure-time getaddrinfo() checks were disabled only if stdenv.hostPlatform.isMips64. These checks must also be disabled if the buildPlatform cannot execute hostPlatform binaries. This commit factors out the control of this disablement as a flag and adds an additional situation in which that flag is enabled. --- pkgs/servers/dante/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index 571572baca2..49e6a26f455 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -1,6 +1,9 @@ { lib, stdenv, fetchurl, fetchpatch, autoreconfHook , pam, libkrb5, cyrus_sasl, miniupnpc, libxcrypt }: +let + remove_getaddrinfo_checks = stdenv.hostPlatform.isMips64 || !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); +in stdenv.mkDerivation rec { pname = "dante"; version = "1.4.3"; @@ -19,7 +22,7 @@ stdenv.mkDerivation rec { dontAddDisableDepTrack = stdenv.isDarwin; - patches = lib.optionals stdenv.hostPlatform.isMips64 [ + patches = lib.optionals remove_getaddrinfo_checks [ (fetchpatch { name = "0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch"; url = "https://raw.githubusercontent.com/buildroot/buildroot/master/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch"; From a08168088124f93a03bbc10cac2b998c7f773ed3 Mon Sep 17 00:00:00 2001 From: Infinitive Witch Date: Sat, 22 Apr 2023 13:53:37 -0300 Subject: [PATCH 036/121] komikku: 1.18.0 -> 1.19.0 Signed-off-by: Infinitive Witch --- pkgs/applications/graphics/komikku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index 47095322fb7..4f2a7bae494 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.18.0"; + version = "1.19.0"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-suqoYV+YsbCB7sUNzds6OoEMH9KO3bt2udok6oXXyls="; + hash = "sha256-4XhcmK9Dgk82ExzugY4SGRfWYC+IgCAxWS+cBURgT2o="; }; nativeBuildInputs = [ From f8005e1487c7e7ec23ab065a6eb73e4a6416200d Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 22 Apr 2023 12:43:58 -0700 Subject: [PATCH 037/121] soapysdr: fix cross --- pkgs/applications/radio/soapysdr/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 59a1e0f59ac..e11e2af401b 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -6,6 +6,7 @@ , ncurses, swig2 , extraPackages ? [] , testers +, buildPackages }: let @@ -51,7 +52,7 @@ in stdenv.mkDerivation (finalAttrs: { postFixup = lib.optionalString (lib.length extraPackages != 0) '' # Join all plugins via symlinking for i in ${toString extraPackages}; do - ${lndir}/bin/lndir -silent $i $out + ${buildPackages.xorg.lndir}/bin/lndir -silent $i $out done # Needed for at least the remote plugin server for file in $out/bin/*; do From 7265c2b8a009c335f367ff9d4bde4011fa8633c5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 22 Apr 2023 18:47:14 -0400 Subject: [PATCH 038/121] linuxwave: init at 0.1.3 --- pkgs/tools/audio/linuxwave/default.nix | 63 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/tools/audio/linuxwave/default.nix diff --git a/pkgs/tools/audio/linuxwave/default.nix b/pkgs/tools/audio/linuxwave/default.nix new file mode 100644 index 00000000000..6c3d6ce2f1b --- /dev/null +++ b/pkgs/tools/audio/linuxwave/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, zig +}: + +stdenv.mkDerivation rec { + pname = "linuxwave"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "linuxwave"; + rev = "v${version}"; + hash = "sha256-e+QTteyHAyYmU4vb86Ju92DxNFFX01g/rsViNI5ba1s="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + installShellFiles + zig + ]; + + postConfigure = '' + export XDG_CACHE_HOME=$(mktemp -d) + ''; + + buildPhase = '' + runHook preBuild + + zig build -Drelease-safe -Dcpu=baseline + + runHook postBuild + ''; + + checkPhase = '' + runHook preCheck + + zig build test + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + zig build -Drelease-safe -Dcpu=baseline --prefix $out install + + installManPage man/linuxwave.1 + + runHook postInstall + ''; + + meta = with lib; { + description = "Generate music from the entropy of Linux"; + homepage = "https://github.com/orhun/linuxwave"; + changelog = "https://github.com/orhun/linuxwave/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0850c4ad65f..954304ebc51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9111,6 +9111,8 @@ with pkgs; lfs = callPackage ../tools/filesystems/lfs { }; + linuxwave = callPackage ../tools/audio/linuxwave { }; + littlefs-fuse = callPackage ../tools/filesystems/littlefs-fuse { }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; From e7a7316c5315efa87965f79c5cfcfca90e3d275f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 22 Apr 2023 16:07:39 -0700 Subject: [PATCH 039/121] imagemagick: 7.1.1-7 -> 7.1.1-8 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-7...7.1.1-8 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 9dabd03ccd5..7a7967d9887 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -47,13 +47,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-7"; + version = "7.1.1-8"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-PeXWtD8AX9VEJruZu/TO1Bpaoa1XNKIFGfGK+TpQEMs="; + hash = "sha256-2wAm2y8YQwhgsPNqxGGJ65emL/kMYoVvF2phZMXTpZc="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From ff553c356c73d0b03c560530f02a7210ca1ca0bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Apr 2023 23:14:17 +0000 Subject: [PATCH 040/121] okteto: 2.14.2 -> 2.14.3 --- pkgs/development/tools/okteto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index d1137c3def3..5282ecac886 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.14.2"; + version = "2.14.3"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-2bO6konOAyrCD+t31ZJ2+Ptp26ylY9wr1uArFu9rlnI="; + hash = "sha256-E96IAAbWmFIQILUU3WLjX6NAXzwIkrbEgKUs4wrh8z4="; }; vendorHash = "sha256-b2qxvP9spXEJVYOq7o0VG2WOxzUchwtLaY97/2IYoV4="; From c552ebbca826b00f2b7286bf09efa8be3ab5d1db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 03:19:45 +0000 Subject: [PATCH 041/121] amdvlk: 2023.Q1.3 -> 2023.Q2.1 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index d997d302fc3..9f24514144a 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2023.Q1.3"; + version = "2023.Q2.1"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "JYGegQQCoKIpvBQYhNbG8j6CgtKb+c8MsK+cFtYUgtY="; + sha256 = "znjv50seqN2Rdzwnu/5ks6q1uiUacM/Z5fzMyCgv0b8="; }; buildInputs = [ From 2a0e437c8d70dda8369a08ddb63ebca3fc2fd726 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 09:43:35 +0000 Subject: [PATCH 042/121] nwg-bar: 0.1.1 -> 0.1.3 --- pkgs/applications/misc/nwg-bar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/nwg-bar/default.nix b/pkgs/applications/misc/nwg-bar/default.nix index 0d96b3cdc78..4dec8077d94 100644 --- a/pkgs/applications/misc/nwg-bar/default.nix +++ b/pkgs/applications/misc/nwg-bar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nwg-bar"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XeRQhDQeobO1xNThdNgBkoGvnO3PMAxrNwTljC1GKPM="; + sha256 = "sha256-/GkusNhHprXwGMNDruEEuFC2ULVIHBN5F00GNex/uq4="; }; patches = [ ./fix-paths.patch ]; @@ -17,7 +17,7 @@ buildGoModule rec { substituteInPlace tools.go --subst-var out ''; - vendorHash = "sha256-EewEhkX7Bwnz+J1ptO31HKHU4NHo76r4NqMbcrWdiu4="; + vendorHash = "sha256-mqcXhnja8ed7vXIqOKBsNrcbrcaycTQXG1jqdc6zcyI="; nativeBuildInputs = [ pkg-config ]; From 12c4aafccb1a310a0b3855eaebcdf7ac37862ce4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 23 Apr 2023 14:08:26 +0300 Subject: [PATCH 043/121] python310Packages.eigenpy: 2.9.2 -> 3.0.0 --- pkgs/development/python-modules/eigenpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index 19f265a7c39..e20cb4c4f63 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "eigenpy"; - version = "2.9.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-h088il9gih1rJJKOI09qq2180DxbxCAVZcgBXWh8aVk="; + hash = "sha256-xaeMsn3G4x5DS6gXc6mbZvi96K1Yu8CuzjcGnYJYrvs="; }; strictDeps = true; From 2af4a9bc09bccb74cda5eefb98193b4bbbb0eba5 Mon Sep 17 00:00:00 2001 From: Andreas Brinner Date: Sun, 23 Apr 2023 11:35:04 +0200 Subject: [PATCH 044/121] nixos/roundcube: fix PostgreSQL password Extract PostgreSQL database password for Roundcube from .pgpass file. The password file is used in two locations: 1. in the Roundcube config.php 2. in the systemd setup service that initializes the roundcube database These two services need the password in different formats. Keep the password file in PostgreSQL standard format and extract the password for the Roundcube config (see #215986). --- nixos/modules/services/mail/roundcube.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index 3aaec145930..70ec3707dc1 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -123,7 +123,15 @@ in environment.etc."roundcube/config.inc.php".text = '' Date: Sun, 23 Apr 2023 12:16:43 +0200 Subject: [PATCH 045/121] nixos/roundcube: fix roundcube-setup start When using Roundcube with a non local PostgreSQL database wait for network start before running roundcube-setup.service Otherwise the database is not reachable and the service fails. --- nixos/modules/services/mail/roundcube.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index 70ec3707dc1..09c31181491 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -231,6 +231,7 @@ in path = [ config.services.postgresql.package ]; }) { + after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; script = let psql = "${lib.optionalString (!localDB) "PGPASSFILE=${cfg.database.passwordFile}"} ${pkgs.postgresql}/bin/psql ${lib.optionalString (!localDB) "-h ${cfg.database.host} -U ${cfg.database.username} "} ${cfg.database.dbname}"; From 78fb35ce39b9f4db45999457c170f65ed153f3eb Mon Sep 17 00:00:00 2001 From: Andreas Brinner Date: Sun, 23 Apr 2023 14:05:40 +0200 Subject: [PATCH 046/121] nixos/roundcube: extend documentation for passwordFile The passwordFile must be formatted correctly. Added some information about how the file content should look like. --- nixos/modules/services/mail/roundcube.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index 09c31181491..ecf4d3ebc4d 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -70,7 +70,11 @@ in }; passwordFile = mkOption { type = types.str; - description = lib.mdDoc "Password file for the postgresql connection. Must be readable by user `nginx`. Ignored if `database.host` is set to `localhost`, as peer authentication will be used."; + description = lib.mdDoc '' + Password file for the postgresql connection. + Must be formated according to PostgreSQL .pgpass standard (see https://www.postgresql.org/docs/current/libpq-pgpass.html) + and readable by user `nginx`. Ignored if `database.host` is set to `localhost`, as peer authentication will be used. + ''; }; dbname = mkOption { type = types.str; @@ -124,8 +128,6 @@ in Date: Sun, 23 Apr 2023 12:48:29 +0000 Subject: [PATCH 047/121] snapmaker-luban: 4.7.2 -> 4.7.3 --- pkgs/applications/misc/snapmaker-luban/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index 2c01cf2a0e7..615cf28103a 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "snapmaker-luban"; - version = "4.7.2"; + version = "4.7.3"; src = fetchurl { url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz"; - sha256 = "sha256-Orl3nKqkz1L1MTUEaxpnhD/nzQPDXxzgAP/GfC5tQ/o="; + sha256 = "sha256-CPeTTnwykaa58tpA7Aznrvrs0DqxOKjspZjHrT+e9tw="; }; nativeBuildInputs = [ From 45bc53cb5214f83767065865ac56700cddc4ba91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 14:14:33 +0000 Subject: [PATCH 048/121] lux: 0.17.2 -> 0.18.0 --- pkgs/tools/video/lux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/video/lux/default.nix b/pkgs/tools/video/lux/default.nix index ac325904aca..128a8a92575 100644 --- a/pkgs/tools/video/lux/default.nix +++ b/pkgs/tools/video/lux/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "lux"; - version = "0.17.2"; + version = "0.18.0"; src = fetchFromGitHub { owner = "iawia002"; repo = "lux"; rev = "v${version}"; - sha256 = "sha256-bEfDZkbASGQcx6IT5m1oy42maEJp8ElMC4uvjPwJbDU="; + sha256 = "sha256-A3DDKpoaZlDUpafAGs5zCknhTeCuwMPnyBHtxke0Bi8="; }; nativeBuildInputs = [ makeWrapper ]; - vendorHash = "sha256-7WgTRnt1RsoMattIiYH2GFlQF12zoWTRkm3vts07/ho="; + vendorHash = "sha256-7wgGJYiIsVTRSuSb4a9LgYCkkayGhNMKqcIKoDxMuAM="; ldflags = [ "-s" "-w" ]; From f2de0166bc2cace212d0a42ad2f6986a029db336 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 14:39:22 +0000 Subject: [PATCH 049/121] soft-serve: 0.4.6 -> 0.4.7 --- pkgs/servers/soft-serve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index 6e1f4c69651..432e2ec2d70 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "sha256-7LegGf/fCWJQfiayqkbg0S13NOICzxxCWxS+vXHmP08="; + sha256 = "sha256-Bjb2CC7yWhbVyKAL2+R+qLfkElux7pSgkD/glkv/jVw="; }; - vendorHash = "sha256-k/IKpeSjgCYQRBRW/TMThQOFWfx1BFJpHpwMQxITkxY="; + vendorHash = "sha256-JVEUR05ciD5AX2uhQjWFNVSY2qD2M4kti9ACHyb+UfM="; doCheck = false; From c58c844b364a776b3251c1725afa597c1e199a96 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 23 Apr 2023 10:49:07 -0400 Subject: [PATCH 050/121] nix-init: 0.2.1 -> 0.2.2 Diff: https://github.com/nix-community/nix-init/compare/v0.2.1...v0.2.2 Changelog: https://github.com/nix-community/nix-init/blob/v0.2.2/CHANGELOG.md --- pkgs/tools/nix/nix-init/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix index 2b207ce03cb..83ddb84163b 100644 --- a/pkgs/tools/nix/nix-init/default.nix +++ b/pkgs/tools/nix/nix-init/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , curl , installShellFiles -, makeWrapper +, makeBinaryWrapper , pkg-config , bzip2 , libgit2_1_5 @@ -26,21 +26,21 @@ in rustPlatform.buildRustPackage rec { pname = "nix-init"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-init"; rev = "v${version}"; - hash = "sha256-SvoKw0Ep8NGknu+6qd6xW6hfH261kFD6DjZhPXQpzs0="; + hash = "sha256-eiPUJj87PU4EgMQRJ4Yv5d/y94j5AklbP1sVNXNSNPs="; }; - cargoHash = "sha256-lm4Y/ZTRMiBp3ECKnHZBvwM8Qso+rilT3BDxzfcnpHQ="; + cargoHash = "sha256-OKHW5q8bvJiwJAAEr9AHEWoDCwDKr6ACxsFRtJOTNis="; nativeBuildInputs = [ curl installShellFiles - makeWrapper + makeBinaryWrapper pkg-config ]; @@ -82,8 +82,10 @@ rustPlatform.buildRustPackage rec { installShellCompletion artifacts/nix-init.{bash,fish} --zsh artifacts/_nix-init ''; - GEN_ARTIFACTS = "artifacts"; - ZSTD_SYS_USE_PKG_CONFIG = true; + env = { + GEN_ARTIFACTS = "artifacts"; + ZSTD_SYS_USE_PKG_CONFIG = true; + }; meta = with lib; { description = "Command line tool to generate Nix packages from URLs"; From 8678ac74d7fed27d558df0128f5a33143f0bd091 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 23 Apr 2023 10:57:38 -0400 Subject: [PATCH 051/121] babashka: 1.3.176 -> 1.3.178 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index e8ed1a25224..692b5330ca3 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -7,11 +7,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.3.176"; + version = "1.3.178"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-Kf7Yb7IrXiX5MGbpxvXSKqx3LEdHFV8+hgq43SAoe00="; + sha256 = "sha256-ihARaZ8GJsoFmlOd0qtbOAQkbs6a9zohJ9PREJoxdZg="; }; graalvmDrv = graalvmCEPackages.graalvm19-ce; From bfc307189f15407b78f0034251c74cb109804eb3 Mon Sep 17 00:00:00 2001 From: zendo Date: Sat, 15 Apr 2023 14:50:11 +0800 Subject: [PATCH 052/121] wike: 1.7.1 -> 2.0.1 --- pkgs/applications/misc/wike/default.nix | 47 ++++++++++++++++--------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix index 00cd8dcf051..e2dafd1ed92 100644 --- a/pkgs/applications/misc/wike/default.nix +++ b/pkgs/applications/misc/wike/default.nix @@ -1,23 +1,31 @@ -{ lib, stdenv, fetchFromGitHub -, meson, pkg-config, ninja +{ lib +, fetchFromGitHub , python3 -, glib, appstream-glib , desktop-file-utils -, gobject-introspection, gtk3 -, wrapGAppsHook -, libhandy, webkitgtk, glib-networking -, gnome, dconf +, meson +, ninja +, pkg-config +, appstream-glib +, desktop-file-utils +, gobject-introspection +, wrapGAppsHook4 +, glib +, gtk4 +, librsvg +, libadwaita +, glib-networking +, webkitgtk_6_0 }: python3.pkgs.buildPythonApplication rec { pname = "wike"; - version = "1.7.1"; + version = "2.0.1"; format = "other"; src = fetchFromGitHub { owner = "hugolabe"; repo = "Wike"; rev = version; - sha256 = "sha256-QLhfzGRrc2En0Hu+UdtPM572PdtXqOFL0W3LoAki4jI="; + hash = "sha256-R8Zg/2tr9MrmtTdbvqD+Ra8+MEBJdgMqC3ptx1VgkeA="; }; nativeBuildInputs = [ @@ -27,17 +35,16 @@ python3.pkgs.buildPythonApplication rec { appstream-glib desktop-file-utils gobject-introspection - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ glib - gtk3 - libhandy - webkitgtk + gtk4 + librsvg + libadwaita glib-networking - gnome.adwaita-icon-theme - dconf + webkitgtk_6_0 ]; propagatedBuildInputs = with python3.pkgs; [ @@ -47,13 +54,21 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' patchShebangs build-aux/meson/postinstall.py + substituteInPlace build-aux/meson/postinstall.py \ + --replace gtk-update-icon-cache gtk4-update-icon-cache + ''; + + # prevent double wrapping + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; meta = with lib; { description = "Wikipedia Reader for the GNOME Desktop"; homepage = "https://github.com/hugolabe/Wike"; license = licenses.gpl3Plus; - platforms = webkitgtk.meta.platforms; + platforms = platforms.linux; maintainers = with maintainers; [ samalws ]; }; } From c5d839180a5c70c72f08ab44f22bef4ce6cad3f6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 23 Apr 2023 18:36:17 +0200 Subject: [PATCH 053/121] ntirpc: 4.3 -> 5.0 --- 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 d1a795bcf9a..39acba13d73 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.3"; + version = "5.0"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "ntirpc"; rev = "v${version}"; - sha256 = "sha256-P9+t9dTiEKjloulypWPJ4sXWWemq9zPUH/Kctvq1SUQ="; + sha256 = "sha256-xqnfo07EHwendzibIz187vdaenHwxg078D6zJvoyewc="; }; postPatch = '' From 862488f4591286e6287bd0059bb8278c7a370590 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 23 Apr 2023 18:36:35 +0200 Subject: [PATCH 054/121] nfs-ganesha: 4.4 -> 5.0 --- pkgs/servers/nfs-ganesha/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index d576f1f46d5..9a5522a1751 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.4"; + version = "5.0"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-MEPy2TXVTegwCpuaIrMol7ag8anxxdcj11z5eYNkDqQ="; + sha256 = "sha256-uJlT0nH3n0zzCVOap7XlxilHqSfklHn0h49He1yZkbs="; }; preConfigure = "cd src"; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { "-DUSE_SYSTEM_NTIRPC=ON" "-DSYSSTATEDIR=/var" "-DENABLE_VFS_POSIX_ACL=ON" + "-DUSE_ACL_MAPPING=ON" ]; nativeBuildInputs = [ From a1363863899cf7eee38bc6b1d4d38abe81b112fa Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 23 Apr 2023 18:21:19 +0200 Subject: [PATCH 055/121] aaaaxy: 1.3.421 -> 1.3.457 https://github.com/divVerent/aaaaxy/releases/tag/v1.3.457 --- pkgs/games/aaaaxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/aaaaxy/default.nix b/pkgs/games/aaaaxy/default.nix index 9a0acc502b9..0da0bed0a3f 100644 --- a/pkgs/games/aaaaxy/default.nix +++ b/pkgs/games/aaaaxy/default.nix @@ -17,17 +17,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.3.421"; + version = "1.3.457"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-MZXnIkOVv49HEkatLEGbIxeJyaiOrh2XLTp5TdvMhk8="; + hash = "sha256-PN/Gt2iDOWsbKspyWYKjnX98xF6NQuGVFjlEg3ZZpio="; fetchSubmodules = true; }; - vendorHash = "sha256-TPm2X0QERJ5lBfojOAWIS60CeAz+Ps2REFtNIT2zGnY="; + vendorHash = "sha256-vI8EyZgjJA89UmqoDuh/H+qQzAKO9pyqpmA8hci9cco="; buildInputs = [ alsa-lib From 26f3c3b0848ab83f50bf84aa9f90c80235e181ff Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sun, 23 Apr 2023 19:23:35 +0200 Subject: [PATCH 056/121] got: 0.86 -> 0.87 --- pkgs/applications/version-management/got/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index be57a4cf5bb..610deabd0d7 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.86"; + version = "0.87"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - hash = "sha256-FHjLEkxsvkYz4tK1k/pEUfDT9rfvN+K68gRc8fPVp7A="; + hash = "sha256-fG8UihNXCxc0j01ImAAI3N0ViNrd9gnTUhRKs7Il5R4="; }; nativeBuildInputs = [ pkg-config bison ] From b77d3fea43b94be94dc2a5d0dd4da45a55f4e199 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 23 Apr 2023 13:23:42 -0400 Subject: [PATCH 057/121] cargo-semver-checks: 0.19.0 -> 0.20.0 Diff: https://github.com/obi1kenobi/cargo-semver-checks/compare/v0.19.0...v0.20.0 Changelog: https://github.com/obi1kenobi/cargo-semver-checks/releases/tag/v0.20.0 --- pkgs/development/tools/rust/cargo-semver-checks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 9468859ee6a..5f56b8211b1 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tZ83Lxo7yKpFQrD1rnm/3YaT3MgiVb/jL2OVdt491xg="; + sha256 = "sha256-z7mDGWU498KU6lEHqLhl0HdTA55Wz3RbZOlF6g1gwN4="; }; - cargoSha256 = "sha256-k0dc/bOkIcLP++ZH+rh01do5kcVDh/8hNGM3MPhg/0g="; + cargoSha256 = "sha256-JQdL4D6ECH8wLOCcAGm7HomJAfJD838KfI4/IRAeqD0="; nativeBuildInputs = [ pkg-config ]; From cf24129e93b81c1916ba3c597618abb9349c3cb4 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 13 Apr 2023 22:01:30 +0000 Subject: [PATCH 058/121] krane: 3.0.1 -> 3.1.0 --- .../networking/cluster/krane/Gemfile.lock | 43 +++++----- .../networking/cluster/krane/gemset.nix | 84 +++++++++---------- 2 files changed, 64 insertions(+), 63 deletions(-) diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index 98ed810a211..cf5832b24dc 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.4) + activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.1) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) colorize (0.8.1) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) ejson (1.3.1) - faraday (2.7.1) + faraday (2.7.4) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) @@ -21,30 +21,28 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - googleauth (1.3.0) + googleauth (1.5.2) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - http (4.4.1) - addressable (~> 2.3) + http (5.1.1) + addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) - http-parser (~> 1.2.0) + llhttp-ffi (~> 0.4.0) http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - http-parser (1.2.3) - ffi-compiler (>= 1.0, < 2.0) i18n (1.12.0) concurrent-ruby (~> 1.0) jsonpath (1.1.2) multi_json - jwt (2.5.0) - krane (3.0.1) + jwt (2.7.0) + krane (3.1.0) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -55,21 +53,24 @@ GEM oj (~> 3.0) statsd-instrument (>= 2.8, < 4) thor (>= 1.0, < 2.0) - kubeclient (4.10.1) - http (>= 3.0, < 5.0) + kubeclient (4.11.0) + http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) rest-client (~> 2.0) + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) memoist (0.16.2) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - minitest (5.16.3) + mime-types-data (3.2023.0218.1) + minitest (5.18.0) multi_json (1.15.0) netrc (0.11.0) - oj (3.13.23) + oj (3.14.3) os (1.1.4) - public_suffix (5.0.0) + public_suffix (5.0.1) rake (13.0.6) recursive-open-struct (1.1.3) rest-client (2.1.0) @@ -83,9 +84,9 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - statsd-instrument (3.5.0) + statsd-instrument (3.5.7) thor (1.2.1) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext @@ -98,4 +99,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.3.24 + 2.4.10 diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index b99238db86c..37fad592686 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 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0"; + sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp"; type = "gem"; }; - version = "7.0.4"; + version = "7.0.4.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.4"; }; colorize = { groups = ["default"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.2"; }; domain_name = { dependencies = ["unf"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590"; + sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.4"; }; faraday-net_http = { groups = ["default"]; @@ -110,21 +110,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hpwgwhk0lmnknkw8kbdfxn95qqs6aagpq815l5fkw9w6mi77pai"; + sha256 = "1lj5haarpn7rybbq9s031zcn9ji3rlz5bk64bwa2j34q5s1h5gis"; type = "gem"; }; - version = "1.3.0"; + version = "1.5.2"; }; http = { - dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"]; + dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y"; + sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw"; type = "gem"; }; - version = "4.4.1"; + version = "5.1.1"; }; http-accept = { groups = ["default"]; @@ -157,17 +157,6 @@ }; version = "2.3.0"; }; - http-parser = { - dependencies = ["ffi-compiler"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18qqvckvqjffh88hfib6c8pl9qwk9gp89w89hl3f2s1x8hgyqka1"; - type = "gem"; - }; - version = "1.2.3"; - }; i18n = { dependencies = ["concurrent-ruby"]; groups = ["default"]; @@ -195,10 +184,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; + sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p"; type = "gem"; }; - version = "2.5.0"; + version = "2.7.0"; }; krane = { dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"]; @@ -206,10 +195,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j3hy00vqk58vf7djip7vhqqczb84pjqlp34h1w4jgbw05vfcbqx"; + sha256 = "1d8vdj3wd2qp8agyadn0w33qf7z2p5lk3vlslb8jlph8x5y3mm70"; type = "gem"; }; - version = "3.0.1"; + version = "3.1.0"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -217,10 +206,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10rg2l15xmv4sy3cjvw3r9rxkylf36p416fhlhpic9zlq8ang6c4"; + sha256 = "1k1zi27fnasqpinfxnajm81pyr11k2j510wacr53d37v97bzr1a9"; type = "gem"; }; - version = "4.10.1"; + version = "4.11.0"; + }; + llhttp-ffi = { + dependencies = ["ffi-compiler" "rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5"; + type = "gem"; + }; + version = "0.4.0"; }; memoist = { groups = ["default"]; @@ -248,20 +248,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; + sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9"; type = "gem"; }; - version = "3.2022.0105"; + version = "3.2023.0218.1"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; + sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; type = "gem"; }; - version = "5.16.3"; + version = "5.18.0"; }; multi_json = { groups = ["default"]; @@ -288,10 +288,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lggrhlihxyfgiqqr9b2fqdxc4d2zff2czq30m3rgn8a0b2gsv90"; + sha256 = "0l8l90iibzrxs33vn3adrhbg8cbmbn1qfh962p7gzwwybsdw73qy"; type = "gem"; }; - version = "3.13.23"; + version = "3.14.3"; }; os = { groups = ["default"]; @@ -308,10 +308,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; + sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; type = "gem"; }; - version = "5.0.0"; + version = "5.0.1"; }; rake = { groups = ["default"]; @@ -370,10 +370,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gl2n26hb8g12n3alh1yg5qg7cjrp9f9fyc25crmaccm5m17v0sa"; + sha256 = "1pg308z3ck1vpazrmczklqa6f9qciay8nysnhc16pgfsh2npzzrz"; type = "gem"; }; - version = "3.5.0"; + version = "3.5.7"; }; thor = { groups = ["default"]; @@ -391,10 +391,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; unf = { dependencies = ["unf_ext"]; From 83d4fa464aa8e6de17119694faa5578590bc5e70 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 13 Apr 2023 22:05:09 +0000 Subject: [PATCH 059/121] texlab: 5.4.1 -> 5.4.2 --- pkgs/development/tools/misc/texlab/Cargo.lock | 1995 ----------------- .../development/tools/misc/texlab/default.nix | 15 +- 2 files changed, 5 insertions(+), 2005 deletions(-) delete mode 100644 pkgs/development/tools/misc/texlab/Cargo.lock diff --git a/pkgs/development/tools/misc/texlab/Cargo.lock b/pkgs/development/tools/misc/texlab/Cargo.lock deleted file mode 100644 index 7349b26f7d2..00000000000 --- a/pkgs/development/tools/misc/texlab/Cargo.lock +++ /dev/null @@ -1,1995 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[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.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" - -[[package]] -name = "arc-swap" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" - -[[package]] -name = "assert_unordered" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74323b7881323eb351134e08ee5331594826789557afef8e309baf481b2264" -dependencies = [ - "ansi_term", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "beef" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bstr" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "ciborium" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" - -[[package]] -name = "ciborium-ll" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "clap" -version = "3.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "bitflags", - "clap_lex 0.2.4", - "indexmap", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" -dependencies = [ - "bitflags", - "clap_derive", - "clap_lex 0.3.2", - "is-terminal", - "once_cell", - "strsim", - "termcolor", -] - -[[package]] -name = "clap_derive" -version = "4.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "console" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "windows-sys 0.42.0", -] - -[[package]] -name = "countme" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" -dependencies = [ - "anes", - "atty", - "cast", - "ciborium", - "clap 3.2.23", - "criterion-plot", - "itertools", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools", -] - -[[package]] -name = "crossbeam" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" -dependencies = [ - "cfg-if", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset 0.8.0", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "dashmap" -version = "5.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" -dependencies = [ - "cfg-if", - "hashbrown", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "encoding_rs_io" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83" -dependencies = [ - "encoding_rs", -] - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "eyre" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fern" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a" -dependencies = [ - "log", -] - -[[package]] -name = "filetime" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "windows-sys 0.45.0", -] - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", - "spin", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "futures-core" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" - -[[package]] -name = "futures-sink" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" - -[[package]] -name = "fuzzy-matcher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" -dependencies = [ - "thread_local", -] - -[[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]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "globset" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashlink" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "human_name" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42af7ece82db04720531abb16506781d40a72c8e62ecb0762d39746d2173255e" -dependencies = [ - "crossbeam-utils", - "libc", - "phf", - "phf_codegen", - "serde", - "serde_json", - "smallstr", - "smallvec", - "unicode-case-mapping", - "unicode-normalization", - "unicode-segmentation", - "unidecode", -] - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "insta" -version = "1.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea5b3894afe466b4bcf0388630fc15e11938a6074af0cd637c825ba2ec8a099" -dependencies = [ - "console", - "globset", - "lazy_static", - "linked-hash-map", - "pest", - "pest_derive", - "serde", - "similar", - "walkdir", - "yaml-rust", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" -dependencies = [ - "libc", - "windows-sys 0.45.0", -] - -[[package]] -name = "is-terminal" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "isocountry" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea1dc4bf0fb4904ba83ffdb98af3d9c325274e92e6e295e4151e86c96363e04" -dependencies = [ - "serde", - "thiserror", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "joinery" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5" - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kqueue" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" -dependencies = [ - "bitflags", - "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.140" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "logos" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8b031682c67a8e3d5446840f9573eb7fe26efe7ec8d195c9ac4c0647c502f1" -dependencies = [ - "logos-derive", -] - -[[package]] -name = "logos-derive" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c" -dependencies = [ - "beef", - "fnv", - "proc-macro2", - "quote", - "regex-syntax", - "syn", -] - -[[package]] -name = "lsp-server" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9b4c78d1c3f35c5864c90e9633377b5f374a4a4983ac64c30b8ae898f9305" -dependencies = [ - "crossbeam-channel", - "log", - "serde", - "serde_json", -] - -[[package]] -name = "lsp-types" -version = "0.94.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b63735a13a1f9cd4f4835223d828ed9c2e35c8c5e61837774399f558b6a1237" -dependencies = [ - "bitflags", - "serde", - "serde_json", - "serde_repr", - "url", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.45.0", -] - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - -[[package]] -name = "notify" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9" -dependencies = [ - "bitflags", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "mio", - "walkdir", - "windows-sys 0.42.0", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys 0.45.0", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pest" -version = "2.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7" -dependencies = [ - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pest_meta" -version = "2.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - -[[package]] -name = "phf" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_shared" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "plotters" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" - -[[package]] -name = "plotters-svg" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "rowan" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5811547e7ba31e903fe48c8ceab10d40d70a101f3d15523c847cce91aa71f332" -dependencies = [ - "countme", - "hashbrown", - "memoffset 0.6.5", - "rustc-hash", - "text-size", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.36.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustversion" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "salsa-2022" -version = "0.1.0" -source = "git+https://github.com/salsa-rs/salsa?rev=ef7c0f12c8159e7025316e959c26f6278a576fa5#ef7c0f12c8159e7025316e959c26f6278a576fa5" -dependencies = [ - "arc-swap", - "crossbeam", - "crossbeam-utils", - "dashmap", - "hashlink", - "indexmap", - "log", - "parking_lot", - "rustc-hash", - "salsa-2022-macros", - "smallvec", -] - -[[package]] -name = "salsa-2022-macros" -version = "0.1.0" -source = "git+https://github.com/salsa-rs/salsa?rev=ef7c0f12c8159e7025316e959c26f6278a576fa5#ef7c0f12c8159e7025316e959c26f6278a576fa5" -dependencies = [ - "eyre", - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "serde" -version = "1.0.154" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cdd151213925e7f1ab45a9bbfb129316bd00799784b174b7cc7bcd16961c49e" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.154" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc80d722935453bcafdc2c9a73cd6fac4dc1938f0346035d84bf99fa9e33217" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_regex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" -dependencies = [ - "regex", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395627de918015623b32e7669714206363a7fc00382bf477e72c1f7533e8eafc" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "similar" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "smallstr" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b1aefdf380735ff8ded0b15f31aab05daf1f70216c01c02a12926badd1df9d" -dependencies = [ - "smallvec", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "smol_str" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" -dependencies = [ - "serde", -] - -[[package]] -name = "spin" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dccf47db1b41fa1573ed27ccf5e08e3ca771cb994f776668c5ebda893b248fc" -dependencies = [ - "lock_api", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.42.0", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "texlab" -version = "5.4.1" -dependencies = [ - "anyhow", - "assert_unordered", - "chrono", - "clap 4.1.8", - "criterion", - "crossbeam-channel", - "dashmap", - "dirs", - "encoding_rs", - "encoding_rs_io", - "fern", - "flate2", - "flume", - "fuzzy-matcher", - "human_name", - "insta", - "isocountry", - "itertools", - "log", - "logos", - "lsp-server", - "lsp-types", - "notify", - "once_cell", - "regex", - "rowan", - "rustc-hash", - "salsa-2022", - "serde", - "serde_json", - "serde_regex", - "serde_repr", - "smol_str", - "strum", - "tempfile", - "thiserror", - "threadpool", - "titlecase", - "unicode-normalization", -] - -[[package]] -name = "text-size" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a" - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] -name = "thiserror" -version = "1.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "titlecase" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38397a8cdb017cfeb48bf6c154d6de975ac69ffeed35980fde199d2ee0842042" -dependencies = [ - "joinery", - "lazy_static", - "regex", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "ucd-trie" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" - -[[package]] -name = "unicode-bidi" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" - -[[package]] -name = "unicode-case-mapping" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916a391c62ffbc5b6220fdafa353e93b530d21904d82ca1a2e29cdb5cfb4399f" - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unidecode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402bb19d8e03f1d1a7450e2bd613980869438e0666331be3e073089124aa1adc" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi", - "winapi-util", -] - -[[package]] -name = "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.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[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-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-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 2f47fb46ffa..0e67d898294 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,21 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.4.1"; + version = "5.4.2"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - sha256 = "sha256-rTYcYq8SL404A/ke5Rb9QcCtwHKhs+84TQGNqRn11HM="; + hash = "sha256-ZgMMzA0wkOyyG+X2in3jOaESsSaDgtXIr6K4P51shqI="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "salsa-2022-0.1.0" = "sha256-GupU78LkQGUQ+GzqAVZZlNKL1zZkmdqJz9+81ROXDqE="; - }; - }; + cargoHash = "sha256-qzIQKx1v2bYxVQ3JVt839DPSyP2gIJqsO8BtW/KraV4="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -46,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.4.0/.github/workflows/publish.yml#L127-L131 + # https://github.com/latex-lsp/texlab/blob/v5.4.2/.github/workflows/publish.yml#L127-L131 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; @@ -55,7 +50,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An implementation of the Language Server Protocol for LaTeX"; - homepage = "https://texlab.netlify.app"; + homepage = "https://github.com/latex-lsp/texlab"; license = licenses.mit; maintainers = with maintainers; [ doronbehar kira-bruneau ]; platforms = platforms.all; From 646872b228ac8ef00b3923d90993b381a4bf18b7 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 13 Apr 2023 22:05:09 +0000 Subject: [PATCH 060/121] texlab: 5.4.2 -> 5.5.0 --- pkgs/development/tools/misc/texlab/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 0e67d898294..3a8e2fbb76d 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.4.2"; + version = "5.5.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-ZgMMzA0wkOyyG+X2in3jOaESsSaDgtXIr6K4P51shqI="; + hash = "sha256-xff6Wj1ZYn3jGrj/snr4ATabLUmL1Jw2LjsjpoG3ZjI="; }; - cargoHash = "sha256-qzIQKx1v2bYxVQ3JVt839DPSyP2gIJqsO8BtW/KraV4="; + cargoHash = "sha256-gEwsnVXY84mTO+JZvcI7EEYCOnVFM07m4VvcWI6zFT0="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.4.2/.github/workflows/publish.yml#L127-L131 + # https://github.com/latex-lsp/texlab/blob/v5.5.0/.github/workflows/publish.yml#L127-L131 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; From 072de16b78efebb5362277a341e9a5f4a6830754 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 13 Apr 2023 22:01:28 +0000 Subject: [PATCH 061/121] emacsPackages.lsp-bridge: 20230311.1648 -> 20230424.1642 --- .../elisp-packages/manual-packages/lsp-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index bdfe1ed2c80..a199e841dd7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -16,7 +16,7 @@ }: let - rev = "c5dc02f6bd47039c320083b3befac0e569c0efa4"; + rev = "7e1e6a4c349e720d75c892cd7230b29c35148342"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -26,13 +26,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20230311.1648"; # 16:48 UTC + version = "20230424.1642"; # 16:42 UTC src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - sha256 = "sha256-vbSVGPFBjAp4VRbJc6a2W0d2IqOusNa+rk4X6jRcjRI="; + sha256 = "sha256-e0XVQpsyjy8HeZN6kLRjnoTpyEefTqstsgydEKlEQ1c="; }; commit = rev; From 2d248b097854b17a553ca3e131b5efa5b68cf17f Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 23 Apr 2023 14:58:43 -0400 Subject: [PATCH 062/121] boxxy: 0.6.3 -> 0.6.4 Diff: https://github.com/queer/boxxy/compare/v0.6.3...v0.6.4 --- pkgs/tools/misc/boxxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/boxxy/default.nix b/pkgs/tools/misc/boxxy/default.nix index b43685513fa..1de9bd0469d 100644 --- a/pkgs/tools/misc/boxxy/default.nix +++ b/pkgs/tools/misc/boxxy/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "boxxy"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "queer"; repo = "boxxy"; rev = "v${version}"; - hash = "sha256-c1AZz5WwSie0lenH0LoPOvR4VWd7pYd59WWmjFn6HiQ="; + hash = "sha256-OUnvjn58jVMg4wYwoSMsqQvy5yveF+KeRjkjvB1W/Q4="; }; - cargoHash = "sha256-840W5wyOV+nTr9HzftOUlUwZ1JRe7+FWTG4Q2L+yCXM="; + cargoHash = "sha256-UhtxvEK3hknBdLS1eOlEPng+THoPuhYGIFhYz4LpF5E="; nativeBuildInputs = [ pkg-config From 9d5dba717041400aececbb86b46896cd18d8b84d Mon Sep 17 00:00:00 2001 From: Andreas Brinner Date: Sun, 23 Apr 2023 20:28:00 +0200 Subject: [PATCH 063/121] nixos/roundcube: read only first line of password file Only read the first line of the password file, if has multiple lines. Mention that behaviour in options documentation. --- nixos/modules/services/mail/roundcube.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index ecf4d3ebc4d..b9cf526b0bb 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -73,7 +73,8 @@ in description = lib.mdDoc '' Password file for the postgresql connection. Must be formated according to PostgreSQL .pgpass standard (see https://www.postgresql.org/docs/current/libpq-pgpass.html) - and readable by user `nginx`. Ignored if `database.host` is set to `localhost`, as peer authentication will be used. + but only one line, no comments and readable by user `nginx`. + Ignored if `database.host` is set to `localhost`, as peer authentication will be used. ''; }; dbname = mkOption { @@ -128,7 +129,7 @@ in Date: Sun, 23 Apr 2023 21:36:32 +0200 Subject: [PATCH 064/121] gromacs: 2023 -> 2023.1 --- .../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 cdc5bc85573..d08c15dd8a6 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 = "2023"; + version = "2023.1"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "sha256-rJLG2nL7vMpBT9io2Xnlbs8XxMHNq+0tpc+05yd7e6g="; + sha256 = "sha256-7vK7Smy2MUz52kfybfKg0nr0v3swmXI9Q2AQc6sKQvQ="; }; nativeBuildInputs = [ cmake ]; From 94add426514aab7e9c9dd39e5631f5a49a8c8722 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 23 Apr 2023 21:53:05 +0200 Subject: [PATCH 065/121] octopus: 12.1 -> 12.2 --- pkgs/applications/science/chemistry/octopus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index cc145baef03..4fb077e4985 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -12,13 +12,13 @@ assert (blas.isILP64 == arpack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; - version = "12.1"; + version = "12.2"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "sha256-dQdb4wGKOQefrgtQVorq6EH9IiAh1tMmj3GiZOXgTBY="; + sha256 = "sha256-tM3D0geOT+8X3EofI+iPR48z8LKFSxQMoO/W/be+OFg="; }; nativeBuildInputs = [ From 66504778ce157db536f70274d1dadc7f8a576a11 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 23 Apr 2023 18:24:42 +0200 Subject: [PATCH 066/121] rye: init at unstable-2023-04-23 --- pkgs/development/tools/rye/default.nix | 36 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/tools/rye/default.nix diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix new file mode 100644 index 00000000000..9ade4878780 --- /dev/null +++ b/pkgs/development/tools/rye/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, openssl +, pkg-config +, stdenv +, SystemConfiguration +}: + +rustPlatform.buildRustPackage rec { + pname = "rye"; + version = "unstable-2023-04-23"; + + src = fetchFromGitHub { + owner = "mitsuhiko"; + repo = "rye"; + rev = "b3fe43a4e462d10784258cad03c19c9738367346"; + hash = "sha256-q9/VUWyrP/NsuLYY1+/5teYvDJGq646WbMXptnUUUyw="; + }; + + cargoHash = "sha256-eyJ6gXFVnSC1aEt5YLl5rFoa3+M73smu5wJdAN15HQM="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + ] + ++ lib.optional stdenv.isDarwin SystemConfiguration; + + meta = with lib; { + description = "A tool to easily manage python dependencies and environments"; + homepage = "https://github.com/mitsuhiko/rye"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f3dcb3c170..3ca887e9252 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18846,6 +18846,10 @@ with pkgs; rufo = callPackage ../development/tools/rufo { }; + rye = callPackage ../development/tools/rye { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; + samurai = callPackage ../development/tools/build-managers/samurai { }; muon = callPackage ../development/tools/build-managers/muon { }; From 5a7bcb521c60fa8729a5be612a091a49f5c69a55 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 23 Apr 2023 16:26:24 -0400 Subject: [PATCH 067/121] felix-fm: 2.2.5 -> 2.2.6 Diff: https://github.com/kyoheiu/felix/compare/v2.2.5...v2.2.6 Changelog: https://github.com/kyoheiu/felix/blob/v2.2.6/CHANGELOG.md --- pkgs/applications/file-managers/felix-fm/Cargo.lock | 2 +- pkgs/applications/file-managers/felix-fm/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/file-managers/felix-fm/Cargo.lock b/pkgs/applications/file-managers/felix-fm/Cargo.lock index b5dff0ece87..ee1a105fae1 100644 --- a/pkgs/applications/file-managers/felix-fm/Cargo.lock +++ b/pkgs/applications/file-managers/felix-fm/Cargo.lock @@ -371,7 +371,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "felix" -version = "2.2.5" +version = "2.2.6" dependencies = [ "chrono", "content_inspector", diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 07ea745aba7..6dbffd06be4 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qN/aOOiSj+HrjZQaDUkps0NORIdCBIevVjTYQm2G2Fg="; + sha256 = "sha256-t/BCRKqCCXZ76bFYyblNnKHB9y0oJ6ajqsbdIGq/YVM="; }; cargoLock = { From ada2efde07053ec6a6adb892193f0fdc8d31e31e Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 23 Apr 2023 17:17:25 -0400 Subject: [PATCH 068/121] sic-image-cli: 0.22.0 -> 0.22.1 Diff: https://github.com/foresterre/sic/compare/v0.22.0...v0.22.1 Changelog: https://github.com/foresterre/sic/blob/v0.22.1/CHANGELOG.md --- pkgs/tools/graphics/sic-image-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/sic-image-cli/default.nix b/pkgs/tools/graphics/sic-image-cli/default.nix index c121cf2406c..00d7b83c2c2 100644 --- a/pkgs/tools/graphics/sic-image-cli/default.nix +++ b/pkgs/tools/graphics/sic-image-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sic-image-cli"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "foresterre"; repo = "sic"; rev = "v${version}"; - sha256 = "sha256-ZKxBanCfPBo5k1EI/cJKpHiWF7M1blZdchWy3DMHrnQ="; + sha256 = "sha256-qUhxJw6c1WBJRS1lNg0opux5ePoVlDCLOWUHRCWgkBk="; }; - cargoSha256 = "sha256-cj9UAPwgj4ZT+ReZWi9hOBNicMBOt9qdveYYF5CFapw="; + cargoSha256 = "sha256-ZhEI6yTOVu1dAIoJhKfE3YiM9QJPnhLd49irmPfNLDM="; nativeBuildInputs = [ installShellFiles nasm ]; From 0df5257b8217dcbd43b195cc25e9fbc309017487 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sun, 23 Apr 2023 23:28:54 +0200 Subject: [PATCH 069/121] nixos/qemu-vm: introduce `virtualisation.mountHostNixStore` option Now that `useBootLoader` produces a full system image, moving disk images can be slow because they have a full Nix store in them. It does not make sense to keep the 9p mountpoint to shadow the /nix/store of the VM. We disable it if we have `useBootLoader` and introduce an option for easy overrides. --- nixos/modules/virtualisation/qemu-vm.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index cbc58344791..5b515a29ae6 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -574,12 +574,15 @@ in virtualisation.writableStore = mkOption { type = types.bool; - default = true; # FIXME + default = cfg.mountHostNixStore; + defaultText = literalExpression "cfg.mountHostNixStore"; description = lib.mdDoc '' If enabled, the Nix store in the VM is made writable by layering an overlay filesystem on top of the host's Nix store. + + By default, this is enabled if you mount a host Nix store. ''; }; @@ -713,6 +716,21 @@ in For applications which do a lot of reads from the store, this can drastically improve performance, but at the cost of disk space and image build time. + + As an alternative, you can use a bootloader which will provide you + with a full NixOS system image containing a Nix store and + avoid mounting the host nix store through + {option}`virtualisation.mountHostNixStore`. + ''; + }; + + virtualisation.mountHostNixStore = + mkOption { + type = types.bool; + default = !cfg.useNixStoreImage && !cfg.useBootLoader; + defaultText = literalExpression "!cfg.useNixStoreImage && !cfg.useBootLoader"; + description = lib.mdDoc '' + Mount the host Nix store as a 9p mount. ''; }; @@ -933,7 +951,7 @@ in virtualisation.additionalPaths = [ config.system.build.toplevel ]; virtualisation.sharedDirectories = { - nix-store = mkIf (!cfg.useNixStoreImage) { + nix-store = mkIf cfg.mountHostNixStore { source = builtins.storeDir; target = "/nix/store"; }; From e4042dedfb966c7f88e032f0c74e26eab30b8043 Mon Sep 17 00:00:00 2001 From: Pierre Allix Date: Tue, 18 Apr 2023 17:32:34 +0200 Subject: [PATCH 070/121] maintainers: add pallix --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 05bb6793734..bdcc14af2f8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11652,6 +11652,12 @@ githubId = 11016164; name = "Fedor Pakhomov"; }; + pallix = { + email = "pierre.allix.work@gmail.com"; + github = "pallix"; + githubId = 676838; + name = "Pierre Allix"; + }; paluh = { email = "paluho@gmail.com"; github = "paluh"; From 106fdb05d9d95370b4b8227eaac18c3816c67503 Mon Sep 17 00:00:00 2001 From: Pierre Allix Date: Wed, 12 Apr 2023 12:22:15 +0200 Subject: [PATCH 071/121] gp-saml-gui: init at version 0.1 --- pkgs/tools/networking/gp-saml-gui/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/tools/networking/gp-saml-gui/default.nix diff --git a/pkgs/tools/networking/gp-saml-gui/default.nix b/pkgs/tools/networking/gp-saml-gui/default.nix new file mode 100644 index 00000000000..3e343b3715d --- /dev/null +++ b/pkgs/tools/networking/gp-saml-gui/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildPythonPackage +, webkitgtk +, wrapGAppsHook +, glib-networking +, gobject-introspection +, openconnect +, pygobject3 +, requests +}: +buildPythonPackage rec { + pname = "gp-saml-gui"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "dlenski"; + repo = "gp-saml-gui"; + rev = "085d3276e17e1094e22e5d49545e273147598eb4"; + sha256 = "sha256-5vIfgDaHE3T+euLliEyXe+Xikf5VyW3b9C2GapWx278="; + }; + + buildInputs = lib.optional stdenv.isLinux glib-networking; + + nativeBuildInputs = [ wrapGAppsHook gobject-introspection glib-networking ]; + + propagatedBuildInputs = [ + requests + pygobject3 + openconnect + ] ++ lib.optional stdenv.isLinux webkitgtk; + + preFixup = '' + gappsWrapperArgs+=( + --set WEBKIT_DISABLE_COMPOSITING_MODE "1" + ) + ''; + + meta = with lib; { + description = "Interactively authenticate to GlobalProtect VPNs that require SAML"; + homepage = "https://github.com/dlenski/gp-saml-gui"; + license = licenses.gpl3Only; + maintainers = [ maintainers.pallix ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45d9fb0a906..caafe81ff57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1537,6 +1537,8 @@ with pkgs; godspeed = callPackage ../tools/networking/godspeed { }; + gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { }; + guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { }; fabs = callPackage ../tools/backup/fabs { }; From 670862bf405993fcae1e6de66d262f462de58dc1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 24 Apr 2023 00:46:50 +0200 Subject: [PATCH 072/121] python310Packages.ttp: 0.9.2 -> 0.9.4 https://github.com/dmulyalin/ttp/releases/tag/0.9.4 https://github.com/dmulyalin/ttp/releases/tag/0.9.3 --- pkgs/development/python-modules/ttp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index f350b2e10a5..9fc1c5eff2a 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "ttp"; - version = "0.9.2"; + version = "0.9.4"; format = "pyproject"; src = fetchFromGitHub { owner = "dmulyalin"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-KhQRC4zcLCnYUtQm08wJzb/YwBquOEGR5L0YUmnzheg="; + hash = "sha256-iZJ38NQnofW9awisY5cFBIN1rjXinA6CpJYSCCnNaOY="; }; nativeBuildInputs = [ @@ -102,6 +102,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/dmulyalin/ttp/releases/tag/${version}"; description = "Template Text Parser"; homepage = "https://github.com/dmulyalin/ttp"; license = licenses.mit; From 9523cce8a084194dab37236fe403687fb675388c Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 23 Apr 2023 18:46:26 -0400 Subject: [PATCH 073/121] jql: 5.2.0 -> 6.0.5, add figsoda as a maintainer Diff: https://github.com/yamafaktory/jql/compare/v5.2.0...jql-v6.0.5 Changelog: https://github.com/yamafaktory/jql/releases/tag/jql-v6.0.5 --- pkgs/development/tools/jql/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index eea6701b6b5..fdc2d011d6f 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,22 +5,22 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "5.2.0"; + version = "6.0.5"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-gFPN3aSukh0QMfGLn65icf5ZyYb8Y+r+GMdG2gm2InY="; + rev = "jql-v${version}"; + hash = "sha256-MdIYU6/j+hpFBcaZ1IiW6ImeWD3mmYezGEpZBbWmRzs="; }; - cargoHash = "sha256-XJW0TDRJdLwgWDm5ZBSCUj5VS5ZowGCr6tHV0MpZuvI="; + cargoHash = "sha256-vb7HyumsLYN9rZTD8KxzV+1SN5F2rLhuullYDwRt7wM="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; homepage = "https://github.com/yamafaktory/jql"; - changelog = "https://github.com/yamafaktory/jql/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ akshgpt7 ]; + changelog = "https://github.com/yamafaktory/jql/releases/tag/${src.rev}"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ akshgpt7 figsoda ]; }; } From e2b6b51e7596c2176d7d90258fb28871243b143e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 24 Apr 2023 01:13:50 +0200 Subject: [PATCH 074/121] python310Packages.pyinsteon: 1.4.1 -> 1.4.2 https://github.com/pyinsteon/pyinsteon/compare/refs/tags/1.4.1...1.4.2 --- pkgs/development/python-modules/pyinsteon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 66891a0bc47..8bd3389e463 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.4.1"; + version = "1.4.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-K8uMyMNZwe6Zr/Qb98wmTLz2+45bx7cmoApnUW5oNPw="; + hash = "sha256-5c2hcW9XSEyIMlyrn70U7tgBWdxGrtJoQkjkYzlrbKE="; }; nativeBuildInputs = [ From 2544a7f2438f0fd6c8147b66cba44e2755603491 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Apr 2023 10:30:07 +0000 Subject: [PATCH 075/121] python310Packages.pylitterbot: 2023.1.2 -> 2023.4.0 --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 8b1b41cf3c4..598d35888b7 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2023.1.2"; + version = "2023.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PSg0u4Beg0OVUMxaBCPxJSVO/MxBvCpDu2rQhiYT9OM="; + hash = "sha256-nF6njY2qNoHW2ZGNDHNeTBTjSBbitJxitPgyayLaqSE="; }; nativeBuildInputs = [ From 646c89856932aae45a3c6476d975bcb411c6cf71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 24 Apr 2023 01:15:12 +0200 Subject: [PATCH 076/121] home-assistant: 2023.4.5 -> 2023.4.6 https://github.com/home-assistant/core/releases/tag/2023.4.6 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5e47d3cbf3b..bb585ac734c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.4.5"; + version = "2023.4.6"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a97d4154578..6a40111f11f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -310,7 +310,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.4.5"; + hassVersion = "2023.4.6"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -326,7 +326,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-nQ41tHIwmARVOGE4bi22zag4uN+6rPXJ6aDr+018fIw="; + hash = "sha256-054MOhLU7sImD5Sl5vUuik6mt7GCupMeBI2pdtpWuls="; }; # Secondary source is git for tests @@ -334,7 +334,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-tFbgQ0e+J3/ERqlAKKXafWDaFIEIGsqX+uw8/bQyO5A="; + hash = "sha256-/SYJUW028HvxLMNHhm6cqQ6jv0J+8NatbZ7h7HyGYXs="; }; nativeBuildInputs = with python3.pkgs; [ From 077515351e90b5eb8ea7c2268e96494a7ff3b826 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 24 Apr 2023 01:24:17 +0200 Subject: [PATCH 077/121] python310Packages.homeassistant-stubs: 2023.4.5 -> 2023.4.6 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.4.6 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 91a0d5cc173..798b4c441e3 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.4.5"; + version = "2023.4.6"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-uZuJ2k52p2fuT15srSifdiD/T0Vk9GUhCh7jY9/nV6o="; + hash = "sha256-uPSES/yK6pgZJ68tRgmWuAwitlBOhYxMWPIi2tcEPh8="; }; nativeBuildInputs = [ From b75b059c747da4e2cd213c23895f49db94b57290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 Apr 2023 20:12:13 -0700 Subject: [PATCH 078/121] python310Packages.jaraco-abode: 4.1.0 -> 5.0.1 Diff: https://github.com/jaraco/jaraco.abode/compare/refs/tags/v4.1.0...v5.0.1 Changelog: https://github.com/jaraco/jaraco.abode/blob/refs/tags/v5.0.1/CHANGES.rst --- pkgs/development/python-modules/jaraco-abode/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix index 9f6f4aa3ca7..053f77cddfb 100644 --- a/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/pkgs/development/python-modules/jaraco-abode/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "jaraco-abode"; - version = "4.1.0"; + version = "5.0.1"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.abode"; rev = "refs/tags/v${version}"; - hash = "sha256-MD8Piwgm+WStEKX+LP0sCezRI4gdHmHis/XMJ8Vuw04="; + hash = "sha256-vKlvZrgRKv2C43JLfl4Wum4Icz9yOKEaB6qKapZ0rwQ="; }; postPatch = '' @@ -86,6 +86,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/jaraco/jaraco.abode/blob/${src.rev}/CHANGES.rst"; homepage = "https://github.com/jaraco/jaraco.abode"; description = "Library interfacing to the Abode home security system"; license = licenses.mit; From a3bc6d87d5eb4ab83d642a46423201b41bf0912a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 Apr 2023 13:45:50 -0700 Subject: [PATCH 079/121] python310Packages.bx-py-utils: 76 -> 78 Diff: https://github.com/boxine/bx_py_utils/compare/refs/tags/v76...v78 Changelog: https://github.com/boxine/bx_py_utils/releases/tag/v78 --- pkgs/development/python-modules/bx-py-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix index 195fdf89f49..f408903a0a1 100644 --- a/pkgs/development/python-modules/bx-py-utils/default.nix +++ b/pkgs/development/python-modules/bx-py-utils/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bx-py-utils"; - version = "76"; + version = "78"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "boxine"; repo = "bx_py_utils"; rev = "refs/tags/v${version}"; - hash = "sha256-daqbF+DCt4yvKHbEzwJyOzEgsYLqhR31a0pYqp9OSvo="; + hash = "sha256-dMcbv/qf+8Qzu47MVFU2QUviT/vjKsHp+45F/6NOlWo="; }; nativeBuildInputs = [ From 4616038ad3bcbf7b1cea8b42e7c13b7143782b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 23 Apr 2023 11:40:47 -0700 Subject: [PATCH 080/121] rnote: 0.5.18 -> 0.6.0 Diff: https://github.com/flxzt/rnote/compare/v0.5.18...v0.6.0 Changelog: https://github.com/flxzt/rnote/releases/tag/v0.6.0 --- pkgs/applications/graphics/rnote/Cargo.lock | 898 ++++++++++++------- pkgs/applications/graphics/rnote/default.nix | 20 +- 2 files changed, 559 insertions(+), 359 deletions(-) diff --git a/pkgs/applications/graphics/rnote/Cargo.lock b/pkgs/applications/graphics/rnote/Cargo.lock index 2c662020665..8c6486a5539 100644 --- a/pkgs/applications/graphics/rnote/Cargo.lock +++ b/pkgs/applications/graphics/rnote/Cargo.lock @@ -23,16 +23,16 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] @@ -69,10 +69,59 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.69" +name = "anstream" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anyhow" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "approx" @@ -93,7 +142,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -118,9 +167,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" dependencies = [ "async-lock", "async-task", @@ -144,22 +193,22 @@ dependencies = [ [[package]] name = "async-io" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock", "autocfg", + "cfg-if", "concurrent-queue", "futures-lite", - "libc", "log", "parking", "polling", + "rustix", "slab", "socket2", "waker-fn", - "windows-sys 0.42.0", ] [[package]] @@ -185,9 +234,9 @@ dependencies = [ [[package]] name = "async-process" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" dependencies = [ "async-io", "async-lock", @@ -196,16 +245,16 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "libc", + "rustix", "signal-hook", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "async-task" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "atomic-polyfill" @@ -218,9 +267,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "atty" @@ -241,9 +290,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "autocxx" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c3621dadf601792243257fe956578abed662504c296e22f537433381a9a8026" +checksum = "9a19c80ba8384f11f11024462523829c2989a3fd7afb8ac70637abdd25bd3b8a" dependencies = [ "aquamarine", "autocxx-macro", @@ -270,27 +319,27 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn", + "syn 1.0.109", "which", ] [[package]] name = "autocxx-build" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5ed44575f2fc241b990e03909634301c9c49f1ff3d921631fdca752c33e297" +checksum = "37823c07a43c1a8d09aaad7ba8785df1b3160dcf0ee1c4e7e83177e9ebc2d804" dependencies = [ "autocxx-engine", "env_logger 0.9.3", "indexmap", - "syn", + "syn 1.0.109", ] [[package]] name = "autocxx-engine" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6a27d1fcc45584c0b7fe5ce06b7b26cefe72cfa55e5a94264be5e427a418e3" +checksum = "aa19cbb6614361e61806db4526bd373415dfe0cb95f6bf811a2ddbd6fa4a8115" dependencies = [ "aquamarine", "autocxx-bindgen", @@ -310,7 +359,7 @@ dependencies = [ "rustversion", "serde_json", "strum_macros", - "syn", + "syn 1.0.109", "tempfile", "thiserror", "version_check", @@ -318,22 +367,22 @@ dependencies = [ [[package]] name = "autocxx-macro" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6022ff3a7c5d5cf54cf37f3dabb54c1bdcbeecb3fab3937903dd0bc562ef7fb6" +checksum = "7313f823cd7e017cf80b46254d9bd78e4cb86b33b7e2cd08e1af312ee7bc77cf" dependencies = [ "autocxx-parser", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "autocxx-parser" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884eef6d9cc6d89a2ca043fad1c17424f857c6082db4122dc7f2fb7e5ec5ff74" +checksum = "a16532d5349c8f165534d95ce2cf70a4aefaf1f33146fe8273f77d3a2f817796" dependencies = [ "indexmap", "itertools 0.10.5", @@ -343,7 +392,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn", + "syn 1.0.109", "thiserror", ] @@ -357,11 +406,20 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.6.2", "object", "rustc-demangle", ] +[[package]] +name = "backtrace-ext" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" +dependencies = [ + "backtrace", +] + [[package]] name = "base64" version = "0.21.0" @@ -370,9 +428,9 @@ checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "bindgen" -version = "0.61.0" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ "bitflags", "cexpr", @@ -385,7 +443,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn", + "syn 1.0.109", ] [[package]] @@ -408,9 +466,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "blocking" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ "async-channel", "async-lock", @@ -418,13 +476,14 @@ dependencies = [ "atomic-waker", "fastrand", "futures-lite", + "log", ] [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" [[package]] name = "bytemuck" @@ -501,11 +560,12 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.11.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" dependencies = [ "smallvec", + "target-lexicon", ] [[package]] @@ -530,9 +590,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -541,55 +601,61 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.9" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9d6ada83c1edcce028902ea27dd929069c70df4c7600b131b4d9a1ad2879cc" +checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749" +dependencies = [ + "anstream", + "anstyle", + "bitflags", "clap_lex", - "is-terminal", "once_cell", "strsim", - "termcolor", ] [[package]] name = "clap_complete" -version = "4.1.5" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37686beaba5ac9f3ab01ee3172f792fc6ffdd685bfb9e63cfef02c0571a4e8e1" +checksum = "1a19591b2ab0e3c04b588a0e04ddde7b9eaa423646d1b4a8092879216bf47473" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.1.9" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "clap_lex" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "cmake" -version = "0.1.49" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" dependencies = [ "cc", ] @@ -610,6 +676,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "combine" version = "4.6.6" @@ -622,9 +694,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ "crossbeam-utils", ] @@ -656,9 +728,9 @@ checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "coreaudio-rs" @@ -673,21 +745,21 @@ dependencies = [ [[package]] name = "coreaudio-sys" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb" +checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24" dependencies = [ "bindgen", ] [[package]] name = "cpal" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1241019dec4a73f874bdf6fe3467a8478b47cecaf79435f7acb01f107ab41b1" +checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" dependencies = [ "alsa", - "core-foundation-sys 0.8.3", + "core-foundation-sys 0.8.4", "coreaudio-rs", "dasp_sample", "jni 0.19.0", @@ -702,7 +774,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows", + "windows 0.46.0", ] [[package]] @@ -722,9 +794,9 @@ checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" [[package]] name = "crossbeam-channel" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -783,7 +855,7 @@ dependencies = [ "proc-macro2", "quote", "smallvec", - "syn", + "syn 1.0.109", ] [[package]] @@ -793,14 +865,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "cxx" -version = "1.0.92" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" dependencies = [ "cc", "cxxbridge-flags", @@ -810,9 +882,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.92" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" dependencies = [ "cc", "codespan-reporting", @@ -820,36 +892,36 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 2.0.15", ] [[package]] name = "cxx-gen" -version = "0.7.92" +version = "0.7.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff01746b8722387dd625f9f6ae0852f73a5b8fef032988bfcd7cd3093c6c2ddd" +checksum = "ee165c38de64e6761c2f38b7e9beee0721110f8585165987ef9db2a753ee4176" dependencies = [ "codespan-reporting", "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "cxxbridge-flags" -version = "1.0.92" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" [[package]] name = "cxxbridge-macro" -version = "1.0.92" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] @@ -873,7 +945,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.109", ] [[package]] @@ -884,7 +956,7 @@ checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -917,7 +989,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -927,7 +999,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" dependencies = [ "derive_builder_core", - "syn", + "syn 1.0.109", ] [[package]] @@ -940,27 +1012,27 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", + "syn 1.0.109", ] [[package]] name = "directories" -version = "4.0.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +checksum = "74be3be809c18e089de43bdc504652bb2bc473fca8756131f8689db8cf079ba9" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" dependencies = [ "libc", "redox_users", - "winapi", + "windows-sys 0.45.0", ] [[package]] @@ -1097,13 +1169,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1118,9 +1190,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.7" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" dependencies = [ "num-traits", ] @@ -1141,7 +1213,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.6.2", "rayon-core", "smallvec", "zune-inflate", @@ -1156,6 +1228,15 @@ dependencies = [ "instant", ] +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + [[package]] name = "field-offset" version = "0.3.5" @@ -1182,7 +1263,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.6.2", ] [[package]] @@ -1230,13 +1311,14 @@ dependencies = [ [[package]] name = "fontdb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff20bef7942a72af07104346154a70a70b089c572e454b41bef6eb6cb10e9c06" +checksum = "bfec8f19f9b89b2901219cc62604810d2bfef15dc1182e95320f57e7cbbe041a" dependencies = [ "fontconfig-parser", "log", "memmap2", + "slotmap", "ttf-parser", ] @@ -1267,9 +1349,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1282,9 +1364,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1292,15 +1374,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1309,15 +1391,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ "fastrand", "futures-core", @@ -1330,32 +1412,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1407,9 +1489,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5042053ee765aeef08d9d7e3f0f1e36a4d37f1659b3f93ad3d6997515dbb64a" +checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" dependencies = [ "bitflags", "cairo-rs", @@ -1423,9 +1505,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f0fb00507af1e9299681dd09965f720e2b5ea95536d49a5681e8994ef10c7a" +checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1440,9 +1522,9 @@ dependencies = [ [[package]] name = "geo" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce129b525496519c00321a00772d4532d2229071699c6dc6c9cefa5fa7d2b9ae" +checksum = "c7d640a4dd1d1c98b45f4653c841a8ec15f461a71b86bc30533ae64c6f20f268" dependencies = [ "float_next_after", "geo-types", @@ -1487,9 +1569,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "js-sys", @@ -1520,9 +1602,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.11.4" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" dependencies = [ "color_quant", "weezl", @@ -1536,9 +1618,9 @@ checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "gio" -version = "0.17.4" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125" +checksum = "d14522e56c6bcb6f7a3aebc25cbcfb06776af4c0c25232b601b4383252d7cb92" dependencies = [ "bitflags", "futures-channel", @@ -1569,9 +1651,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.5" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773" +checksum = "a7f1de7cbde31ea4f0a919453a2dcece5d54d5b70e08f8ad254dc4840f5f09b6" dependencies = [ "bitflags", "futures-channel", @@ -1592,9 +1674,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.5" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454924cafe58d9174dc32972261fe271d6cd3c10f5e9ff505522a28dcf601a40" +checksum = "0a7206c5c03851ef126ea1444990e81fdd6765fb799d5bc694e4897ca01bb97f" dependencies = [ "anyhow", "heck", @@ -1602,7 +1684,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1657,9 +1739,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa9cd285a72a95124b65c069a9cb1b8fb8e310be71783404c39fccf3bf7774c" +checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" dependencies = [ "bitflags", "cairo-rs", @@ -1673,9 +1755,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a445ae1e50cbf181a1d5c61b920a7e7e8657b96e0ecdbbf8911a86fad462a32" +checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1689,9 +1771,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.2" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47dca53cb1a8ae3006e869b5711ae7370180db537f6d98e3bcaf23fabfd911f" +checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" dependencies = [ "bitflags", "cairo-rs", @@ -1712,24 +1794,23 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.6.0" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4676c4f90d8b010e88cb4558f61f47d76d6f6b8e6f6b89e62640f443907f61" +checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f" dependencies = [ "anyhow", "proc-macro-crate", "proc-macro-error", "proc-macro2", - "quick-xml", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "gtk4-sys" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65463dc801460e498d5e7ffa6e9ae2cfbed7d05fabd1ca5a8d024adbc89eeda6" +checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1831,16 +1912,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.3", + "core-foundation-sys 0.8.4", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows 0.48.0", ] [[package]] @@ -1871,9 +1952,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.5" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" dependencies = [ "bytemuck", "byteorder", @@ -1884,7 +1965,7 @@ dependencies = [ "num-rational", "num-traits", "png", - "scoped_threadpool", + "qoi", "tiff", ] @@ -1896,9 +1977,9 @@ checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf" [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -1926,7 +2007,7 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "ink-stroke-modeler-rs" version = "0.1.0" -source = "git+https://github.com/flxzt/ink-stroke-modeler-rs?rev=6a3f2f1e8691ad09f36a231c7defe78fc448f709#6a3f2f1e8691ad09f36a231c7defe78fc448f709" +source = "git+https://github.com/flxzt/ink-stroke-modeler-rs?rev=c12302c6f1f87a45cb474b67a02897daa32a46a3#c12302c6f1f87a45cb474b67a02897daa32a46a3" dependencies = [ "anyhow", "autocxx", @@ -1949,25 +2030,25 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.7" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e86b86ae312accbf05ade23ce76b625e0e47a255712b7414037385a1c05380" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ "hermit-abi 0.3.1", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "is-terminal" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", "rustix", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2063,18 +2144,9 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.8.3" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "kurbo" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8c31eaef73f18e0d938785e01ab471ec73e3f90c3389e84335ade689ba953b" +checksum = "28a2d0c1781729f69dbea30f968608cadfaeb6582e5ce903a167a5216b53cd0f" dependencies = [ "arrayvec", ] @@ -2140,9 +2212,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "libloading" @@ -2162,8 +2234,8 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "librsvg" -version = "2.55.92" -source = "git+https://gitlab.gnome.org/GNOME/librsvg?tag=2.55.92#69342757cb197c3a0ba2b66138d5008283d97209" +version = "2.56.0" +source = "git+https://gitlab.gnome.org/GNOME/librsvg?tag=2.56.0#b831e077174ae608d8cd09e532fc0e7ce1fe5c4f" dependencies = [ "anyhow", "byteorder", @@ -2213,9 +2285,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf" [[package]] name = "locale_config" @@ -2295,9 +2367,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matrixmultiply" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" +checksum = "bb99c395ae250e1bf9133673f03ca9f97b7e71b705436bf8f089453445d1e9fe" dependencies = [ "rawpointer", ] @@ -2328,11 +2400,12 @@ dependencies = [ [[package]] name = "miette" -version = "5.6.0" +version = "5.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07749fb52853e739208049fb513287c6f448de9103dfa78b05ae01f2fc5809bb" +checksum = "92a992891d5579caa9efd8e601f82e30a1caa79a27a5db075dde30ecb9eab357" dependencies = [ "backtrace", + "backtrace-ext", "is-terminal", "miette-derive", "once_cell", @@ -2348,13 +2421,13 @@ dependencies = [ [[package]] name = "miette-derive" -version = "5.6.0" +version = "5.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a07ad93a80d1b92bb44cb42d7c49b49c9aab1778befefad49cceb5e4c5bf460" +checksum = "4c65c625186a9bcce6699394bee511e1b1aec689aa7e3be1bf4e996e75834153" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] @@ -2372,6 +2445,16 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + [[package]] name = "moveit" version = "0.5.1" @@ -2406,7 +2489,7 @@ checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2415,7 +2498,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", ] [[package]] @@ -2498,7 +2581,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2560,7 +2643,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2642,12 +2725,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978aa494585d3ca4ad74929863093e87cac9790d81fe7aba2b3dc2890643a0fc" -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "owo-colors" version = "3.5.0" @@ -2675,7 +2752,7 @@ dependencies = [ "find-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2733,9 +2810,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" @@ -2755,16 +2832,16 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "windows-sys 0.45.0", ] [[package]] name = "parry2d-f64" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1bf555d44a3be6c6b6acdea1614af50b12987b4b9651c812d3219e8136c336" +checksum = "2f612055f319eb83e67841fdf00248eee26045a1759b5d94fa9c6ecce7c1e78d" dependencies = [ "approx", "arrayvec", @@ -2897,7 +2974,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2910,7 +2987,7 @@ dependencies = [ "phf_shared 0.11.1", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2940,19 +3017,25 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + [[package]] name = "piet" version = "0.6.2" -source = "git+https://github.com/linebender/piet?rev=413397445e6772e0a651d60cf58a823b98f67c23#413397445e6772e0a651d60cf58a823b98f67c23" +source = "git+https://github.com/linebender/piet?rev=1d8a6fd627d8d6492bc42a42c734205a981077f8#1d8a6fd627d8d6492bc42a42c734205a981077f8" dependencies = [ - "kurbo 0.9.1", + "kurbo", "unic-bidi", ] [[package]] name = "piet-cairo" version = "0.6.2" -source = "git+https://github.com/linebender/piet?rev=413397445e6772e0a651d60cf58a823b98f67c23#413397445e6772e0a651d60cf58a823b98f67c23" +source = "git+https://github.com/linebender/piet?rev=1d8a6fd627d8d6492bc42a42c734205a981077f8#1d8a6fd627d8d6492bc42a42c734205a981077f8" dependencies = [ "cairo-rs", "pango", @@ -2979,7 +3062,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3002,14 +3085,15 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "png" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" dependencies = [ "bitflags", "crc32fast", + "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -3024,9 +3108,9 @@ dependencies = [ [[package]] name = "polling" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", "bitflags", @@ -3035,7 +3119,7 @@ dependencies = [ "libc", "log", "pin-project-lite", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -3102,7 +3186,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.109", ] [[package]] @@ -3124,7 +3208,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -3147,28 +3231,28 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + [[package]] name = "quick-error" version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -[[package]] -name = "quick-xml" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41" -dependencies = [ - "memchr", -] - [[package]] name = "quote" version = "1.0.26" @@ -3238,7 +3322,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", ] [[package]] @@ -3280,9 +3364,9 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f851a03551ceefd30132e447f07f96cb7011d6b658374f3aed847333adb5559" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rawpointer" @@ -3327,22 +3411,31 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", - "redox_syscall", + "getrandom 0.2.9", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.7.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ "aho-corasick", "memchr", @@ -3351,9 +3444,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "rgb" @@ -3366,7 +3459,7 @@ dependencies = [ [[package]] name = "rnote" -version = "0.5.18" +version = "0.6.0" dependencies = [ "anyhow", "cairo-rs", @@ -3376,7 +3469,7 @@ dependencies = [ "gettext-rs", "gtk4", "image", - "kurbo 0.9.1", + "kurbo", "libadwaita", "log", "nalgebra", @@ -3407,7 +3500,7 @@ dependencies = [ [[package]] name = "rnote-cli" -version = "0.5.18" +version = "0.6.0" dependencies = [ "anyhow", "clap", @@ -3426,7 +3519,7 @@ dependencies = [ "anyhow", "base64", "ink-stroke-modeler-rs", - "kurbo 0.9.1", + "kurbo", "log", "nalgebra", "num-derive", @@ -3459,7 +3552,7 @@ dependencies = [ "gtk4", "image", "itertools 0.10.5", - "kurbo 0.9.1", + "kurbo", "librsvg", "log", "nalgebra", @@ -3478,7 +3571,6 @@ dependencies = [ "rnote-compose", "rnote-fileformats", "rodio", - "rosvgtree", "rstar", "semver", "serde", @@ -3487,7 +3579,6 @@ dependencies = [ "svg", "unicode-segmentation", "usvg", - "usvg-text-layout", "xmlwriter", ] @@ -3525,15 +3616,15 @@ dependencies = [ [[package]] name = "rosvgtree" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc23d1ace03d6b8153c7d16f0708cd80b61ee8e80304954803354e67e40d150" +checksum = "8cdb7996003c5cc8a8c2585b4ab6b422da64ad86a9c99cfa7ba320e15e8739f3" dependencies = [ "log", "roxmltree", "simplecss", "siphasher", - "svgtypes 0.9.0", + "svgtypes 0.11.0", ] [[package]] @@ -3587,9 +3678,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -3608,16 +3699,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.9" +version = "0.37.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +checksum = "d9b864d3c18a5785a05953adeed93e2dca37ed30f18e69bba9f30079d51f363f" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -3666,12 +3757,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "scoped_threadpool" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - [[package]] name = "scopeguard" version = "1.1.0" @@ -3713,29 +3798,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.156" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.156" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -3788,9 +3873,9 @@ dependencies = [ [[package]] name = "simba" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4" +checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" dependencies = [ "approx", "num-complex", @@ -3880,9 +3965,9 @@ dependencies = [ [[package]] name = "spade" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1190e0e8f4eb17fc3dbb2d20e1142676e56aaac3daede39f64a3302d687b80f3" +checksum = "88e65803986868d2372c582007c39ba89936a36ea5f236bf7a7728dc258f04f9" dependencies = [ "num-traits", "optional", @@ -3892,9 +3977,9 @@ dependencies = [ [[package]] name = "spin" -version = "0.9.6" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] @@ -3956,7 +4041,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.109", ] [[package]] @@ -3971,9 +4056,9 @@ dependencies = [ [[package]] name = "supports-hyperlinks" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4806e0b03b9906e76b018a5d821ebf198c8e9dc0829ed3328eeeb5094aed60" +checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d" dependencies = [ "is-terminal", ] @@ -3989,9 +4074,9 @@ dependencies = [ [[package]] name = "svg" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e715e0c3fc987f4c435dc7189641fd9caa6919a74675ace605c38e201d278001" +checksum = "02d815ad337e8449d2374d4248448645edfe74e699343dd5719139d93fa87112" [[package]] name = "svg_path_ops" @@ -4013,11 +4098,11 @@ dependencies = [ [[package]] name = "svgtypes" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ee29c1407a5b18ccfe5f6ac82ac11bab3b14407e09c209a6c1a32098b19734" +checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" dependencies = [ - "kurbo 0.8.3", + "kurbo", "siphasher", ] @@ -4103,18 +4188,35 @@ dependencies = [ ] [[package]] -name = "system-deps" -version = "6.0.3" +name = "syn" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055" dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.5.11", + "toml 0.7.3", "version-compare", ] +[[package]] +name = "target-lexicon" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" + [[package]] name = "temp-dir" version = "0.1.11" @@ -4123,15 +4225,15 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", + "redox_syscall 0.3.5", "rustix", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -4177,22 +4279,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] @@ -4253,9 +4355,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.7" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ "indexmap", "serde", @@ -4329,9 +4431,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.11" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-bidi-mirroring" @@ -4413,35 +4515,62 @@ dependencies = [ [[package]] name = "usvg" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b6bb4e62619d9f68aa2d8a823fea2bff302340a1f2d45c264d5b0be170832e" +checksum = "67a6cab2bc32b5a4310a06c7d3c6b51b5c7897b1f7c7d2bf73bf052f5754950f" dependencies = [ "base64", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2352a2c05655a7e4d3dca76cf65764efce35527472668bae5c6fc876b4c996d" +dependencies = [ "data-url", "flate2", "imagesize", - "kurbo 0.9.1", + "kurbo", "log", - "rctree", "rosvgtree", "strict-num", + "svgtypes 0.11.0", + "usvg-tree", ] [[package]] name = "usvg-text-layout" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195386e01bc35f860db024de275a76e7a31afdf975d18beb6d0e44764118b4db" +checksum = "392baafaaa861ff8c9863546f92a60c51380fc49aa185a6840fb2af564c73530" dependencies = [ "fontdb", - "kurbo 0.9.1", + "kurbo", "log", "rustybuzz", "unicode-bidi", "unicode-script", "unicode-vo", - "usvg", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cb92fe40e0ffb45fd01349187e276a695f6c676a016d72ba09510009594829" +dependencies = [ + "kurbo", + "rctree", + "strict-num", + "svgtypes 0.11.0", ] [[package]] @@ -4450,6 +4579,12 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "version-compare" version = "0.1.1" @@ -4511,7 +4646,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -4545,7 +4680,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4626,11 +4761,20 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.44.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] @@ -4639,13 +4783,13 @@ 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", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -4654,7 +4798,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] @@ -4663,13 +4816,28 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" 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", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -4678,36 +4846,72 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + [[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + [[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -4715,10 +4919,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] -name = "winnow" -version = "0.3.6" +name = "windows_x86_64_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" dependencies = [ "memchr", ] @@ -4764,9 +4974,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "zune-inflate" -version = "0.2.51" +version = "0.2.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01728b79fb9b7e28a8c11f715e1cd8dc2cda7416a007d66cac55cebb3a8ac6b" +checksum = "440a08fd59c6442e4b846ea9b10386c38307eae728b216e1ab2c305d1c9daaf8" dependencies = [ "simd-adler32", ] diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index 1e4a5b78337..01d9c653d31 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , alsa-lib , appstream-glib , cmake @@ -24,32 +23,24 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.18"; + version = "0.6.0"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-N07Y9kmGvMFS0Kq4i2CltJvNTuqbXausZZGjAQRDmNU="; + hash = "sha256-47mWlUXp62fMh5c13enFjmuMxzrmEZlwJFsZhYCB1Vs="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "ink-stroke-modeler-rs-0.1.0" = "sha256-+R3T/9Ty+F6YxxtA0Un6UhFyKbGOvqBKwHt4WSHWhsk="; - "librsvg-2.55.92" = "sha256-WVwxjjWR/TloSmyzH8Jo1mTjLHVifBw1Xn965wuoEDs="; - "piet-0.6.2" = "sha256-76yeX0yQMC0hh6u2xT/kS/2fjs+GO+nCks2fnOImf0c="; + "ink-stroke-modeler-rs-0.1.0" = "sha256-DrbFolHGL3ywk2p6Ly3x0vbjqxy1mXld+5CPrNlJfQM="; + "librsvg-2.56.0" = "sha256-4poP7xsoylmnKaUWuJ0tnlgEMpw9iJrM3dvt4IaFi7w="; + "piet-0.6.2" = "sha256-If0qiZkgXeLvsrECItV9/HmhTk1H52xmVO7cUsD9dcU="; }; }; - patches = [ - # https://github.com/flxzt/rnote/pull/569 - (fetchpatch { - url = "https://github.com/flxzt/rnote/commit/8585b446c08b246f3d55359026415cb3d242d44e.patch"; - hash = "sha256-ePpTQ/3mzZTNjU9P4vTu9CM0vX8+r8b6njuj7hDgFCg="; - }) - ]; - nativeBuildInputs = [ appstream-glib # For appstream-util cmake @@ -85,7 +76,6 @@ stdenv.mkDerivation rec { pushd build-aux chmod +x cargo_build.py meson_post_install.py patchShebangs cargo_build.py meson_post_install.py - substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" popd ''; From abab00a89c60a866bfcaecdcdd451d5814881624 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 5 Apr 2023 16:05:42 -0700 Subject: [PATCH 081/121] zathura: fix cross by disabling tests, adding `check` The only part of zathura that won't cross compile is the tests. Let's disable these so the binaries at least can be cross-built. This commit also adds `check` to `buildInputs` and fixes the reference to `sphinx`. Co-authored-by: apfelkuchen6 <73002165+apfelkuchen6@users.noreply.github.com> Co-authored-by: Artturi --- pkgs/applications/misc/zathura/core/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 84015ba4a3f..6282b812b24 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -6,12 +6,12 @@ , gtk-mac-integration }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura"; version = "0.5.2"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz"; sha256 = "15314m9chmh5jkrd9vk2h2gwcwkcffv2kjcxkd4v3wmckz5sfjy6"; }; @@ -25,16 +25,17 @@ stdenv.mkDerivation rec { "-Dconvert-icon=enabled" "-Dsynctex=enabled" # Make sure tests are enabled for doCheck - "-Dtests=enabled" - ] ++ lib.optional (!stdenv.isLinux) "-Dseccomp=disabled"; + (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) + (lib.mesonEnable "seccomp" stdenv.hostPlatform.isLinux) + ]; nativeBuildInputs = [ - meson ninja pkg-config desktop-file-utils python3.pkgs.sphinx - gettext wrapGAppsHook libxml2 check appstream-glib + meson ninja pkg-config desktop-file-utils python3.pythonForBuild.pkgs.sphinx + gettext wrapGAppsHook libxml2 appstream-glib ]; buildInputs = [ - gtk girara libintl sqlite glib file librsvg + gtk girara libintl sqlite glib file librsvg check texlive.bin.core ] ++ lib.optional stdenv.isLinux libseccomp ++ lib.optional stdenv.isDarwin gtk-mac-integration; @@ -48,4 +49,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ globin ]; }; -} +}) From 0227195b627529e40a5f14fcc25f19f39c60ab5b Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 23 Dec 2022 19:05:53 -0800 Subject: [PATCH 082/121] nmh: init at 1.7.1 These tools are mainly useful for writing scripts that manipulating claws-mail's mail folders. I doubt anybody uses nmh to read their email anymore, and most other mail clients have migrated to maildir. Co-authored-by: Anderson Torres --- pkgs/tools/networking/nmh/default.nix | 85 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/tools/networking/nmh/default.nix diff --git a/pkgs/tools/networking/nmh/default.nix b/pkgs/tools/networking/nmh/default.nix new file mode 100644 index 00000000000..68dd412dff4 --- /dev/null +++ b/pkgs/tools/networking/nmh/default.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, autoreconfHook +, bison +, coreutils +, cyrus_sasl +, db +, fetchFromSavannah +, flex +, gdbm +, liblockfile +, ncurses +, openssl +, readline +, runtimeShell +}: + +stdenv.mkDerivation (finalAttrs: { + + pname = "nmh"; + version = "1.7.1"; + src = fetchFromSavannah { + repo = "nmh"; + rev = finalAttrs.version; + hash = "sha256-sBftXl4hWs4bKw5weHkif1KIJBpheU/RCePx0WXuv9o="; + }; + + postPatch = '' + substituteInPlace config/config.c --replace /bin/cat ${coreutils}/bin/cat + substituteInPlace \ + sbr/arglist.c \ + uip/mhbuildsbr.c \ + uip/whatnowsbr.c \ + uip/slocal.c \ + --replace '"/bin/sh"' '"${runtimeShell}"' + # the "cleanup" pseudo-test makes diagnosing test failures a pain + ln -s -f ${stdenv}/bin/true test/cleanup + ''; + + nativeBuildInputs = [ + autoreconfHook + flex + bison + ]; + + buildInputs = [ + cyrus_sasl + db + gdbm + liblockfile + ncurses + openssl + readline + ]; + + doCheck = true; + enableParallelBuilding = true; + + meta = { + description = "New MH Mail Handling System"; + homepage = "https://nmh.nongnu.org/"; + downloadPage = "http://download.savannah.nongnu.org/releases/nmh/"; + changelog = "http://savannah.nongnu.org/news/?group=nmh"; + license = [ lib.licenses.bsd3 ]; + longDescription = '' + This is the nmh mail user agent (reader/sender), a command-line based + mail reader that is powerful and extensible. nmh is an excellent choice + for people who receive and process a lot of mail. + + Unlike most mail user agents, nmh is not a single program, rather it is + a set of programs that are run from the shell. This allows the user to + utilize the full power of the Unix shell in coordination with nmh. + Various front-ends are available, such as mh-e (an emacs mode), xmh, and + exmh (X11 clients). + + nmh was originally based on MH version 6.8.3, and is intended to be a + (mostly) compatible drop-in replacement for MH. + + These tools are mainly useful for writing scripts that manipulating + claws-mail's mail folders. Most other mail clients have migrated to + maildir. + ''; + }; + +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4557c4b7219..2abe8f685fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5452,6 +5452,8 @@ with pkgs; notifymuch = callPackage ../applications/misc/notifymuch { }; + nmh = callPackage ../tools/networking/nmh { }; + npins = callPackage ../tools/nix/npins { }; nrsc5 = callPackage ../applications/misc/nrsc5 { }; From bece4931b53c901bbe6aa34b5c84a4782de5fabd Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Mon, 24 Apr 2023 03:31:27 +0000 Subject: [PATCH 083/121] Update pkgs/tools/networking/nmh/default.nix Co-authored-by: Anderson Torres --- pkgs/tools/networking/nmh/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/networking/nmh/default.nix b/pkgs/tools/networking/nmh/default.nix index 68dd412dff4..23c3efbbf31 100644 --- a/pkgs/tools/networking/nmh/default.nix +++ b/pkgs/tools/networking/nmh/default.nix @@ -16,7 +16,6 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "nmh"; version = "1.7.1"; src = fetchFromSavannah { From 26ecc0c359f627cdf7b3a0e8b13f4b2b5902c53a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 23 Apr 2023 21:08:44 -0700 Subject: [PATCH 084/121] nmh: add -Wno-stringop-truncation --- pkgs/tools/networking/nmh/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/nmh/default.nix b/pkgs/tools/networking/nmh/default.nix index 23c3efbbf31..e32da2708a5 100644 --- a/pkgs/tools/networking/nmh/default.nix +++ b/pkgs/tools/networking/nmh/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { readline ]; + NIX_CFLAGS_COMPILE = "-Wno-stringop-truncation"; doCheck = true; enableParallelBuilding = true; From 467ee31e58ccb79476d815f4131cb283cecd9560 Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Mon, 24 Apr 2023 04:30:37 +0000 Subject: [PATCH 085/121] Update doc/stdenv/meta.chapter.md Co-authored-by: Valentin Gagarin --- doc/stdenv/meta.chapter.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index f4e9a5d4f9b..6f58648cdf5 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -182,7 +182,8 @@ meta.hydraPlatforms = []; ### `broken` {#var-meta-broken} -If set to `true`, the package is marked as "broken", meaning that it won’t show up in `nix-env -qa`, and cannot be built or installed unless the environment variable `NIXPKGS_ALLOW_BROKEN` is set. Such unconditionally-broken packages should be removed from Nixpkgs eventually unless they are fixed. +If set to `true`, the package is marked as "broken", meaning that it won’t show up in [search.nixos.org](https://search.nixos.org/packages), and cannot be built or installed unless the environment variable [`NIXPKGS_ALLOW_BROKEN`](#opt-allowBroken) is set. +Such unconditionally-broken packages should be removed from Nixpkgs eventually unless they are fixed. The value of this attribute can depend on a package's arguments, including `stdenv`. This means that `broken` can be used to express constraints such as "does not cross compile" (`meta.broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)`) or "broken if all of a certain set of its dependencies are broken". This makes `broken` strictly more powerful than `meta.badPlatforms`. However `meta.availableOn` currently examines only `meta.platforms` and `meta.badPlatforms`, so `meta.broken` does not influence the default values for optional dependencies. From 401430319c2a5ceb488cfad9a3e4a6207aa5cad7 Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Mon, 24 Apr 2023 04:31:38 +0000 Subject: [PATCH 086/121] Update doc/stdenv/meta.chapter.md Co-authored-by: Valentin Gagarin --- doc/stdenv/meta.chapter.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index 6f58648cdf5..1ce44a9065f 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -185,7 +185,23 @@ meta.hydraPlatforms = []; If set to `true`, the package is marked as "broken", meaning that it won’t show up in [search.nixos.org](https://search.nixos.org/packages), and cannot be built or installed unless the environment variable [`NIXPKGS_ALLOW_BROKEN`](#opt-allowBroken) is set. Such unconditionally-broken packages should be removed from Nixpkgs eventually unless they are fixed. -The value of this attribute can depend on a package's arguments, including `stdenv`. This means that `broken` can be used to express constraints such as "does not cross compile" (`meta.broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)`) or "broken if all of a certain set of its dependencies are broken". This makes `broken` strictly more powerful than `meta.badPlatforms`. However `meta.availableOn` currently examines only `meta.platforms` and `meta.badPlatforms`, so `meta.broken` does not influence the default values for optional dependencies. +The value of this attribute can depend on a package's arguments, including `stdenv`. +This means that `broken` can be used to express constraints, for example: + +- Does not cross compile + + ```nix + meta.broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform) + ``` + +- Broken if all of a certain set of its dependencies are broken + + ```nix + meta.broken = lib.all (map (p: p.meta.broken) [ glibc musl ]) + ``` + +This makes `broken` strictly more powerful than `meta.badPlatforms`. +However `meta.availableOn` currently examines only `meta.platforms` and `meta.badPlatforms`, so `meta.broken` does not influence the default values for optional dependencies. ## Licenses {#sec-meta-license} From 75bbbbd39b15341bb54197db321ea37fc6e25b4b Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 23 Apr 2023 21:32:40 -0700 Subject: [PATCH 087/121] remove trailing whitespace --- doc/stdenv/meta.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index 1ce44a9065f..30bfb392c93 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -185,7 +185,7 @@ meta.hydraPlatforms = []; If set to `true`, the package is marked as "broken", meaning that it won’t show up in [search.nixos.org](https://search.nixos.org/packages), and cannot be built or installed unless the environment variable [`NIXPKGS_ALLOW_BROKEN`](#opt-allowBroken) is set. Such unconditionally-broken packages should be removed from Nixpkgs eventually unless they are fixed. -The value of this attribute can depend on a package's arguments, including `stdenv`. +The value of this attribute can depend on a package's arguments, including `stdenv`. This means that `broken` can be used to express constraints, for example: - Does not cross compile From a544b5828fecf0e6a984a4a43bf52542574864b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Apr 2023 09:39:16 +0200 Subject: [PATCH 088/121] python310Packages.pyunifiprotect: 4.8.1 -> 4.8.2 Diff: https://github.com/briis/pyunifiprotect/compare/refs/tags/v4.8.1...v4.8.2 Changelog: https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v4.8.2 --- pkgs/development/python-modules/pyunifiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 180741a8792..4d886196648 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.8.1"; + version = "4.8.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+fZtzSUTObWkLQ7Nq6pCP+vN1+OUFi3d8AJdr5FGI+k="; + hash = "sha256-NjoTUK1Tg2RqREI2DDT86mDO4rS5iZk+cffaGWLVSyc="; }; postPatch = '' From f30c5b8c64d8390111456f4792f2764cea84662a Mon Sep 17 00:00:00 2001 From: geri1701 Date: Thu, 20 Apr 2023 21:30:13 +0200 Subject: [PATCH 089/121] typst-fmt: init at unstable-2023-04-16 Add call for typst-fmt Update pkgs/tools/typesetting/typst-fmt/default.nix Co-authored-by: figsoda Update pkgs/tools/typesetting/typst-fmt/default.nix Co-authored-by: figsoda --- pkgs/tools/typesetting/typst-fmt/Cargo.lock | 1315 ++++++++++++++++++ pkgs/tools/typesetting/typst-fmt/default.nix | 35 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 1352 insertions(+) create mode 100644 pkgs/tools/typesetting/typst-fmt/Cargo.lock create mode 100644 pkgs/tools/typesetting/typst-fmt/default.nix diff --git a/pkgs/tools/typesetting/typst-fmt/Cargo.lock b/pkgs/tools/typesetting/typst-fmt/Cargo.lock new file mode 100644 index 00000000000..2329bac7091 --- /dev/null +++ b/pkgs/tools/typesetting/typst-fmt/Cargo.lock @@ -0,0 +1,1315 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bstr" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +dependencies = [ + "lazy_static", + "memchr", + "regex-automata", +] + +[[package]] +name = "bstr" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "clap_lex" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "comemo" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70b396e6f0a1a7d2c1d588fd8a255a8c30a8edeef65bc96b4afb3fdb8a8bf281" +dependencies = [ + "comemo-macros", + "siphasher", +] + +[[package]] +name = "comemo-macros" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "421c3e125e48959f3b6a18c0d266f3c228f6e28464c73cc44cff24e808fcda2d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "console" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "windows-sys 0.42.0", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "data-url" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30bfce702bcfa94e906ef82421f2c0e61c076ad76030c16ee5d2e9a32fe193" +dependencies = [ + "matches", +] + +[[package]] +name = "ecow" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e60e2840fbfc397c7972b11a6e6bd99a0248921cc1e31f293c5f6c5ac24831da" + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "flate2" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +dependencies = [ + "crc32fast", + "miniz_oxide 0.6.2", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "gif" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "globmatch" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0e82f77d5e36ce0c3941a39a6d8fff8ed9553ae13586b31640d6885f7376097" +dependencies = [ + "globset", + "log", + "walkdir", +] + +[[package]] +name = "globset" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +dependencies = [ + "aho-corasick", + "bstr 1.4.0", + "fnv", + "log", + "regex", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "if_chain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" + +[[package]] +name = "image" +version = "0.24.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "gif 0.12.0", + "jpeg-decoder 0.3.0", + "num-rational", + "num-traits", + "png", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "jpeg-decoder" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" + +[[package]] +name = "kurbo" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449" +dependencies = [ + "arrayvec 0.7.2", +] + +[[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.141" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" + +[[package]] +name = "linux-raw-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "miniz_oxide" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +dependencies = [ + "adler", +] + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "pdf-writer" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "249f9b33a3192626f2cd9f4b0cd66c1ec32d65968d58cf4d8239977feddddead" +dependencies = [ + "bitflags", + "itoa", + "ryu", +] + +[[package]] +name = "pico-args" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" + +[[package]] +name = "pixglyph" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eefadd393715fe315c8cdcd587f893b818a6dfe4f6f9faeb44b764c7c38fd8b" +dependencies = [ + "ttf-parser 0.18.1", +] + +[[package]] +name = "png" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +dependencies = [ + "bitflags", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.7.1", +] + +[[package]] +name = "proc-macro2" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rctree" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae028b272a6e99d9f8260ceefa3caa09300a8d6c8d2b2001316474bc52122e9" + +[[package]] +name = "regex" +version = "1.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "resvg" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e702d1e8e00a3a0717b96244cba840f34f542d8f23097c8903266c4e2975658" +dependencies = [ + "gif 0.11.4", + "jpeg-decoder 0.2.6", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rgb" +version = "0.8.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "roxmltree" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "rustix" +version = "0.37.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustybuzz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a617c811f5c9a7060fe511d35d13bf5b9f0463ce36d63ce666d05779df2b4eba" +dependencies = [ + "bitflags", + "bytemuck", + "smallvec", + "ttf-parser 0.15.2", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "safe_arch" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "serde" +version = "1.0.160" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.160" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + +[[package]] +name = "simd-adler32" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" + +[[package]] +name = "similar" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +dependencies = [ + "bstr 0.2.17", + "unicode-segmentation", +] + +[[package]] +name = "similar-asserts" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbf644ad016b75129f01a34a355dcb8d66a5bc803e417c7a77cc5d5ee9fa0f18" +dependencies = [ + "console", + "similar", +] + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subsetter" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" + +[[package]] +name = "svg2pdf" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd5736713f3850a24060c3cdd7ac9efdc0c5138779386c6c8975b46d54d2d3d5" +dependencies = [ + "image", + "miniz_oxide 0.5.4", + "pdf-writer", + "usvg", +] + +[[package]] +name = "svgtypes" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22975e8a2bac6a76bb54f898a6b18764633b00e780330f0b689f65afb3975564" +dependencies = [ + "siphasher", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thin-vec" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac81b6fd6beb5884b0cf3321b8117e6e5d47ecb6fc89f414cfdcca8b2fe2dd8" + +[[package]] +name = "tiny-skia" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d049bfef0eaa2521e75d9ffb5ce86ad54480932ae19b85f78bec6f52c4d30d78" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "bytemuck", + "cfg-if", + "png", + "safe_arch", +] + +[[package]] +name = "toml" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "ttf-parser" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" + +[[package]] +name = "ttf-parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" + +[[package]] +name = "typst" +version = "0.2.0" +source = "git+https://github.com/typst/typst.git#1e948f7fa29395cfc2bd704bfdbe6019229ba500" +dependencies = [ + "bitflags", + "bytemuck", + "comemo", + "ecow", + "flate2", + "if_chain", + "image", + "indexmap", + "log", + "miniz_oxide 0.5.4", + "once_cell", + "pdf-writer", + "pixglyph", + "regex", + "resvg", + "roxmltree", + "rustybuzz", + "serde", + "siphasher", + "subsetter", + "svg2pdf", + "thin-vec", + "tiny-skia", + "ttf-parser 0.18.1", + "typst-macros", + "unicode-math-class", + "unicode-segmentation", + "unicode-xid", + "unscanny", + "usvg", + "xmp-writer", +] + +[[package]] +name = "typst-fmt" +version = "0.1.0" +dependencies = [ + "clap", + "env_logger", + "globmatch", + "itertools", + "log", + "regex", + "similar-asserts", + "toml", + "typst", +] + +[[package]] +name = "typst-macros" +version = "0.2.0" +source = "git+https://github.com/typst/typst.git#1e948f7fa29395cfc2bd704bfdbe6019229ba500" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", + "unscanny", +] + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-general-category" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07547e3ee45e28326cc23faac56d44f58f16ab23e413db526debce3b0bfd2742" + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + +[[package]] +name = "unicode-math-class" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" + +[[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unscanny" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" + +[[package]] +name = "usvg" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a261d60a7215fa339482047cc3dafd4e22e2bf34396aaebef2b707355bbb39c0" +dependencies = [ + "base64", + "data-url", + "flate2", + "float-cmp", + "kurbo", + "log", + "pico-args", + "rctree", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "walkdir" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[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-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] + +[[package]] +name = "xmlparser" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" + +[[package]] +name = "xmp-writer" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fd742bbbb930fc972b28bf66b7546dfbc7bb9a4c7924299df0ae6a5641fcadf" diff --git a/pkgs/tools/typesetting/typst-fmt/default.nix b/pkgs/tools/typesetting/typst-fmt/default.nix new file mode 100644 index 00000000000..45e4f66d56b --- /dev/null +++ b/pkgs/tools/typesetting/typst-fmt/default.nix @@ -0,0 +1,35 @@ +{ lib, rustPlatform, fetchFromGitHub }: +rustPlatform.buildRustPackage rec { + pname = "typst-fmt"; + version = "unstable-2023-04-16"; + + src = fetchFromGitHub { + owner = "astrale-sharp"; + repo = pname; + rev = "9ed1fd1656f8e776b6c8d9d326c488f5ba1091eb"; + hash = "sha256-yHR13n5yx5Yl2atteGQq+qqz21zsy37ZJfGllbvSZcQ="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "typst-0.2.0" = "sha256-+YHyxZTzMG9zpzLV9NgJsMtrXG+/ymPQo5b26HDYJaQ="; + }; + }; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + checkFlags = [ + # test_eof is ignored upstream + "--skip=rules::tests_typst_format::test_eof" + ]; + + meta = with lib; { + description = "A formatter for the Typst language"; + homepage = "https://github.com/astrale-sharp/typst-fmt"; + license = licenses.mit; + maintainers = with maintainers; [ geri1701 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7688008acbc..978bd3ee840 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13118,6 +13118,8 @@ with pkgs; typst = callPackage ../tools/typesetting/typst { }; + typst-fmt = callPackage ../tools/typesetting/typst-fmt { }; + tz = callPackage ../tools/misc/tz { }; u9fs = callPackage ../servers/u9fs { }; From 466bfb64dc048e19442001e18e1000e2d914f5a4 Mon Sep 17 00:00:00 2001 From: geri1701 Date: Thu, 20 Apr 2023 21:05:53 +0200 Subject: [PATCH 090/121] Add geri1701 to maintainer-list.nix --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cce68256a6a..da9b3e23058 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5573,6 +5573,12 @@ fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; }]; }; + geri1701 = { + email = "geri@sdf.org"; + github = "geri1701"; + githubId = 67984144; + name = "Gerhard Schwanzer"; + }; gerschtli = { email = "tobias.happ@gmx.de"; github = "Gerschtli"; From 372e0f8efc5ee4d73ab7197c0312e7ee9d13d997 Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Mon, 24 Apr 2023 08:06:50 +0000 Subject: [PATCH 091/121] doc/stdenv/meta.chapter.md: document meta.badPlatforms (#225276) * doc/stdenv/meta.chapter.md: document meta.badPlatforms We don't have any documentation for the `meta.badPlatforms` attribute. This commit adds documentation for it. --- doc/stdenv/meta.chapter.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index 30bfb392c93..2e0cae67d50 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -86,6 +86,23 @@ meta.platforms = lib.platforms.linux; Attribute Set `lib.platforms` defines [various common lists](https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix) of platforms types. +### `badPlatforms` {#var-meta-badPlatforms} + +The list of Nix [platform types](https://github.com/NixOS/nixpkgs/blob/b03ac42b0734da3e7be9bf8d94433a5195734b19/lib/meta.nix#L75-L81) on which the package is known not to be buildable. +Hydra will never create prebuilt binaries for these platform types, even if they are in [`meta.platforms`](#var-meta-platforms). +In general it is preferable to set `meta.platforms = lib.platforms.all` and then exclude any platforms on which the package is known not to build. +For example, a package which requires dynamic linking and cannot be linked statically could use this: + +```nix +meta.platforms = lib.platforms.all; +meta.badPlatforms = [ lib.systems.inspect.patterns.isStatic ]; +``` + +The [`lib.meta.availableOn`](https://github.com/NixOS/nixpkgs/blob/b03ac42b0734da3e7be9bf8d94433a5195734b19/lib/meta.nix#L95-L106) function can be used to test whether or not a package is available (i.e. buildable) on a given platform. +Some packages use this to automatically detect the maximum set of features with which they can be built. +For example, `systemd` [requires dynamic linking](https://github.com/systemd/systemd/issues/20600#issuecomment-912338965), and [has a `meta.badPlatforms` setting](https://github.com/NixOS/nixpkgs/blob/b03ac42b0734da3e7be9bf8d94433a5195734b19/pkgs/os-specific/linux/systemd/default.nix#L752) similar to the one above. +Packages which can be built with or without `systemd` support will use `lib.meta.availableOn` to detect whether or not `systemd` is available on the [`hostPlatform`](#ssec-cross-platform-parameters) for which they are being built; if it is not available (e.g. due to a statically-linked host platform like `pkgsStatic`) this support will be disabled by default. + ### `tests` {#var-meta-tests} ::: {.warning} @@ -173,7 +190,7 @@ To be effective, it must be presented directly to an evaluation process that han ### `hydraPlatforms` {#var-meta-hydraPlatforms} -The list of Nix platform types for which the Hydra instance at `hydra.nixos.org` will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of `meta.platforms`. Thus, the only reason to set `meta.hydraPlatforms` is if you want `hydra.nixos.org` to build the package on a subset of `meta.platforms`, or not at all, e.g. +The list of Nix platform types for which the [Hydra](https://github.com/nixos/hydra) [instance at `hydra.nixos.org`](https://nixos.org/hydra) will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of `meta.platforms`. Thus, the only reason to set `meta.hydraPlatforms` is if you want `hydra.nixos.org` to build the package on a subset of `meta.platforms`, or not at all, e.g. ```nix meta.platforms = lib.platforms.linux; From 15fdac8845e9a1f43a028056f1a81eb2e76a9574 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 24 Apr 2023 11:25:05 +0300 Subject: [PATCH 092/121] linux_6_3: init --- pkgs/os-specific/linux/kernel/linux-6.3.nix | 18 ++++++++++++++++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 11 ++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-6.3.nix diff --git a/pkgs/os-specific/linux/kernel/linux-6.3.nix b/pkgs/os-specific/linux/kernel/linux-6.3.nix new file mode 100644 index 00000000000..4cd9acab66b --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-6.3.nix @@ -0,0 +1,18 @@ +{ lib, fetchurl, buildLinux, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "6.3"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = versions.pad 3 version; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; + sha256 = "sha256-ujSR9e1r0nCjcMRAQ049aQhfzdUoki+gHnPXZX23Ox4="; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 95004ba483a..4f00b0e30c9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -913,6 +913,7 @@ mapAliases ({ linuxPackages_6_0 = linuxKernel.packages.linux_6_0; linuxPackages_6_1 = linuxKernel.packages.linux_6_1; linuxPackages_6_2 = linuxKernel.packages.linux_6_2; + linuxPackages_6_3 = linuxKernel.packages.linux_6_3; linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; @@ -935,6 +936,7 @@ mapAliases ({ linux_6_0 = linuxKernel.kernels.linux_6_0; linux_6_1 = linuxKernel.kernels.linux_6_1; linux_6_2 = linuxKernel.kernels.linux_6_2; + linux_6_3 = linuxKernel.kernels.linux_6_3; linuxPackages_mptcp = throw "'linuxPackages_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 linux_mptcp_95 = throw "'linux_mptcp_95' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 40a92a957a1..8daa52a73df 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -189,6 +189,14 @@ in { ]; }; + linux_6_3 = callPackage ../os-specific/linux/kernel/linux-6.3.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.fix-em-ice-bonding + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -565,6 +573,7 @@ in { linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_2 = recurseIntoAttrs (packagesFor kernels.linux_6_2); + linux_6_3 = recurseIntoAttrs (packagesFor kernels.linux_6_3); } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 @@ -632,7 +641,7 @@ in { packageAliases = { linux_default = packages.linux_6_1; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_2; + linux_latest = packages.linux_6_3; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_6_1; From 4e2d1aeed841dcacdc3178c072ad72e2c9124216 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Apr 2023 10:29:21 +0200 Subject: [PATCH 093/121] python310Packages.fakeredis: 2.10.3 -> 2.11.0 Diff: https://github.com/dsoftwareinc/fakeredis-py/compare/refs/tags/v2.10.3...v2.11.0 Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.11.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 367c0f8b813..3c2a6671ea2 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.10.3"; + version = "2.11.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-qd8tofR5FdfV/A37gfNRYALf5rUMh7ldhS/hETUHo/k="; + hash = "sha256-R9fB8Y22HPFxMtFQJmmbxZWh6qUtbXrWFUetaOKRFlg="; }; nativeBuildInputs = [ From 98eea76fc676b3ca29bd795b3304b98f4d628916 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Apr 2023 10:31:18 +0200 Subject: [PATCH 094/121] python310Packages.niko-home-control: 0.2.2 -> 0.3.0 Diff: https://github.com/NoUseFreak/niko-home-control/compare/0.2.2...0.3.0 --- pkgs/development/python-modules/niko-home-control/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/niko-home-control/default.nix b/pkgs/development/python-modules/niko-home-control/default.nix index a7a696384df..46707205e86 100644 --- a/pkgs/development/python-modules/niko-home-control/default.nix +++ b/pkgs/development/python-modules/niko-home-control/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "niko-home-control"; - version = "0.2.2"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "NoUseFreak"; repo = pname; rev = version; - sha256 = "0ah02dfnnbk98grvd180fp9rak5gpi58xiql1yyzig5pcbjidvk3"; + sha256 = "sha256-n/uQAX2LgxeGTRF56+G5vm5wbeTQQQODV4EKaPgKw1k="; }; propagatedBuildInputs = [ From 1db78654420620c8b2d65c299fcde6ea63f07349 Mon Sep 17 00:00:00 2001 From: Varun Madiath Date: Sun, 23 Apr 2023 10:13:06 -0400 Subject: [PATCH 095/121] muon: 0.1.0 -> 0.2.0 --- pkgs/development/tools/build-managers/muon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/muon/default.nix b/pkgs/development/tools/build-managers/muon/default.nix index 69320cc217e..eae4320896a 100644 --- a/pkgs/development/tools/build-managers/muon/default.nix +++ b/pkgs/development/tools/build-managers/muon/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "muon" + lib.optionalString embedSamurai "-embedded-samurai"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromSourcehut { name = "muon-src"; owner = "~lattis"; repo = "muon"; rev = finalAttrs.version; - hash = "sha256-m382/Y+qOYk7hHdDdOpiYWNWrqpnWPCG4AKGGkmLt4o="; + hash = "sha256-ZHWyUV/BqM3ihauXDqDVkZURDDbBiRcEzptyGQmw94I="; }; outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ]; From 414e10385a7682218eb123066199dacfc1ed082d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 23 Apr 2023 20:13:27 -0300 Subject: [PATCH 096/121] muon: update wrapfiles --- pkgs/development/tools/build-managers/muon/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/muon/default.nix b/pkgs/development/tools/build-managers/muon/default.nix index eae4320896a..c3be1a4bc53 100644 --- a/pkgs/development/tools/build-managers/muon/default.nix +++ b/pkgs/development/tools/build-managers/muon/default.nix @@ -52,14 +52,14 @@ stdenv.mkDerivation (finalAttrs: { # URLs manually extracted from subprojects directory meson-docs-wrap = fetchurl { name = "meson-docs-wrap"; - url = "https://mochiro.moe/wrap/meson-docs-0.63.0-239-g41a05ff93.tar.gz"; - hash = "sha256-wg2mDkrkE1xVNXJf4sVm6cN1ozVeDbbw0CBYtixg5/Q="; + url = "https://mochiro.moe/wrap/meson-docs-1.0.1-19-gdd8d4ee22.tar.gz"; + hash = "sha256-jHSPdLFR5jUeds4e+hLZ6JOblor5iuCV5cIwoc4K9gI="; }; samurai-wrap = fetchurl { name = "samurai-wrap"; - url = "https://mochiro.moe/wrap/samurai-1.2-28-g4e3a595.tar.gz"; - hash = "sha256-TZAEwndVgoWr/zhykfr0wcz9wM96yG44GfzM5p9TpBo="; + url = "https://mochiro.moe/wrap/samurai-1.2-32-g81cef5d.tar.gz"; + hash = "sha256-aPMAtScqweGljvOLaTuR6B0A0GQQQrVbRviXY4dpCoc="; }; in '' pushd $sourceRoot/subprojects From 9ed444d2124706d58b8ab546ad4252e51ab47674 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 23 Apr 2023 19:27:36 +0000 Subject: [PATCH 097/121] python3.pkgs.pyblake2: remove No longer used by trezor (the only thing that used it in Nixpkgs), and deprecated upstream in favor of hashlib in the standard library, which has supported BLAKE2 since Python 3.6. --- .../python-modules/pyblake2/default.nix | 23 ------------------- .../python-modules/trezor/default.nix | 2 -- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/python-modules/pyblake2/default.nix diff --git a/pkgs/development/python-modules/pyblake2/default.nix b/pkgs/development/python-modules/pyblake2/default.nix deleted file mode 100644 index a0f62cf0e77..00000000000 --- a/pkgs/development/python-modules/pyblake2/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "pyblake2"; - version = "1.1.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "5ccc7eb02edb82fafb8adbb90746af71460fbc29aa0f822526fc976dff83e93f"; - }; - - # requires setting up sphinx doctest - doCheck = false; - - meta = { - description = "BLAKE2 hash function extension module"; - license = lib.licenses.publicDomain; - homepage = "https://github.com/dchest/pyblake2"; - }; -} diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index a106db6d565..24c282d7d8b 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -14,7 +14,6 @@ , mnemonic , pillow , protobuf -, pyblake2 , requests , shamir-mnemonic , simple-rlp @@ -47,7 +46,6 @@ buildPythonPackage rec { mnemonic pillow protobuf - pyblake2 requests shamir-mnemonic simple-rlp diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7af70d4884f..e0fb03cbca0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -186,6 +186,7 @@ mapAliases ({ pushbullet = pushbullet-py; # Added 2022-10-15 Pweave = pweave; # added 2023-02-19 pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02 + pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23 pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 PyGithub = pygithub; # added 2023-02-19 pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6af5c709ed..a8e15ce0d1e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8016,8 +8016,6 @@ self: super: with self; { pyblackbird = callPackage ../development/python-modules/pyblackbird { }; - pyblake2 = callPackage ../development/python-modules/pyblake2 { }; - pyblock = toPythonModule (callPackage ../development/python-modules/pyblock { }); pybluez = callPackage ../development/python-modules/pybluez { From ed66b7751ca38b1f4dbe29f2df44861d23b38ebf Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Tue, 31 Jan 2023 14:55:14 +0200 Subject: [PATCH 098/121] maintainers: add hellwolf --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 201ba054598..0260f3627b5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6118,6 +6118,12 @@ githubId = 2405974; name = "Sébastian Méric de Bellefon"; }; + hellwolf = { + email = "zhicheng.miao@gmail.com"; + github = "hellwolf"; + githubId = 186660; + name = "Miao, ZhiCheng"; + }; henkery = { email = "jim@reupload.nl"; github = "henkery"; From 1c7579605bc7730e7d88539704aa1b467952c9bd Mon Sep 17 00:00:00 2001 From: takov751 <40316768+takov751@users.noreply.github.com> Date: Mon, 24 Apr 2023 11:26:28 +0100 Subject: [PATCH 099/121] uboot: 2022.10 -> 2023.01 --- pkgs/misc/uboot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 2832f6c8aee..b19b68fce75 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -24,10 +24,10 @@ }: let - defaultVersion = "2022.10"; + defaultVersion = "2023.01"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - hash = "sha256-ULRIKlBbwoG6hHDDmaPCbhReKbI1ALw1xQ3r1/pGvfg="; + hash = "sha256-aUI7rTgPiaCRZjbonm3L0uRRLVhDCNki0QOdHkMxlQ8="; }; buildUBoot = lib.makeOverridable ({ version ? null From b8e9168ca74d9974d6a8728ad13583b9e7ad40a5 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Fri, 14 Apr 2023 21:23:21 +0300 Subject: [PATCH 100/121] owncloud-client: 2.11.0.8354 -> 3.2.1 - include a required internal package: libre-graph-api-cpp-qt-client --- .../networking/owncloud-client/default.nix | 34 +++++++++++++++---- .../libre-graph-api-cpp-qt-client.nix | 34 +++++++++++++++++++ 2 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 16abab431bd..36b1b88696f 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,16 +1,32 @@ -{ lib, fetchurl, mkDerivation, cmake, extra-cmake-modules, pkg-config, qtbase, qtkeychain, sqlite, libsecret }: +{ lib +, fetchFromGitHub +, mkDerivation +, pkg-config +, cmake +, extra-cmake-modules +, callPackage +, qtbase +, qtkeychain +, qttools +, sqlite +, libsecret +}: mkDerivation rec { pname = "owncloud-client"; - version = "2.11.0.8354"; + version = "3.2.1"; - src = fetchurl { - url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz"; - sha256 = "sha256-YraWvGgeF5b1+3i5Jlk+bwvAULr7KFOSX8y0ZoPpljI="; + libregraph = callPackage ./libre-graph-api-cpp-qt-client.nix { }; + + src = fetchFromGitHub { + owner = "owncloud"; + repo = "client"; + rev = "refs/tags/v${version}"; + hash = "sha256-39tpvzlTy3KRxg8DzCQW2VnsaLqJ+dNQRur2TqRZytE="; }; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ]; - buildInputs = [ qtbase qtkeychain sqlite libsecret ]; + buildInputs = [ qtbase qttools qtkeychain sqlite libsecret libregraph ]; qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" @@ -19,13 +35,17 @@ mkDerivation rec { cmakeFlags = [ "-UCMAKE_INSTALL_LIBDIR" "-DNO_SHIBBOLETH=1" + # https://github.com/owncloud/client/issues/10537#issuecomment-1447965096 + # NB! From 4.0 it may be turned off by default + "-DWITH_AUTO_UPDATER=OFF" ]; meta = with lib; { description = "Synchronise your ownCloud with your computer using this desktop client"; homepage = "https://owncloud.org"; - maintainers = [ maintainers.qknight ]; + maintainers = with maintainers; [ qknight hellwolf ]; platforms = platforms.unix; license = licenses.gpl2Plus; + changelog = "https://github.com/owncloud/client/releases/tag/v${version}"; }; } diff --git a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix b/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix new file mode 100644 index 00000000000..fb089cf0997 --- /dev/null +++ b/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitHub +, mkDerivation +, cmake +, qtbase +}: + +mkDerivation rec { + pname = "libre-graph-api-cpp-qt-client"; + version = "0.13.2"; + + src = fetchFromGitHub { + owner = "owncloud"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-gbrA8P+ukQAiF2czC2szw3fJv1qoPJyMQ72t7PqB5/s="; + }; + + sourceRoot = "source/client"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase ]; + + cmakeFlags = [ ]; + + meta = with lib; { + description = "C++ Qt API for Libre Graph, a free API for cloud collaboration inspired by the MS Graph API"; + homepage = "https://owncloud.org"; + maintainers = with maintainers; [ qknight hellwolf ]; + platforms = platforms.unix; + license = licenses.asl20; + changelog = "https://github.com/owncloud/libre-graph-api-cpp-qt-client/releases/tag/v${version}"; + }; +} From ecd33b6f92472081efb7c4d16f99c0b955517b2d Mon Sep 17 00:00:00 2001 From: nviets Date: Mon, 24 Apr 2023 06:15:55 -0500 Subject: [PATCH 101/121] lightgbm: init at 2023-02-18 (#216971) * Adding lightgbm with cli tool, r-package, and other features. * Update pkgs/development/libraries/lightgbm/default.nix Co-authored-by: Yt --------- Co-authored-by: nviets Co-authored-by: Yt --- .../libraries/lightgbm/default.nix | 142 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 144 insertions(+) create mode 100644 pkgs/development/libraries/lightgbm/default.nix diff --git a/pkgs/development/libraries/lightgbm/default.nix b/pkgs/development/libraries/lightgbm/default.nix new file mode 100644 index 00000000000..7ac716b326d --- /dev/null +++ b/pkgs/development/libraries/lightgbm/default.nix @@ -0,0 +1,142 @@ +{ config, stdenv, lib, fetchFromGitHub, cmake, gtest, doCheck ? true +, cudaSupport ? config.cudaSupport or false, openclSupport ? false, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false +, rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost, llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages }: + +assert doCheck -> mpiSupport != true; +assert openclSupport -> cudaSupport != true; +assert cudaSupport -> openclSupport != true; + +stdenv.mkDerivation rec { + pnameBase = "lightgbm"; + # prefix with r when building the R library + # The R package build results in a special binary file + # that contains a subset of the .so file use for the CLI + # and python version. In general, the CRAN version from + # nixpkgs's r-modules should be used, but this non-standard + # build allows for enabling CUDA support and other features + # which aren't included in the CRAN release. Build with: + # nix-build -E "with (import $NIXPKGS{}); \ + # let \ + # lgbm = lightgbm.override{rLibrary = true; doCheck = false;}; \ + # in \ + # rWrapper.override{ packages = [ lgbm ]; }" + pname = lib.optionalString rLibrary "r-" + pnameBase; + version = "3.3.5"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = pnameBase; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-QRuBbMVtD5J5ECw+bAp57bWaRc/fATMcTq+AKikhj1I="; + }; + + nativeBuildInputs = [ cmake ] + ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals openclSupport [ opencl-headers ocl-icd boost ] + ++ lib.optionals mpiSupport [ openmpi ] + ++ lib.optionals hdfsSupport [ hadoop ] + ++ lib.optionals (hdfsSupport || javaWrapper) [ openjdk ] + ++ lib.optionals javaWrapper [ swig ] + ++ lib.optionals rLibrary [ R ]; + + buildInputs = [ gtest ] + ++ lib.optional cudaSupport cudaPackages.cudatoolkit; + + propagatedBuildInputs = lib.optionals rLibrary [ + rPackages.data_table + rPackages.jsonlite + rPackages.Matrix + rPackages.R6 + ]; + + # Skip APPLE in favor of linux build for .so files + postPatch = '' + export PROJECT_SOURCE_DIR=./ + substituteInPlace CMakeLists.txt \ + --replace "find_package(GTest CONFIG)" "find_package(GTest REQUIRED)" \ + --replace "OpenCL_INCLUDE_DIRS}" "OpenCL_INCLUDE_DIRS}" \ + --replace "elseif(APPLE)" "elseif(APPLESKIP)" + substituteInPlace \ + external_libs/compute/include/boost/compute/cl.hpp \ + external_libs/compute/include/boost/compute/cl_ext.hpp \ + --replace "include Date: Fri, 14 Apr 2023 00:02:24 -0700 Subject: [PATCH 102/121] python310Packages.beautifulsoup4: workaround splicing issue with python hooks the splicing got broken in 33d12e5f --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a784017465..411e487a129 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1242,7 +1242,9 @@ self: super: with self; { beartype = callPackage ../development/python-modules/beartype { }; - beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; + beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { + inherit (python.pythonForBuild.pkgs) sphinxHook; # hook splicing broken since #194205 + }; beautifultable = callPackage ../development/python-modules/beautifultable { }; From 6c2712dbf09d21f5e76e15170235fd62bf9e1cf4 Mon Sep 17 00:00:00 2001 From: Stefan Junker <1181362+steveeJ@users.noreply.github.com> Date: Mon, 24 Apr 2023 14:33:50 +0200 Subject: [PATCH 103/121] fix(banana-accounting): multiple issues (#221820) banana-accounting: add missing libgcrypt and wrapGAppsHook --- pkgs/applications/office/banana-accounting/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/office/banana-accounting/default.nix b/pkgs/applications/office/banana-accounting/default.nix index 555b2a2aad2..e1c5f7fdeb4 100644 --- a/pkgs/applications/office/banana-accounting/default.nix +++ b/pkgs/applications/office/banana-accounting/default.nix @@ -9,6 +9,8 @@ , libX11 , lib , stdenv +, libgcrypt +, wrapGAppsHook }: stdenv.mkDerivation { @@ -33,10 +35,12 @@ stdenv.mkDerivation { stdenv.cc.cc.lib libGL libX11 + libgcrypt ]; nativeBuildInputs = [ autoPatchelfHook + wrapGAppsHook ]; installPhase = '' From 51e0e48f35edc0c36b57fea9acbb3fa8a0b2046a Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 27 Mar 2023 09:29:22 -0400 Subject: [PATCH 104/121] CONTRIBUTING.md: Clarify guidelines for `meta.description` --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7ebff3d332d..82f8d022a92 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,6 +43,7 @@ Below is a short excerpt of some points in there: * Not start with the package name. * More generally, it should not refer to the package name. * Not end with a period (or any punctuation for that matter). + * Aim to inform while avoiding subjective language. * `meta.license` must be set and fit the upstream license. * If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`. * If in doubt, try to contact the upstream developers for clarification. From cc782a953dc252dca4774364fd4f1be2dfafb03a Mon Sep 17 00:00:00 2001 From: Fernando Ayats Date: Mon, 24 Apr 2023 14:46:52 +0200 Subject: [PATCH 105/121] graph-easy: change pname to graph-easy --- pkgs/tools/graphics/graph-easy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix index b12a56c963e..4f3b89eea91 100644 --- a/pkgs/tools/graphics/graph-easy/default.nix +++ b/pkgs/tools/graphics/graph-easy/default.nix @@ -1,7 +1,7 @@ { lib, perlPackages, fetchurl }: perlPackages.buildPerlPackage { - pname = "Graph-Easy"; + pname = "graph-easy"; version = "0.76"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Graph-Easy-0.76.tar.gz"; From f0dcebd4f6157403008e7253541a5faea0b2872c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 12:53:25 +0000 Subject: [PATCH 106/121] patchelfUnstable: unstable-2023-03-27 -> unstable-2023-04-23 --- pkgs/development/tools/misc/patchelf/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index d90c6ef4a8c..c4d9807e0b3 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "unstable-2023-03-27"; + version = "unstable-2023-04-23"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "99db062953e88c26e1b1ae5120b8f8bd9f8d9b90"; - sha256 = "sha256-6UQR7pmaeIv4G/eymgrFXXfrh3ODfsqIIAu0A44N/6g="; + rev = "99c24238981b7b1084313aca8f5c493bb46f302c"; + sha256 = "sha256-v8hMcFVtTknn1LMfRCDQa/bYgP/bpsPhSYp01TiCtew="; }; # Drop test that fails on musl (?) From 4a5817c44a62c415ce3ec24ff832d12108805012 Mon Sep 17 00:00:00 2001 From: rogarb <69053978+rogarb@users.noreply.github.com> Date: Mon, 24 Apr 2023 14:00:09 +0000 Subject: [PATCH 107/121] toot: 0.34.1 -> 0.36.0 (#227688) --- pkgs/applications/misc/toot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 6edae3b2eed..14d3cd8f0cf 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "toot"; - version = "0.34.1"; + version = "0.36.0"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "refs/tags/${version}"; - sha256 = "sha256-5LTd3FPodYxMm4zZJsAfO0O1Y0AXUxaz+ZtEh6b5Etw="; + sha256 = "sha256-gEQA9PASSKAMqulOaK8ynBXX7BdptY1uwdS1tOf3/Jc="; }; nativeCheckInputs = with python3Packages; [ pytest ]; From 719666c4792d84099d2e62b16bbd91b94e35b692 Mon Sep 17 00:00:00 2001 From: Paul Nicholson Date: Mon, 24 Apr 2023 08:17:17 -0700 Subject: [PATCH 108/121] spotify: 1.1.99.878.g1e4ccc6e -> 1.2.9.743.g85d9593d --- pkgs/applications/audio/spotify/linux.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 0784bbfe1e1..df50e3bd28f 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -2,7 +2,7 @@ , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon -, pname, meta +, pname, meta, harfbuzz # High-DPI support: Spotify's --force-device-scale-factor argument # not added if `null`, otherwise, should be a number. , deviceScaleFactor ? null @@ -14,14 +14,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.1.99.878.g1e4ccc6e"; + version = "1.2.9.743.g85d9593d"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "62"; + rev = "64"; deps = [ alsa-lib @@ -39,6 +39,7 @@ let gdk-pixbuf glib gtk3 + harfbuzz libdrm libgcrypt libnotify @@ -83,7 +84,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "339r2q13nnpwi7gjd1axc6z2gycfm9gwz3x9dnqyaqd1g3rw7nk6nfbp6bmpkr68lfq1jfgvqwnimcgs84rsi7nmgsiabv3cz0673wv"; + sha512 = "5e8f4a1901c26e9bb5986e048226d8a15f5bc4c2acf16b20a404f228ef142e4d21c6a88a4a54c8d9e654ba5b15cb1fea1cdc50c21fbe8e3c374e241a44adf12d"; }; nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ]; From 4a2cbfd0e52059b79ff128ddad0fdc741aa0d030 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 24 Apr 2023 19:33:40 +0300 Subject: [PATCH 109/121] owl-compositor: fix pname conflict with owl --- pkgs/applications/window-managers/owl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/owl/default.nix b/pkgs/applications/window-managers/owl/default.nix index ac42c38e7aa..fa9ea8e8b6a 100644 --- a/pkgs/applications/window-managers/owl/default.nix +++ b/pkgs/applications/window-managers/owl/default.nix @@ -15,7 +15,7 @@ let mkDerivation = if stdenv.isDarwin then stdenv.mkDerivation else gnustep.gsmakeDerivation; in mkDerivation { - pname = "owl"; + pname = "owl-compositor"; version = "unstable-2021-11-10"; src = fetchFromGitHub { From 1c74fa18ce7fd8b644841bf661742ec6fad2562c Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Sun, 23 Apr 2023 21:57:50 +0530 Subject: [PATCH 110/121] xplr: 0.20.2 -> 0.21.1 https://github.com/sayanarijit/xplr/releases/tag/v0.21.1 Originally authored by @mimame (in #223450). - Disable one specific failing test - Move from pkgs/applications/misc/ to pkgs/applications/file-managers/ - Add @mimame as maintainer. --- .../{misc => file-managers}/xplr/default.nix | 13 +++++++++---- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) rename pkgs/applications/{misc => file-managers}/xplr/default.nix (62%) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/file-managers/xplr/default.nix similarity index 62% rename from pkgs/applications/misc/xplr/default.nix rename to pkgs/applications/file-managers/xplr/default.nix index 0b1aa7eb915..6fd3565bfaf 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/file-managers/xplr/default.nix @@ -2,23 +2,28 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.20.2"; + version = "0.21.1"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iPcxDNtwWnvFljZw052aw/ekCahyFBNt/zbUAdaWJA8="; + sha256 = "sha256-WUv0F7etmJFNRnHXkQ5G3p/5BWL30kfSYnxXYpAdo+I="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-Sn7ZcNdmMDQJHn99iTJX9c3uVhaGpRvEgdoJFmIUgeU="; + cargoSha256 = "sha256-0JJpGSOwayPB3cn7OpBjsOiK4WQNbil3gYrfkqG2cS8="; + + checkFlags = [ + # failure: path::tests::test_relative_to_parent + "--skip=path::tests::test_relative_to_parent" + ]; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; homepage = "https://xplr.dev"; license = licenses.mit; - maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g ]; + maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g mimame ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9355cb9c78..e13d735a055 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2523,6 +2523,8 @@ with pkgs; fox = fox_1_6; }; + xplr = callPackage ../applications/file-managers/xplr { }; + ytree = callPackage ../applications/file-managers/ytree { }; ### APPLICATIONS/TERMINAL-EMULATORS @@ -13520,7 +13522,6 @@ with pkgs; xe = callPackage ../tools/system/xe { }; - xplr = callPackage ../applications/misc/xplr { }; xray = callPackage ../tools/networking/xray { }; From 3fd093ef5b1ecac98c38b69b8819070b53c218bf Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Mon, 24 Apr 2023 16:45:53 +0200 Subject: [PATCH 111/121] terminator: 2.1.2 -> 2.1.3 --- pkgs/applications/terminal-emulators/terminator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 54c9f946763..4dee206be28 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -14,13 +14,13 @@ python3.pkgs.buildPythonApplication rec { pname = "terminator"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "gnome-terminator"; repo = "terminator"; rev = "v${version}"; - hash = "sha256-dN9+6VGIdIyY52nm2BMONeb+WV7UGL68frjnHRxRzTU="; + hash = "sha256-Kx0z9oheA7Ihgsyg6zgPcGFMrqlXoIpQcL/dMqPB2qA="; }; nativeBuildInputs = [ From f515d4ad45432e58d2ab3708e64d47381eb664b1 Mon Sep 17 00:00:00 2001 From: Andreas Pelme Date: Sun, 5 Feb 2023 20:30:14 +0100 Subject: [PATCH 112/121] maintainers: add pelme --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ee231ce5ae3..83484c97d89 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11995,6 +11995,12 @@ githubId = 920910; name = "peelz"; }; + pelme = { + email = "andreas@pelme.se"; + github = "pelme"; + githubId = 20529; + name = "Andreas Pelme"; + }; penalty1083 = { email = "penalty1083@outlook.com"; github = "penalty1083"; From 7509871fea118c38e7342551254015f42868b544 Mon Sep 17 00:00:00 2001 From: Andreas Pelme Date: Sun, 5 Feb 2023 20:36:10 +0100 Subject: [PATCH 113/121] looseversion: init at 1.0.3 --- .../python-modules/looseversion/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/looseversion/default.nix diff --git a/pkgs/development/python-modules/looseversion/default.nix b/pkgs/development/python-modules/looseversion/default.nix new file mode 100644 index 00000000000..5a71caf8c66 --- /dev/null +++ b/pkgs/development/python-modules/looseversion/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "looseversion"; + version = "1.0.3"; + format = "flit"; + + src = fetchPypi { + inherit version pname; + sha256 = "sha256-A1KIhg4a/mfWPqnHAN2dCVxyTi5XIqOQKd2RZS1DFu0"; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + pytestFlagsArray = [ "tests.py" ]; + pythonImportsCheck = [ "looseversion" ]; + + meta = with lib; { + description = "Version numbering for anarchists and software realists"; + homepage = "https://github.com/effigies/looseversion"; + license = licenses.psfl; + maintainers = with maintainers; [ pelme ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34f90f83cc8..5d124af9813 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5742,6 +5742,8 @@ self: super: with self; { loopy = callPackage ../development/python-modules/loopy { }; + looseversion = callPackage ../development/python-modules/looseversion { }; + losant-rest = callPackage ../development/python-modules/losant-rest { }; lrcalc-python = callPackage ../development/python-modules/lrcalc-python { }; From 51b96d8e85a27800a6c710cc63189ca8dd6651b8 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Mon, 24 Apr 2023 01:14:35 +0200 Subject: [PATCH 114/121] electrum: fix ledger devices support New Ledger protocol needs a new dependency to work https://github.com/spesmilo/electrum/pull/8041 --- pkgs/applications/misc/electrum/default.nix | 1 + .../python-modules/ledger-bitcoin/default.nix | 40 +++++++++++++++++++ .../python-modules/ledgercomm/default.nix | 30 ++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 4 files changed, 75 insertions(+) create mode 100644 pkgs/development/python-modules/ledger-bitcoin/default.nix create mode 100644 pkgs/development/python-modules/ledgercomm/default.nix diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 08d887f7e92..ca8001760a2 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -72,6 +72,7 @@ python3.pkgs.buildPythonApplication { tlslite-ng # plugins btchip-python + ledger-bitcoin ckcc-protocol keepkey trezor diff --git a/pkgs/development/python-modules/ledger-bitcoin/default.nix b/pkgs/development/python-modules/ledger-bitcoin/default.nix new file mode 100644 index 00000000000..edfc9c7f22f --- /dev/null +++ b/pkgs/development/python-modules/ledger-bitcoin/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, ledgercomm +, packaging +, typing-extensions + }: + +buildPythonPackage rec { + pname = "ledger-bitcoin"; + version = "0.2.1"; + format = "pyproject"; + + src = fetchPypi { + inherit version; + pname = "ledger_bitcoin"; + hash = "sha256-AWl/q2MzzspNIo6yf30S92PgM/Ygsb+1lJsg7Asztso="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + ledgercomm + packaging + typing-extensions + ]; + + pythonImportsCheck = [ + "ledger_bitcoin" + ]; + + meta = with lib; { + description = "Client library for Ledger Bitcoin application."; + homepage = "https://github.com/LedgerHQ/app-bitcoin-new/tree/develop/bitcoin_client/ledger_bitcoin"; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/ledgercomm/default.nix b/pkgs/development/python-modules/ledgercomm/default.nix new file mode 100644 index 00000000000..092378a142b --- /dev/null +++ b/pkgs/development/python-modules/ledgercomm/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools + }: + +buildPythonPackage rec { + pname = "ledgercomm"; + version = "1.1.2"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-izOPbwv+34Xq8mpq9+QRIGhd+z4pVnGJSMnYOktRVbs="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "ledgercomm" + ]; + + meta = with lib; { + description = "Python library to send and receive APDU through HID or TCP socket. It can be used with a Ledger Nano S/X or with the Speculos emulator."; + homepage = "https://github.com/LedgerHQ/ledgercomm"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6af5c709ed..cc465f603dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5426,8 +5426,12 @@ self: super: with self; { ledger_agent = callPackage ../development/python-modules/ledger_agent { }; + ledger-bitcoin = callPackage ../development/python-modules/ledger-bitcoin { }; + ledgerblue = callPackage ../development/python-modules/ledgerblue { }; + ledgercomm = callPackage ../development/python-modules/ledgercomm { }; + ledgerwallet = callPackage ../development/python-modules/ledgerwallet { inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; }; From 4e0f98c33bb736cd6bf2ebb7abe4fa06fcb4a671 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 18:02:18 +0000 Subject: [PATCH 115/121] vale: 2.24.3 -> 2.24.4 --- pkgs/tools/text/vale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 8fe7182898c..c4ded0d2668 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.24.3"; + version = "2.24.4"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-8sJdt7lM/Ut/mtCoN2QZjtqh1fiWbI9taiLlnnx66PE="; + hash = "sha256-gX37n1h/O7CqgXgWBndBHLtIeUWJaIJVJLyIb3Sd9YY="; }; vendorHash = "sha256-ZgBt4BgZWViNqYCuqb/Wt1zVjFM9h1UsmsYox7kMJ1A="; From 74a7d447b2164cfd273014cc374a8877fdc29045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 19 Apr 2023 17:16:33 -0700 Subject: [PATCH 116/121] iptsd: 1.1.1 -> 1.2.0 Diff: https://github.com/linux-surface/iptsd/compare/v1.1.1...v1.2.0 Changelog: https://github.com/linux-surface/iptsd/releases/tag/v1.2.0 --- pkgs/applications/misc/iptsd/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index e117313861f..1cd2da0099c 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/pkgs/applications/misc/iptsd/default.nix @@ -6,6 +6,8 @@ , ninja , pkg-config , cli11 +, eigen +, fmt , hidrd , inih , microsoft_gsl @@ -15,13 +17,13 @@ stdenv.mkDerivation rec { pname = "iptsd"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - hash = "sha256-IwvoqmqJTM6xtEp7AzLgT4dZgRsmXYmu6Zivx3oSm+Q="; + hash = "sha256-8RE93pIg5fVAYOOq8zHlWy0uTxep7hrJlowPu48beTs="; }; nativeBuildInputs = [ @@ -35,6 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ cli11 + eigen + fmt hidrd inih microsoft_gsl @@ -47,7 +51,7 @@ stdenv.mkDerivation rec { substituteInPlace etc/meson.build \ --replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \ --replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'" - substituteInPlace etc/udev/50-ipts.rules \ + substituteInPlace etc/udev/50-iptsd.rules.in \ --replace "/bin/systemd-escape" "${systemd}/bin/systemd-escape" ''; From a13e5eea982b5b1c2dc33ce295c4166aba06c202 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 24 Apr 2023 20:56:54 +0200 Subject: [PATCH 117/121] firefox-unwrapped: 112.0.1 -> 112.0.2 https://www.mozilla.org/en-US/firefox/112.0.2/releasenotes/ --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 82177b4de0a..d18532fd512 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = buildMozillaMach rec { pname = "firefox"; - version = "112.0.1"; + version = "112.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "23a5cd9c1f165275d8ca7465bebce86018441c72292421f4ed56d7ad8ada9402dc8d22a08467d9d0ef3ef8c62338006dfa3bcbddf12cb8a59eafa0bd7d0cda50"; + sha512 = "2cd7adeb6c9a39ad4c5366982e0e58382d7f205e6f2cee02b8ec2867034d1c0c884eeeb870a35db35cba60fa9c84aea73f8c77cfd9f36b5146dde06464aaabd1"; }; meta = { From 58ebe2d68019602e8bc45307b39cb9fe4f5b02bc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 24 Apr 2023 21:00:02 +0200 Subject: [PATCH 118/121] firefox-bin-unwrapped: 112.0.1 -> 112.0.2 https://www.mozilla.org/en-US/firefox/112.0.2/releasenotes/ --- .../browsers/firefox-bin/release_sources.nix | 802 +++++++++--------- 1 file changed, 401 insertions(+), 401 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 2203b526c09..0aa5f37a697 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1005 +1,1005 @@ { - version = "112.0.1"; + version = "112.0.2"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ach/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ach/firefox-112.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "36fd6c7580b7c52be08eeec0cdb078847d85150db5a7589b6170b87680352aee"; + sha256 = "4a32600dad771995ad6c347174b85f8f186da8ddd5223255c80d5f1a88bba375"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/af/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/af/firefox-112.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "faadb7dbb35eb85dd5afd2b1fae89a317efbc57d47c55bddf5913633f3a94f5a"; + sha256 = "ab23aed01c5e1ca7afcf09494ed11066625c9be3d3e386d68745e7e3a7d24b42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/an/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/an/firefox-112.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "413cc005f597c80e45e21238e6d1efc6b7ea9601a414f17f7a9de649ae100838"; + sha256 = "7a3c5919771eb1fb5ff5238339de9bc19139011293125c64216572b5ffecf28a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ar/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ar/firefox-112.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "ea1da8a30f29b34444140ded31282fbb22376954d5ee2a6a7545d2eddb19edd8"; + sha256 = "077af6c198cbcf37bd128cb4a6831868c8b472663246cb46adb89588a4451851"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ast/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ast/firefox-112.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "441d682a09325f46cead74d300b4f27200af97b4315fd2990d1fa33ba93412c5"; + sha256 = "494c7cc952ecd0d349b7e5626233ffbdfd541ad0efd7f502198f76d6eadee33d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/az/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/az/firefox-112.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "24440875e36dcba8c5d4e125715d2d8c61bab534739ff5a4e0c9e41419c3a05a"; + sha256 = "87519f82b780e04a8fc4c41d0ab248562c3d6b6d6941d9a50b0f1d7ae1335367"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/be/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/be/firefox-112.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "5b3e6c637256f9d54e414a56807f8c3e5dcad75e839b97bb26c4ed8391538e53"; + sha256 = "f65bf7ea0d9dfa5be6da26dd762e862dc562688f506a65c05d5d344693ef7325"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/bg/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/bg/firefox-112.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "cb132442599cc876435aeb99ce3d366ecabe583f66ac50b964fc6d34039b7a06"; + sha256 = "fdee1836538fbfcb9f5409a132a3ba13a0c6cbd56be5f5839c5a6aa10f21fb78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/bn/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/bn/firefox-112.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "8ffa2b5e01300ef62a980d504b9d5c61c17c71e36bc267694d7de6594227f86e"; + sha256 = "b305faf020b19eb6c7967b2e1c5b1b8ecd026ea49d8387fbd1a7304e7fe4eec3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/br/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/br/firefox-112.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "ee830d98b21fc9cc74a181c2c3cdb61692a83450df7dd35b7777591fa17cbd16"; + sha256 = "f373e63caeb791e7f6394e9339daf7e5604a5e8603f0b04bc138b3c9660198a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/bs/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/bs/firefox-112.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "1728f28b2b36feaf09eaf6b1750a2b9bd23e03bbf72b9fc7836e4c2ded27d120"; + sha256 = "d1889939bce050c63a769c2d67666361d78b2d87210fcaedeb41b0ad13fc8e38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ca-valencia/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ca-valencia/firefox-112.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c9cb9c84d03593a2f95071fe4e720fe23b8a70284c9f6b4225f3d501672b0800"; + sha256 = "9092a32d66cf883b574d0532ccf7398468d4940186f3bb31fc6add6154430f51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ca/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ca/firefox-112.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "633d527b4d9e4ff77474ac9e401290d1f700243588c963e96490a36ff1a9fd92"; + sha256 = "d7bb4dec533ba1824692e13dcfcf8b0dc2831d3c6556e8a2122285599227994e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/cak/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/cak/firefox-112.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a7228264a85d64f8aa7a585452a7ff452535bf23faa4fde823a1d161c9234a19"; + sha256 = "89ebad425295cf88f6a33b238e98eaf593afd7459d6db3f75cc1f50cf3354273"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/cs/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/cs/firefox-112.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "133263691738d5a03950bc909ed50b5379c56ab118b43ab1ebf874cf67c448ac"; + sha256 = "4a6d64263f1503cc35c36b2077bd64adbe9d2e7de4223a64c1eeb5eaf2e939a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/cy/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/cy/firefox-112.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "ac0b70542cb73d62f76619daaa435ec433e766af5922947113239e6d2ba9dcc2"; + sha256 = "d07924a243ce699dc200fdaedc57cf197126b3f31da78fd9b65ff8b24483729a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/da/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/da/firefox-112.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "71167831d1cd3836ef54f8fc0e42ffee0a22116c1f9b512a5a9f4ef6eb94dd6f"; + sha256 = "401d14c70aaa14ded17b5f1f4ea1d5ebc4a1dffba349aadc730e3a226e78f1c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/de/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/de/firefox-112.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c01cf989f29d637504de219af4905769318b93aee07ad2b02ec56b678a733ab6"; + sha256 = "0b8785f1b6320878bd4a870adeb93512331fdd9ef86150ad8aaef0440c5fc0b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/dsb/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/dsb/firefox-112.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "6c442c04e8899cc11055839bfe946a4cf5710fa07daefb858f67e63a749006cf"; + sha256 = "d8324ff9c74be9bf6e20ba76f67d7ceaed2f6e551331873f4d1564f84eae18b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/el/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/el/firefox-112.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c8d02a7659d65f47fe95a3528246631ac502c972d9cae5efac34d41175300902"; + sha256 = "ec2b6ab8258c6b7c09524e5c1d6b7204d82aecf7b0daf13cee23f8a9c53995dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/en-CA/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/en-CA/firefox-112.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "69e5c206ff03eef0a2da0b8dafebbb5b7fc75ed83c56915974587ae2bf13c314"; + sha256 = "733933a42d4488689aab752954895d9ebf0f6c8bca3600816b2d97f047d7a0c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/en-GB/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/en-GB/firefox-112.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8b0111486226ba15b1a145914647ae05c0c3c25280c2d15de2c10e5928eb0926"; + sha256 = "7e2014255101bcc88ad490eca8f8d6c7206e5463ce2570630f4d9c7829afc1d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/en-US/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/en-US/firefox-112.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6ae1a778523203660d1c300dfca88c14e2ea012e417a31238f6b312cfc3902f1"; + sha256 = "dd91e070aa5c6fa2e174cd4dcfaf4794791e6ccacc2a6a8ad8ecb5b6a51cf6bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/eo/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/eo/firefox-112.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "b8882e0c5d01432ab35b18e2dd6de92432964366671887d6171020018a87af2e"; + sha256 = "0fd41889e888e9ac017485f3883d21cc855ec45642879c4e7c38320de31674e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/es-AR/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/es-AR/firefox-112.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "fad8033a87c95d50d7959ef7d74186b832a93ae0be590f5d2122651c7f8a8421"; + sha256 = "28cf2a097b222dd13f51eac35cb9d9ff500fd7a43003cedbf63cc3bad30bd013"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/es-CL/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/es-CL/firefox-112.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "53a70c208fe9599f709bb706f1cfc4dba73c1165ae0308cff42f0bab89f27d68"; + sha256 = "948eed7a7575d7c6624508abd734e2db897c4b1277f91bf9543d9a286bc9051d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/es-ES/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/es-ES/firefox-112.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a36a7cfd3214b40566e76086dd0554c264bbe58044e170f3a5529a57bf45a96b"; + sha256 = "3de6cdfa93914bc8da328100fc04313a4863a4c9c10eed3c9792ca3eba6a817b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/es-MX/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/es-MX/firefox-112.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "408aa0cdf4199ee4bcedf5167739582bffd4779a55eef529ddb1e55dc5312b08"; + sha256 = "cac850a48979e1b96112ec144520728804d61f18e9f615a2e1a0738b8cd92765"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/et/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/et/firefox-112.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "17c4dbb7f5833a3ad954891d2f73eadcd464812500e75a11be93142920b1ff8e"; + sha256 = "645ada14230634143a8bc338f8595596ffb6de4f448efde826ecb6e7d7e07ca8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/eu/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/eu/firefox-112.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0db77714cef6bb365f7757d4d9d2c3f9cb8f422a0b1b1f1742e9bb0e69f9ad03"; + sha256 = "8212ef486ec59000dee4bcd62d61e55cd375381b5119c688980910f6ab27426b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/fa/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/fa/firefox-112.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "16ef1cff8506f6c2b51fd511416e87095929824f86f9efa48b4e4908f7fff39a"; + sha256 = "83886a65a04e7a32d3c479e953e228ce08b3e8b62b1074f07286e46e7265790b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ff/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ff/firefox-112.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "0d62047ad33735aa46f745af59baf77ed7fe5f52acad40f08b26a9a477dee9d6"; + sha256 = "e06797ab1e0c263ca31d1b5c1cd8b4e38823efc053f2be2e7467679fcb22e073"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/fi/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/fi/firefox-112.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e0f3cac06f7a949ab17e60599fcadce7c3953df5f079fb88ef7bf2288c57bd3b"; + sha256 = "b14d6bdf063177efa85eb6813c21f91ca0a6139b38aed501e65cc584a68e15ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/fr/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/fr/firefox-112.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c764c8a45e7ba5c2d2843a9abc875cc69e6854d51ff1971574581a96eba46f00"; + sha256 = "9729e6f1baf38fde3382869572fb073beeab30f8a9a837643cbc69b63a45f463"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/fur/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/fur/firefox-112.0.2.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "25bdd7f2ef2082f78fa5791c96991bb5c0a8b8d2e9dea084d8657a1296c47bd8"; + sha256 = "ac8f33ecf4e7ee66bb7c428052f853793d426f1fe169805f231412e28aa6404a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/fy-NL/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/fy-NL/firefox-112.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "4bea0e611c5574c481ffc1f6c31ab085225536856f7de8100a75d31651530b89"; + sha256 = "103cd7396ef8c64df1f84db958d12688fbb90f95e56c0be05590f7d9b8a2348d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ga-IE/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ga-IE/firefox-112.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "90e6f28e3aed2288731b3b9e7066b4603846b2ef848a23cfa6d821478879b146"; + sha256 = "9a04c66d62dcb51c573f9b14b48a064a1fd2725ca20f4518af6de2517e7054fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/gd/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/gd/firefox-112.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3b3fb7d17b4091eca185833f8f486b17b8fe3b9c3ecad316dccb0779aadb4490"; + sha256 = "2a8e057a49f39610ae4ed5c0cec5feacb435680194070b4e0ea5c64ca2328933"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/gl/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/gl/firefox-112.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "dde97c135fba0ce84e1e517a77821a7c9cde34ac02230ab23879982c2bc4de77"; + sha256 = "a354febd40bbdc0dfa8d03306336f43a919f8e393fc984edc2a8a32fd7e06500"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/gn/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/gn/firefox-112.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "be096c4bd208c339c1882aa22d5ca94139cc6605691a114ff8f2de397946be2f"; + sha256 = "fdcb1f427ad40ff9559090dad581f5039e768627dbbad1fda99624d4bb51d8d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/gu-IN/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/gu-IN/firefox-112.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "62c3d524526543f0ea6ef1b5013b3dd2316590eb8f9b2a68184c68e24cd20e43"; + sha256 = "c8b946ba9cf2c56d6dca6d9c10a67602f4fad80969858a7c7b906bdda7fdf6f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/he/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/he/firefox-112.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5f626f9004889bafbb11a6bce604481f0e8b1e445b372d8159d210798c67cc20"; + sha256 = "9990a04b86f765d79e00890780c7fcf2ec3fd61573ef7f341f156c1c48cd467f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/hi-IN/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/hi-IN/firefox-112.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "465bcef608d516b88a5c6a6e0c833f77e871250ccd937f2ff200aa88152a8acf"; + sha256 = "f3a2c58f7192abbd4690711255035186498b1a8c499afbc9c2dcceaa61fc0b2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/hr/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/hr/firefox-112.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5dec945d595e193c1971a179224d3f68b3df23b5c0a587375a77afce4d9e0055"; + sha256 = "26dded9c117143aafdf502896a11197b028ca978701830f1c84acf258ab307c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/hsb/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/hsb/firefox-112.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "a6db8e61d45a20bbb6797757eccc1150ac8f7d3a24561ff86f7a68b57183a051"; + sha256 = "caf295576ac3d579a1b88cae94e46934cd4c83ff89658b5876e7af217ee31681"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/hu/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/hu/firefox-112.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "5d1e84ffe73b3d91d1d2527a8dd08fdbd7f0df50cdbeeefcf9139b0ac359ebde"; + sha256 = "89e89b13c7dd676ca4cc739ddceab1184c68e70f12292795d91142813058e279"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/hy-AM/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/hy-AM/firefox-112.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "07988bd5220f474ca1b6ca06a7a30f057b3ac93e07dccb2d969d938c74d92388"; + sha256 = "6c3819149739a866dd231707daaf6819da49e26d5941f556b24f0cf29be8c35c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ia/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ia/firefox-112.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "dd4193ab35b05a767575f332398c1952020dbe698f583e08eeb3012e35ec386e"; + sha256 = "10965794c2075e5a9e5cac21eb9a6dd4e12e1cc55d2bae846a5c7ce2de9159d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/id/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/id/firefox-112.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1b9cb6b5889b32cf5d906a4d85521b8fdc98f74d1ed13ac77a8252bfe7ff84d9"; + sha256 = "a91f75dee13ca425fc7abde7696c26ebfdf0db98b339015ad2a5db8d2254742f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/is/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/is/firefox-112.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a4b0d7918a259ba34df259366d1db65e7ae1c47feea4e9fb6047c0051eccf52f"; + sha256 = "365946180b375dea606db48a6929264a2e151f53d413ffc0ecf8e3845c0d962f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/it/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/it/firefox-112.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e9a5fb694a2b26ee05059340b4d6698261d1b9440e2a838ffa8eed3fab7a967c"; + sha256 = "57feb62a6d3e9b5be052988109724c870d8a7e0f5dc88f08a57dc853b1c42a9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ja/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ja/firefox-112.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9ed9888d19d21024306163a155df7c49188212e308e1aa4981273fb5f06e2a88"; + sha256 = "b5a47f6a9995789049b717b45ef489da1ddd19532d69d69b887b7a33a9b582dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ka/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ka/firefox-112.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "7b573603e74a833fbdcad554b27d006f01a0d6019e94338e6fead0c0be1c56b2"; + sha256 = "8cee5bfe910d8297aba0c41ebf82f0df957a4bbf2add068fdf39dbfd91abd480"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/kab/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/kab/firefox-112.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "a98b7b01aa07c27075d44d593870fa52dc124103b52e77f30cfaec12f755c194"; + sha256 = "c6045ff1ccf44319be689de1564b27d4986ae97e944d54d730551adef6124ced"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/kk/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/kk/firefox-112.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "74a496d781fea2e845876871bd731d98fa6f30c4b083e19eadc2762c8cd3644f"; + sha256 = "5f18181e89268c4556d3d2d299aed3283fa82edec3ebfcab40df3baa494b1697"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/km/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/km/firefox-112.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "a0b5a577323ae6f20d0bbfb0022c502e9c3228ea0e252cce19bc88df64cb22fb"; + sha256 = "3909f25efcfac4a4663c93a95f1590f55cee54681f8f4110647040f911b6cdba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/kn/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/kn/firefox-112.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "05c03016b5782ff7b07610cc3e438a9657b226d9150f5335a3fd34906348dc8f"; + sha256 = "b6a5512beb535eba8a3a58c3807ab1c02af73850f030bf013cc08df07649cdee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ko/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ko/firefox-112.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "9da58cde61b0f0e2208dc01b4de216732786460e8d6fa82533b682bb4d678614"; + sha256 = "f8235d477c82154ef6bfabfd172b5a13451b3970e4beec8cc6500184ada1af60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/lij/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/lij/firefox-112.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "85202a3383a179b471d5020469af49fb52e154e4f71cd00833fe7137240c8149"; + sha256 = "169d029ae526ea51e5812e116f7266ce51fc4c622c693b976e2a874ea4ef857a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/lt/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/lt/firefox-112.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fbcf75e4b55d6eb423f3d94e363e68d0ca1e33f3e199c4ea4d26f0cfd0b3e4f5"; + sha256 = "6e65530f552c9c267f5b3cc31f301118d5474aa539b33f46bbaff27f62b9f016"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/lv/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/lv/firefox-112.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "d41068cd02315dec5daac3c6dfe37ef7eb9c0f2ebafb9d9f223cc287b8d22115"; + sha256 = "46325094def40a1d9589c7fa49484bacac27277cdf754b7cacaae203b5940bcb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/mk/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/mk/firefox-112.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "ec654f8c5d676506b134c5ba4069c7fe1bea15db644808b191d6474f45c75783"; + sha256 = "033756b122d219ce79b667f405d54fe1c0eccd1532f43d42bde1c8b928d3ddb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/mr/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/mr/firefox-112.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "b4f0d9ff4b887b7d2fb657b107547caf834804e695872a422570211d4eeff089"; + sha256 = "71f23b05b692eb12c834ef356a868e455bdfdb3bf6ed641eb4b6565b4d2fdcc6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ms/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ms/firefox-112.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "3bcae3c3c59484e7196bf8b7122da9a75f1f5657f68cc8125cd3e37c77f85ebf"; + sha256 = "0e224bb6d7341a17656c57bce4c8f753708deee18fa0f31877938702c3a2d61d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/my/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/my/firefox-112.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "dc07314c65084877c8c89035b1f821eea79993dcc5b55ecb304754ba6ea6808b"; + sha256 = "9eb954ee63bf6e4c8b6ef3fe1eaf8e91eeaa546b78ea4b1e518a1400865d94bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/nb-NO/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/nb-NO/firefox-112.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "df4b24e54cd19b30a2d0de40e6efac30ff7a7a4a5542c9f6dd4c63b1f9359af5"; + sha256 = "ca2368edf9441d1fdb4d580926b7af8f1330f99bff62f0d2ce8cc669cd10e85e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ne-NP/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ne-NP/firefox-112.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "ff641ab36ed7c353609c346a66a9a7e5e5ff4f18a789a00d3c22c23bacc2a8a8"; + sha256 = "324ec07ac0a4694388b392e051e60d4fbed9df5b5a4e16e8b5362f3d35aae2fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/nl/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/nl/firefox-112.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b3161e91e62415101daef2620d747e67cafc649518007da34e16da0a46a881ef"; + sha256 = "1abafd5ed255a8c73ef9c1ec1bdd52f4f5d7f1fc305e55bff279d681d48f9266"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/nn-NO/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/nn-NO/firefox-112.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "3b298aa6a1957e160d162f36eaf8af2e5f0c36af80dd7d047f50774b9f7d1d09"; + sha256 = "1d821b71811a9ff6359ecd91695d92ddf4c84c7480e70ddc5a5bcb9b4e038d74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/oc/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/oc/firefox-112.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "ce50933b0f8e672f1552973791312ef337b71e374c4327ea7bcee7f30da43baf"; + sha256 = "f249b854be5e54abd6218be95110aa94694054adaddd31b6c932d29b51cd9681"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/pa-IN/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/pa-IN/firefox-112.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "8b01acea823d687303fa21f6502a2e6b4ab1a6f3ad3a6e4b3a7e2a0ea0ee55c1"; + sha256 = "8575d4e60c478e6129be7e56ad537eced9ca5f50b22fcad976a6574486cdc67e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/pl/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/pl/firefox-112.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9d2018e146acac6440bc12ea8c6c410ea7c11e7e18cda5e8f72f33813d5dbd87"; + sha256 = "6d822d6de184aa269dcf6c6d868fcffde563081321e861285a48ab471fb9759d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/pt-BR/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/pt-BR/firefox-112.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "0c4b8b4871c4a2a8374f6cdb5c3c8f8986285d4e0a105797e025608298765253"; + sha256 = "1856751bbc497a734508db1717ca7ee82c67af3e6adfdbfe7dfc44e80f0536e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/pt-PT/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/pt-PT/firefox-112.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "6e227a07bf2d909763a22f8bf5c2e2b74b39651881685d00bc64bd4fea7d939f"; + sha256 = "b98aa8e3a2b3cf760723228406c21d9407a13be5f5e5785c7271aa3952261f94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/rm/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/rm/firefox-112.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "28878ce52ccf14a6745d5e2b57155d20ac966a345822d1d95006fdeaae12a2a7"; + sha256 = "8a5ae33a54647c02c18e01acd5b1a15076d8f9afbc324643f985912f7e724f7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ro/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ro/firefox-112.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "dd0b021cd9cd6f903d9b253309658da187485f57db7b1ae6e466c186ee49d8b7"; + sha256 = "8396ac479024eef5631a54e58807118e0fa9cedb863303876c67d16a126a80c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ru/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ru/firefox-112.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6b0564a7139628b15df935f4a1add5263ca67e686b0558ec70f305258bdc4054"; + sha256 = "ffbf56b7677b5a2f8d3d712eb029aa92e196201157634ad45f7eee32329df4e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/sc/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/sc/firefox-112.0.2.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "db9e37d5202a44542ea7fb62a946c858eac6716625c63d190a34d0fda7a7b955"; + sha256 = "16beacb5eecedcf911bb4a7b70d47f396e68b495842f60e7cb90a7581499f05b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/sco/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/sco/firefox-112.0.2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "f35499b1b27fa69934a2c9fbc030a15884966c6f7b38e3d07abdfe7d8af8ba28"; + sha256 = "41349269d84c88543f343c9ffcc003d89650584e7e01a618a38e7aa7455162ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/si/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/si/firefox-112.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "cd90b1bcb2e0c59420f33728b63530f282bebe61cea80e5817dc8eb8abe77d52"; + sha256 = "4e1d451b9e1dfe6e9a3783dbbab627da7337da28b419fb20b4530f8ab667e01b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/sk/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/sk/firefox-112.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "3d34d6502191d06f207c57b8cd15cd33b6cb93533bb962498c240be8b6d8a989"; + sha256 = "474535436e42a5e0db7c4ff066a066633e9d27f912018a7d297fb2155b271e17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/sl/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/sl/firefox-112.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "32a5359344d8580d551d38a03d691eae56c0f868cd1e5810bcf116043cd19f97"; + sha256 = "e9470ab915fec42daec4a790d9c6c6dba5bb3c322bd4dd86d3275b875a1076bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/son/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/son/firefox-112.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7ac2c8a8218687638bc3ba9f14b72015020d25cc6a28e192705bd5dfdca83b60"; + sha256 = "d46566118297c0699de1809dfda3a322ff64fa966218aa0e869b81a473a94fc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/sq/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/sq/firefox-112.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "6cefb5b63772879cc83a8113afa682499222f0c58b736bca9049699f76ba4403"; + sha256 = "84c87224e4fbda73e953b88a37607722daaf47a8330d2fedaa08bf55a5a4f7c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/sr/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/sr/firefox-112.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "73a3ef123e3c65f251557cdcad39197684ef258bc9d79973568d8e50641bd6b4"; + sha256 = "aacceca53b7a5bf79be03992741ce67b8a902a2684e9354452d4f56618a51f2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/sv-SE/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/sv-SE/firefox-112.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6182cdf106563fd8016765a08169dae772641b7badf581b4f1cd71d22d66a739"; + sha256 = "76142e5423922ae3b75946dce3b2a902f3fab70339c07d9a4815d668e23a9821"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/szl/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/szl/firefox-112.0.2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "808d255d36dc65c0126a62e6acc54231bd4bcc6e171a2ac017f1746607b9c981"; + sha256 = "dbd0a963fa7a674f3aa3fc2f22bf35c3f2d9a9efab49800ef259cb914b82b819"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ta/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ta/firefox-112.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "32389f9702b9f2e1dc87c40d6ab64da59c42ae7d0471c56d8f66c8187ddc2fc4"; + sha256 = "08a6f42e20932a906e7eb365b75c8536536fdff50db5ad702ff687345401a7a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/te/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/te/firefox-112.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "3a0ebea6051d8e495c8bdce885b6880198bae4f72c5c4991611d9f9b58054921"; + sha256 = "c82225dc13a4dd9feceda5552677cf80734785e04b5281140bb0245f3df47784"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/th/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/th/firefox-112.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c3987449dc9f22b149c193aab7f618129e6f3f82df87753f21b93a579f4a8c46"; + sha256 = "42c8282d65f1aa74b3c1508040650a0c5a5890d378e35d4bc5c301843569e02f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/tl/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/tl/firefox-112.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "f69a1d00396fca338b1ef37fc98566c1f977fd41103950a05bec22f88eca9708"; + sha256 = "3c877d0a2fb95e25361d2936096a7c47b56062f05db8505b2848d8f4d6be3795"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/tr/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/tr/firefox-112.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ccdee7f762fae29a3a6f52a50aa3104965fac7c8ea6d0c0be7029dec33d59f48"; + sha256 = "c8f105b999bdb235c6f90d5cdcba94d615f03c0fbab08d850043b8e38677af65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/trs/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/trs/firefox-112.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "9ddbd803a3188c69c90b0a62b295cbbef3357f3cd3074080bf6f4d6eb87b94d3"; + sha256 = "01f0f20141d982dbc6db2c49c3456cba85bdec92e967c9e22b467320a927463c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/uk/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/uk/firefox-112.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5409d308337224d5c76a7f20d99d6bae87b0535aa9ba3c56abaac677543dd04e"; + sha256 = "99a1fbbd80e2b74004ea492f6bc8fcff2c11fe3a393dfec69644f6f2d7a6eb09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/ur/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ur/firefox-112.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "a2aa8fbaef5f1814128a3d39a4780bbb8aa20ab7970f10ecd51165e21e0fbb4d"; + sha256 = "5f6a004c96b55842566a37c9b7bb63e7b384ec8da9d4032fc02f61eb7995a717"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/uz/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/uz/firefox-112.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "55230fd3cde7e5dab7309b7dcfd7688feb332ec3c8370001ba925076c3200bbf"; + sha256 = "6681c59607a6dcdf51e95d802c68cd2eee3cee8935b7a0b493fddd3c32205e16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/vi/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/vi/firefox-112.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "f7a8ecf5eeac44aa6ca156d131ebd05a268ce5e92ff0c88c208c3981a658ef78"; + sha256 = "457590c34d1b207414192f8a1f2b54884dac2c5cfe8999aaf135ac58eb0dc731"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xh/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/xh/firefox-112.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "e52862f470202fa07f370a8912023edbf2a5350f1aa7ce5351afa335fc194bc4"; + sha256 = "d2fafd74b04ba3cdf2de360f9f6d7e19da576d81139010fe3d80a19055a3a326"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/zh-CN/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/zh-CN/firefox-112.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "03e0a67ed68413022cb5452e68f1dde9480ec71cfd6726be604cbc54581ce84c"; + sha256 = "30062a56f9b7cce01adc683896d921a568ced738a7bc089f679df85820d62441"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/zh-TW/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/zh-TW/firefox-112.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "f4e54e3ef22307cb52c26059cd7d862ce7c45c24e6c7cc365f3b0e45f84afeea"; + sha256 = "ac6ff13f68590aff1d7ec0e88c147ba86bd2074d98ba6586dd4f2a3a448ff38f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ach/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ach/firefox-112.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "68d790bffa6415c57274d39e1ca04ccafd55c78720b659beaa696746c8a196a4"; + sha256 = "8e5894479c8c2670ca2ca8aa2067f319e7609d2d15eb19ab6c47eedc3af02ebf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/af/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/af/firefox-112.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "db827c1ece4fa12b217fb7c41af6064cd286c1f73c3deda8f370cc24294829f7"; + sha256 = "4be87cd20eae2e2e0481fee449a56db8d22fb4ebe356a7ca04db2911b025d152"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/an/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/an/firefox-112.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "8e43a3008913bbbb33578ffe6725e5cfcc191484d66e9b4ccb80fb4bd1e1822c"; + sha256 = "34c8db9bca3f337a6f081c99299fd6b07c3d69352e1032882922d380531fcc49"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ar/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ar/firefox-112.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "639cda8d39adf8618b316ed30768306c60b5a2f03c8aacc4e8196b9050f7bc5d"; + sha256 = "0441a66c9e246804cded5f6db9456e5d31dee3984c59b2b4b01540f92713dcf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ast/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ast/firefox-112.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "76e1b0b2d93728304eca8dd25c6d8b589afd054ab1b1b1ac0ddaf4c20982962b"; + sha256 = "32089836ebcb905c17a10c7f9b02a209064c4db693c29d962bc0067ada617b1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/az/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/az/firefox-112.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "7ce308bcfb41db1149425cb73b3298ea98735c871c46077bec33a9c74d876ac7"; + sha256 = "50b29941e2185e0793587952009571b067e8e60a298388b7024fc4648e5d03aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/be/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/be/firefox-112.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "fde37924c46e1a0d1f7dfe17187abf1756e7f02a5ace60b239acfdca11f9a5b4"; + sha256 = "c4848f7e1a5f50a6814d57f17a5834bc7b1286e988cc52196182291ab9aa2d7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/bg/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/bg/firefox-112.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "8b99e80e883aa1d24612978e085adb0d0d6fb00bc71817e48cdf95bd407eab3e"; + sha256 = "0ae7bbb8b682b363878577ef92d146f36b48884b2deaedcbf6bc57da434758ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/bn/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/bn/firefox-112.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "82e31e51ecd8d478eef65f437e07d695745bd03d02ee90379364c17506cac7fa"; + sha256 = "e5e0640cd37e4e9d115e7f67d0a90b08e34a0146356bfcd67214cb7dcfae3c9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/br/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/br/firefox-112.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "23a8d61abb4001186847a43b13cf497f9872b8aba5119e515ef4fc5862220410"; + sha256 = "f5e5149cd30fce3dd992ab09157f3975eb4823bb9f0b7a0662cbde28c64baecf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/bs/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/bs/firefox-112.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "149c6fcba2165f9c16f2df471aa345c75b7effe9d7d34e011a1c59bd4a24992a"; + sha256 = "29f609bcba5ef2fde4bd796eeae9155b9ced42da97203f527ebfa1ea038e8d81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ca-valencia/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ca-valencia/firefox-112.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "567e3cf76f645820a1b10cae5c1b38967c0348fbf65eda45eeb9fe2fa4d901d8"; + sha256 = "9b732ef026044892b33f5e4059e4b86ae670ed202b31735b8a26b7c86d935f80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ca/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ca/firefox-112.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "db7bee1e3fe1be75d7fb92a242d7a436902f5fe86b8aa4c7fa25dfe61f3faac2"; + sha256 = "5e8b8ce7f063212e92bd1a23ac22a9e74642e6c69c51f2e123ba1b0756f1b95c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/cak/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/cak/firefox-112.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "4eb2cd9f324777fcb8be0af9840eea4d01084921c270278605a4d9e90f69ab41"; + sha256 = "596c1aea0b6a6634be8de4e334a2186111b6a3370cf428b6ab24c6707a588442"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/cs/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/cs/firefox-112.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "d5acd46ffe1c44b8e150cc392c06de3b9886dc996942c82593a326692897c8b0"; + sha256 = "fa53d85a8a7ca5af00fedbb527de4c0c4386b4c62ed7c7f3a76f9c189123954b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/cy/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/cy/firefox-112.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d086fddb56c18a8189ca6c66c353e76d2e99853c88847675b2b69362741c41a7"; + sha256 = "18ee47aa148012d2d5528db5829feebbec941568221731c38f191485ca57ec0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/da/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/da/firefox-112.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "b8c6e563c98a1a7e0c583bc3463d501dfa7d5b3f9e5bfdf026fad1f20e94b4b4"; + sha256 = "0c17d62a5edbddbff5bdb5ec7efd2ea32fc0e19ba7767500d0f21d15d6aa3d14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/de/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/de/firefox-112.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "8be83652fd8872ece97120f21abc66ef17332900696aea65350d9c36f51aef20"; + sha256 = "cb9b72b06c83a0eedf83704ff01aa6a7ae8b15a39118cdec4c6abeca6b59fc8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/dsb/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/dsb/firefox-112.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "0b7c5bf0808b4cdb24767aca38983db2769a9dc17182b05f05767f5bdb1510a7"; + sha256 = "ece81a97a047b520aa912db9ca372a8e9550cbd1f0c8996cdf3f686068edcdf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/el/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/el/firefox-112.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "564fc0fc6cf469254a55756142a7bd221f7e8f5a2a65a7af7884442d405cdcc3"; + sha256 = "35076bd574b638a871f3a0a70a87b7a0b6f56b3eea8653d2888cdb4fa1fc52df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/en-CA/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/en-CA/firefox-112.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8fe5513b1cd1e4735ead8f7232bfa95e709a7f09e15c998ffcc57e866f0e0177"; + sha256 = "38ed101fbb4a68915c6e11eed1576c0312fcb1ec7c45264fb929f5019fa30340"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/en-GB/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/en-GB/firefox-112.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "6d7614935cd1cb93e8dbb843e5725d263655d0042fbcde4656fb90899fc4923e"; + sha256 = "06f5012d8e6ede5eeab23dfdf8eb06e20410514e13e7872ffe6b77c5bd6cf25d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/en-US/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/en-US/firefox-112.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "7c30ab48a4cc32e6358d6dd29e34274453b1db998cb52cfc5e2108ebf1f9ba41"; + sha256 = "b3b6537de3f8c2606d6cd119a4158c1e30ad21cd0936e9887fffe398cfa264cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/eo/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/eo/firefox-112.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "d0c603545d9e36cc43a0dcf5013d29c2557f7b31fc4c551fe482d5e53b76e7f9"; + sha256 = "8eec80b82de6279eda4d1a4b740c7be1eb4c3278efd9d1ddb35235775527ac72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/es-AR/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/es-AR/firefox-112.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "2b3e80b83fe78178074a784c6800ceea0ef449ec0fca0919855c0cfb0d8f3eb8"; + sha256 = "226a16beaea00f60292f4ca1275967aa266f30b0f9afd7fc7f8ef20b28db409d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/es-CL/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/es-CL/firefox-112.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "fa46c867f8daef7b4aebf3c9968f12b26aa5ead295baa5da991730bfd022907d"; + sha256 = "e08c2d0452fb24aa7ebff8bb937df400d18a84f6cb19e80884fc1fa5daf41590"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/es-ES/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/es-ES/firefox-112.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a6c24fef469e0b7e4b8bab3ad7127c569e0c2e0c38c5cbf344dc70ada34016b8"; + sha256 = "eefb4f5342e102b90b6350d3dc091c6286459aa69938a0e9d57b1e4624beb41b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/es-MX/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/es-MX/firefox-112.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "372403d23deac3dfb397bb3c5da5b10e58c60656b9c5d9126d06435c07b86282"; + sha256 = "bd7424bd23b4dedfc007e15c13e250030194b4b4efee75f52ed87ef0b7059b6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/et/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/et/firefox-112.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "586efc4af3e4c10e13394967d880e4132e9739da259a505df84488ed069bdb55"; + sha256 = "66d1f747f3545aacc89e26f062052dafd48ad3bec8e8285f86764198ee325fe8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/eu/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/eu/firefox-112.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "ea16876186a0666cbf4783a114ae32c60d5279e9c0aee9db5ab7404a8ed94ff8"; + sha256 = "0cc51370fd7640ee7b9b319b5a6ea211b6fe1b5a8aa8dc36e75f7da25e8c4b98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/fa/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/fa/firefox-112.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "44189a301db4defe04160de90fd4722003b062460c44ccb54466044641eadfa6"; + sha256 = "550cccf8b9ab72e9d9d0a37edd836c9c0c6a397c54a58bc23aacca2567055d01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ff/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ff/firefox-112.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "6d61ac3ec8652416cbf32449658da95eecd8ea84fbb0fe5ddac4fc8c9ced964e"; + sha256 = "402e4bdff0865524ceb5c295c157d7387f22682a29ac16718239af485f1f0384"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/fi/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/fi/firefox-112.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "09e3ae90365f38d5fe7859c24c6bee640fd0aee3f2283d9cf1cc5840ac9fa70a"; + sha256 = "9f49648a46043fbbd22ec1b73b73452bdac23bb046c1bd4951f17b847c403ee9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/fr/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/fr/firefox-112.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "a037725177bd002cb06ff82548efe8e48b99095362c1ed443101dfe00f0c2e87"; + sha256 = "ab17b387391556820d9ebdf4dc28bbc90e3e644d5364ab48faf49e0b378c1b5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/fur/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/fur/firefox-112.0.2.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "fbfb3357784a0609260e42ef8011f354e3e9312607d116d324bbffa410607f01"; + sha256 = "b1420357530394c326a85f06c0b66cf1a7f1f92aed13b7e04fcf49f9e492033a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/fy-NL/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/fy-NL/firefox-112.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1a7348fd973379cb6b639f4651d704267cba9eea65484672858a7e6f55739cde"; + sha256 = "1758f2ce57166b97182c02904970eedc00cb8c5195f7872f7edbc63f0443d184"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ga-IE/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ga-IE/firefox-112.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "01b7652d854d25745378e612f71e9aacef07d18318f14658a17d491a25724a62"; + sha256 = "05f0ce176ef1ed1df62e56e57ca78c2da4181769213c62a84dfd1486bd6c0291"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/gd/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/gd/firefox-112.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "33bb06317e98eb560bff3599f57aa76b3d686549b32237200c12374fbb95cb7a"; + sha256 = "c71cf775a36b2e40512fbb514d18f7d1e5734bb2bf9ce3753fa992178c71cc84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/gl/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/gl/firefox-112.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "8ea125896e735709ac7ae1f5ef29740dd7db3eb08de10ee0b5a25e005e1bb1e1"; + sha256 = "527a3b3175a70e4309194ed8ec12d2735dfa51c6830a62f7ca202553f85038ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/gn/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/gn/firefox-112.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "f3e546720ac549e6b4c94bceba5c8fa66ef0af771268052fd114141397c5f518"; + sha256 = "125222a06c0b25f0187907cc66d04a15638d8f162544dfa53af3bc85a0922396"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/gu-IN/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/gu-IN/firefox-112.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "e5a671e30fefd9a669b4f6d86b958887320dec0f450a302069ce944327d2b0b9"; + sha256 = "49a051e5a95b0738c7f5e97ddd3679ad062c83d80395d71fd7e5a9988577db16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/he/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/he/firefox-112.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "ecbea24231080df03d6a884589d1a48f5cdbc61eb9f53111507e438a1442972e"; + sha256 = "f0e992f6b27a99f67a252fbd67fbe1511230467c3b2ede7b0d3395c4bebe040b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/hi-IN/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/hi-IN/firefox-112.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "9ad861c0dfcc7cdf08129948b04a1ff22dbc84c67b0b085621fa11f9b733691a"; + sha256 = "d4639508f927056cace33d0d1adbdbad13852f05b00ff5b439bbd956c7cb5f67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/hr/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/hr/firefox-112.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "66a15a6321789612a15e1f897ba69146a0f48640a452b92e98ee50bc2fc5bee1"; + sha256 = "29cd33f9d173a416e9e8a825ec1b6b7656eb429475befb3debed0f9319c4f9ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/hsb/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/hsb/firefox-112.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "5e0a10c8abc026543ec9aee297b0246af5726fbc19c8c3defe3816cff96a5306"; + sha256 = "da044123db5f309920f49075d6b2c2d379423094f79cd82ff857cb8e55a80634"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/hu/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/hu/firefox-112.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "35dfc59a336d1d4c977f393cda08df4aac2ea4b570cb347234b04e36e60ccd7a"; + sha256 = "4212ff43a627d29a081effc62cd8a44db79f266c1f2a9f64fb610cea7930b7d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/hy-AM/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/hy-AM/firefox-112.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a44666a2855563a2437a3a5b317858b5d97608c1d84a366e6fc9ca7d500fd908"; + sha256 = "fefa97627dfd5e368057ad40be7ac15a397e2915f82f4dbaafccfcbacf0d96f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ia/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ia/firefox-112.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "578824cc54bf08eebb5391f7195e0e668684103d57913c73f34323e48fc9b997"; + sha256 = "4fd80715413cb0eeb63c615764b287ca126f2cc09014f4dfd213f2f7be81b64e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/id/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/id/firefox-112.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ec9d5f75f85a97e88fa16eca1e5d365b20453594f23bc7ce6b0accd64a06cd2a"; + sha256 = "e43da18d58eeb275888988471307004ea7efbf6ccd88c6e03dc16e5bfa548e08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/is/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/is/firefox-112.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c11658c067c6ec8ed7f2cf34c74587b6500a3f96d0d48647105d6218b39dbffa"; + sha256 = "a2ba240444cbc96d56b6d4a851da6f80b783f9fd74ab0b89a672f88173b33a0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/it/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/it/firefox-112.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "0cd5cb70fc40956caed930ca51c01c539159a35a7a5ad5cbf9257a3e12bb9845"; + sha256 = "4f908a9c9386c214301ea3cd6e8298d7aea9ef94ec8c92062bcf6a98ff7d5c7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ja/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ja/firefox-112.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "56a73fddb5a0d2d2160e68bcfab172e81f572a2db3981b43b330292057b0e671"; + sha256 = "c69b6cf1fde3d7a76f258732f9aaa558e1315ec0dd83bd3f2a6af02c88d05bef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ka/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ka/firefox-112.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "57bc43faf0e2610fb0e58c5e7e323e7909a9834dcac1bb6b1b3803c0ffe88ab4"; + sha256 = "6c1fb4069bece39160c3d8de030c8d8d8e7f698784199aeff9b86cb5d6af3803"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/kab/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/kab/firefox-112.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "48eca6ab0e3dc3d187f2f296b48f5ddf85481f3c0a14614778fee21d0356ab5c"; + sha256 = "e14bbc22e6f922714109db165cec4f8dcd9c4a3672b37519e3df7e0e9fedcfe5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/kk/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/kk/firefox-112.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "0e8693939975ef607d1d955b994e047e43018be58654f25436233c8686241baf"; + sha256 = "92c694a35a19cede811364ad0bad3cdb33a62de8a6effe742a5c57ba865ac5be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/km/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/km/firefox-112.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "453b984e1709b99947d1e4ef4509c89f73de9041d231c62755674f976599b1ac"; + sha256 = "2e4f6f21b44e8a2812961bd2e625bfd8b070816ea3640cee163d177dfe090498"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/kn/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/kn/firefox-112.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "a25556c0340257300b205c4ffc4e0f6f59d8dd151a415452e501f041ba868278"; + sha256 = "ec99d9517002fa62cdc210c57fd9ef3a38faf35fd3ce34c24910b42673b67133"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ko/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ko/firefox-112.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3fd45baeafaee0f24639388337c659073c19f6892e7ce02a458521fb50fb021f"; + sha256 = "3fb1d5ba4c8f6b3824c72c561e45834054113f70ccd8087ff8c9a957ee9dce4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/lij/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/lij/firefox-112.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "74d12bfbb8b64d95c583a4d18e3ddeb7c47589206d9e01093e536af83b3c2263"; + sha256 = "d8225a7dfb4f93faff92f853fef3001c737a83328ea51618aaa4f8aab44fb902"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/lt/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/lt/firefox-112.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "935a06e6c9418796b262bf11c2bf10e02c799866f9a71cfb1b287387a1e7d429"; + sha256 = "631230b71052285b7d58b272839fdfb6b86457690c3036094faa50f11cad0ae4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/lv/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/lv/firefox-112.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "37ba1df6e5300cab332f66e1872ebfd03210a9405b2a6a696c04cb5973e8aa3e"; + sha256 = "31a76eed0cddd4bb7ba24c063d0936d4f0e36e3efc18f8f0e504bd1bc3542f99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/mk/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/mk/firefox-112.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "846f8905382d8ecd621ecb4476364d13a83cc9759f3c6d6fa532f52d868f5081"; + sha256 = "d2987264002bb665866507da3e6df5a04d72834c98f89a996cd24ab968b0a4a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/mr/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/mr/firefox-112.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "eb182cf3e62502d7978e8321a43dcf7ce83b2f8871494206b89b36063ee87f9e"; + sha256 = "d39f7668e6548de3e5a33265ea5ee6b99d801a97aff7e2cc12f054ac6042655f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ms/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ms/firefox-112.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ca659d6e58ad5bbda6f5029358ee8d8e2434490ceb315ee9c92777892976eb35"; + sha256 = "1d9d5aef69d76136d0b02313277bc79069f7ad778ff700430fc91481dfb9a2ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/my/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/my/firefox-112.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "a3656a0dceaab329a1b66d2559307c95582da97599f0f24afbd1a2f3ac3d8978"; + sha256 = "5ce8128deacde8fcd65f0dc40919cc1a47f2699258be3b19c3cddc6766df8185"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/nb-NO/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/nb-NO/firefox-112.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "79696194984f1789a2e0b1b0ccaddae490077bacaa96184adf4f8d298b75b47b"; + sha256 = "b6ab5e4dc4566b9e7a2147b487cbe6cac2661168d2d2a9af19fdb8054d3fea6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ne-NP/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ne-NP/firefox-112.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "bdcd39bd3d0c0441044f7f1d7ed2dea1d07fc550778e6071ec03d159b30db413"; + sha256 = "0b738935a8b514fa94137713a64b3343747af647f92c89a8650300e74fe06c3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/nl/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/nl/firefox-112.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "b0e14bad355f3a63a37fae0dc74eb3f974c5a923261ac42dea9d30485ebe61c6"; + sha256 = "43bea3aaf6394e346d5a7a94fa9b6d272eadbd24ca4c905e5ec19d24070f5763"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/nn-NO/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/nn-NO/firefox-112.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "2cd11da894f7f3ee53ceb1138ceda8542b4b143341cbcd624a4f9bc808d520ad"; + sha256 = "21bbb6ea695b81932168ce7ed16b14a3204b5cbd8cd4963544dedf02d1aab10e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/oc/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/oc/firefox-112.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "7435492bd6079d7e76cdb4a41f070b42ee4c080d3e891f05a21942046d33d76d"; + sha256 = "91bbc293db4e4397c0502d38fcb9c5fbadeb7834ffab87e337bd33b96afe9911"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/pa-IN/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/pa-IN/firefox-112.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "93c90602e511aac82efa2da0fb4c3043bfadcfa27cb87a39108c803639d52b3e"; + sha256 = "03b9d04b28df436bdab3d792f15e5a59f30073c50f9f1697d0062c6defcd0f4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/pl/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/pl/firefox-112.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a75bfe0ec38e782c939348a34e6acf23598338c3350278f096ab73354c43f3c4"; + sha256 = "84b532132fcc5e832d71a97de46f14fb2ae8a0855bcb88b98b77c73a22a9d742"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/pt-BR/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/pt-BR/firefox-112.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "67b17c53ec8618064d0fefc0b5a61ee8911f714396fc19b0931fcd242c8d117e"; + sha256 = "346524c9dd078c68227e681afd0344b1574623a88abb025dbadd7ecfad4759c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/pt-PT/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/pt-PT/firefox-112.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e4e412aab7cd1e938be7c5e689bee63499a9b44b5e4efa2fafa58d5bb2c12c2a"; + sha256 = "e14516096e990defff67deb73aaae9448b4a14ce660829aa7c392d9a45b3891f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/rm/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/rm/firefox-112.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "b86be0830e26e01302f1f99ed9c5acc9a43757d340361dc137267c9b95feeff9"; + sha256 = "7c6e7381e963eb9d7100c1d380df759107d5baf4f4862177986adb2068844ac5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ro/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ro/firefox-112.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "ad830ca7e0c7f0b53031fc85d8884beb6beabedc38dbe570f06324fa4acb0bc6"; + sha256 = "6b9d0dd1256f50088706d1c695d08d92a970f5b1ad6e536647e4b917ed3758d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ru/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ru/firefox-112.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "9c2778b094dbebe800f8f590d1df5202b1632616d0f78ba94d8db31726ad8b83"; + sha256 = "52e4449fac2a97b5db5ca525edc664e0fb25519df4472e8f820b4233c33411ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/sc/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/sc/firefox-112.0.2.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "4799ac43e8a0d44412e8ff2c50982d494d039430eb1175bd98dda95399b8aadf"; + sha256 = "3b011a7316737f53219e942cdb62938d961826e284246294097a4505e8ebeb71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/sco/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/sco/firefox-112.0.2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "135ef70b894fb2ce564c9e8070b65f605b199382b109faa2f2519f9ebbf9c0f9"; + sha256 = "37d7f80776a35165ec071e8dff8d390db5a11e5f8f11814b9c7c0fc3d18fbb24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/si/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/si/firefox-112.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "52329952a8075a05a248a49d69a5c5ceb41778d6c68b76e5a334b1ebff3d4a1d"; + sha256 = "3acf9722a50c1baa35bafd323876882999b353c9b3b39a38ea8085d44cc27694"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/sk/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/sk/firefox-112.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "1b3073d92b6eacabf8c26efa58e00c6895332f560f4be93a57fba4666f328751"; + sha256 = "c2571e8d25564675ee4c11126e3a8dee278b11ba4be1f333c4a0feb83d78f3a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/sl/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/sl/firefox-112.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "4ec9e44b3defcd7b79f60a4304123f228bbbfc4ad615548ef5183366d730c335"; + sha256 = "d12738c69e586a45bb45339b4c5e4dbe9812eb161517479d5e09c1d84ac8e6b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/son/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/son/firefox-112.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "1da86784e9dc41d4d2c6b05d35da1a2f96bd133b87b759719768bf085fa07dc4"; + sha256 = "dbde4f4fb12d2c76ec6ebb478f23e23914af66f417960ee1459ad7d5af85a306"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/sq/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/sq/firefox-112.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "06525d8421cc412c8e5ec2c6cb47d91665b9d0e8d622c09b2fb70b21ad0a724c"; + sha256 = "a588d5a5328794397d4b2b85800343f86f5e7219f1419e9c9cfc1102e686cec0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/sr/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/sr/firefox-112.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "358dcc70895bdfd935419b755711dc7001a56866746a0340b534192e58de7948"; + sha256 = "bb2539149ab918bb256946dbb1c229b161ace148c6bcf1882329460f5c37b62d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/sv-SE/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/sv-SE/firefox-112.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "91a7e6eaa15b846a6d7f942249b783e51fad059cd13932726ae8a2bfe154b746"; + sha256 = "af57326935c3b392d80ee6148d02caf3c371adb0e1feb509c992e38394a0285c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/szl/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/szl/firefox-112.0.2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "8127eeba4f40a5a1a4c7a85bdb343ac360bcdf2f14721423196f7803c8648bc5"; + sha256 = "79a565f7d7954385f0bd2d24004a9915611c23659bf6da928817cb876b1b2130"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ta/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ta/firefox-112.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "337ddde6c133d2fd2a4e5850605586ffdf78a4038aa54f291584d522efd06faf"; + sha256 = "92c515d9e7686579833c211662022fc81b9342f3b69672454ca7f88ae40912c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/te/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/te/firefox-112.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "602edab53a94b72761f1fcf805621e2871633540e43212602ba85381ca7a0093"; + sha256 = "3e1e2280e586ec818d21213e83ef09cff59d85802b40d297d24937312c9b0f36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/th/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/th/firefox-112.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "541593a4e696e85281942f57a0276da033c47a1ab2782820f8c77c97d10ab74b"; + sha256 = "c5f564feeca7ee1ed94749cbc5864bc1ed2905a995d11f3551c7ec8d2be82d16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/tl/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/tl/firefox-112.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "6d5a977aa0e651bb8a3c1868b4639472c203e791d0cba0ce34ac556ea18a0e27"; + sha256 = "32ccb86053d91355cb937af203297051cf32ef09085199924ac62374f3b5a43c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/tr/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/tr/firefox-112.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "2c94db9856cf6dfaa810fe6397185959a8d78222d3cc8e8968906cbe864b3ae4"; + sha256 = "0b97e08b5852bf2ed2ed19098e850fc7670772a797c21bec561ff2bed55b3679"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/trs/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/trs/firefox-112.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "21742ee25642a258df95f7aa2dc92f422546408e8084071b42792d90b0cb6713"; + sha256 = "01a7242176bfd92ca3aad41305f5eac96d191c6cc8790981e4dbf4f0ad0792ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/uk/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/uk/firefox-112.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "6f93c32705ce3b72db574c36c318fcf69c91423eaf41b70d144b91f6a71b91d1"; + sha256 = "4b4a9642cf069bca7c5f01d76c2c8503530f37810cc09fe72ad73f213c96e78b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/ur/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ur/firefox-112.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "8ccea04fb8a753fcf0b7c4a1a2c941e630438ed74b077714355d816c09e5c537"; + sha256 = "47a4e99ec6dd1d262b21e432485c2bef3ef112971fdecbb01cab5715a868bccb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/uz/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/uz/firefox-112.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "707fb054e342b449c79a86788096d25ca61f965ce31f862d8779135d5eed888e"; + sha256 = "4ea75c2774cb552b962df7aa851bf7ae102dfb1de72637143784ba52e21e8d08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/vi/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/vi/firefox-112.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "4019556dd8c934548c0ea646d5c6d3dc557c9bbe4382a30375fd03f564eb034c"; + sha256 = "6fba17093fa1146955e614e49faa9aba235a1b9cc071e2622e6fd2f089049fd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/xh/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/xh/firefox-112.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "712d9a1f97b649aa3776a7d80fc38b71c204689afff6e0f49f13a4fcda786092"; + sha256 = "bf02cdb2d591dec4fb86b548fc17d6e7d1a7e147b4a8aec0eb5282227f82b575"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/zh-CN/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/zh-CN/firefox-112.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "59a5c6cbeaae82e0debe411685b1f5b44bd59acf965c93af52c21a715600522b"; + sha256 = "2dd64475a0ea10963d04be835e1ce45a7f89a3dbd9f838b7913dd64a93197629"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-i686/zh-TW/firefox-112.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/zh-TW/firefox-112.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "85fe472a78190083dae4e3f275636ef1b8f5518f6d3fda04fe352c0cb702c490"; + sha256 = "a72f3dd7664de9f976e5f3c7fc8ab5d1ae4a3a9fa1e2d548d2059e76d3a8d53d"; } ]; } From 90a8b9e3febfc1e615ff8308ed2418d48ba4eb6a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 24 Apr 2023 17:30:05 +0000 Subject: [PATCH 119/121] rustPlatform.buildRustPackage: fix cross .override breaks splicing, so this was using the shell for the host platform. --- pkgs/build-support/rust/build-rust-package/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index a1bddeb6c49..2cd30af56b7 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -11,7 +11,7 @@ , cargoSetupHook , cargo , cargo-auditable -, cargo-auditable-cargo-wrapper +, buildPackages , rustc , libiconv , windows @@ -121,7 +121,7 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg patchRegistryDeps = ./patch-registry-deps; nativeBuildInputs = nativeBuildInputs ++ lib.optionals auditable [ - (cargo-auditable-cargo-wrapper.override { + (buildPackages.cargo-auditable-cargo-wrapper.override { inherit cargo cargo-auditable; }) ] ++ [ From b82dbe2fdc61a78f9eb931170bfea09fa824888d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 24 Apr 2023 15:24:12 +0200 Subject: [PATCH 120/121] python3Packages.torchvision: 0.14.1 -> 0.15.1 --- pkgs/development/python-modules/torchvision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 449d635372a..f4db7d16b84 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -40,7 +40,7 @@ let }; pname = "torchvision"; - version = "0.14.1"; + version = "0.15.1"; in buildPythonPackage { inherit pname version; @@ -49,7 +49,7 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-lKkEJolJQaLr1TVm44CizbJQedGa1wyy0cFWg2LTJN0="; + hash = "sha256-CQS2IXb8YSLrrkn/7BsO4Me5Cv0eXgMAKXM4rGzr0Bw="; }; nativeBuildInputs = [ libpng ninja which ] ++ lib.optionals cudaSupport [ cuda-native-redist ]; From 5d391228f62ece322441ac73b15e20185fbd9672 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 24 Apr 2023 22:37:23 +0200 Subject: [PATCH 121/121] electrum: 4.3.4 -> 4.4.0 --- pkgs/applications/misc/electrum/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index ca8001760a2..760a34ed3dd 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -11,7 +11,7 @@ }: let - version = "4.3.4"; + version = "4.4.0"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -28,7 +28,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-0xYGTCk+Sk7LP+E9r2Y7UJZsfbobLe6Yb+x5ZRCN40Y="; + sha256 = "sha256-lXMz0U7zgtCApBCGZcpOHvLcyOeGG0yJE/gr7Gv+yBQ="; postFetch = '' mv $out ./all @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-+Z4NZK/unFN6mxCuMleHBxAoD+U1PzVk3/ZnZRmOOxo="; + sha256 = "sha256-SHV+fCDhfgIh7s8L7eDbKj8bkHSVm7J2PPQ4CQpp6cI="; }; postUnpack = '' @@ -84,7 +84,7 @@ python3.pkgs.buildPythonApplication { postPatch = '' # make compatible with protobuf4 by easing dependencies ... substituteInPlace ./contrib/requirements/requirements.txt \ - --replace "protobuf>=3.12,<4" "protobuf>=3.12" + --replace "protobuf>=3.20,<4" "protobuf>=3.20" # ... and regenerating the paymentrequest_pb2.py file protoc --python_out=. electrum/paymentrequest.proto