From 4c55d256cdc3eec67ef0f5775d22da72b92c993e Mon Sep 17 00:00:00 2001
From: Jason Yundt
Date: Sun, 3 Nov 2024 22:36:32 +0000
Subject: [PATCH 0130/2159] python312Packages.cassandra-driver: 3.29.1 ->
3.29.2
---
.../cassandra-driver/default.nix | 27 ++-----------------
1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix
index b72fd7d8a525..f6069e3475e0 100644
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -6,7 +6,6 @@
cython,
eventlet,
fetchFromGitHub,
- fetchpatch2,
geomet,
gevent,
gremlinpython,
@@ -26,38 +25,16 @@
buildPythonPackage rec {
pname = "cassandra-driver";
- version = "3.29.1";
+ version = "3.29.2";
pyproject = true;
src = fetchFromGitHub {
owner = "datastax";
repo = "python-driver";
rev = "refs/tags/${version}";
- hash = "sha256-pnNm5Pd5k4bt+s3GrUUDWRpSdqNSM89GiX8DZKYzW1E=";
+ hash = "sha256-RX9GLk2admzRasmP7LCwIfsJIt8TC/9rWhIcoTqS0qc=";
};
- patches = [
- # https://github.com/datastax/python-driver/pull/1201
- # Also needed for below patch to apply
- (fetchpatch2 {
- name = "remove-mock-dependency.patch";
- url = "https://github.com/datastax/python-driver/commit/9aca00be33d96559f0eabc1c8a26bb439dcebbd7.patch";
- hash = "sha256-ZN95V8ebbjahzqBat2oKBJLfu0fqbWMvAu0DzfVGw8I=";
- })
- # https://github.com/datastax/python-driver/pull/1215
- (fetchpatch2 {
- name = "convert-to-pytest.patch";
- url = "https://github.com/datastax/python-driver/commit/9952e2ab22c7e034b96cc89330791d73c221546b.patch";
- hash = "sha256-xa2aV6drBcgkQT05kt44vwupg3oMHLbcbZSQ7EHKnko=";
- })
- # https://github.com/datastax/python-driver/pull/1195
- (fetchpatch2 {
- name = "remove-assertRaisesRegexp.patch";
- url = "https://github.com/datastax/python-driver/commit/622523b83971e8a181eb4853b7d877420c0351ef.patch";
- hash = "sha256-Q8pRhHBLKyenMfrITf8kDv3BbsSCDAmVisTr4jSAIvA=";
- })
- ];
-
pythonRelaxDeps = [ "geomet" ];
build-system = [
From ff546ee4f31c357117eb4741e41f355fe476f951 Mon Sep 17 00:00:00 2001
From: huantian
Date: Sun, 3 Nov 2024 18:18:51 -0800
Subject: [PATCH 0131/2159] tetrio-plus: split tpsecore into seperate package
main purpose of this is to allow tpsecore to be built by hydra
adding tetrio-plus to top level packages didn't cause it to be built,
since tetrio-plus is marked unfree
also includes a minor version bump for tetrio-plus/tpsecore itself
this update for tpsecore fixes #352897 as it includes a version bump for
wasm-bindgen, allowing us to also increase wasm-bindgen-cli version
---
pkgs/by-name/te/tetrio-plus/package.nix | 59 ++-------------------
pkgs/by-name/tp/tpsecore/package.nix | 68 +++++++++++++++++++++++++
2 files changed, 71 insertions(+), 56 deletions(-)
create mode 100644 pkgs/by-name/tp/tpsecore/package.nix
diff --git a/pkgs/by-name/te/tetrio-plus/package.nix b/pkgs/by-name/te/tetrio-plus/package.nix
index 86ee4bda8d70..8750e5e61381 100644
--- a/pkgs/by-name/te/tetrio-plus/package.nix
+++ b/pkgs/by-name/te/tetrio-plus/package.nix
@@ -2,74 +2,25 @@
lib,
stdenv,
fetchFromGitLab,
- rustPlatform,
- rustc,
- wasm-pack,
- wasm-bindgen-cli,
- binaryen,
-
fetchYarnDeps,
yarn,
fixup-yarn-lock,
nodejs,
asar,
+ tpsecore,
tetrio-desktop,
}:
let
- version = "0.27.4";
+ version = "0.27.5";
rev = "electron-v${version}-tetrio-v${tetrio-desktop.version}";
src = fetchFromGitLab {
owner = "UniQMG";
repo = "tetrio-plus";
inherit rev;
- hash = "sha256-HwGFg8dxqtqghdP+PXWXr6Fi5vfgopThs+QNa3N1awk=";
- fetchSubmodules = true;
- };
-
- wasm-bindgen-82 = wasm-bindgen-cli.override {
- version = "0.2.82";
- hash = "sha256-BQ8v3rCLUvyCCdxo5U+NHh30l9Jwvk9Sz8YQv6fa0SU=";
- cargoHash = "sha256-mP85+qi2KA0GieaBzbrQOBqYxBZNRJipvd2brCRGyOM=";
- };
-
- tpsecore = rustPlatform.buildRustPackage {
- pname = "tpsecore";
- inherit version src;
-
- sourceRoot = "${src.name}/tpsecore";
-
- cargoHash = "sha256-zqeoPeGZvSz7W3c7MXnvvq73hvavg1RGzPc3iTqAjBo=";
-
- nativeBuildInputs = [
- wasm-pack
- wasm-bindgen-82
- binaryen
- rustc.llvmPackages.lld
- ];
-
- buildPhase = ''
- HOME=$(mktemp -d) wasm-pack build --target web --release
- '';
-
- installPhase = ''
- cp -r pkg/ $out
- '';
-
- doCheck = false;
-
- meta = {
- description = "Self contained toolkit for creating, editing, and previewing TPSE files";
- homepage = "https://gitlab.com/UniQMG/tpsecore";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [
- huantian
- wackbyte
- ];
- platforms = lib.platforms.linux;
- };
+ hash = "sha256-hbHofrC2dJOh2kh3VLb/d0dHrcszyqTyID1PAaGApxY=";
};
offlineCache = fetchYarnDeps {
@@ -119,16 +70,12 @@ stdenv.mkDerivation (finalAttrs: {
# Actually install tetrio-plus where the above patch script expects
cp -r $src out/tetrioplus
chmod -R u+w out/tetrioplus
-
# Install tpsecore
cp ${tpsecore}/{tpsecore_bg.wasm,tpsecore.js} out/tetrioplus/source/lib/
- # Remove uneeded tpsecore source code
- rm -rf out/tetrioplus/tpsecore/
# Disable useless uninstall button in the tetrio-plus popup
substituteInPlace out/tetrioplus/desktop-manifest.js \
--replace-fail '"show_uninstaller_button": true' '"show_uninstaller_button": false'
-
# Display 'nixpkgs' next to version in tetrio-plus popup
echo "nixpkgs" > out/tetrioplus/resources/override-commit
diff --git a/pkgs/by-name/tp/tpsecore/package.nix b/pkgs/by-name/tp/tpsecore/package.nix
new file mode 100644
index 000000000000..6d87efd6ec36
--- /dev/null
+++ b/pkgs/by-name/tp/tpsecore/package.nix
@@ -0,0 +1,68 @@
+{
+ lib,
+ fetchFromGitLab,
+ rustPlatform,
+ rustc,
+ wasm-pack,
+ wasm-bindgen-cli,
+ binaryen,
+}:
+
+let
+ version = "0.1.1";
+
+ wasm-bindgen-cli-95 = wasm-bindgen-cli.override {
+ version = "0.2.95";
+ hash = "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss=";
+ cargoHash = "sha256-6iMebkD7FQvixlmghGGIvpdGwFNLfnUcFke/Rg8nPK4=";
+ };
+in
+rustPlatform.buildRustPackage {
+ pname = "tpsecore";
+ inherit version;
+
+ src = fetchFromGitLab {
+ owner = "UniQMG";
+ repo = "tpsecore";
+ rev = "v${version}";
+ hash = "sha256-+OynnLMBEiYwdFzxGzgkcBN6xrHoH1Q6O5i+OW7RBLo=";
+ };
+
+ cargoHash = "sha256-mPaWXiDjJd/uTBpktauKWg8X9sNBb3FXw5BSGB33NxI=";
+
+ nativeBuildInputs = [
+ wasm-pack
+ wasm-bindgen-cli-95
+ binaryen
+ rustc.llvmPackages.lld
+ ];
+
+ buildPhase = ''
+ runHook preBuild
+
+ HOME=$(mktemp -d) wasm-pack build --target web --release
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ cp -r pkg/ $out
+
+ runHook postInstall
+ '';
+
+ doCheck = false;
+
+ meta = {
+ description = "Self contained toolkit for creating, editing, and previewing TPSE files";
+ homepage = "https://gitlab.com/UniQMG/tpsecore";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [
+ huantian
+ wackbyte
+ ];
+ platforms = lib.platforms.linux;
+ };
+}
From baa84c3c68321678857d6a0627a8c6b814492b86 Mon Sep 17 00:00:00 2001
From: Emery Hemingway
Date: Mon, 4 Nov 2024 08:17:19 +0100
Subject: [PATCH 0132/2159] nim-2_0: 2.0.10 -> 2.0.12
---
pkgs/by-name/ni/nim-unwrapped-2_0/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix
index 232d4dcbfac7..ab8d1dc8120a 100644
--- a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix
+++ b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix
@@ -7,10 +7,10 @@
nim-unwrapped-2_2.overrideAttrs (
finalAttrs: previousAttrs: {
- version = "2.0.10";
+ version = "2.0.12";
src = fetchurl {
url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz";
- hash = "sha256-8UVDwjOpLHub0np9mEx4yfnBvXMyAwrBa+fFQMdbDqA=";
+ hash = "sha256-xIh5ScXrjX+an1bwrrK/IUD6vwruDwWAoxnioJgVczo=";
};
patches = lib.lists.unique (
builtins.filter (
From 179f1365e022d5fb02144a2d3f4e7b4dbacbc990 Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues
Date: Mon, 4 Nov 2024 11:04:39 +0100
Subject: [PATCH 0133/2159] rPackages.bgx: fix build
---
pkgs/development/r-modules/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 4689a1e95ac3..e367d2a1c65b 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -770,6 +770,7 @@ let
RmecabKo = [ pkgs.mecab ];
markets = [ pkgs.gsl ];
rlas = [ pkgs.boost ];
+ bgx = [ pkgs.boost ];
PoissonBinomial = [ pkgs.fftw.dev ];
poisbinom = [ pkgs.fftw.dev ];
PoissonMultinomial = [ pkgs.fftw.dev ];
From 1fe651e76ca98dee8fb10f715cb2c9312d8f4714 Mon Sep 17 00:00:00 2001
From: aktaboot
Date: Mon, 4 Nov 2024 13:44:59 +0100
Subject: [PATCH 0134/2159] monolith: add nix update script
---
pkgs/tools/backup/monolith/default.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix
index c1c9842fbf19..454fed104ec1 100644
--- a/pkgs/tools/backup/monolith/default.nix
+++ b/pkgs/tools/backup/monolith/default.nix
@@ -6,6 +6,7 @@
, libiconv
, Security
, SystemConfiguration
+, nix-update-script
}:
rustPlatform.buildRustPackage rec {
@@ -29,6 +30,8 @@ rustPlatform.buildRustPackage rec {
checkFlags = [ "--skip=tests::cli" ];
+ passthru.updateScript = nix-update-script { };
+
meta = with lib; {
description = "Bundle any web page into a single HTML file";
mainProgram = "monolith";
From 0a4aaa9d9a73735890cc7dca8db14c1aea0cb189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?=
Date: Mon, 4 Nov 2024 20:24:05 +0100
Subject: [PATCH 0135/2159] pkgs/stdenv/freebsd: update x86_64-unknown-freebsd
bootstrap-files
sha256sum of files to be uploaded:
$ sha256sum /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build/on-server/*
a072dd769596c1efe2c58b9fde141f986ac6ba2c45dfe1bc1c29be07b8370b36 /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build/on-server/bootstrap-tools.tar.xz
71ff3ba54f0741355948f403db95f2c54ae3b69dd39f991fdad17ae5ab623a77 /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build/on-server/unpack.nar.xz
Suggested commands to upload files to 'tarballs.nixos.org':
$ nix-store --realize /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build
$ aws s3 cp --recursive --acl public-read /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build/on-server/ s3://nixpkgs-tarballs/stdenv/x86_64-unknown-freebsd/b92edf1104c47016385e85c87c2d953cf5cd2f98
$ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/x86_64-unknown-freebsd/b92edf1104c47016385e85c87c2d953cf5cd2f98 ./
$ sha256sum bootstrap-tools.tar.xz unpack.nar.xz
$ sha256sum /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build/on-server/*
---
.../bootstrap-files/x86_64-unknown-freebsd.nix | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix b/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix
index 2b0d620b906d..de7a004d51ab 100644
--- a/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix
+++ b/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix
@@ -2,20 +2,20 @@
# $ ./refresh-tarballs.bash --targets=x86_64-unknown-freebsd
#
# Metadata:
-# - nixpkgs revision: 6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2
+# - nixpkgs revision: b92edf1104c47016385e85c87c2d953cf5cd2f98
# - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.x86_64-unknown-freebsd.build/latest
-# - resolved hydra build: https://hydra.nixos.org/build/271214352
-# - instantiated derivation: /nix/store/aahbgs95ani3bd70vxb8kwrvbms0d6ii-build.drv
-# - output directory: /nix/store/ikzxl9ws9yxrl8g8z2kcjwqlq5gfjbhx-build
-# - build time: Sat, 31 Aug 2024 17:18:35 +0000
+# - resolved hydra build: https://hydra.nixos.org/build/276943819
+# - instantiated derivation: /nix/store/npq4w33g3a2gcgh1q535gj4ixd1g5ksl-build.drv
+# - output directory: /nix/store/yy36y5s9i4wl768imwfn112sb7w3pyk8-build
+# - build time: Thu, 31 Oct 2024 20:57:22 +0000
{
bootstrapTools = import {
- url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2/bootstrap-tools.tar.xz";
- hash = "sha256-f7Fqxtpj7/0Sbs+kUgMs7oJ0JmPuh3bqD2YzOBTw2fc=";
+ url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/b92edf1104c47016385e85c87c2d953cf5cd2f98/bootstrap-tools.tar.xz";
+ hash = "sha256-oHLddpWWwe/ixYuf3hQfmGrGuixF3+G8HCm+B7g3CzY=";
};
unpack = import {
- url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/6414ef7ca3bf18ec4f9628d09ccc1eb030276ee2/unpack.nar.xz";
- hash = "sha256-3NTRtonoc3ZqnEF3hr1mUPH/aw+04OlwVxGhZmjXlMM=";
+ url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-freebsd/b92edf1104c47016385e85c87c2d953cf5cd2f98/unpack.nar.xz";
+ hash = "sha256-aR3lz35Y3ppJBG0/WAT8avsUeDgNMejhGf9LRxTiScI=";
name = "unpack";
unpack = true;
};
From e510e227beafdd3bcb5b4a3c0f6feefcb0d40c21 Mon Sep 17 00:00:00 2001
From: Wang Liao
Date: Sat, 2 Nov 2024 22:36:14 +0800
Subject: [PATCH 0136/2159] kitty: Binary wrap kitty, and sign on darwin
Using shell to wrap is slow and not recommended, this alsos fixes issue
on aarch64-darwin sequoia 15.1.
Also auto sign kitty to prevent permission error on x86_64-darwin.
---
pkgs/applications/terminal-emulators/kitty/default.nix | 4 ++++
pkgs/top-level/all-packages.nix | 1 +
2 files changed, 5 insertions(+)
diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix
index cab3a2103a54..70bb01e9346f 100644
--- a/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -28,6 +28,8 @@
, go_1_23
, buildGo123Module
, nix-update-script
+, makeBinaryWrapper
+, autoSignDarwinBinariesHook
}:
with python3Packages;
@@ -85,9 +87,11 @@ buildPythonApplication rec {
sphinx-inline-tabs
go_1_23
fontconfig
+ makeBinaryWrapper
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
imagemagick
libicns # For the png2icns tool.
+ autoSignDarwinBinariesHook
] ++ lib.optionals stdenv.hostPlatform.isLinux [
wayland-scanner
];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 55968eed1355..14e646fc3db3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2813,6 +2813,7 @@ with pkgs;
kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty {
harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; };
+ inherit (darwin) autoSignDarwinBinariesHook;
inherit (darwin.apple_sdk_11_0) Libsystem;
inherit (darwin.apple_sdk_11_0.frameworks)
Cocoa
From 31fd3a6fe95deee382055dcc4244c2cfa20ef17b Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt
Date: Tue, 5 Nov 2024 16:15:20 +0100
Subject: [PATCH 0137/2159] cocoapods: 1.15.1 -> 1.16.2
---
.../tools/cocoapods/Gemfile-beta.lock | 54 ++++++-----
pkgs/development/tools/cocoapods/Gemfile.lock | 54 ++++++-----
.../tools/cocoapods/gemset-beta.nix | 95 ++++++++++---------
pkgs/development/tools/cocoapods/gemset.nix | 95 ++++++++++---------
4 files changed, 160 insertions(+), 138 deletions(-)
diff --git a/pkgs/development/tools/cocoapods/Gemfile-beta.lock b/pkgs/development/tools/cocoapods/Gemfile-beta.lock
index 363d1f9a30a0..f4bd57b14ec4 100644
--- a/pkgs/development/tools/cocoapods/Gemfile-beta.lock
+++ b/pkgs/development/tools/cocoapods/Gemfile-beta.lock
@@ -5,29 +5,32 @@ GEM
base64
nkf
rexml
- activesupport (7.1.3)
+ activesupport (7.2.2)
base64
+ benchmark (>= 0.3)
bigdecimal
- concurrent-ruby (~> 1.0, >= 1.0.2)
+ concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
+ logger (>= 1.4.2)
minitest (>= 5.1)
- mutex_m
- tzinfo (~> 2.0)
- addressable (2.8.6)
- public_suffix (>= 2.0.2, < 6.0)
+ securerandom (>= 0.3)
+ tzinfo (~> 2.0, >= 2.0.5)
+ addressable (2.8.7)
+ public_suffix (>= 2.0.2, < 7.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
- bigdecimal (3.1.6)
+ benchmark (0.3.0)
+ bigdecimal (3.1.8)
claide (1.1.0)
- cocoapods (1.15.2)
+ cocoapods (1.16.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
- cocoapods-core (= 1.15.2)
+ cocoapods-core (= 1.16.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -41,8 +44,8 @@ GEM
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
- xcodeproj (>= 1.23.0, < 2.0)
- cocoapods-core (1.15.2)
+ xcodeproj (>= 1.27.0, < 2.0)
+ cocoapods-core (1.16.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
@@ -62,43 +65,42 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
- concurrent-ruby (1.2.3)
+ concurrent-ruby (1.3.4)
connection_pool (2.4.1)
- drb (2.2.0)
- ruby2_keywords
+ drb (2.2.1)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
- ffi (1.16.3)
+ ffi (1.17.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
- i18n (1.14.1)
+ i18n (1.14.6)
concurrent-ruby (~> 1.0)
- json (2.7.1)
- minitest (5.22.2)
+ json (2.7.6)
+ logger (1.6.1)
+ minitest (5.25.1)
molinillo (0.8.0)
- mutex_m (0.2.0)
- nanaimo (0.3.0)
+ nanaimo (0.4.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
- rexml (3.2.6)
+ rexml (3.3.9)
ruby-macho (2.5.1)
- ruby2_keywords (0.0.5)
+ securerandom (0.3.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
- xcodeproj (1.24.0)
+ xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
- nanaimo (~> 0.3.0)
- rexml (~> 3.2.4)
+ nanaimo (~> 0.4.0)
+ rexml (>= 3.3.6, < 4.0)
PLATFORMS
ruby
@@ -107,4 +109,4 @@ DEPENDENCIES
cocoapods (>= 1.7.0.beta.1)
BUNDLED WITH
- 2.4.20
+ 2.5.9
diff --git a/pkgs/development/tools/cocoapods/Gemfile.lock b/pkgs/development/tools/cocoapods/Gemfile.lock
index 194f5e8a84bf..93dbeec2e4de 100644
--- a/pkgs/development/tools/cocoapods/Gemfile.lock
+++ b/pkgs/development/tools/cocoapods/Gemfile.lock
@@ -5,29 +5,32 @@ GEM
base64
nkf
rexml
- activesupport (7.1.3)
+ activesupport (7.2.2)
base64
+ benchmark (>= 0.3)
bigdecimal
- concurrent-ruby (~> 1.0, >= 1.0.2)
+ concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
+ logger (>= 1.4.2)
minitest (>= 5.1)
- mutex_m
- tzinfo (~> 2.0)
- addressable (2.8.6)
- public_suffix (>= 2.0.2, < 6.0)
+ securerandom (>= 0.3)
+ tzinfo (~> 2.0, >= 2.0.5)
+ addressable (2.8.7)
+ public_suffix (>= 2.0.2, < 7.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
- bigdecimal (3.1.6)
+ benchmark (0.3.0)
+ bigdecimal (3.1.8)
claide (1.1.0)
- cocoapods (1.15.2)
+ cocoapods (1.16.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
- cocoapods-core (= 1.15.2)
+ cocoapods-core (= 1.16.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -41,8 +44,8 @@ GEM
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
- xcodeproj (>= 1.23.0, < 2.0)
- cocoapods-core (1.15.2)
+ xcodeproj (>= 1.27.0, < 2.0)
+ cocoapods-core (1.16.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
@@ -62,43 +65,42 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
- concurrent-ruby (1.2.3)
+ concurrent-ruby (1.3.4)
connection_pool (2.4.1)
- drb (2.2.0)
- ruby2_keywords
+ drb (2.2.1)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
- ffi (1.16.3)
+ ffi (1.17.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
- i18n (1.14.1)
+ i18n (1.14.6)
concurrent-ruby (~> 1.0)
- json (2.7.1)
- minitest (5.22.2)
+ json (2.7.6)
+ logger (1.6.1)
+ minitest (5.25.1)
molinillo (0.8.0)
- mutex_m (0.2.0)
- nanaimo (0.3.0)
+ nanaimo (0.4.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
- rexml (3.2.6)
+ rexml (3.3.9)
ruby-macho (2.5.1)
- ruby2_keywords (0.0.5)
+ securerandom (0.3.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
- xcodeproj (1.24.0)
+ xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
- nanaimo (~> 0.3.0)
- rexml (~> 3.2.4)
+ nanaimo (~> 0.4.0)
+ rexml (>= 3.3.6, < 4.0)
PLATFORMS
ruby
@@ -107,4 +109,4 @@ DEPENDENCIES
cocoapods
BUNDLED WITH
- 2.4.20
+ 2.5.9
diff --git a/pkgs/development/tools/cocoapods/gemset-beta.nix b/pkgs/development/tools/cocoapods/gemset-beta.nix
index 022ce3a0f668..381bf3a188f3 100644
--- a/pkgs/development/tools/cocoapods/gemset-beta.nix
+++ b/pkgs/development/tools/cocoapods/gemset-beta.nix
@@ -1,14 +1,14 @@
{
activesupport = {
- dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
+ dependencies = ["base64" "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09zrw3sydkk6lwzjhzia38wg1as5aab2lgnysfdr1qxh39zi7z7v";
+ sha256 = "12ijz1mmg70agw4d91hjdyzvma3dzs52mchasslxyn7p9j960qs3";
type = "gem";
};
- version = "7.1.3";
+ version = "7.2.2";
};
addressable = {
dependencies = ["public_suffix"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
+ sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
type = "gem";
};
- version = "2.8.6";
+ version = "2.8.7";
};
algoliasearch = {
dependencies = ["httpclient" "json"];
@@ -52,15 +52,25 @@
};
version = "0.2.0";
};
+ benchmark = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wghmhwjzv4r9mdcny4xfz2h2cm7ci24md79rvy2x65r4i99k9sc";
+ type = "gem";
+ };
+ version = "0.3.0";
+ };
bigdecimal = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w";
+ sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
type = "gem";
};
- version = "3.1.6";
+ version = "3.1.8";
};
CFPropertyList = {
dependencies = ["base64" "nkf" "rexml"];
@@ -89,10 +99,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02h9lk5w0ilz39cdl7fil0fpmfbzyc23whkgp4rx2a6hx0yibxgh";
+ sha256 = "0phyvpx78jlrpvldbxjmzq92mfx6l66va2fz2s5xpwrdydhciw8g";
type = "gem";
};
- version = "1.15.2";
+ version = "1.16.2";
};
cocoapods-core = {
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
@@ -100,10 +110,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0di1g9k1f6i80yxzdl3rdlfdk2w89dv6k5m06444rbg1gzcm09ij";
+ sha256 = "0ay1dwjg79rfa6mbfyy96in0k364dgn7s8ps6v7n07k9432bbcab";
type = "gem";
};
- version = "1.15.2";
+ version = "1.16.2";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -182,10 +192,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
+ sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
type = "gem";
};
- version = "1.2.3";
+ version = "1.3.4";
};
connection_pool = {
groups = ["default"];
@@ -198,15 +208,14 @@
version = "2.4.1";
};
drb = {
- dependencies = ["ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79";
+ sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
type = "gem";
};
- version = "2.2.0";
+ version = "2.2.1";
};
escape = {
groups = ["default"];
@@ -234,10 +243,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
+ sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
type = "gem";
};
- version = "1.16.3";
+ version = "1.17.0";
};
fourflusher = {
groups = ["default"];
@@ -285,30 +294,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
+ sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
type = "gem";
};
- version = "1.14.1";
+ version = "1.14.6";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq";
+ sha256 = "03q7kbadhbyfnz21abv2b9dyqnjvxpd51ppqihg40rrimw1vm6id";
type = "gem";
};
- version = "2.7.1";
+ version = "2.7.6";
+ };
+ logger = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+ type = "gem";
+ };
+ version = "1.6.1";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5";
+ sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
type = "gem";
};
- version = "5.22.2";
+ version = "5.25.1";
};
molinillo = {
groups = ["default"];
@@ -320,25 +339,15 @@
};
version = "0.8.0";
};
- mutex_m = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
- type = "gem";
- };
- version = "0.2.0";
- };
nanaimo = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma";
+ sha256 = "08q73nchv8cpk28h1sdnf5z6a862fcf4mxy1d58z25xb3dankw7s";
type = "gem";
};
- version = "0.3.0";
+ version = "0.4.0";
};
nap = {
groups = ["default"];
@@ -385,10 +394,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+ sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
type = "gem";
};
- version = "3.2.6";
+ version = "3.3.9";
};
ruby-macho = {
groups = ["default"];
@@ -400,15 +409,15 @@
};
version = "2.5.1";
};
- ruby2_keywords = {
+ securerandom = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
+ sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q";
type = "gem";
};
- version = "0.0.5";
+ version = "0.3.1";
};
typhoeus = {
dependencies = ["ethon"];
@@ -438,9 +447,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wpg4n7b8571j2h8h7v2kk8pr141rgf6m8mhk221k990fissrq56";
+ sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc";
type = "gem";
};
- version = "1.24.0";
+ version = "1.27.0";
};
}
diff --git a/pkgs/development/tools/cocoapods/gemset.nix b/pkgs/development/tools/cocoapods/gemset.nix
index d89ae9ca3aa4..092d4f15ae56 100644
--- a/pkgs/development/tools/cocoapods/gemset.nix
+++ b/pkgs/development/tools/cocoapods/gemset.nix
@@ -1,14 +1,14 @@
{
activesupport = {
- dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
+ dependencies = ["base64" "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09zrw3sydkk6lwzjhzia38wg1as5aab2lgnysfdr1qxh39zi7z7v";
+ sha256 = "12ijz1mmg70agw4d91hjdyzvma3dzs52mchasslxyn7p9j960qs3";
type = "gem";
};
- version = "7.1.3";
+ version = "7.2.2";
};
addressable = {
dependencies = ["public_suffix"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
+ sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
type = "gem";
};
- version = "2.8.6";
+ version = "2.8.7";
};
algoliasearch = {
dependencies = ["httpclient" "json"];
@@ -50,15 +50,25 @@
};
version = "0.2.0";
};
+ benchmark = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wghmhwjzv4r9mdcny4xfz2h2cm7ci24md79rvy2x65r4i99k9sc";
+ type = "gem";
+ };
+ version = "0.3.0";
+ };
bigdecimal = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w";
+ sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
type = "gem";
};
- version = "3.1.6";
+ version = "3.1.8";
};
CFPropertyList = {
dependencies = ["base64" "nkf" "rexml"];
@@ -87,10 +97,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02h9lk5w0ilz39cdl7fil0fpmfbzyc23whkgp4rx2a6hx0yibxgh";
+ sha256 = "0phyvpx78jlrpvldbxjmzq92mfx6l66va2fz2s5xpwrdydhciw8g";
type = "gem";
};
- version = "1.15.2";
+ version = "1.16.2";
};
cocoapods-core = {
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
@@ -98,10 +108,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0di1g9k1f6i80yxzdl3rdlfdk2w89dv6k5m06444rbg1gzcm09ij";
+ sha256 = "0ay1dwjg79rfa6mbfyy96in0k364dgn7s8ps6v7n07k9432bbcab";
type = "gem";
};
- version = "1.15.2";
+ version = "1.16.2";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -176,10 +186,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
+ sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
type = "gem";
};
- version = "1.2.3";
+ version = "1.3.4";
};
connection_pool = {
groups = ["default"];
@@ -192,15 +202,14 @@
version = "2.4.1";
};
drb = {
- dependencies = ["ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79";
+ sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
type = "gem";
};
- version = "2.2.0";
+ version = "2.2.1";
};
escape = {
source = {
@@ -226,10 +235,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
+ sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
type = "gem";
};
- version = "1.16.3";
+ version = "1.17.0";
};
fourflusher = {
groups = ["default"];
@@ -273,30 +282,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
+ sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
type = "gem";
};
- version = "1.14.1";
+ version = "1.14.6";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq";
+ sha256 = "03q7kbadhbyfnz21abv2b9dyqnjvxpd51ppqihg40rrimw1vm6id";
type = "gem";
};
- version = "2.7.1";
+ version = "2.7.6";
+ };
+ logger = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+ type = "gem";
+ };
+ version = "1.6.1";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5";
+ sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
type = "gem";
};
- version = "5.22.2";
+ version = "5.25.1";
};
molinillo = {
groups = ["default"];
@@ -308,25 +327,15 @@
};
version = "0.8.0";
};
- mutex_m = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
- type = "gem";
- };
- version = "0.2.0";
- };
nanaimo = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma";
+ sha256 = "08q73nchv8cpk28h1sdnf5z6a862fcf4mxy1d58z25xb3dankw7s";
type = "gem";
};
- version = "0.3.0";
+ version = "0.4.0";
};
nap = {
source = {
@@ -369,10 +378,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+ sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
type = "gem";
};
- version = "3.2.6";
+ version = "3.3.9";
};
ruby-macho = {
groups = ["default"];
@@ -384,15 +393,15 @@
};
version = "2.5.1";
};
- ruby2_keywords = {
+ securerandom = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
+ sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q";
type = "gem";
};
- version = "0.0.5";
+ version = "0.3.1";
};
typhoeus = {
dependencies = ["ethon"];
@@ -422,9 +431,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wpg4n7b8571j2h8h7v2kk8pr141rgf6m8mhk221k990fissrq56";
+ sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc";
type = "gem";
};
- version = "1.24.0";
+ version = "1.27.0";
};
}
From 920eac097f5c355adc0321d44f24032b1faa38a7 Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen
Date: Wed, 19 Jun 2024 14:03:47 +0200
Subject: [PATCH 0138/2159] gfie: init at 4.2
---
pkgs/by-name/gf/gfie/package.nix | 51 ++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 pkgs/by-name/gf/gfie/package.nix
diff --git a/pkgs/by-name/gf/gfie/package.nix b/pkgs/by-name/gf/gfie/package.nix
new file mode 100644
index 000000000000..acd0a99a4de4
--- /dev/null
+++ b/pkgs/by-name/gf/gfie/package.nix
@@ -0,0 +1,51 @@
+{
+ lib,
+ stdenv,
+ fetchurl,
+ dpkg,
+ autoPatchelfHook,
+ qt5,
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "gfie";
+ version = "4.2";
+
+ src = fetchurl {
+ url = "http://greenfishsoftware.org/dl/gfie/gfie-${finalAttrs.version}.deb";
+ hash = "sha256-hyL0t66jRTVF1Hq2FRUobsfjLGmYgsMGDE/DBdoXhCI=";
+ };
+
+ unpackCmd = "dpkg -x $curSrc source";
+
+ nativeBuildInputs = [
+ dpkg
+ autoPatchelfHook
+ qt5.wrapQtAppsHook
+ ];
+
+ buildInputs = with qt5; [
+ qtbase
+ qtsvg
+ qtwebengine
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ mv usr/share opt $out
+ ln -s $out/opt/gfie-${finalAttrs.version}/gfie $out/bin/gfie
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Powerful open source image editor, especially suitable for creating icons, cursors, animations and icon libraries";
+ homepage = "http://greenfishsoftware.org/gfie.php";
+ license = with lib.licenses; [ gpl3 ];
+ maintainers = with lib.maintainers; [ pluiedev ];
+ platforms = [ "x86_64-linux" ];
+ mainProgram = "gfie";
+ sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+ };
+})
From 2a27662845330f07c481baf066053b6b53f5afd8 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth
Date: Fri, 12 Jul 2024 16:26:49 -0700
Subject: [PATCH 0139/2159] maintainers: add jhol
---
maintainers/maintainer-list.nix | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 61a95b7f88f6..cd10e324cba3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10253,6 +10253,13 @@
githubId = 2502736;
name = "James Hillyerd";
};
+ jhol = {
+ name = "Joel Holdsworth";
+ email = "joel@airwebreathe.org.uk";
+ github = "jhol";
+ githubId = 1449493;
+ keys = [ { fingerprint = "08F7 2546 95DE EAEF 03DE B0E4 D874 562D DC99 D889"; } ];
+ };
jhollowe = {
email = "jhollowe@johnhollowell.com";
github = "jhollowe";
From c2a6507f0591367017d46574884f92493fb01a29 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth
Date: Fri, 19 Apr 2024 17:25:14 -0700
Subject: [PATCH 0140/2159] sphinxcontrib-moderncmakedomain init at 3.29.0
---
.../default.nix | 40 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 2 +
2 files changed, 42 insertions(+)
create mode 100644 pkgs/development/python-modules/sphinxcontrib-moderncmakedomain/default.nix
diff --git a/pkgs/development/python-modules/sphinxcontrib-moderncmakedomain/default.nix b/pkgs/development/python-modules/sphinxcontrib-moderncmakedomain/default.nix
new file mode 100644
index 000000000000..524c9b094674
--- /dev/null
+++ b/pkgs/development/python-modules/sphinxcontrib-moderncmakedomain/default.nix
@@ -0,0 +1,40 @@
+{
+ lib,
+ buildPythonPackage,
+ defusedxml,
+ fetchPypi,
+ hatchling,
+ pytestCheckHook,
+ sphinx,
+}:
+
+buildPythonPackage rec {
+ pname = "sphinxcontrib-moderncmakedomain";
+ version = "3.29.0";
+ pyproject = true;
+
+ src = fetchPypi {
+ inherit version;
+ pname = "sphinxcontrib_moderncmakedomain";
+ hash = "sha256-NYfe8kH/JXfQu+8RgQoILp3sG3ij1LSgZiQLXz3BtbI=";
+ };
+
+ build-system = [ hatchling ];
+
+ dependencies = [ sphinx ];
+
+ nativeCheckInputs = [
+ defusedxml
+ pytestCheckHook
+ sphinx
+ ];
+
+ pythonNamespaces = [ "sphinxcontrib" ];
+
+ meta = with lib; {
+ description = "Sphinx extension which renders CMake documentation";
+ homepage = "https://github.com/scikit-build/moderncmakedomain";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ jhol ];
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d823896acbb3..58cc5ae01c5c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14933,6 +14933,8 @@ self: super: with self; {
sphinxcontrib-log-cabinet = callPackage ../development/python-modules/sphinxcontrib-log-cabinet { };
+ sphinxcontrib-moderncmakedomain = callPackage ../development/python-modules/sphinxcontrib-moderncmakedomain { };
+
sphinxcontrib-nwdiag = callPackage ../development/python-modules/sphinxcontrib-nwdiag { };
sphinxcontrib-newsfeed = callPackage ../development/python-modules/sphinxcontrib-newsfeed { };
From d65243dcef837233696bedb61e323ca2fd007ecf Mon Sep 17 00:00:00 2001
From: Blake Smith
Date: Tue, 5 Nov 2024 14:11:02 -0600
Subject: [PATCH 0141/2159] nixos/gotosocial: fix failing tests
Fixes: https://github.com/NixOS/nixpkgs/issues/353896
Upstream gotosocial started caching instance user count in:
https://github.com/superseriousbusiness/gotosocial/commit/4592e290872e0208d03189aea4f410cd47a5dc1d
---
nixos/tests/web-apps/gotosocial.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/nixos/tests/web-apps/gotosocial.nix b/nixos/tests/web-apps/gotosocial.nix
index f9d28c2b8b99..49e8400533bc 100644
--- a/nixos/tests/web-apps/gotosocial.nix
+++ b/nixos/tests/web-apps/gotosocial.nix
@@ -21,7 +21,6 @@
machine.wait_for_open_port(8081)
# check user registration via cli
- machine.succeed("curl -sS -f http://localhost:8081/nodeinfo/2.0 | jq '.usage.users.total' | grep -q '^0$'")
machine.succeed("gotosocial-admin account create --username nickname --email email@example.com --password kurtz575VPeBgjVm")
machine.succeed("curl -sS -f http://localhost:8081/nodeinfo/2.0 | jq '.usage.users.total' | grep -q '^1$'")
'';
From 70f47b08a068ddbf48e580fe0cdd176ef36b961d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
Date: Tue, 5 Nov 2024 17:07:57 -0800
Subject: [PATCH 0142/2159] python312Packages.caldav: 1.3.9 -> 1.4.0
Diff: https://github.com/python-caldav/caldav/compare/refs/tags/v1.3.9...v1.4.0
Changelog: https://github.com/python-caldav/caldav/blob/v1.4.0/CHANGELOG.md
---
.../python-modules/caldav/default.nix | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix
index 9813d9b581bc..ce517c659439 100644
--- a/pkgs/development/python-modules/caldav/default.nix
+++ b/pkgs/development/python-modules/caldav/default.nix
@@ -7,10 +7,10 @@
pytestCheckHook,
pythonOlder,
python,
- pytz,
recurring-ical-events,
requests,
setuptools,
+ setuptools-scm,
toPythonModule,
tzlocal,
vobject,
@@ -19,32 +19,32 @@
buildPythonPackage rec {
pname = "caldav";
- version = "1.3.9";
-
+ version = "1.4.0";
pyproject = true;
- disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "python-caldav";
- repo = pname;
+ repo = "caldav";
rev = "refs/tags/v${version}";
- hash = "sha256-R9zXwD0sZE4bg6MTHWWCWWlZ5wH0H6g650zA7AboAo8=";
+ hash = "sha256-rixhEIcl37ZIiYFOnJY0Ww75xZy3o/436JcgLmoOGi0=";
};
- nativeBuildInputs = [ setuptools ];
+ build-system = [
+ setuptools
+ setuptools-scm
+ ];
- propagatedBuildInputs = [
+ dependencies = [
vobject
lxml
requests
icalendar
recurring-ical-events
- pytz
- tzlocal
];
nativeCheckInputs = [
pytestCheckHook
+ tzlocal
(toPythonModule (xandikos.override { python3Packages = python.pkgs; }))
];
From a70af477b19cf3874dc8ddfe80dd01cdfe21e5db Mon Sep 17 00:00:00 2001
From: OPNA2608
Date: Wed, 6 Nov 2024 02:32:58 +0100
Subject: [PATCH 0143/2159] libfmvoice: 0-unstable-2024-06-06 ->
0-unstable-2024-11-03
---
pkgs/by-name/li/libfmvoice/package.nix | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/pkgs/by-name/li/libfmvoice/package.nix b/pkgs/by-name/li/libfmvoice/package.nix
index cccc2f512e54..1448e294b68c 100644
--- a/pkgs/by-name/li/libfmvoice/package.nix
+++ b/pkgs/by-name/li/libfmvoice/package.nix
@@ -7,15 +7,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libfmvoice";
- version = "0-unstable-2024-06-06";
+ version = "0-unstable-2024-11-03";
src = fetchFromGitHub {
owner = "vampirefrog";
repo = "libfmvoice";
- rev = "cd89a6a386b3b17c74b1caca11e297b2748cf90d";
- hash = "sha256-yak+pKxkrKOX/qgtwpldjd85deE/JB040bVjDD1mo7A=";
+ rev = "c4b069cf633e52d4b7dce6e0b4277a0daa057774";
+ hash = "sha256-ZwqzrQ3kpOAZjJcstovmoNW8bG56w1YXm5ZMYIkjQ9M=";
};
+ outputs = [
+ "out"
+ "bin"
+ ];
+
strictDeps = true;
enableParallelBuilding = true;
@@ -25,14 +30,21 @@ stdenv.mkDerivation (finalAttrs: {
];
buildFlags = [
+ "AR=${stdenv.cc.targetPrefix}ar"
"CC=${stdenv.cc.targetPrefix}cc"
];
installPhase = ''
runHook preInstall
- for prog in $(grep 'PROGS=' Makefile | cut -d'=' -f2); do
- install -Dm755 $prog $out/bin/$prog
+ install -Dm644 libfmvoice.a $out/lib/libfmvoice.a
+
+ for header in *.h; do
+ install -Dm644 $header $out/include/$header
+ done
+
+ for prog in $(grep 'PROGS:=' Makefile | cut -d'=' -f2); do
+ install -Dm755 $prog $bin/bin/$prog
done
runHook postInstall
From ecff2204449afc1ced32878fc673808451e61000 Mon Sep 17 00:00:00 2001
From: OPNA2608
Date: Wed, 6 Nov 2024 02:33:33 +0100
Subject: [PATCH 0144/2159] libfmvoice: nixfmt
---
pkgs/by-name/li/libfmvoice/package.nix | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/pkgs/by-name/li/libfmvoice/package.nix b/pkgs/by-name/li/libfmvoice/package.nix
index 1448e294b68c..eada99e2e229 100644
--- a/pkgs/by-name/li/libfmvoice/package.nix
+++ b/pkgs/by-name/li/libfmvoice/package.nix
@@ -1,8 +1,9 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, unstableGitUpdater
-, zlib
+{
+ stdenv,
+ lib,
+ fetchFromGitHub,
+ unstableGitUpdater,
+ zlib,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -25,9 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
- buildInputs = [
- zlib
- ];
+ buildInputs = [ zlib ];
buildFlags = [
"AR=${stdenv.cc.targetPrefix}ar"
From e90e71b3069d4f05b3dd3221f3f2cc5090a9d45e Mon Sep 17 00:00:00 2001
From: OPNA2608
Date: Wed, 6 Nov 2024 02:34:31 +0100
Subject: [PATCH 0145/2159] libfmvoice: Drop meta-wide "with lib;"
---
pkgs/by-name/li/libfmvoice/package.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/by-name/li/libfmvoice/package.nix b/pkgs/by-name/li/libfmvoice/package.nix
index eada99e2e229..7b457400f576 100644
--- a/pkgs/by-name/li/libfmvoice/package.nix
+++ b/pkgs/by-name/li/libfmvoice/package.nix
@@ -53,11 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
updateScript = unstableGitUpdater { };
};
- meta = with lib; {
+ meta = {
description = "C library for loading, saving and converting FM sound chip voice files in various formats";
homepage = "https://github.com/vampirefrog/libfmvoice";
- license = licenses.gpl3Only;
- maintainers = with maintainers; [ OPNA2608 ];
- platforms = platforms.all;
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ OPNA2608 ];
+ platforms = lib.platforms.all;
};
})
From 833eebc021af388fd917d74bb68bb6c76c6caa96 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 6 Nov 2024 02:35:07 +0100
Subject: [PATCH 0146/2159] python312Packages.bidsschematools: init at 0.11.3
---
.../bidsschematools/default.nix | 45 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 2 +
2 files changed, 47 insertions(+)
create mode 100644 pkgs/development/python-modules/bidsschematools/default.nix
diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix
new file mode 100644
index 000000000000..c27bbfd85f3d
--- /dev/null
+++ b/pkgs/development/python-modules/bidsschematools/default.nix
@@ -0,0 +1,45 @@
+{
+ lib,
+ buildPythonPackage,
+ pythonOlder,
+ fetchPypi,
+ setuptools,
+ click,
+ pyyaml,
+ jsonschema,
+}:
+
+buildPythonPackage rec {
+ pname = "bidsschematools";
+ version = "0.11.3";
+ pyproject = true;
+
+ disabled = pythonOlder "3.9";
+
+ src = fetchPypi {
+ pname = "bidsschematools";
+ inherit version;
+ hash = "sha256-GvR3pOXXmdpjH2xdL+trhLW6ZdsTpEWUdNUlVQ4gFXo=";
+ };
+
+ build-system = [
+ setuptools
+ ];
+
+ dependencies = [
+ click
+ pyyaml
+ jsonschema
+ ];
+
+ pythonImportsCheck = [
+ "bidsschematools"
+ ];
+
+ meta = {
+ description = "Python tools for working with the BIDS schema";
+ homepage = "https://github.com/bids-standard/bids-specification/tree/master/tools/schemacode";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ wegank ];
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f9e572d92a3..f0ef277cf7b7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1601,6 +1601,8 @@ self: super: with self; {
bids-validator = callPackage ../development/python-modules/bids-validator { };
+ bidsschematools = callPackage ../development/python-modules/bidsschematools { };
+
biliass = callPackage ../development/python-modules/biliass { };
bilibili-api-python = callPackage ../development/python-modules/bilibili-api-python { };
From cd2d4944bedfac8de96e70844c25cc3719219fb7 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 6 Nov 2024 02:35:20 +0100
Subject: [PATCH 0147/2159] python312Packages.bids-validator: fix build
---
.../python-modules/bids-validator/default.nix | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix
index 3162ba276cf7..061e85b734cc 100644
--- a/pkgs/development/python-modules/bids-validator/default.nix
+++ b/pkgs/development/python-modules/bids-validator/default.nix
@@ -7,6 +7,9 @@
# build-system
setuptools,
versioneer,
+
+ # dependencies
+ bidsschematools,
}:
buildPythonPackage rec {
@@ -14,7 +17,7 @@ buildPythonPackage rec {
version = "1.14.7.post0";
pyproject = true;
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "bids_validator";
@@ -22,21 +25,22 @@ buildPythonPackage rec {
hash = "sha256-5gBaUAt1+KlhWT+2fUYIUQfa2xFvWaXDtSSqBpeUW2Y=";
};
- nativeBuildInputs = [
+ build-system = [
setuptools
versioneer
];
- # needs packages which are not available in nixpkgs
- doCheck = false;
+ dependencies = [
+ bidsschematools
+ ];
pythonImportsCheck = [ "bids_validator" ];
- meta = with lib; {
+ meta = {
description = "Validator for the Brain Imaging Data Structure";
homepage = "https://github.com/bids-standard/bids-validator";
changelog = "https://github.com/bids-standard/bids-validator/releases/tag/v${version}";
- license = licenses.mit;
- maintainers = [ ];
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ wegank ];
};
}
From 221b2afe734658cc09f2b9fdec0cc1783990b0f0 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 6 Nov 2024 02:35:30 +0100
Subject: [PATCH 0148/2159] python312Packages.pybids: fix build
---
pkgs/development/python-modules/pybids/default.nix | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
index 80db75b9551a..aaf3efd234cd 100644
--- a/pkgs/development/python-modules/pybids/default.nix
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -12,6 +12,7 @@
nibabel,
bids-validator,
sqlalchemy,
+ universal-pathlib,
pytestCheckHook,
versioneer,
}:
@@ -31,12 +32,12 @@ buildPythonPackage rec {
"sqlalchemy"
];
- nativeBuildInputs = [
+ build-system = [
setuptools
versioneer
] ++ versioneer.optional-dependencies.toml;
- propagatedBuildInputs = [
+ dependencies = [
bids-validator
click
formulaic
@@ -46,6 +47,7 @@ buildPythonPackage rec {
pandas
scipy
sqlalchemy
+ universal-pathlib
];
pythonImportsCheck = [ "bids" ];
@@ -64,12 +66,12 @@ buildPythonPackage rec {
"test_to_df"
];
- meta = with lib; {
+ meta = {
description = "Python tools for querying and manipulating BIDS datasets";
homepage = "https://github.com/bids-standard/pybids";
changelog = "https://github.com/bids-standard/pybids/blob/${version}/CHANGELOG.rst";
- license = licenses.mit;
- maintainers = [ ];
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ wegank ];
mainProgram = "pybids";
};
}
From 63def5281884dd422797668e7de9eda0c507dccf Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya
Date: Wed, 6 Nov 2024 19:50:04 +0900
Subject: [PATCH 0149/2159] pinact: 0.2.1 -> 1.0.0
---
pkgs/by-name/pi/pinact/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix
index 133688d22693..4c2f34a45043 100644
--- a/pkgs/by-name/pi/pinact/package.nix
+++ b/pkgs/by-name/pi/pinact/package.nix
@@ -7,18 +7,18 @@
let
pname = "pinact";
- version = "0.2.1";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "suzuki-shunsuke";
repo = "pinact";
rev = "v${version}";
- hash = "sha256-HfeHfKXDBHPgxisWSVnrLOQf/4NXtnehkIjQqiCoFIc=";
+ hash = "sha256-fOmQDfqG1aWzpL80Nc8JA6HWQR+z9mhqtwU4rC2g2Gg=";
};
in
buildGoModule {
inherit pname version src;
- vendorHash = "sha256-L9EGygiJ40f7Yw46KdaAof5O/ren6inTK7XerB/uv1g=";
+ vendorHash = "sha256-AFlkzs5mL/x9CwfF2apLcQbiu60GD33oFH6lQDHAL1M=";
doCheck = true;
From 2d79445d164f68a558f8e349861dc1ef2f3f03aa Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 6 Nov 2024 20:30:18 +0800
Subject: [PATCH 0150/2159] libsForQt5.pix: nixfmt
---
pkgs/applications/maui/pix.nix | 37 +++++++++++++++++-----------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/pkgs/applications/maui/pix.nix b/pkgs/applications/maui/pix.nix
index b19c5dff7148..c84f6f56d709 100644
--- a/pkgs/applications/maui/pix.nix
+++ b/pkgs/applications/maui/pix.nix
@@ -1,21 +1,22 @@
-{ lib
-, mkDerivation
-, cmake
-, extra-cmake-modules
-, applet-window-buttons
-, karchive
-, kcoreaddons
-, ki18n
-, kio
-, kirigami2
-, mauikit
-, mauikit-filebrowsing
-, mauikit-imagetools
-, qtmultimedia
-, qtquickcontrols2
-, qtlocation
-, exiv2
-, kquickimageedit
+{
+ lib,
+ mkDerivation,
+ cmake,
+ extra-cmake-modules,
+ applet-window-buttons,
+ karchive,
+ kcoreaddons,
+ ki18n,
+ kio,
+ kirigami2,
+ mauikit,
+ mauikit-filebrowsing,
+ mauikit-imagetools,
+ qtmultimedia,
+ qtquickcontrols2,
+ qtlocation,
+ exiv2,
+ kquickimageedit,
}:
mkDerivation {
From 3ea10f99b7cb0c6fa7ab56f082030c7cfea97ae2 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 6 Nov 2024 20:39:41 +0800
Subject: [PATCH 0151/2159] libsForQt5.pix: fix build
---
pkgs/applications/maui/pix.nix | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/maui/pix.nix b/pkgs/applications/maui/pix.nix
index c84f6f56d709..de57aaedbccf 100644
--- a/pkgs/applications/maui/pix.nix
+++ b/pkgs/applications/maui/pix.nix
@@ -17,8 +17,17 @@
qtlocation,
exiv2,
kquickimageedit,
+ fetchFromGitHub,
}:
+let
+ src-kdtree = fetchFromGitHub {
+ owner = "cdalitz";
+ repo = "kdtree-cpp";
+ rev = "refs/tags/v1.3";
+ hash = "sha256-h3cmndvjMlp/MTk/Ve3R183BLrE7VbL7GQx8YkOHEgU=";
+ };
+in
mkDerivation {
pname = "pix";
@@ -27,6 +36,18 @@ mkDerivation {
extra-cmake-modules
];
+ postPatch = ''
+ cp ${src-kdtree}/kdtree.cpp src/
+ substituteInPlace src/CMakeLists.txt \
+ --replace-fail "main.cpp" "main.cpp kdtree.cpp"
+ '';
+
+ env = {
+ NIX_CFLAGS_COMPILE = toString [
+ "-I${src-kdtree}"
+ ];
+ };
+
buildInputs = [
applet-window-buttons
karchive
@@ -44,11 +65,11 @@ mkDerivation {
kquickimageedit
];
- meta = with lib; {
+ meta = {
description = "Image gallery application";
mainProgram = "pix";
homepage = "https://invent.kde.org/maui/pix";
- license = licenses.gpl3Plus;
- maintainers = with maintainers; [ onny ];
+ license = lib.licenses.gpl3Plus;
+ maintainers = with lib.maintainers; [ onny ];
};
}
From ef7e5af4a45e36a69286663f06314179bf2949c8 Mon Sep 17 00:00:00 2001
From: Alyssa Ross
Date: Wed, 6 Nov 2024 14:46:16 +0100
Subject: [PATCH 0152/2159] cosmic-settings-daemon: use make install
Manually duplicating the logic from the Makefile here means that we
will miss new things when they're added. We were already missing the
system_actions file.
---
pkgs/by-name/co/cosmic-settings-daemon/package.nix | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index f2ddef390d63..d915de2da74f 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -1,6 +1,7 @@
{
lib,
fetchFromGitHub,
+ stdenv,
rustPlatform,
pkg-config,
libinput,
@@ -42,10 +43,12 @@ rustPlatform.buildRustPackage rec {
udev
];
- postInstall = ''
- mkdir -p $out/share/polkit-1/rules.d
- cp data/polkit-1/rules.d/*.rules $out/share/polkit-1/rules.d/
- '';
+ makeFlags = [
+ "prefix=$(out)"
+ "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"
+ ];
+
+ dontCargoInstall = true;
meta = with lib; {
homepage = "https://github.com/pop-os/cosmic-settings-daemon";
From 45b28d976f0d217e42a0173e61a21d0ec04a42ab Mon Sep 17 00:00:00 2001
From: Jordan Williams
Date: Wed, 6 Nov 2024 13:42:38 -0600
Subject: [PATCH 0153/2159] nixos/mopidy: fix Python dependency collisions
between extensions
Fixes #297539.
---
nixos/modules/services/audio/mopidy.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix
index 198ca74359dc..3e0241c10b81 100644
--- a/nixos/modules/services/audio/mopidy.nix
+++ b/nixos/modules/services/audio/mopidy.nix
@@ -12,6 +12,7 @@ let
mopidyEnv = buildEnv {
name = "mopidy-with-extensions-${mopidy.version}";
+ ignoreCollisions = true;
paths = closePropagation cfg.extensionPackages;
pathsToLink = [ "/${mopidyPackages.python.sitePackages}" ];
nativeBuildInputs = [ makeWrapper ];
From 181f4aec8990d59b13be0efcd20d15975e398f24 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta
Date: Wed, 6 Nov 2024 21:47:42 +0100
Subject: [PATCH 0154/2159] ft2-clone: 1.86 -> 1.88
Diff: https://github.com/8bitbubsy/ft2-clone/compare/v1.86...v1.88
---
pkgs/applications/audio/ft2-clone/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
index 84de0229497d..18eff60feb24 100644
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ft2-clone";
- version = "1.86";
+ version = "1.88";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${version}";
- hash = "sha256-/sdMBRCZvuKTp8ygCrLmIy0DiWJC6lLWdsY+ZxRY+pY=";
+ hash = "sha256-3ylzroIp3d5u6meP7guu+NlYGTqy9UUjIi9box7NbXI=";
};
nativeBuildInputs = [ cmake ];
From bafae5bf436a988527a79273c19058cd9e4a4a65 Mon Sep 17 00:00:00 2001
From: jopejoe1
Date: Sat, 7 Sep 2024 21:16:37 +0200
Subject: [PATCH 0155/2159] lib/licenses: set spdx for Ubuntu font license
---
lib/licenses.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 9affe6a2d63c..3a630c9fbdb7 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -1223,6 +1223,7 @@ lib.mapAttrs mkLicense ({
};
ufl = {
+ spdxId = "Ubuntu-font-1.0";
fullName = "Ubuntu Font License 1.0";
url = "https://ubuntu.com/legal/font-licence";
};
From 568bb8c275e0460888c805fbddfcc991ac898dbe Mon Sep 17 00:00:00 2001
From: jopejoe1
Date: Sat, 7 Sep 2024 21:24:31 +0200
Subject: [PATCH 0156/2159] lib/licenses: remove urls from licenses that have a
spdxId
if the licenses have a spdxId the url get auto-generated from it.
---
lib/licenses.nix | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 3a630c9fbdb7..b35e007f9403 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -115,7 +115,6 @@ lib.mapAttrs mkLicense ({
arphicpl = {
spdxId = "Arphic-1999";
fullName = "Arphic Public License";
- url = "https://www.freedesktop.org/wiki/Arphic_Public_License/";
};
artistic1 = {
@@ -236,7 +235,6 @@ lib.mapAttrs mkLicense ({
bsl11 = {
spdxId = "BUSL-1.1";
fullName = "Business Source License 1.1";
- url = "https://mariadb.com/bsl11";
free = false;
redistributable = true;
};
@@ -249,13 +247,11 @@ lib.mapAttrs mkLicense ({
cal10 = {
spdxId = "CAL-1.0";
fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)";
- url = "https://opensource.org/licenses/CAL-1.0";
};
caldera = {
spdxId = "Caldera";
fullName = "Caldera License";
- url = "http://www.lemis.com/grog/UNIX/ancient-source-all.pdf";
};
capec = {
@@ -459,7 +455,6 @@ lib.mapAttrs mkLicense ({
ecl20 = {
fullName = "Educational Community License, Version 2.0";
- url = "https://opensource.org/licenses/ECL-2.0";
shortName = "ECL 2.0";
spdxId = "ECL-2.0";
};
@@ -477,7 +472,6 @@ lib.mapAttrs mkLicense ({
elastic20 = {
spdxId = "Elastic-2.0";
fullName = "Elastic License 2.0";
- url = "https://github.com/elastic/elasticsearch/blob/main/licenses/ELASTIC-LICENSE-2.0.txt";
free = false;
};
@@ -671,7 +665,6 @@ lib.mapAttrs mkLicense ({
iasl = {
spdxId = "Intel-ACPI";
fullName = "Intel ACPI Software License Agreement";
- url = "https://old.calculate-linux.org/packages/licenses/iASL";
};
icu = {
@@ -697,7 +690,6 @@ lib.mapAttrs mkLicense ({
info-zip = {
spdxId = "Info-ZIP";
fullName = "Info-ZIP License";
- url = "https://infozip.sourceforge.net/license.html";
};
inria-compcert = {
@@ -882,7 +874,6 @@ lib.mapAttrs mkLicense ({
miros = {
spdxId = "MirOS";
fullName = "MirOS License";
- url = "https://opensource.org/licenses/MirOS";
};
mit = {
@@ -939,7 +930,6 @@ lib.mapAttrs mkLicense ({
mulan-psl2 = {
spdxId = "MulanPSL-2.0";
fullName = "Mulan Permissive Software License, Version 2";
- url = "https://license.coscl.org.cn/MulanPSL2";
};
naist-2003 = {
@@ -974,7 +964,6 @@ lib.mapAttrs mkLicense ({
fullName = "Netdata Cloud UI License v1.0";
free = false;
redistributable = true; # Only if used in Netdata products.
- url = "https://raw.githubusercontent.com/netdata/netdata/master/web/gui/v2/LICENSE.md";
};
nistSoftware = {
@@ -1072,7 +1061,6 @@ lib.mapAttrs mkLicense ({
parity70 = {
spdxId = "Parity-7.0.0";
fullName = "Parity Public License 7.0.0";
- url = "https://paritylicense.com/versions/7.0.0.html";
};
php301 = {
@@ -1094,7 +1082,6 @@ lib.mapAttrs mkLicense ({
psfl = {
spdxId = "Python-2.0";
fullName = "Python Software Foundation License version 2";
- url = "https://docs.python.org/license.html";
};
publicDomain = {
@@ -1225,7 +1212,6 @@ lib.mapAttrs mkLicense ({
ufl = {
spdxId = "Ubuntu-font-1.0";
fullName = "Ubuntu Font License 1.0";
- url = "https://ubuntu.com/legal/font-licence";
};
unfree = {
@@ -1269,7 +1255,6 @@ lib.mapAttrs mkLicense ({
upl = {
spdxId = "UPL-1.0";
fullName = "Universal Permissive License";
- url = "https://oss.oracle.com/licenses/upl/";
};
vim = {
@@ -1335,7 +1320,6 @@ lib.mapAttrs mkLicense ({
xfig = {
spdxId = "Xfig";
fullName = "xfig";
- url = "https://mcj.sourceforge.net/authors.html#xfig";
};
xinetd = {
From 8ec0981318b393e644f6967db0be5f5e7765a90f Mon Sep 17 00:00:00 2001
From: RatCornu
Date: Tue, 5 Nov 2024 23:38:07 +0100
Subject: [PATCH 0157/2159] pingvin-share: 1.1.3 -> 1.2.4
---
pkgs/servers/pingvin-share/backend.nix | 2 +-
pkgs/servers/pingvin-share/default.nix | 4 ++--
pkgs/servers/pingvin-share/frontend.nix | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/servers/pingvin-share/backend.nix b/pkgs/servers/pingvin-share/backend.nix
index 17046f1fd9f5..baefe0370d27 100644
--- a/pkgs/servers/pingvin-share/backend.nix
+++ b/pkgs/servers/pingvin-share/backend.nix
@@ -31,7 +31,7 @@ buildNpmPackage {
prisma
];
- npmDepsHash = "sha256-F+pYEsaU4Rsiq1z3rwGeKznZqpITF+AoFgswhTFeXf8=";
+ npmDepsHash = "sha256-RedMH3zWXTNOu/15UDeATP+gWBfDvt4vhKVahL/sEKM=";
makeCacheWritable = true;
npmFlags = [ "--legacy-peer-deps" ];
diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/pingvin-share/default.nix
index eaf7392ab4d2..03e986f74034 100644
--- a/pkgs/servers/pingvin-share/default.nix
+++ b/pkgs/servers/pingvin-share/default.nix
@@ -5,12 +5,12 @@
}:
let
- version = "1.1.3";
+ version = "1.2.4";
src = fetchFromGitHub {
owner = "stonith404";
repo = "pingvin-share";
rev = "v${version}";
- hash = "sha256-n3EwmS8uKrhEuNOh55eAkEtibAerAy6AduszW4leJuI=";
+ hash = "sha256-hGM7xTgB+XTytnNdGNKQYd7YLAIMbBczxsrcNE3EXkc=";
};
in
diff --git a/pkgs/servers/pingvin-share/frontend.nix b/pkgs/servers/pingvin-share/frontend.nix
index 84092c174810..aa6ccda5afd1 100644
--- a/pkgs/servers/pingvin-share/frontend.nix
+++ b/pkgs/servers/pingvin-share/frontend.nix
@@ -23,7 +23,7 @@ buildNpmPackage {
buildInputs = [ vips ];
nativeBuildInputs = [ pkg-config ];
- npmDepsHash = "sha256-laVAVwx/A/6TunCmmZYQKAuYqv1xTG3e1DIonj2S9IU=";
+ npmDepsHash = "sha256-aTarzVt+9Sn0xvAfPyoXFoHqPVjKDGv/OfLO8/RdkQw=";
makeCacheWritable = true;
npmFlags = [ "--legacy-peer-deps" ];
From ad6564b0c33fda65c92544f18e67e3c8da25147d Mon Sep 17 00:00:00 2001
From: RatCornu
Date: Thu, 7 Nov 2024 00:19:01 +0100
Subject: [PATCH 0158/2159] nixos/pingvin-share: update env variable name
---
nixos/modules/services/web-apps/pingvin-share.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/services/web-apps/pingvin-share.nix b/nixos/modules/services/web-apps/pingvin-share.nix
index 2d637a82ba8e..6b2ddf4e9c02 100644
--- a/nixos/modules/services/web-apps/pingvin-share.nix
+++ b/nixos/modules/services/web-apps/pingvin-share.nix
@@ -145,7 +145,7 @@ in
PRISMA_QUERY_ENGINE_LIBRARY = "${pkgs.prisma-engines}/lib/libquery_engine.node";
PRISMA_INTROSPECTION_ENGINE_BINARY = "${pkgs.prisma-engines}/bin/introspection-engine";
PRISMA_FMT_BINARY = "${pkgs.prisma-engines}/bin/prisma-fmt";
- PORT = toString cfg.backend.port;
+ BACKEND_PORT = toString cfg.backend.port;
DATABASE_URL = "file:${cfg.dataDir}/pingvin-share.db?connection_limit=1";
DATA_DIRECTORY = cfg.dataDir;
};
From 0a785f6f426b3bf4e9cae68613c5e1c27bcd4191 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage
Date: Tue, 5 Nov 2024 15:52:30 +0100
Subject: [PATCH 0159/2159] nixos/gdm: automatically enable
services.displayManager
---
nixos/modules/services/x11/display-managers/gdm.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index c454b110776b..5ec06767f51b 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -147,6 +147,9 @@ in
services.displayManager =
{
+ # Enable desktop session data
+ enable = true;
+
environment = {
GDM_X_SERVER_EXTRA_ARGS = toString
(lib.filter (arg: arg != "-terminate") cfg.xserverArgs);
From 65835ab8d2a4339d9a7404b28ab1ea6e536a3531 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 7 Nov 2024 00:58:03 +0100
Subject: [PATCH 0160/2159] python312Packages.templateflow: fix build
---
.../python-modules/templateflow/default.nix | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/templateflow/default.nix b/pkgs/development/python-modules/templateflow/default.nix
index f00ce991ea3e..32f922065e56 100644
--- a/pkgs/development/python-modules/templateflow/default.nix
+++ b/pkgs/development/python-modules/templateflow/default.nix
@@ -4,6 +4,8 @@
fetchFromGitHub,
pythonOlder,
setuptools-scm,
+ hatchling,
+ hatch-vcs,
nipreps-versions,
pybids,
requests,
@@ -24,8 +26,13 @@ buildPythonPackage rec {
hash = "sha256-COS767n2aC65m6AJihZb4NhJ4ZK9YkTAZR7Hcnc/LMs=";
};
- nativeBuildInputs = [ setuptools-scm ];
- propagatedBuildInputs = [
+ build-system = [
+ setuptools-scm
+ hatchling
+ hatch-vcs
+ ];
+
+ dependencies = [
nipreps-versions
pybids
requests
@@ -33,7 +40,12 @@ buildPythonPackage rec {
];
doCheck = false; # most tests try to download data
- #pythonImportsCheck = [ "templateflow" ]; # touches $HOME/.cache, hence needs https://github.com/NixOS/nixpkgs/pull/120300
+
+ postFixup = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ pythonImportsCheck = [ "templateflow" ];
meta = with lib; {
homepage = "https://templateflow.org/python-client";
From 10a2c9d7b8fad0ed4f3f869281ffb1778bf9aec6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Thu, 31 Oct 2024 05:26:30 +0000
Subject: [PATCH 0161/2159] superhtml: 0.5.0 -> 0.5.1
---
pkgs/by-name/su/superhtml/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/su/superhtml/package.nix b/pkgs/by-name/su/superhtml/package.nix
index e12dfd5fbbd6..8990c1298687 100644
--- a/pkgs/by-name/su/superhtml/package.nix
+++ b/pkgs/by-name/su/superhtml/package.nix
@@ -7,13 +7,13 @@
}:
stdenv.mkDerivation rec {
pname = "superhtml";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "superhtml";
rev = "refs/tags/v${version}";
- hash = "sha256-E4IVDYps6K+SdemkfwtTjOE+Rdu8m4Itfd3Kv0XO7qk=";
+ hash = "sha256-ubFFFHlYTYmivVI5hd/Mj+jFIBuPQ/IycNv3BLxkeuc=";
};
nativeBuildInputs = [
From aaacedffa4a42b75cbc71ec677b9e24b03a55685 Mon Sep 17 00:00:00 2001
From: Anderson Torres
Date: Wed, 18 Sep 2024 13:50:46 -0300
Subject: [PATCH 0162/2159] sov: adopt and nixfmt-rfc-style
---
pkgs/by-name/so/sov/package.nix | 43 ++++++++++++++++-----------------
1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/pkgs/by-name/so/sov/package.nix b/pkgs/by-name/so/sov/package.nix
index fcc4e3a2da73..79de58d4f33c 100644
--- a/pkgs/by-name/so/sov/package.nix
+++ b/pkgs/by-name/so/sov/package.nix
@@ -1,17 +1,18 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch2
-, meson
-, ninja
-, pkg-config
-, wayland-scanner
-, freetype
-, libglvnd
-, libxkbcommon
-, wayland
-, wayland-protocols
-, gitUpdater
+{
+ lib,
+ fetchFromGitHub,
+ fetchpatch2,
+ freetype,
+ gitUpdater,
+ libglvnd,
+ libxkbcommon,
+ meson,
+ ninja,
+ pkg-config,
+ stdenv,
+ wayland,
+ wayland-protocols,
+ wayland-scanner,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -34,11 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
})
];
- strictDeps = true;
-
- depsBuildBuild = [
- pkg-config
- ];
+ depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [
meson
@@ -55,14 +52,16 @@ stdenv.mkDerivation (finalAttrs: {
wayland-protocols
];
+ strictDeps = true;
+
passthru.updateScript = gitUpdater { };
meta = {
- description = "Workspace overview app for sway";
homepage = "https://github.com/milgra/sov";
+ description = "Workspace overview app for sway";
license = lib.licenses.gpl3Only;
mainProgram = "sov";
- maintainers = with lib.maintainers; [ ];
- platforms = lib.platforms.linux;
+ maintainers = with lib.maintainers; [ AndersonTorres ];
+ inherit (wayland.meta) platforms;
};
})
From d91203cd4ceb6e9f7ffbcda8ad09063e287c1231 Mon Sep 17 00:00:00 2001
From: Anderson Torres
Date: Wed, 6 Nov 2024 23:35:31 -0300
Subject: [PATCH 0163/2159] sov: mark as broken on Darwin
---
pkgs/by-name/so/sov/package.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/by-name/so/sov/package.nix b/pkgs/by-name/so/sov/package.nix
index 79de58d4f33c..e01b1c8f9446 100644
--- a/pkgs/by-name/so/sov/package.nix
+++ b/pkgs/by-name/so/sov/package.nix
@@ -63,5 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "sov";
maintainers = with lib.maintainers; [ AndersonTorres ];
inherit (wayland.meta) platforms;
+ # sys/timerfd.h header inexistent
+ broken = stdenv.isDarwin;
};
})
From b32690dd8b1aec230452544ced44818f70aea53f Mon Sep 17 00:00:00 2001
From: CaptainEureka
Date: Thu, 7 Nov 2024 10:45:45 +0100
Subject: [PATCH 0164/2159] audiobookshelf: 2.16.1 -> 2.16.2
---
pkgs/by-name/au/audiobookshelf/source.json | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json
index 9fd9317d4640..58bf912accd4 100644
--- a/pkgs/by-name/au/audiobookshelf/source.json
+++ b/pkgs/by-name/au/audiobookshelf/source.json
@@ -1,9 +1,9 @@
{
"owner": "advplyr",
"repo": "audiobookshelf",
- "rev": "50fd659749128a321ecc3284e128d014433145a9",
- "hash": "sha256-lYzzzH2heSj0doPfAEWL+pTP9wTsTzLb3+Fu0DHD1w0=",
- "version": "2.16.1",
- "depsHash": "sha256-7kA1AusnF7iDMACd9lQ8wbdbtjtouh9qu1J8EzzYUrQ=",
- "clientDepsHash": "sha256-NwOkMdlmh+tQCWKrbKBbf9XPA3mtz7S3VrGwvpBS0Rc="
+ "rev": "e05cb0ef4de000eb20e46b6557a35fa12cc6b9a0",
+ "hash": "sha256-wbcXyHtlpCZ5lmFmYxMB5Z+ObVq0P8LFAQ1AoQpWbt8=",
+ "version": "2.16.2",
+ "depsHash": "sha256-/A+XyN2nfpj8bSJgfNey7DOKB7QeeuZGCy2yKi46HwQ=",
+ "clientDepsHash": "sha256-vpn455/DJopb2TIiIKXjuS3CxI1pXRH3TU3QfZtbMi8="
}
From b83ad8ea1e52f482e0bab4e4215a775ab9004a54 Mon Sep 17 00:00:00 2001
From: Markus Nyman
Date: Wed, 7 Aug 2024 12:34:58 +0300
Subject: [PATCH 0165/2159] fyi: init at 1.0.4
---
pkgs/by-name/fy/fyi/package.nix | 43 +++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
create mode 100644 pkgs/by-name/fy/fyi/package.nix
diff --git a/pkgs/by-name/fy/fyi/package.nix b/pkgs/by-name/fy/fyi/package.nix
new file mode 100644
index 000000000000..cf6cc59ddc40
--- /dev/null
+++ b/pkgs/by-name/fy/fyi/package.nix
@@ -0,0 +1,43 @@
+{
+ stdenv,
+ lib,
+ fetchFromGitea,
+ pkg-config,
+ meson,
+ ninja,
+ dbus,
+ scdoc,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "fyi";
+ version = "1.0.4";
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "dnkl";
+ repo = "fyi";
+ rev = finalAttrs.version;
+ hash = "sha256-UGkShHziREQTkQUlbFXT1144BiBApFVbCvu5A1DuoMI=";
+ };
+
+ depsBuildBuild = [ pkg-config ];
+
+ nativeBuildInputs = [
+ pkg-config
+ meson
+ ninja
+ scdoc
+ ];
+
+ buildInputs = [ dbus ];
+
+ meta = {
+ changelog = "https://codeberg.org/dnkl/fyi/releases/tag/${finalAttrs.version}";
+ description = "Command line utility to create desktop notifications";
+ homepage = "https://codeberg.org/dnkl/fyi";
+ license = [ lib.licenses.mit ];
+ mainProgram = "fyi";
+ maintainers = with lib.maintainers; [ marnym ];
+ platforms = lib.platforms.linux;
+ };
+})
From b45392ecb998cf3d2aea426ac629f52af986dc2c Mon Sep 17 00:00:00 2001
From: Sam Connelly
Date: Wed, 6 Nov 2024 19:50:45 -0500
Subject: [PATCH 0166/2159] metadata: Update ffmpeg-next dependency
See https://github.com/zmwangx/metadata/pull/11
---
pkgs/by-name/me/metadata/package.nix | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/me/metadata/package.nix b/pkgs/by-name/me/metadata/package.nix
index 03e8666009e4..d9d71da65087 100644
--- a/pkgs/by-name/me/metadata/package.nix
+++ b/pkgs/by-name/me/metadata/package.nix
@@ -1,5 +1,6 @@
{ lib
, fetchFromGitHub
+, fetchpatch
, pkg-config
, ffmpeg
, rustPlatform
@@ -14,11 +15,11 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "zmwangx";
repo = "metadata";
- rev = "v${version}";
- hash = "sha256-OFWdCV9Msy/mNaSubqoJi4tBiFqL7RuWWQluSnKe4fU=";
+ rev = "ec9614cfa64ffc95d74e4b19496ebd9b026e692b";
+ hash = "sha256-ugirYg3l+zIfKAqp2smLgG99mX9tsy9rmGe6lFAwx5o=";
};
- cargoHash = "sha256-F5jXS/W600nbQtu1FD4+DawrFsO+5lJjvAvTiFKT840=";
+ cargoHash = "sha256-OMm39sgbq2wTRJTVoCf5imJe3hmf+Djq9w9tzKBrkIM=";
nativeBuildInputs = [
pkg-config
@@ -27,6 +28,14 @@ rustPlatform.buildRustPackage rec {
rustPlatform.bindgenHook
];
+ cargoPatches = [
+ (fetchpatch {
+ name = "update-crate-ffmpeg-next-version.patch";
+ url = "https://github.com/myclevorname/metadata/commit/a1bc9f53d9aa0aeb17cbb530a1da1de4fdf85328.diff";
+ hash = "sha256-LEwOK1UFUwLZhqLnoUor5CSOwz4DDjNFMnMOGq1S1Sc=";
+ })
+ ];
+
postBuild = ''
a2x --doctype manpage --format manpage man/metadata.1.adoc
'';
From b79f5f98fc3e3c698012ed4ccedf9a6bc4fcb777 Mon Sep 17 00:00:00 2001
From: Kira Bruneau
Date: Thu, 7 Nov 2024 02:22:48 -0500
Subject: [PATCH 0167/2159] yabridge: 5.1.0 -> 5.1.1
---
pkgs/tools/audio/yabridge/default.nix | 4 ++--
pkgs/tools/audio/yabridge/hardcode-dependencies.patch | 6 +++---
.../audio/yabridge/libyabridge-from-nix-profiles.patch | 2 +-
pkgs/tools/audio/yabridgectl/Cargo.lock | 2 +-
.../audio/yabridgectl/chainloader-from-nix-profiles.patch | 4 ++--
.../audio/yabridgectl/remove-dependency-verification.patch | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix
index c356f17cb43b..540ffb8eaff3 100644
--- a/pkgs/tools/audio/yabridge/default.nix
+++ b/pkgs/tools/audio/yabridge/default.nix
@@ -72,14 +72,14 @@ let
in
multiStdenv.mkDerivation (finalAttrs: {
pname = "yabridge";
- version = "5.1.0";
+ version = "5.1.1";
# NOTE: Also update yabridgectl's cargoHash when this is updated
src = fetchFromGitHub {
owner = "robbert-vdh";
repo = "yabridge";
rev = "refs/tags/${finalAttrs.version}";
- hash = "sha256-vnSdGedpiit8nym26i1QFiNnATk0Bymm7e5Ha2H41/M=";
+ hash = "sha256-4eA3vQFklIWkhtbd3Nw39bnJT6gPcni79ZyQVqU4+GQ=";
};
# Unpack subproject sources
diff --git a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch
index d33bdf30eed2..e5ab00293858 100644
--- a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch
+++ b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch
@@ -1,5 +1,5 @@
diff --git a/meson.build b/meson.build
-index c602c5ad..a52e20a1 100644
+index 9e69128d..8c53ac88 100644
--- a/meson.build
+++ b/meson.build
@@ -226,7 +226,7 @@ if is_64bit_system
@@ -12,7 +12,7 @@ index c602c5ad..a52e20a1 100644
# These are all headers-only libraries, and thus won't require separate 32-bit
diff --git a/src/common/notifications.cpp b/src/common/notifications.cpp
-index 66e08527..685c54af 100644
+index 654b6c83..78ba2fe7 100644
--- a/src/common/notifications.cpp
+++ b/src/common/notifications.cpp
@@ -29,8 +29,8 @@
@@ -27,7 +27,7 @@ index 66e08527..685c54af 100644
std::atomic libdbus_handle = nullptr;
std::mutex libdbus_mutex;
diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
-index 82db99a5..491f005d 100644
+index 441345c6..f3e51cff 100644
--- a/src/plugin/utils.cpp
+++ b/src/plugin/utils.cpp
@@ -103,7 +103,7 @@ std::string PluginInfo::wine_version() const {
diff --git a/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch b/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch
index 54125551e315..bcc55d48f0aa 100644
--- a/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch
+++ b/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch
@@ -1,5 +1,5 @@
diff --git a/src/chainloader/utils.cpp b/src/chainloader/utils.cpp
-index c43e5693..b8352adf 100644
+index fa90b8f7..bd44d0ea 100644
--- a/src/chainloader/utils.cpp
+++ b/src/chainloader/utils.cpp
@@ -29,8 +29,10 @@
diff --git a/pkgs/tools/audio/yabridgectl/Cargo.lock b/pkgs/tools/audio/yabridgectl/Cargo.lock
index 451b0ae0141c..1bdd1ede22af 100644
--- a/pkgs/tools/audio/yabridgectl/Cargo.lock
+++ b/pkgs/tools/audio/yabridgectl/Cargo.lock
@@ -914,7 +914,7 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
[[package]]
name = "yabridgectl"
-version = "5.1.0"
+version = "5.1.1"
dependencies = [
"anyhow",
"clap",
diff --git a/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch b/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch
index 35193c919f63..763b4a67a3b6 100644
--- a/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch
+++ b/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch
@@ -1,5 +1,5 @@
diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs
-index da5f4ff5..c220d62d 100644
+index d948beff..9b3f9ffb 100644
--- a/tools/yabridgectl/src/config.rs
+++ b/tools/yabridgectl/src/config.rs
@@ -22,6 +22,7 @@ use serde_derive::{Deserialize, Serialize};
@@ -58,7 +58,7 @@ index da5f4ff5..c220d62d 100644
));
}
diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs
-index 0a29d431..479eaef0 100644
+index e66ef0da..bfe9c8bf 100644
--- a/tools/yabridgectl/src/main.rs
+++ b/tools/yabridgectl/src/main.rs
@@ -134,7 +134,7 @@ fn main() -> Result<()> {
diff --git a/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch b/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch
index a1494a490384..d320e489eec6 100644
--- a/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch
+++ b/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch
@@ -1,5 +1,5 @@
diff --git a/tools/yabridgectl/src/actions.rs b/tools/yabridgectl/src/actions.rs
-index a0d9b98e..2819f017 100644
+index 6a8be858..5ce5e460 100644
--- a/tools/yabridgectl/src/actions.rs
+++ b/tools/yabridgectl/src/actions.rs
@@ -847,14 +847,6 @@ pub fn do_sync(config: &mut Config, options: &SyncOptions) -> Result<()> {
From cf166c43d9e6ef512b8c23f783c68348682d7099 Mon Sep 17 00:00:00 2001
From: seth
Date: Thu, 7 Nov 2024 19:03:50 +0000
Subject: [PATCH 0168/2159] binary: 5.0 -> 5.1
---
pkgs/by-name/bi/binary/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/bi/binary/package.nix b/pkgs/by-name/bi/binary/package.nix
index 0f77b26c5c86..311393c9049b 100644
--- a/pkgs/by-name/bi/binary/package.nix
+++ b/pkgs/by-name/bi/binary/package.nix
@@ -16,14 +16,14 @@
python3Packages.buildPythonApplication rec {
pname = "binary";
- version = "5.0";
+ version = "5.1";
format = "other";
src = fetchFromGitHub {
owner = "fizzyizzy05";
repo = "binary";
rev = "refs/tags/${version}";
- hash = "sha256-T/gFXYcUJBN1NWMQaFco1bqqZTz3JHQpM8C2Y5yz7SI=";
+ hash = "sha256-HBmWaT0cjYz3UAO1r5chFW7KARpL1EnY8wEeR9etPE0=";
};
nativeBuildInputs = [
From 9c8c11f5c2d1dc232f26335c3e5a98805ce7458b Mon Sep 17 00:00:00 2001
From: seth
Date: Thu, 7 Nov 2024 14:28:58 -0500
Subject: [PATCH 0169/2159] binary: run meson checks
also clean up a few things
---
pkgs/by-name/bi/binary/package.nix | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/pkgs/by-name/bi/binary/package.nix b/pkgs/by-name/bi/binary/package.nix
index 311393c9049b..2838820a4618 100644
--- a/pkgs/by-name/bi/binary/package.nix
+++ b/pkgs/by-name/bi/binary/package.nix
@@ -1,23 +1,24 @@
{
lib,
- fetchFromGitHub,
- python3Packages,
appstream,
blueprint-compiler,
desktop-file-utils,
+ fetchFromGitHub,
glib,
gobject-introspection,
+ gtk4,
libadwaita,
meson,
ninja,
pkg-config,
+ python3Packages,
wrapGAppsHook4,
}:
python3Packages.buildPythonApplication rec {
pname = "binary";
version = "5.1";
- format = "other";
+ pyproject = false;
src = fetchFromGitHub {
owner = "fizzyizzy05";
@@ -26,12 +27,15 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-HBmWaT0cjYz3UAO1r5chFW7KARpL1EnY8wEeR9etPE0=";
};
+ strictDeps = true;
+
nativeBuildInputs = [
appstream
blueprint-compiler
- desktop-file-utils
- glib # need glib-compile-schemas
+ desktop-file-utils # for `desktop-file-validate`
+ glib # for `glib-compile-schemas`
gobject-introspection
+ gtk4 # for `gtk-update-icon-cache`
meson
ninja
pkg-config
@@ -45,6 +49,13 @@ python3Packages.buildPythonApplication rec {
dontWrapGApps = true;
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
+ # NOTE: `postCheck` is intentionally not used here, as the entire checkPhase
+ # is skipped by `buildPythonApplication`
+ # https://github.com/NixOS/nixpkgs/blob/9d4343b7b27a3e6f08fc22ead568233ff24bbbde/pkgs/development/interpreters/python/mk-python-derivation.nix#L296
+ postInstallCheck = ''
+ mesonCheckPhase
+ '';
+
meta = {
description = "Small and simple app to convert numbers to a different base";
homepage = "https://github.com/fizzyizzy05/binary";
From 9823494bcf4ecbabef763cae9175bd782d473a8a Mon Sep 17 00:00:00 2001
From: seth
Date: Thu, 7 Nov 2024 19:04:02 +0000
Subject: [PATCH 0170/2159] commit: 4.1 -> 4.2
---
pkgs/by-name/co/commit/package.nix | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/pkgs/by-name/co/commit/package.nix b/pkgs/by-name/co/commit/package.nix
index c213ef37962d..dc241c7df00f 100644
--- a/pkgs/by-name/co/commit/package.nix
+++ b/pkgs/by-name/co/commit/package.nix
@@ -1,29 +1,32 @@
{
lib,
stdenv,
- fetchFromGitHub,
- appstream-glib,
+ appstream,
blueprint-compiler,
desktop-file-utils,
+ fetchFromGitHub,
gjs,
+ glib,
+ gtk4,
gtksourceview5,
libadwaita,
libspelling,
meson,
ninja,
+ nix-update-script,
pkg-config,
wrapGAppsHook4,
- nix-update-script,
}:
+
stdenv.mkDerivation rec {
pname = "commit";
- version = "4.1";
+ version = "4.2";
src = fetchFromGitHub {
owner = "sonnyp";
repo = "Commit";
- rev = "v${version}";
- hash = "sha256-HhyoQ4wrc8dHvVU+MylJgaKu9HwSw+/f6UDTIM2YRNk=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-L8CI8SAGWhhJyTc8aMPV0s+UevEJGE7n1l7fFnTjdPw=";
fetchSubmodules = true;
};
@@ -44,9 +47,11 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
- appstream-glib
+ appstream
blueprint-compiler
- desktop-file-utils
+ desktop-file-utils # for `desktop-file-validate` & `update-desktop-database`
+ glib # for `glib-compile-schemas`
+ gtk4 # for `gtk-update-icon-cache`
meson
ninja
pkg-config
@@ -54,10 +59,10 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ gjs
+ gtksourceview5
libadwaita
libspelling
- gtksourceview5
- gjs
];
passthru = {
From 9341dc94dd3364112badb26f8ed2cd099db43c38 Mon Sep 17 00:00:00 2001
From: seth
Date: Thu, 7 Nov 2024 15:05:54 -0500
Subject: [PATCH 0171/2159] commit: run meson checks & cleanup
- `rec` -> `finalAttrs`
- `strictDeps`
---
pkgs/by-name/co/commit/package.nix | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/co/commit/package.nix b/pkgs/by-name/co/commit/package.nix
index dc241c7df00f..7f4992c77a32 100644
--- a/pkgs/by-name/co/commit/package.nix
+++ b/pkgs/by-name/co/commit/package.nix
@@ -18,14 +18,14 @@
wrapGAppsHook4,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "commit";
version = "4.2";
src = fetchFromGitHub {
owner = "sonnyp";
repo = "Commit";
- rev = "refs/tags/v${version}";
+ rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-L8CI8SAGWhhJyTc8aMPV0s+UevEJGE7n1l7fFnTjdPw=";
fetchSubmodules = true;
};
@@ -46,10 +46,13 @@ stdenv.mkDerivation rec {
patchShebangs {,.}*
'';
+ strictDeps = true;
+
nativeBuildInputs = [
appstream
blueprint-compiler
desktop-file-utils # for `desktop-file-validate` & `update-desktop-database`
+ gjs
glib # for `glib-compile-schemas`
gtk4 # for `gtk-update-icon-cache`
meson
@@ -65,6 +68,8 @@ stdenv.mkDerivation rec {
libspelling
];
+ doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
passthru = {
updateScript = nix-update-script { };
};
@@ -77,4 +82,4 @@ stdenv.mkDerivation rec {
mainProgram = "re.sonny.Commit";
platforms = lib.platforms.linux;
};
-}
+})
From 95f260494a9b649769140bf759ab537ed8c9acd2 Mon Sep 17 00:00:00 2001
From: seth
Date: Thu, 7 Nov 2024 19:07:45 +0000
Subject: [PATCH 0172/2159] identity: 0.6.0 -> 0.7.0
---
pkgs/by-name/id/identity/Cargo.lock | 2728 --------------------------
pkgs/by-name/id/identity/package.nix | 16 +-
2 files changed, 9 insertions(+), 2735 deletions(-)
delete mode 100644 pkgs/by-name/id/identity/Cargo.lock
diff --git a/pkgs/by-name/id/identity/Cargo.lock b/pkgs/by-name/id/identity/Cargo.lock
deleted file mode 100644
index 75e811d9266c..000000000000
--- a/pkgs/by-name/id/identity/Cargo.lock
+++ /dev/null
@@ -1,2728 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
-
-[[package]]
-name = "ashpd"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3affe251686bd936a0afb74b9693e8bf2f193d51da1b9a45d3f1303a9bd2cc7"
-dependencies = [
- "async-std",
- "enumflags2",
- "futures-channel",
- "futures-util",
- "gdk4-wayland",
- "gdk4-x11",
- "gtk4",
- "once_cell",
- "rand",
- "serde",
- "serde_repr",
- "url",
- "zbus",
-]
-
-[[package]]
-name = "async-broadcast"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
-dependencies = [
- "event-listener",
- "futures-core",
-]
-
-[[package]]
-name = "async-channel"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
-dependencies = [
- "concurrent-queue",
- "event-listener",
- "futures-core",
-]
-
-[[package]]
-name = "async-executor"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
-dependencies = [
- "async-lock",
- "async-task",
- "concurrent-queue",
- "fastrand 1.9.0",
- "futures-lite",
- "slab",
-]
-
-[[package]]
-name = "async-fs"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
-dependencies = [
- "async-lock",
- "autocfg",
- "blocking",
- "futures-lite",
-]
-
-[[package]]
-name = "async-global-executor"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
-dependencies = [
- "async-channel",
- "async-executor",
- "async-io",
- "async-lock",
- "blocking",
- "futures-lite",
- "once_cell",
-]
-
-[[package]]
-name = "async-io"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
-dependencies = [
- "async-lock",
- "autocfg",
- "cfg-if",
- "concurrent-queue",
- "futures-lite",
- "log",
- "parking",
- "polling",
- "rustix 0.37.23",
- "slab",
- "socket2",
- "waker-fn",
-]
-
-[[package]]
-name = "async-lock"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
-dependencies = [
- "event-listener",
-]
-
-[[package]]
-name = "async-process"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
-dependencies = [
- "async-io",
- "async-lock",
- "autocfg",
- "blocking",
- "cfg-if",
- "event-listener",
- "futures-lite",
- "rustix 0.37.23",
- "signal-hook",
- "windows-sys",
-]
-
-[[package]]
-name = "async-recursion"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "async-std"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
-dependencies = [
- "async-channel",
- "async-global-executor",
- "async-io",
- "async-lock",
- "crossbeam-utils",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-lite",
- "gloo-timers",
- "kv-log-macro",
- "log",
- "memchr",
- "once_cell",
- "pin-project-lite",
- "pin-utils",
- "slab",
- "wasm-bindgen-futures",
-]
-
-[[package]]
-name = "async-task"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
-
-[[package]]
-name = "async-trait"
-version = "0.1.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
-
-[[package]]
-name = "atomic_refcell"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905"
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
-
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[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 = "blocking"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
-dependencies = [
- "async-channel",
- "async-lock",
- "async-task",
- "atomic-waker",
- "fastrand 1.9.0",
- "futures-lite",
- "log",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "cairo-rs"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b"
-dependencies = [
- "bitflags 2.4.0",
- "cairo-sys-rs",
- "glib",
- "libc",
- "once_cell",
- "thiserror",
-]
-
-[[package]]
-name = "cairo-sys-rs"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "cfg-expr"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9"
-dependencies = [
- "smallvec",
- "target-lexicon",
-]
-
-[[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.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "num-traits",
- "winapi",
-]
-
-[[package]]
-name = "concurrent-queue"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-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 = "dav1d"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ca43c8e58ee931086b5fd9a4b6a8cc40c1346592246c4fe3d299eca1684c75"
-dependencies = [
- "bitflags 2.4.0",
- "dav1d-sys",
-]
-
-[[package]]
-name = "dav1d-sys"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "615542bb14c18b795f46aba92258902168218d714090f5fff47e68c9a352ea2d"
-dependencies = [
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "either"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
-
-[[package]]
-name = "enumflags2"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2"
-dependencies = [
- "enumflags2_derive",
- "serde",
-]
-
-[[package]]
-name = "enumflags2_derive"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys",
-]
-
-[[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 = "event-listener"
-version = "2.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
-
-[[package]]
-name = "field-offset"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
-dependencies = [
- "memoffset 0.9.0",
- "rustc_version",
-]
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
-dependencies = [
- "futures-core",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
-
-[[package]]
-name = "futures-lite"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
-dependencies = [
- "fastrand 1.9.0",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
-
-[[package]]
-name = "futures-macro"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
-
-[[package]]
-name = "futures-task"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
-
-[[package]]
-name = "futures-util"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
-dependencies = [
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "gdk-pixbuf"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3"
-dependencies = [
- "gdk-pixbuf-sys",
- "gio",
- "glib",
- "libc",
- "once_cell",
-]
-
-[[package]]
-name = "gdk-pixbuf-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
-dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gdk4"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c"
-dependencies = [
- "cairo-rs",
- "gdk-pixbuf",
- "gdk4-sys",
- "gio",
- "glib",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gdk4-sys"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0"
-dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "pkg-config",
- "system-deps",
-]
-
-[[package]]
-name = "gdk4-wayland"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0db9102ff11e55bd65e153c1192abc21ddfa45ede90622e423d4e4a0e5d5f313"
-dependencies = [
- "gdk4",
- "gdk4-wayland-sys",
- "gio",
- "glib",
- "libc",
-]
-
-[[package]]
-name = "gdk4-wayland-sys"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d48159be256ae0212d5a2b9884627197d08082c7168b28775b53a0f9885d5624"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gdk4-win32"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe66650c41f64e41ada9f85c4bdb96e5549c669e594892240dfb147a63256057"
-dependencies = [
- "gdk4",
- "gdk4-win32-sys",
- "gio",
- "glib",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gdk4-win32-sys"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b5c187546cd3ad9f1787b46c66272d8fcdf8197bfe4f6e2647fe910c39e396d"
-dependencies = [
- "gdk-pixbuf-sys",
- "gdk4-sys",
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gdk4-x11"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28c9bbf8ea1ea8469e74c3fdfafc142c9e14810a27f89ddb01b5e9076a60a450"
-dependencies = [
- "gdk4",
- "gdk4-x11-sys",
- "gio",
- "glib",
- "libc",
-]
-
-[[package]]
-name = "gdk4-x11-sys"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3de1709370758192369f5329aa593847797f1c693c95e8a261e9b2e06a5f125"
-dependencies = [
- "gdk4-sys",
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "generator"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustversion",
- "windows",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "gettext-rs"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364"
-dependencies = [
- "gettext-sys",
- "locale_config",
-]
-
-[[package]]
-name = "gettext-sys"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d"
-dependencies = [
- "cc",
- "temp-dir",
-]
-
-[[package]]
-name = "gio"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-util",
- "gio-sys",
- "glib",
- "libc",
- "once_cell",
- "pin-project-lite",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "gio-sys"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
- "winapi",
-]
-
-[[package]]
-name = "glib"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7"
-dependencies = [
- "bitflags 2.4.0",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-task",
- "futures-util",
- "gio-sys",
- "glib-macros",
- "glib-sys",
- "gobject-sys",
- "libc",
- "log",
- "memchr",
- "once_cell",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "glib-macros"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0"
-dependencies = [
- "heck",
- "proc-macro-crate",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "glib-sys"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
-dependencies = [
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gloo-timers"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "gobject-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "graphene-rs"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401"
-dependencies = [
- "glib",
- "graphene-sys",
- "libc",
-]
-
-[[package]]
-name = "graphene-sys"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59"
-dependencies = [
- "glib-sys",
- "libc",
- "pkg-config",
- "system-deps",
-]
-
-[[package]]
-name = "gsk4"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5"
-dependencies = [
- "cairo-rs",
- "gdk4",
- "glib",
- "graphene-rs",
- "gsk4-sys",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gsk4-sys"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46"
-dependencies = [
- "cairo-sys-rs",
- "gdk4-sys",
- "glib-sys",
- "gobject-sys",
- "graphene-sys",
- "libc",
- "pango-sys",
- "system-deps",
-]
-
-[[package]]
-name = "gst-plugin-dav1d"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8c337439958259aa248798efee09afeb5bd57d87af1c207a4be17e5234074fa"
-dependencies = [
- "dav1d",
- "gst-plugin-version-helper 0.7.5",
- "gstreamer",
- "gstreamer-base",
- "gstreamer-video",
- "num_cpus",
-]
-
-[[package]]
-name = "gst-plugin-gtk4"
-version = "0.12.0-alpha.1"
-source = "git+https://gitlab.freedesktop.org/YaLTeR/gst-plugins-rs.git?branch=gtk4-scaling-filter-stable#ca6bc179606c0ba4f07db7136468744b47952dc9"
-dependencies = [
- "gdk4-wayland",
- "gdk4-win32",
- "gdk4-x11",
- "gst-plugin-version-helper 0.12.0-alpha.1",
- "gstreamer",
- "gstreamer-base",
- "gstreamer-gl",
- "gstreamer-gl-egl",
- "gstreamer-gl-wayland",
- "gstreamer-gl-x11",
- "gstreamer-video",
- "gtk4",
- "windows-sys",
-]
-
-[[package]]
-name = "gst-plugin-version-helper"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87921209945e5dc809848a100115fad65bd127671896f0206f45e272080cc4c9"
-dependencies = [
- "chrono",
-]
-
-[[package]]
-name = "gst-plugin-version-helper"
-version = "0.12.0-alpha.1"
-source = "git+https://gitlab.freedesktop.org/YaLTeR/gst-plugins-rs.git?branch=gtk4-scaling-filter-stable#ca6bc179606c0ba4f07db7136468744b47952dc9"
-dependencies = [
- "chrono",
-]
-
-[[package]]
-name = "gst-plugin-webp"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07dd5a10468f04ae4d987ba754d4b81772260b3bb9e72ee26b0ca4d1ef850a38"
-dependencies = [
- "gst-plugin-version-helper 0.7.5",
- "gstreamer",
- "gstreamer-video",
- "libwebp-sys2",
-]
-
-[[package]]
-name = "gstreamer"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cdb86791dc39a5443f7d08cf3e7ae9c88a94991aba620d177cb5804838201f"
-dependencies = [
- "cfg-if",
- "futures-channel",
- "futures-core",
- "futures-util",
- "glib",
- "gstreamer-sys",
- "itertools",
- "libc",
- "muldiv",
- "num-integer",
- "num-rational",
- "option-operations",
- "paste",
- "pretty-hex",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "gstreamer-base"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fe38a6d5c1e516ce3fd6069e972a540d315448ed69fdadad739e6c6c6eb2a01"
-dependencies = [
- "atomic_refcell",
- "cfg-if",
- "glib",
- "gstreamer",
- "gstreamer-base-sys",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-base-sys"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b9c029583ed61fa5258076a42df91732dc7f5582044ea7ee66a721641e6af4"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-gl"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e616c363a79424bae3623d85b5f71542ef5cad318da9fe4e887e78992a4239d3"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-base",
- "gstreamer-gl-sys",
- "gstreamer-video",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-gl-egl"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e69e5a572616ea36387b39dcfec370d35d3c0e29efeb41e5da91540d9f163cec"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-gl",
- "gstreamer-gl-egl-sys",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-gl-egl-sys"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8fc720bf2e17be334c70def3be390b549a390608234d06e70e7f7a373e7dbd2"
-dependencies = [
- "glib-sys",
- "gstreamer-gl-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-gl-sys"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e3e2f33ecd2d4e410a63ccad18d0e3692dac69b9752286e66a006fa57c952d"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-base-sys",
- "gstreamer-sys",
- "gstreamer-video-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-gl-wayland"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7850180c0021d690073697b22a6f1492dcba0ddccd2111d5ae043f6a65f9e9f3"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-gl",
- "gstreamer-gl-wayland-sys",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-gl-wayland-sys"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f4abcee01a58ddfa299360fd9bc1b3f96a02fee2f81149c6f3129b3258a03cc"
-dependencies = [
- "glib-sys",
- "gstreamer-gl-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-gl-x11"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d62204eaef32be3228b8749dcf3d18e350910308fc84c05c416a6f29b80df34"
-dependencies = [
- "glib",
- "gstreamer",
- "gstreamer-gl",
- "gstreamer-gl-x11-sys",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-gl-x11-sys"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e472da0b77e877765d171e2d151cd5b4b8865d44bb18cedc61409dbe0ca5f1b"
-dependencies = [
- "glib-sys",
- "gstreamer-gl-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-sys"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a70e3a99118bcd1221f8a62d7a905bae5e5cc2cda678bb46bf3cd36e0f899d33"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gstreamer-video"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0db8adfc000cd58f8ece0fe6b4beb79e19e4a6135cfb81138fdb016b603f7d60"
-dependencies = [
- "cfg-if",
- "futures-channel",
- "glib",
- "gstreamer",
- "gstreamer-base",
- "gstreamer-video-sys",
- "libc",
-]
-
-[[package]]
-name = "gstreamer-video-sys"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0284250a09fa824b21df1a21967eef4a5d85b5e0c1e335ed2ba9b9be1424dae"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "gstreamer-base-sys",
- "gstreamer-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gtk4"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c"
-dependencies = [
- "cairo-rs",
- "field-offset",
- "futures-channel",
- "gdk-pixbuf",
- "gdk4",
- "gio",
- "glib",
- "graphene-rs",
- "gsk4",
- "gtk4-macros",
- "gtk4-sys",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gtk4-macros"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f"
-dependencies = [
- "anyhow",
- "proc-macro-crate",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "gtk4-sys"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603"
-dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk4-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "graphene-sys",
- "gsk4-sys",
- "libc",
- "pango-sys",
- "system-deps",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
-
-[[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.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "identity"
-version = "0.1.0"
-dependencies = [
- "ashpd",
- "futures-util",
- "gettext-rs",
- "glib",
- "gst-plugin-dav1d",
- "gst-plugin-gtk4",
- "gst-plugin-webp",
- "gstreamer",
- "gstreamer-video",
- "gtk4",
- "libadwaita",
- "once_cell",
- "tracing",
- "tracing-chrome",
- "tracing-log",
- "tracing-subscriber",
- "tracing-tracy",
-]
-
-[[package]]
-name = "idna"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
-dependencies = [
- "equivalent",
- "hashbrown",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
-
-[[package]]
-name = "js-sys"
-version = "0.3.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "kv-log-macro"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libadwaita"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253"
-dependencies = [
- "gdk-pixbuf",
- "gdk4",
- "gio",
- "glib",
- "gtk4",
- "libadwaita-sys",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "libadwaita-sys"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7"
-dependencies = [
- "gdk4-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "gtk4-sys",
- "libc",
- "pango-sys",
- "system-deps",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.147"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
-
-[[package]]
-name = "libwebp-sys2"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f9c6964201c51319f16a796dc947a73961646eba49f584187b12de9970d077"
-dependencies = [
- "cc",
- "cfg-if",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
-
-[[package]]
-name = "locale_config"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934"
-dependencies = [
- "lazy_static",
- "objc",
- "objc-foundation",
- "regex",
- "winapi",
-]
-
-[[package]]
-name = "log"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
-dependencies = [
- "value-bag",
-]
-
-[[package]]
-name = "loom"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
-dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "memoffset"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "muldiv"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
-
-[[package]]
-name = "nix"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
- "memoffset 0.7.1",
- "static_assertions",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[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.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
-
-[[package]]
-name = "option-operations"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0"
-dependencies = [
- "paste",
-]
-
-[[package]]
-name = "ordered-stream"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
-dependencies = [
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "pango"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1"
-dependencies = [
- "gio",
- "glib",
- "libc",
- "once_cell",
- "pango-sys",
-]
-
-[[package]]
-name = "pango-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "parking"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
-
-[[package]]
-name = "paste"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
-
-[[package]]
-name = "polling"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if",
- "concurrent-queue",
- "libc",
- "log",
- "pin-project-lite",
- "windows-sys",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "pretty-hex"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5"
-
-[[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-dependencies = [
- "once_cell",
- "toml_edit",
-]
-
-[[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 1.0.109",
- "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.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "regex"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.3.6",
- "regex-syntax 0.7.4",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.7.4",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustix"
-version = "0.37.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.8",
- "windows-sys",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
-dependencies = [
- "bitflags 2.4.0",
- "errno",
- "libc",
- "linux-raw-sys 0.4.5",
- "windows-sys",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
-
-[[package]]
-name = "ryu"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
-[[package]]
-name = "semver"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
-
-[[package]]
-name = "serde"
-version = "1.0.186"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.186"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.105"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
-
-[[package]]
-name = "socket2"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[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.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "system-deps"
-version = "6.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3"
-dependencies = [
- "cfg-expr",
- "heck",
- "pkg-config",
- "toml",
- "version-compare",
-]
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
-
-[[package]]
-name = "temp-dir"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
-
-[[package]]
-name = "tempfile"
-version = "3.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
-dependencies = [
- "cfg-if",
- "fastrand 2.0.0",
- "redox_syscall",
- "rustix 0.38.8",
- "windows-sys",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.47"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.47"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[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 = "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 = "toml"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.19.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tracing"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
-dependencies = [
- "cfg-if",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
-]
-
-[[package]]
-name = "tracing-chrome"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "496b3cd5447f7ff527bbbf19b071ad542a000adf297d4127078b4dfdb931f41a"
-dependencies = [
- "serde_json",
- "tracing-core",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "tracing-tracy"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3edd27f53bc0e55aefa9223f68eb44354060103d3e34635f6e27627fe0227f"
-dependencies = [
- "tracing-core",
- "tracing-subscriber",
- "tracy-client",
-]
-
-[[package]]
-name = "tracy-client"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c78458aa3759647e0399e959a06f9f6dc61450a1caaa4f1632a3df8e8c55af7"
-dependencies = [
- "loom",
- "once_cell",
- "tracy-client-sys",
-]
-
-[[package]]
-name = "tracy-client-sys"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e764693ea5a090fb9b0a33fe9d32aa52656ae7ccd9f820719d2d998677c2eb"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "typenum"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "uds_windows"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d"
-dependencies = [
- "tempfile",
- "winapi",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "url"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "value-bag"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version-compare"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "waker-fn"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
-
-[[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.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.29",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.29",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
-
-[[package]]
-name = "web-sys"
-version = "0.3.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
-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-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
-dependencies = [
- "windows-targets",
-]
-
-[[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.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-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.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "winnow"
-version = "0.5.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "xdg-home"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd"
-dependencies = [
- "nix",
- "winapi",
-]
-
-[[package]]
-name = "zbus"
-version = "3.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948"
-dependencies = [
- "async-broadcast",
- "async-executor",
- "async-fs",
- "async-io",
- "async-lock",
- "async-process",
- "async-recursion",
- "async-task",
- "async-trait",
- "blocking",
- "byteorder",
- "derivative",
- "enumflags2",
- "event-listener",
- "futures-core",
- "futures-sink",
- "futures-util",
- "hex",
- "nix",
- "once_cell",
- "ordered-stream",
- "rand",
- "serde",
- "serde_repr",
- "sha1",
- "static_assertions",
- "tracing",
- "uds_windows",
- "winapi",
- "xdg-home",
- "zbus_macros",
- "zbus_names",
- "zvariant",
-]
-
-[[package]]
-name = "zbus_macros"
-version = "3.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "regex",
- "syn 1.0.109",
- "zvariant_utils",
-]
-
-[[package]]
-name = "zbus_names"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9"
-dependencies = [
- "serde",
- "static_assertions",
- "zvariant",
-]
-
-[[package]]
-name = "zvariant"
-version = "3.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c"
-dependencies = [
- "byteorder",
- "enumflags2",
- "libc",
- "serde",
- "static_assertions",
- "url",
- "zvariant_derive",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "3.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "zvariant_utils",
-]
-
-[[package]]
-name = "zvariant_utils"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix
index 55731e045e10..6b6d90647d56 100644
--- a/pkgs/by-name/id/identity/package.nix
+++ b/pkgs/by-name/id/identity/package.nix
@@ -11,7 +11,9 @@
desktop-file-utils,
gst_all_1,
gtk4,
+ lcms,
libadwaita,
+ libseccomp,
libwebp,
meson,
ninja,
@@ -22,21 +24,19 @@
stdenv.mkDerivation rec {
pname = "identity";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "YaLTeR";
repo = "identity";
rev = "v${version}";
- hash = "sha256-AiOaTjYOc7Eo+9kl1H91TKAkCKNUJNWobmBENZlHBhQ=";
+ hash = "sha256-h8/mWGuosBiQRpoW8rINJht/7UBVEnUnTKY5HBCAyw4=";
};
- cargoDeps = rustPlatform.importCargoLock {
- lockFile = ./Cargo.lock;
- outputHashes = {
- "gst-plugin-gtk4-0.12.0-alpha.1" = "sha256-JSw9yZ4oy7m6c9pqOT+fnYEbTlneLTtWQf3/Jbek/ps=";
- };
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit pname version src;
+ hash = "sha256-oO7l4zVKR93fFLqkY67DfzrAA9kUN06ov9ogwDuaVlE=";
};
nativeBuildInputs = [
@@ -60,8 +60,10 @@ stdenv.mkDerivation rec {
gst_all_1.gst-plugins-good
gst_all_1.gstreamer
gtk4
+ lcms
libadwaita
libwebp
+ libseccomp
];
passthru.updateScript = nix-update-script { };
From e0784fad5f822b4665c26b8e4eeadf29f57fb9aa Mon Sep 17 00:00:00 2001
From: seth
Date: Thu, 7 Nov 2024 15:19:51 -0500
Subject: [PATCH 0173/2159] identity: run checks
---
pkgs/by-name/id/identity/package.nix | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix
index 6b6d90647d56..b34219b9a851 100644
--- a/pkgs/by-name/id/identity/package.nix
+++ b/pkgs/by-name/id/identity/package.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
ninja
pkg-config
rustc
+ rustPlatform.cargoCheckHook
rustPlatform.cargoSetupHook
wrapGAppsHook4
];
@@ -66,6 +67,20 @@ stdenv.mkDerivation rec {
libseccomp
];
+ mesonBuildType = "release";
+
+ doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+ cargoCheckType = if (finalAttrs.mesonBuildType != "debug") then "release" else "debug";
+
+ checkPhase = ''
+ runHook preCheck
+
+ cargoCheckHook
+ mesonCheckPhase
+
+ runHook postCheck
+ '';
+
passthru.updateScript = nix-update-script { };
meta = {
From fbcf962708ba159bbb7c3b80a0e73ce4dc21424d Mon Sep 17 00:00:00 2001
From: seth
Date: Thu, 7 Nov 2024 15:22:32 -0500
Subject: [PATCH 0174/2159] identity: use best practices & cleanup
---
pkgs/by-name/id/identity/package.nix | 29 ++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix
index b34219b9a851..bcfa4d3178ca 100644
--- a/pkgs/by-name/id/identity/package.nix
+++ b/pkgs/by-name/id/identity/package.nix
@@ -1,14 +1,13 @@
{
lib,
stdenv,
- fetchFromGitLab,
- rustPlatform,
- cargo,
- rustc,
appstream,
blueprint-compiler,
+ cargo,
dav1d,
desktop-file-utils,
+ fetchFromGitLab,
+ glib,
gst_all_1,
gtk4,
lcms,
@@ -17,12 +16,14 @@
libwebp,
meson,
ninja,
- pkg-config,
nix-update-script,
+ pkg-config,
+ rustPlatform,
+ rustc,
wrapGAppsHook4,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "identity";
version = "0.7.0";
@@ -30,26 +31,30 @@ stdenv.mkDerivation rec {
domain = "gitlab.gnome.org";
owner = "YaLTeR";
repo = "identity";
- rev = "v${version}";
+ rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-h8/mWGuosBiQRpoW8rINJht/7UBVEnUnTKY5HBCAyw4=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
- inherit pname version src;
+ inherit (finalAttrs) pname version src;
hash = "sha256-oO7l4zVKR93fFLqkY67DfzrAA9kUN06ov9ogwDuaVlE=";
};
+ strictDeps = true;
+
nativeBuildInputs = [
appstream
blueprint-compiler
cargo
- desktop-file-utils
+ desktop-file-utils # for `desktop-file-validate`
+ glib # for `glib-compile-schemas`
+ gtk4 # for `gtk-update-icon-cache`
meson
ninja
pkg-config
- rustc
rustPlatform.cargoCheckHook
rustPlatform.cargoSetupHook
+ rustc
wrapGAppsHook4
];
@@ -63,8 +68,8 @@ stdenv.mkDerivation rec {
gtk4
lcms
libadwaita
- libwebp
libseccomp
+ libwebp
];
mesonBuildType = "release";
@@ -91,4 +96,4 @@ stdenv.mkDerivation rec {
mainProgram = "identity";
platforms = lib.platforms.linux;
};
-}
+})
From 6952de9ce100bc4231b6d610b76ff409e8b60df8 Mon Sep 17 00:00:00 2001
From: seth
Date: Thu, 7 Nov 2024 15:47:34 -0500
Subject: [PATCH 0175/2159] identity: use versionCheckHook
---
pkgs/by-name/id/identity/package.nix | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix
index bcfa4d3178ca..1dc05c1c4ca1 100644
--- a/pkgs/by-name/id/identity/package.nix
+++ b/pkgs/by-name/id/identity/package.nix
@@ -20,6 +20,7 @@
pkg-config,
rustPlatform,
rustc,
+ versionCheckHook,
wrapGAppsHook4,
}:
@@ -77,6 +78,9 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
cargoCheckType = if (finalAttrs.mesonBuildType != "debug") then "release" else "debug";
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ doInstallCheck = true;
+
checkPhase = ''
runHook preCheck
From 6e91bba94d11159626d5ab6eb23fdc619ee93adb Mon Sep 17 00:00:00 2001
From: seth
Date: Thu, 7 Nov 2024 15:48:38 -0500
Subject: [PATCH 0176/2159] identity: add meta.changelog
---
pkgs/by-name/id/identity/package.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix
index 1dc05c1c4ca1..1c3198cab71e 100644
--- a/pkgs/by-name/id/identity/package.nix
+++ b/pkgs/by-name/id/identity/package.nix
@@ -95,6 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Program for comparing multiple versions of an image or video";
homepage = "https://gitlab.gnome.org/YaLTeR/identity";
+ changelog = "https://gitlab.gnome.org/YaLTeR/identity/-/releases/v${finalAttrs.version}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ getchoo ];
mainProgram = "identity";
From 182f3d0737ede9acaa15aa28da6c5f6712b1e4f8 Mon Sep 17 00:00:00 2001
From: seth
Date: Thu, 7 Nov 2024 19:05:03 +0000
Subject: [PATCH 0177/2159] garnet: 1.0.18 -> 1.0.36
Changelog: https://github.com/microsoft/garnet/releases/tag/v1.0.36
Diff: https://github.com/microsoft/garnet/compare/v1.0.18...v1.0.36
---
pkgs/by-name/ga/garnet/deps.nix | 31 +++++++++++++++---------------
pkgs/by-name/ga/garnet/package.nix | 16 ++++++++++-----
2 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/pkgs/by-name/ga/garnet/deps.nix b/pkgs/by-name/ga/garnet/deps.nix
index 518e30b05d5a..04b09146a091 100644
--- a/pkgs/by-name/ga/garnet/deps.nix
+++ b/pkgs/by-name/ga/garnet/deps.nix
@@ -2,10 +2,11 @@
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
- (fetchNuGet { pname = "Azure.Core"; version = "1.25.0"; hash = "sha256-v9m4Jxa9hLH1gYK3kKITgSC0VLRdE/Qd0yBnPMnZ2XM="; })
- (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.14.1"; hash = "sha256-5HtijBNuV5RIg6MmU+xaeBuyfu7lu93dwv+fe2zU8sw="; })
- (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.13.0"; hash = "sha256-bi+rIM+7lgbrU8mOxYy0R+0tvYIe3MMUX9UuhbNfzxo="; })
+ (fetchNuGet { pname = "Azure.Core"; version = "1.41.0"; hash = "sha256-/ixQr8KFGlZa43gGd2A7aBzwu9h+wLO6OqIMy3YbW+Y="; })
+ (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.21.2"; hash = "sha256-DvdMGuophEbvvVtbRU3vsNwla0zTn5dn7HbW0Mr4P/o="; })
+ (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.20.1"; hash = "sha256-XBDyzAEt5iwdyB3jgoG5TLyx5NZ/MoiEerBR/7U7F4w="; })
(fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; hash = "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="; })
+ (fetchNuGet { pname = "KeraLua"; version = "1.4.1"; hash = "sha256-ouRL7+0bW/VYUNNYQoXenXzYO0HNF3D1IsScqtah3DE="; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; })
(fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "8.0.0"; hash = "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="; })
@@ -21,18 +22,19 @@
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; })
(fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.5.1"; hash = "sha256-q4Q9HtdGbjfih1QegppYaJh1ZrzCzQ56NXM7lQ9ZvU0="; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.5.1"; hash = "sha256-/Xuu3mzeicfMP4elmXkJvBLsoAye7c57sX+fRmE9yds="; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.5.1"; hash = "sha256-Tro3KKW/WjAnVoaMcOwvLybp+/Mm8GCObS7DPbrNCv4="; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "7.5.1"; hash = "sha256-WykYJpzRtoBaJxQth+euthUi9l2zwT1k7MIXwWdTeAs="; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "7.5.1"; hash = "sha256-1TO55DCgFxB8kzBdqwS58WK7mTyw+iOYQc8ZsCoDOKM="; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.5.1"; hash = "sha256-gf0QQMx+/n8AMoH5Yrq17ndbAeFkN95qGVRxmI7J0pE="; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.Validators"; version = "7.5.1"; hash = "sha256-o1hxAT1gKqTGTlTHEMMcHmjn7RjtbACA0X99VBaH8cI="; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.0.1"; hash = "sha256-zPWUKTCfGm4MWcYPU037NzezsFE1g8tEijjQkw5iooI="; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.0.1"; hash = "sha256-Xv9MUnjb66U3xeR9drOcSX5n2DjOCIJZPMNSKjWHo9Y="; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.0.1"; hash = "sha256-FfwrH/2eLT521Kqw+RBIoVfzlTNyYMqlWP3z+T6Wy2Y="; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "8.0.1"; hash = "sha256-v3DIpG6yfIToZBpHOjtQHRo2BhXGDoE70EVs6kBtrRg="; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "8.0.1"; hash = "sha256-ZHKaZxqESk+OU1SFTFGxvZ71zbdgWqv1L6ET9+fdXX0="; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.0.1"; hash = "sha256-beVbbVQy874HlXkTKarPTT5/r7XR1NGHA/50ywWp7YA="; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.Validators"; version = "8.0.1"; hash = "sha256-5LTLbFNWz33nco+hyKAEHcQeAWaBugJ0oMKR6AuEI34="; })
(fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "8.0.0"; hash = "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="; })
(fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "8.0.0"; hash = "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="; })
- (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; })
- (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.6.0"; hash = "sha256-CXjadDqpxzYqiZzF6t3Wl6Fum+8U1/cjmEBCkzxw7h4="; })
- (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.5.1"; hash = "sha256-1pBDkT0aL2xiPg55728rA0FHIqyCNnrv1TYLjuLnMV8="; })
+ (fetchNuGet { pname = "NLua"; version = "1.7.3"; hash = "sha256-2+eOxal0BDwAc6nJTNsFvf5E0KdfksIie7C7hEKeQos="; })
+ (fetchNuGet { pname = "System.ClientModel"; version = "1.0.0"; hash = "sha256-yHb72M/Z8LeSZea9TKw2eD0SdYEoCNwVw6Z3695SC2Y="; })
+ (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; hash = "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="; })
+ (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "8.0.1"; hash = "sha256-hW4f9zWs0afxPbcMqCA/FAGvBZbBFSkugIOurswomHg="; })
(fetchNuGet { pname = "System.Interactive.Async"; version = "6.0.1"; hash = "sha256-4yzkdop+BMlpQ+qz/H7D7LkH1Ekh9n51t9yteHpv/58="; })
(fetchNuGet { pname = "System.IO.Hashing"; version = "6.0.0"; hash = "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE="; })
(fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; hash = "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="; })
@@ -40,8 +42,7 @@
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; })
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; hash = "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="; })
- (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; })
(fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; hash = "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="; })
- (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; })
+ (fetchNuGet { pname = "System.Text.Json"; version = "8.0.5"; hash = "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; })
]
diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix
index 9fefa3ad331e..9d0eb9a8bc0c 100644
--- a/pkgs/by-name/ga/garnet/package.nix
+++ b/pkgs/by-name/ga/garnet/package.nix
@@ -1,25 +1,31 @@
{
lib,
buildDotnetModule,
- fetchFromGitHub,
dotnetCorePackages,
+ fetchFromGitHub,
nix-update-script,
}:
+
buildDotnetModule rec {
pname = "garnet";
- version = "1.0.18";
+ version = "1.0.36";
src = fetchFromGitHub {
owner = "microsoft";
repo = "garnet";
- rev = "v${version}";
- hash = "sha256-vKjFUa/f/nsBaBkxwIhtMox2qtbBzy+ipuqFHtLhbr4=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-iWfRj1PN54TXiNMSYYNq0rjA50ag0lyEJdDFw0cMv4g=";
};
projectFile = "main/GarnetServer/GarnetServer.csproj";
nugetDeps = ./deps.nix;
- dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_8_0 ];
+ dotnet-sdk =
+ with dotnetCorePackages;
+ combinePackages [
+ sdk_6_0
+ sdk_8_0
+ ];
dotnet-runtime = dotnetCorePackages.runtime_8_0;
dotnetBuildFlags = [
From 277a2669d2a5600435c4f0a4c29b93cd3833cea9 Mon Sep 17 00:00:00 2001
From: Artturin
Date: Sun, 3 Nov 2024 00:48:35 +0200
Subject: [PATCH 0178/2159] gobject-introspection: Conditionalize
`depsTargetTargetPropagated`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes ↓
```
nix-repl> pkgsCross.x86_64-freebsd.pkgsBuildHost.gobject-introspection
error: Don't know how to run x86_64-unknown-freebsd executables.
```
The unwrapped already doesn't error
```
nix-repl> pkgsCross.x86_64-freebsd.pkgsBuildHost.gobject-introspection-unwrapped
«derivation /nix/store/xq4q4vigy2glmfng2h6bbr4sysyk8ipz-gobject-introspection-1.82.0.drv»
```
https://www.github.com/NixOS/nixpkgs/blob/7b1cffdd2e13b2cdad5b37e259016efd0ea48fcd/pkgs/development/libraries/gobject-introspection/default.nix#L114
It's caused by `depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ];` in the wrapper
In `graphene` there is
`PATH=${python3.withPackages (pp: [ pp.pygobject3 pp.tappy ])}/bin:$PATH patchShebangs tests/introspection.py`
Which causes the `Don't know` error in `pkgsCross.x86_64-freebsd.pkgsBuildHost.graphene`
because `python3` and `pygobject3` will be from `pkgsHostTarget`
and then `pygobject3` has `gobject-introspection` from `pkgsHostTarget`
and then that `gobject-introspection` will have `pkgsCross.x86_64-freebsd.pkgsCross.x86_64-freebsd.buildPackages.pkgsTargetTarget.gobject-introspection.gobject-introspection` in `depsTargetTargetPropagated`
To test that importing the python library `gi` works without `depsTargetTargetPropagated`
```nix
let
pkgs =
(import ./. {
crossSystem = (import ./lib).systems.examples.aarch64-multiplatform;
# On `master` uncomment this and comment `propagatedBuildInputs` below and you'll get
# error: Don't know how to run x86_64-unknown-freebsd executables.
#crossSystem = (import ./lib).systems.examples.x86_64-freebsd;
overlays = [
(_: prev: {
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
(_: pprev: {
pygobject3-test = pprev.pygobject3.overrideAttrs {
propagatedBuildInputs = [
pprev.pycairo
(prev.gobject-introspection.overrideAttrs { depsTargetTargetPropagated = [ ]; })
];
};
})
];
})
];
}).pkgs;
pyr = pkgs.pkgsBuildHost.python3Packages.python.withPackages (pp: [ pp.pygobject3-test ]);
in
pkgs.pkgsBuildBuild.runCommand "test" { } ''
"${pyr.interpreter}" -c "import gi" && touch "$out"
''
```
---
pkgs/development/libraries/gobject-introspection/wrapper.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix
index 53b1a35f8212..5d6547a2b67d 100644
--- a/pkgs/development/libraries/gobject-introspection/wrapper.nix
+++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix
@@ -94,7 +94,10 @@ else
unwrapped = overriddenUnwrappedGir;
};
dontStrip = true;
- depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ];
+ # Conditional is for `pkgsCross.x86_64-freebsd.pkgsBuildHost.gobject-introspection` `error: Don't know how to run x86_64-unknown-freebsd executables.`
+ # `pkgsCross.x86_64-freebsd.buildPackages.python3.withPackages (pp: [ pp.pygobject3 ])`
+ # Using the python module does not need this propagation
+ depsTargetTargetPropagated = lib.optionals (stdenv.targetPlatform.emulatorAvailable buildPackages) [ overridenTargetUnwrappedGir ];
buildCommand = ''
eval fixupPhase
${lib.concatMapStrings (output: ''
From 1a118d8c4af04e90cc855fcbabe31448ce424f77 Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen
Date: Thu, 31 Oct 2024 09:42:02 +0100
Subject: [PATCH 0179/2159] evremap: init at 0-unstable-2024-06-17
---
pkgs/by-name/ev/evremap/package.nix | 36 +++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 pkgs/by-name/ev/evremap/package.nix
diff --git a/pkgs/by-name/ev/evremap/package.nix b/pkgs/by-name/ev/evremap/package.nix
new file mode 100644
index 000000000000..8771aac00093
--- /dev/null
+++ b/pkgs/by-name/ev/evremap/package.nix
@@ -0,0 +1,36 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ pkg-config,
+ libevdev,
+ nix-update-script,
+}:
+rustPlatform.buildRustPackage {
+ pname = "evremap";
+ version = "0-unstable-2024-06-17";
+
+ src = fetchFromGitHub {
+ owner = "wez";
+ repo = "evremap";
+ rev = "cc618e8b973f5c6f66682d1477b3b868a768c545";
+ hash = "sha256-aAAnlGlSFPOK3h8UuAOlFyrKTEuzbyh613IiPE7xWaA=";
+ };
+
+ cargoHash = "sha256-uFej58+51+JX36K1Rr1ZmBe7rHojOjmTO2VWINS6MvU=";
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ libevdev ];
+
+ passthru.updateScript = nix-update-script {
+ extraArgs = [ "--version=branch" ];
+ };
+
+ meta = {
+ description = "Keyboard input remapper for Linux/Wayland systems";
+ homepage = "https://github.com/wez/evremap";
+ maintainers = with lib.maintainers; [ pluiedev ];
+ license = with lib.licenses; [ mit ];
+ mainProgram = "evremap";
+ };
+}
From 5106cce978472c09277608cc88f444486fa9acd5 Mon Sep 17 00:00:00 2001
From: schrobingus
Date: Thu, 7 Nov 2024 13:53:46 -0800
Subject: [PATCH 0180/2159] maintainers: add schrobingus
---
maintainers/maintainer-list.nix | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a844c0b45998..f44e2b0485be 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19517,6 +19517,13 @@
githubId = 5104601;
name = "schnusch";
};
+ schrobingus = {
+ email = "brent.monning.jr@gmail.com";
+ name = "Brent Monning";
+ github = "schrobingus";
+ githubId = 72168352;
+ matrix = "@schrobingus:matrix.org";
+ };
Schweber = {
github = "Schweber";
githubId = 64630479;
From ffdc305e978d3c563f395102d814758baa1c69b2 Mon Sep 17 00:00:00 2001
From: David Calavera
Date: Thu, 7 Nov 2024 22:22:30 +0000
Subject: [PATCH 0181/2159] cargo-lambda: 1.4.0 -> 1.5.0
---
.../tools/rust/cargo-lambda/default.nix | 36 +++++--------------
1 file changed, 8 insertions(+), 28 deletions(-)
diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix
index b63c9e43b415..c66e39c01baa 100644
--- a/pkgs/development/tools/rust/cargo-lambda/default.nix
+++ b/pkgs/development/tools/rust/cargo-lambda/default.nix
@@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-lambda";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- hash = "sha256-QTFIFD04pAcNgj+ktY8WP0ScDmSy6mNlhfiXAabMlGE=";
+ hash = "sha256-58kVtwBZEAlv9eVesqmWMZ+KxAwEiGMm8mCf9X5tPMI=";
};
- cargoHash = "sha256-1/+bkxEpIvaJBJatqpX186MHKOdLO8Jiw8NEnyr9ctg=";
+ cargoHash = "sha256-DoMIVpYtEHvYSW2THpZFdhoFI0zjC70hYnwnzGwkJ4Q=";
nativeCheckInputs = [ cacert ];
@@ -43,36 +43,16 @@ rustPlatform.buildRustPackage rec {
];
checkFlags = [
- # Disabled because they access the network.
- "--skip=test_build_basic_extension"
- "--skip=test_build_basic_function"
- "--skip=test_build_basic_zip_extension"
- "--skip=test_build_basic_zip_function"
- "--skip=test_build_event_type_function"
- "--skip=test_build_http_feature_function"
- "--skip=test_build_http_function"
- "--skip=test_build_internal_zip_extension"
- "--skip=test_build_logs_extension"
- "--skip=test_build_telemetry_extension"
- "--skip=test_build_zip_workspace"
+ # Tests disabled because they access the network.
"--skip=test_download_example"
- "--skip=test_init_subcommand"
- "--skip=test_init_subcommand_without_override"
- "--skip=test_build_example"
- "--skip=test_deploy_workspace"
- "--skip=test_add_files"
- "--skip=test_consistent_hash"
- "--skip=test_create_binary_archive_from_target"
- "--skip=test_create_binary_archive_with_base_path"
- "--skip=test_zip_extension"
- "--skip=test_zip_funcion"
- "--skip=test_zip_funcion_with_files"
- "--skip=test_zip_internal_extension"
];
- # remove date from version output to make reproducible
+ # Remove files that don't make builds reproducible:
+ # - Remove build.rs file that adds the build date to the version.
+ # - Remove cargo_lambda.rs that contains tests that reach the network.
postPatch = ''
rm crates/cargo-lambda-cli/build.rs
+ rm crates/cargo-lambda-cli/tests/cargo_lambda.rs
'';
postInstall = ''
From 6c359f48f312d8ce42d805572fd4fe3d30fe6349 Mon Sep 17 00:00:00 2001
From: Yuxuan Shui
Date: Fri, 8 Nov 2024 00:58:41 +0000
Subject: [PATCH 0182/2159] fuse: move env vars to `env.*`
See #217206
Signed-off-by: Yuxuan Shui
---
pkgs/os-specific/linux/fuse/common.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index be73e16c8083..a2a9608fd35c 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
# Ensure that FUSE calls the setuid wrapper, not
# $out/bin/fusermount. It falls back to calling fusermount in
# $PATH, so it should also work on non-NixOS systems.
- NIX_CFLAGS_COMPILE = ''-DFUSERMOUNT_DIR="/run/wrappers/bin"'';
+ env.NIX_CFLAGS_COMPILE = ''-DFUSERMOUNT_DIR="/run/wrappers/bin"'';
preConfigure =
''
From 5bcd7350a4ae728d558f2bc244b8b20bcb01842b Mon Sep 17 00:00:00 2001
From: wrvsrx
Date: Fri, 8 Nov 2024 13:23:09 +0800
Subject: [PATCH 0183/2159] fcitx5-rime: allow empty `rimeDataPkgs`
---
pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
index 1b34b1260aac..ae6a36658fd2 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
rimeDataDrv = symlinkJoin {
name = "fcitx5-rime-data";
paths = rimeDataPkgs;
+ postBuild = "mkdir -p $out/share/rime-data";
};
postInstall = ''
From 51fc0761d20831aed4a05c2f6916d90fefdcc87f Mon Sep 17 00:00:00 2001
From: Colin
Date: Fri, 8 Nov 2024 07:28:42 +0000
Subject: [PATCH 0184/2159] syshud: 0-unstable-2024-09-26 ->
0-unstable-2024-11-04
---
pkgs/by-name/sy/syshud/package.nix | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix
index e8989bcf47b1..38aad6a345b2 100644
--- a/pkgs/by-name/sy/syshud/package.nix
+++ b/pkgs/by-name/sy/syshud/package.nix
@@ -14,18 +14,22 @@
stdenv.mkDerivation (finalAttrs: {
pname = "syshud";
- version = "0-unstable-2024-09-26";
+ version = "0-unstable-2024-11-04";
src = fetchFromGitHub {
owner = "System64fumo";
repo = "syshud";
- rev = "0b6e4958d8ea66b54bc67f0b5aa005fa3eaa4f6f";
- hash = "sha256-cyE7ZxesAmnepW7kI6b9Gp7R/v+yG2//EQAj4/X6c+c=";
+ rev = "157b725a3f29d67f16c25fb3062b62ad6fec4e15";
+ hash = "sha256-q04xYOdnnyUyiFc72Gzk65fWzQgYSOACPUXIk7kvIP8=";
};
postPatch = ''
substituteInPlace Makefile \
- --replace-fail 'pkg-config' ''${PKG_CONFIG}
+ --replace-fail pkg-config ''${PKG_CONFIG}
+ substituteInPlace src/main.cpp \
+ --replace-fail /usr/share/sys64/hud/config.conf $out/share/sys64/hud/config.conf
+ substituteInPlace src/window.cpp \
+ --replace-fail /usr/share/sys64/hud/style.css $out/share/sys64/hud/style.css
'';
nativeBuildInputs = [
From 36223da9c1947297cf10b92682e7be60a97a33e3 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Fri, 18 Oct 2024 10:38:59 +0200
Subject: [PATCH 0185/2159] buildGoModule: remove
`buildFlags`/`buildFlagsArray`
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
pkgs/build-support/go/module.nix | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index 3a3ae71de508..3b735dba266c 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -54,10 +54,6 @@
# Go build flags.
, GOFLAGS ? [ ]
- # Needed for buildFlags{,Array} warning
-, buildFlags ? "" # deprecated
-, buildFlagsArray ? "" # deprecated
-
, ...
}@args':
@@ -213,8 +209,6 @@ in
'');
buildPhase = args.buildPhase or (
- lib.warnIf (buildFlags != "" || buildFlagsArray != "")
- "`buildFlags`/`buildFlagsArray` are deprecated and will be removed in the 24.11 release. Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`"
lib.warnIf (builtins.elem "-buildid=" ldflags)
"`-buildid=` is set by default as ldflag by buildGoModule"
''
@@ -232,12 +226,13 @@ in
buildGoDir() {
local cmd="$1" dir="$2"
- declare -ga buildFlagsArray
declare -a flags
- flags+=($buildFlags "''${buildFlagsArray[@]}")
flags+=(''${tags:+-tags=''${tags// /,}})
flags+=(''${ldflags:+-ldflags="$ldflags"})
flags+=("-p" "$NIX_BUILD_CORES")
+ if (( "''${NIX_DEBUG:-0}" >= 1 )); then
+ flags+=(-x)
+ fi
if [ "$cmd" = "test" ]; then
flags+=(-vet=off)
@@ -267,10 +262,6 @@ in
fi
}
- if (( "''${NIX_DEBUG:-0}" >= 1 )); then
- buildFlagsArray+=(-x)
- fi
-
if [ -z "$enableParallelBuilding" ]; then
export NIX_BUILD_CORES=1
fi
From 41e907f884b5a2da94dae41e6195469359b09f5c Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen
Date: Thu, 31 Oct 2024 23:11:07 +0100
Subject: [PATCH 0186/2159] nixos/evremap: init module
---
.../manual/release-notes/rl-2411.section.md | 2 +
nixos/modules/module-list.nix | 1 +
nixos/modules/services/misc/evremap.nix | 167 ++++++++++++++++++
3 files changed, 170 insertions(+)
create mode 100644 nixos/modules/services/misc/evremap.nix
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 73ccad6714df..9ea2e8b5a5ed 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -121,6 +121,8 @@
- [HomeBox](https://github.com/sysadminsmedia/homebox), an inventory and organization system built for the home user. Available as [services.homebox](#opt-services.homebox.enable).
+- [evremap](https://github.com/wez/evremap), a keyboard input remapper for Linux/Wayland systems. Available as [services.evremap](options.html#opt-services.evremap).
+
- [matrix-hookshot](https://matrix-org.github.io/matrix-hookshot), a Matrix bot for connecting to external services. Available as [services.matrix-hookshot](#opt-services.matrix-hookshot.enable).
- [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various Git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0537dbf3ad1c..eef106a91229 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -752,6 +752,7 @@
./services/misc/etebase-server.nix
./services/misc/etesync-dav.nix
./services/misc/evdevremapkeys.nix
+ ./services/misc/evremap.nix
./services/misc/felix.nix
./services/misc/flaresolverr.nix
./services/misc/forgejo.nix
diff --git a/nixos/modules/services/misc/evremap.nix b/nixos/modules/services/misc/evremap.nix
new file mode 100644
index 000000000000..9508955d8171
--- /dev/null
+++ b/nixos/modules/services/misc/evremap.nix
@@ -0,0 +1,167 @@
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
+let
+ cfg = config.services.evremap;
+ format = pkgs.formats.toml { };
+
+ key = lib.types.strMatching "KEY_[[:upper:]]+" // {
+ description = "key ID prefixed with KEY_";
+ };
+
+ mkKeyOption =
+ description:
+ lib.mkOption {
+ type = key;
+ description = ''
+ ${description}
+
+ You can get a list of keys by running `evremap list-keys`.
+ '';
+ };
+ mkKeySeqOption =
+ description:
+ (mkKeyOption description)
+ // {
+ type = lib.types.listOf key;
+ };
+
+ dualRoleModule = lib.types.submodule {
+ options = {
+ input = mkKeyOption "The key that should be remapped.";
+ hold = mkKeySeqOption "The key sequence that should be output when the input key is held.";
+ tap = mkKeySeqOption "The key sequence that should be output when the input key is tapped.";
+ };
+ };
+
+ remapModule = lib.types.submodule {
+ options = {
+ input = mkKeySeqOption "The key sequence that should be remapped.";
+ output = mkKeySeqOption "The key sequence that should be output when the input sequence is entered.";
+ };
+ };
+in
+{
+ options.services.evremap = {
+ enable = lib.mkEnableOption "evremap, a keyboard input remapper for Linux/Wayland systems";
+
+ settings = lib.mkOption {
+ type = lib.types.submodule {
+ freeformType = format.type;
+
+ options = {
+ device_name = lib.mkOption {
+ type = lib.types.str;
+ example = "AT Translated Set 2 keyboard";
+ description = ''
+ The name of the device that should be remapped.
+
+ You can get a list of devices by running `evremap list-devices` with elevated permissions.
+ '';
+ };
+
+ dual_role = lib.mkOption {
+ type = lib.types.listOf dualRoleModule;
+ default = [ ];
+ example = [
+ {
+ input = "KEY_CAPSLOCK";
+ hold = [ "KEY_LEFTCTRL" ];
+ tap = [ "KEY_ESC" ];
+ }
+ ];
+ description = ''
+ List of dual-role remappings that output different key sequences based on whether the
+ input key is held or tapped.
+ '';
+ };
+
+ remap = lib.mkOption {
+ type = lib.types.listOf remapModule;
+ default = [ ];
+ example = [
+ {
+ input = [
+ "KEY_LEFTALT"
+ "KEY_UP"
+ ];
+ output = [ "KEY_PAGEUP" ];
+ }
+ ];
+ description = ''
+ List of remappings.
+ '';
+ };
+ };
+ };
+
+ description = ''
+ Settings for evremap.
+
+ See the [upstream documentation](https://github.com/wez/evremap/blob/master/README.md#configuration)
+ for how to configure evremap.
+ '';
+ default = { };
+ };
+ };
+
+ config = lib.mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.evremap ];
+
+ hardware.uinput.enable = true;
+
+ systemd.services.evremap = {
+ description = "evremap - keyboard input remapper";
+ wantedBy = [ "multi-user.target" ];
+
+ script = "${lib.getExe pkgs.evremap} remap ${format.generate "evremap.toml" cfg.settings}";
+
+ serviceConfig = {
+ DynamicUser = true;
+ User = "evremap";
+ SupplementaryGroups = [
+ config.users.groups.input.name
+ config.users.groups.uinput.name
+ ];
+ Restart = "on-failure";
+ RestartSec = 5;
+ TimeoutSec = 20;
+
+ # Hardening
+ ProtectClock = true;
+ ProtectKernelLogs = true;
+ ProtectControlGroups = true;
+ ProtectKernelModules = true;
+ ProtectHostname = true;
+ ProtectKernelTunables = true;
+ ProtectProc = "invisible";
+ ProtectHome = true;
+ ProcSubset = "pid";
+
+ PrivateTmp = true;
+ PrivateNetwork = true;
+ PrivateUsers = true;
+
+ RestrictRealtime = true;
+ RestrictNamespaces = true;
+ RestrictAddressFamilies = "none";
+
+ MemoryDenyWriteExecute = true;
+ LockPersonality = true;
+ IPAddressDeny = "any";
+ AmbientCapabilities = "";
+ CapabilityBoundingSet = "";
+ SystemCallArchitectures = "native";
+ SystemCallFilter = [
+ "@system-service"
+ "~@resources"
+ "~@privileged"
+ ];
+ UMask = "0027";
+ };
+ };
+ };
+}
From ba29d1f53554feaf3f4545a9354ef3e892d8f8e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B6xtermann?=
Date: Fri, 8 Nov 2024 09:33:37 +0100
Subject: [PATCH 0187/2159] xpra: 6.1.3 -> 6.2.1
---
pkgs/tools/X11/xpra/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 73998f83646b..324fe3aeeb30 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -70,13 +70,13 @@ let
'';
in buildPythonApplication rec {
pname = "xpra";
- version = "6.1.3";
+ version = "6.2.1";
src = fetchFromGitHub {
owner = "Xpra-org";
repo = "xpra";
rev = "v${version}";
- hash = "sha256-b21kSHaveRzJhFvdNaFdoQpC9B3Hu0X79EOIjkbvxWk=";
+ hash = "sha256-TdRQcl0o9L37JXWxoWkAw9sAH5eWpynWkCwo1tBwa9s=";
};
patches = [
From 9360b490a87e2c2d2bef346ae8b9319951d35d4a Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Fri, 8 Nov 2024 09:57:03 +0100
Subject: [PATCH 0188/2159] distribution: 3.0.0-beta.1 -> 3.0.0-rc.1
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
pkgs/by-name/di/distribution/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/di/distribution/package.nix b/pkgs/by-name/di/distribution/package.nix
index 7f2e4c5407b7..c88851553530 100644
--- a/pkgs/by-name/di/distribution/package.nix
+++ b/pkgs/by-name/di/distribution/package.nix
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "distribution";
- version = "3.0.0-beta.1";
+ version = "3.0.0-rc.1";
src = fetchFromGitHub {
owner = "distribution";
repo = "distribution";
rev = "v${version}";
- hash = "sha256-tiTwrcRtOEIs1sCkzHXY1TPYw0TOdDvM2Y8YdgQjEmI=";
+ hash = "sha256-dfy3P8zAFlni2heQcz61+sjivHE97Syh/ICreTgxUAM=";
};
vendorHash = null;
From 7f886ba9dbe32d52c229678b36ca5f67bb3c40e7 Mon Sep 17 00:00:00 2001
From: Michael Adler
Date: Fri, 8 Nov 2024 09:57:30 +0100
Subject: [PATCH 0189/2159] luaprompt: install man page
---
pkgs/development/lua-modules/overrides.nix | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 8ad01a57b105..18f754068828 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -415,11 +415,17 @@ in
];
});
- luaprompt = prev.luaprompt.overrideAttrs (_: {
+ luaprompt = prev.luaprompt.overrideAttrs (oa: {
externalDeps = [
{ name = "READLINE"; dep = readline; }
{ name = "HISTORY"; dep = readline; }
];
+
+ nativeBuildInputs = oa.nativeBuildInputs ++ [ installShellFiles ];
+
+ postInstall = ''
+ installManPage luap.1
+ '';
});
# As a nix user, use this derivation instead of "luarocks_bootstrap"
From 185dfb5fc6e65c048febb83f49a880d9c9f1c073 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt
Date: Fri, 8 Nov 2024 10:21:42 +0100
Subject: [PATCH 0190/2159] sus-compiler: 0.0.2 -> 0.1.1
diff: https://github.com/pc2/sus-compiler/compare/v0.0.2...v0.1.1
release: https://github.com/pc2/sus-compiler/releases/tag/v0.1.1
---
pkgs/by-name/su/sus-compiler/Cargo.lock | 463 ++++++++++++++++++++---
pkgs/by-name/su/sus-compiler/package.nix | 8 +-
2 files changed, 407 insertions(+), 64 deletions(-)
diff --git a/pkgs/by-name/su/sus-compiler/Cargo.lock b/pkgs/by-name/su/sus-compiler/Cargo.lock
index 56bc269bde50..6f70ec513dab 100644
--- a/pkgs/by-name/su/sus-compiler/Cargo.lock
+++ b/pkgs/by-name/su/sus-compiler/Cargo.lock
@@ -21,6 +21,12 @@ dependencies = [
"yansi",
]
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
[[package]]
name = "atty"
version = "0.2.14"
@@ -34,9 +40,9 @@ dependencies = [
[[package]]
name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bitflags"
@@ -45,14 +51,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
-name = "cc"
-version = "1.1.19"
+name = "bitflags"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d74707dde2ba56f86ae90effb3b43ddd369504387e718014de010cec7959800"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "cc"
+version = "1.1.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baee610e9452a8f6f0a1b6194ec09ff9e2d85dea54432acdae41aa0761c95d70"
dependencies = [
"shlex",
]
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
[[package]]
name = "clap"
version = "3.2.25"
@@ -60,7 +78,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
dependencies = [
"atty",
- "bitflags",
+ "bitflags 1.3.2",
"clap_lex",
"indexmap",
"strsim",
@@ -92,6 +110,38 @@ version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
[[package]]
name = "form_urlencoded"
version = "1.2.1"
@@ -101,6 +151,17 @@ dependencies = [
"percent-encoding",
]
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
[[package]]
name = "hashbrown"
version = "0.12.3"
@@ -117,13 +178,142 @@ dependencies = [
]
[[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_collections"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
]
[[package]]
@@ -144,9 +334,25 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]]
name = "libc"
-version = "0.2.158"
+version = "0.2.162"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+]
+
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
[[package]]
name = "log"
@@ -172,7 +378,7 @@ version = "0.94.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"serde",
"serde_json",
"serde_repr",
@@ -272,9 +478,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
@@ -289,10 +495,21 @@ dependencies = [
]
[[package]]
-name = "regex"
-version = "1.10.6"
+name = "redox_users"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick",
"memchr",
@@ -302,9 +519,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
@@ -313,9 +530,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "ryu"
@@ -325,29 +542,29 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]]
name = "serde"
-version = "1.0.210"
+version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.210"
+version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.87",
]
[[package]]
name = "serde_json"
-version = "1.0.128"
+version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"itoa",
"memchr",
@@ -363,7 +580,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.87",
]
[[package]]
@@ -372,6 +589,18 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
[[package]]
name = "strsim"
version = "0.10.0"
@@ -380,7 +609,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "sus-proc-macro"
-version = "0.0.1"
+version = "0.1.0"
dependencies = [
"quote",
"syn 1.0.109",
@@ -390,10 +619,12 @@ dependencies = [
[[package]]
name = "sus_compiler"
-version = "0.0.2"
+version = "0.1.1"
dependencies = [
"ariadne",
+ "arrayvec",
"clap",
+ "dirs-next",
"lsp-server",
"lsp-types",
"num",
@@ -417,15 +648,26 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.77"
+version = "2.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
[[package]]
name = "termcolor"
version = "1.4.1"
@@ -442,19 +684,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
[[package]]
-name = "tinyvec"
-version = "1.8.0"
+name = "thiserror"
+version = "1.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892"
dependencies = [
- "tinyvec_macros",
+ "thiserror-impl",
]
[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
+name = "thiserror-impl"
+version = "1.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
[[package]]
name = "tree-sitter"
@@ -468,44 +725,29 @@ dependencies = [
[[package]]
name = "tree-sitter-sus"
-version = "0.0.2"
+version = "0.1.0"
dependencies = [
"cc",
"tree-sitter",
]
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
[[package]]
name = "unicode-ident"
version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
[[package]]
name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "url"
-version = "2.5.2"
+version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
dependencies = [
"form_urlencoded",
"idna",
@@ -513,6 +755,24 @@ dependencies = [
"serde",
]
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
[[package]]
name = "winapi"
version = "0.3.9"
@@ -617,8 +877,87 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
[[package]]
name = "yansi"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
diff --git a/pkgs/by-name/su/sus-compiler/package.nix b/pkgs/by-name/su/sus-compiler/package.nix
index adc2bf9b4e7d..c7f38a8fe4f3 100644
--- a/pkgs/by-name/su/sus-compiler/package.nix
+++ b/pkgs/by-name/su/sus-compiler/package.nix
@@ -7,19 +7,23 @@
rustPlatform.buildRustPackage rec {
pname = "sus-compiler";
- version = "0.0.2";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "pc2";
repo = "sus-compiler";
rev = "v${version}";
- hash = "sha256-f93uT6ELW3T2Xd539EfZCf2LSbxcYnEX+smmLzBAxqc=";
+ hash = "sha256-VSoroUultjBn2KxfvyhS923RQ/1v9AXb15k4/MoR+oM=";
fetchSubmodules = true;
};
# no lockfile upstream
cargoLock.lockFile = ./Cargo.lock;
+ preBuild = ''
+ export HOME="$TMPDIR";
+ '';
+
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
From 36d73142c0625683ee950d87cd8bcadc04c45fe0 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt
Date: Fri, 8 Nov 2024 10:11:22 +0100
Subject: [PATCH 0191/2159] pagefind: 1.1.1 -> 1.2.0
changelog: https://github.com/CloudCannon/pagefind/releases/tag/v1.2.0
Diff: https://github.com/cloudcannon/pagefind/compare/refs/tags/v1.1.1...v1.2.0
---
pkgs/applications/misc/pagefind/default.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix
index 8caf7c0fbe17..9bdeb864ca95 100644
--- a/pkgs/applications/misc/pagefind/default.nix
+++ b/pkgs/applications/misc/pagefind/default.nix
@@ -16,6 +16,8 @@
wasm-pack,
}:
+# TODO: package python bindings
+
let
wasm-bindgen-92 = wasm-bindgen-cli.override {
@@ -36,16 +38,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "pagefind";
- version = "1.1.1";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "cloudcannon";
repo = "pagefind";
rev = "refs/tags/v${version}";
- hash = "sha256-4NfosDp5Wwz2lnqaFNcaIbWpjWiaQ4WCL6TcKEkfPck=";
+ hash = "sha256-OKZYy+Mm9xOEBBD/tI2GwP2+Myt5aELosRP8Tbi5bqY=";
};
- cargoHash = "sha256-hnT9w3j8/YuN00x0LBPr75BKGWSnIYUNFTWIgtghJP4";
+ cargoHash = "sha256-k50RyGuS66r+wWIij7yOOSlDxXYY1y+lTJgCkMREllc=";
env.npmDeps_web_js = fetchNpmDeps {
name = "npm-deps-web-js";
From e101d57e4448f3f3fbaee8fac8bfb3a6f33daadb Mon Sep 17 00:00:00 2001
From: Brieuc Dubois
Date: Fri, 1 Nov 2024 08:26:14 +0200
Subject: [PATCH 0192/2159] hyprsome: init at 0.1.12
---
pkgs/by-name/hy/hyprsome/package.nix | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 pkgs/by-name/hy/hyprsome/package.nix
diff --git a/pkgs/by-name/hy/hyprsome/package.nix b/pkgs/by-name/hy/hyprsome/package.nix
new file mode 100644
index 000000000000..a7bf15ee4f3b
--- /dev/null
+++ b/pkgs/by-name/hy/hyprsome/package.nix
@@ -0,0 +1,28 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage {
+ pname = "hyprsome";
+ version = "0.1.12-unstable-2024-05-20";
+
+ src = fetchFromGitHub {
+ owner = "sopa0";
+ repo = "hyprsome";
+ rev = "985e1a3b03b5118c98c03983f60ea9f74775858c";
+ hash = "sha256-JiOV9c23yOhaVW2NHgs8rjM8l9qt181Tigf5sCnPep8=";
+ };
+
+ cargoHash = "sha256-Jqx77/PDWEJ+NPJN2R6n4w9nVPXQoHeuVfYKUB3i9Lg=";
+
+ meta = {
+ description = "Awesome-like workspaces for Hyprland";
+ homepage = "https://github.com/sopa0/hyprsome";
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ bhasherbel ];
+ platforms = lib.platforms.linux;
+ mainProgram = "hyprsome";
+ };
+}
From 4c0227b02a650ef42705057f61bd9b19bf1b1bc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?=
<23130178+ShadowRZ@users.noreply.github.com>
Date: Thu, 24 Oct 2024 14:16:11 +0800
Subject: [PATCH 0193/2159] netlify-cli: 12.2.4 -> 17.37.1, migrate to
buildNpmPackage
---
.../web/netlify-cli/composition.nix | 17 -
pkgs/development/web/netlify-cli/default.nix | 58 +-
pkgs/development/web/netlify-cli/generate.sh | 14 -
.../web/netlify-cli/netlify-cli.json | 6 -
pkgs/development/web/netlify-cli/node-env.nix | 689 -
.../web/netlify-cli/node-packages.nix | 11931 ----------------
pkgs/development/web/netlify-cli/shell.nix | 7 -
pkgs/development/web/netlify-cli/update.sh | 11 -
8 files changed, 40 insertions(+), 12693 deletions(-)
delete mode 100644 pkgs/development/web/netlify-cli/composition.nix
delete mode 100755 pkgs/development/web/netlify-cli/generate.sh
delete mode 100644 pkgs/development/web/netlify-cli/netlify-cli.json
delete mode 100644 pkgs/development/web/netlify-cli/node-env.nix
delete mode 100644 pkgs/development/web/netlify-cli/node-packages.nix
delete mode 100644 pkgs/development/web/netlify-cli/shell.nix
delete mode 100755 pkgs/development/web/netlify-cli/update.sh
diff --git a/pkgs/development/web/netlify-cli/composition.nix b/pkgs/development/web/netlify-cli/composition.nix
deleted file mode 100644
index 4bd736ddc723..000000000000
--- a/pkgs/development/web/netlify-cli/composition.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file has been generated by node2nix 1.11.1. Do not edit!
-
-{pkgs ? import {
- inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
-
-let
- nodeEnv = import ./node-env.nix {
- inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
- inherit pkgs nodejs;
- libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
- };
-in
-import ./node-packages.nix {
- inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
- inherit nodeEnv;
-}
diff --git a/pkgs/development/web/netlify-cli/default.nix b/pkgs/development/web/netlify-cli/default.nix
index d5b06686a88d..59ac34156b39 100644
--- a/pkgs/development/web/netlify-cli/default.nix
+++ b/pkgs/development/web/netlify-cli/default.nix
@@ -1,18 +1,40 @@
-{ callPackage, fetchFromGitHub, lib, pkgs }:
-let
- nodePackages = import ./composition.nix { inherit pkgs; };
- sourceInfo = (lib.importJSON ./netlify-cli.json);
-in
- nodePackages.package.override {
- preRebuild = ''
- export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild"
- '';
- src = fetchFromGitHub {
- inherit (sourceInfo) owner repo rev hash;
- };
- bypassCache = true;
- reconstructLock = true;
- passthru.tests.test = callPackage ./test.nix { };
- meta.maintainers = with lib.maintainers; [ roberth ];
- meta.mainProgram = "netlify";
- }
+{
+ callPackage,
+ vips,
+ pkg-config,
+ lib,
+ buildNpmPackage,
+ fetchFromGitHub,
+ nix-update-script,
+}:
+
+buildNpmPackage rec {
+ pname = "netlify-cli";
+ version = "17.37.1";
+
+ src = fetchFromGitHub {
+ owner = "netlify";
+ repo = "cli";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-34WvnbvLv2bB8CTlFKf351eQ5enYRhDqHoHRvJTBq4M=";
+ };
+
+ npmDepsHash = "sha256-zbr8TVCIKa/x5vzc3bR++qDcu0AuAgq1rfE69rytCWw=";
+
+ buildInputs = [ vips ];
+ nativeBuildInputs = [ pkg-config ];
+
+ passthru = {
+ tests.test = callPackage ./test.nix { };
+ updateScript = nix-update-script { };
+ };
+
+ meta = {
+ description = "Netlify command line tool";
+ homepage = "https://github.com/netlify/cli";
+ changelog = "https://github.com/netlify/cli/blob/v${version}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ roberth ];
+ mainProgram = "netlify";
+ };
+}
diff --git a/pkgs/development/web/netlify-cli/generate.sh b/pkgs/development/web/netlify-cli/generate.sh
deleted file mode 100755
index 3eaed13a85b7..000000000000
--- a/pkgs/development/web/netlify-cli/generate.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-set -eu -o pipefail
-cd "$( dirname "${BASH_SOURCE[0]}" )"
-rm -f ./node-env.nix
-src="$(nix-build --expr 'let pkgs = import ../../../.. {}; meta = (pkgs.lib.importJSON ./netlify-cli.json); in pkgs.fetchFromGitHub { inherit (meta) owner repo rev hash; }')"
-echo $src
-node2nix \
- --input $src/package.json \
- --lock $src/npm-shrinkwrap.json \
- --output node-packages.nix \
- --composition composition.nix \
- --node-env node-env.nix \
- --nodejs-18 \
- ;
diff --git a/pkgs/development/web/netlify-cli/netlify-cli.json b/pkgs/development/web/netlify-cli/netlify-cli.json
deleted file mode 100644
index 1fe187bcbccc..000000000000
--- a/pkgs/development/web/netlify-cli/netlify-cli.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "owner": "netlify",
- "repo": "cli",
- "rev": "6c7e8c9a4db4e2e408f65e6098a194497944e306",
- "hash": "sha256-YMnQrurZDJtfeHBCIzy6vToGHnqtdRGvWFPX5RcWyPg="
-}
diff --git a/pkgs/development/web/netlify-cli/node-env.nix b/pkgs/development/web/netlify-cli/node-env.nix
deleted file mode 100644
index eb94495aeba3..000000000000
--- a/pkgs/development/web/netlify-cli/node-env.nix
+++ /dev/null
@@ -1,689 +0,0 @@
-# This file originates from node2nix
-
-{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
-
-let
- # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
- utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
-
- python = if nodejs ? python then nodejs.python else python2;
-
- # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
- tarWrapper = runCommand "tarWrapper" {} ''
- mkdir -p $out/bin
-
- cat > $out/bin/tar <> $out/nix-support/hydra-build-products
- '';
- };
-
- # Common shell logic
- installPackage = writeShellScript "install-package" ''
- installPackage() {
- local packageName=$1 src=$2
-
- local strippedName
-
- local DIR=$PWD
- cd $TMPDIR
-
- unpackFile $src
-
- # Make the base dir in which the target dependency resides first
- mkdir -p "$(dirname "$DIR/$packageName")"
-
- if [ -f "$src" ]
- then
- # Figure out what directory has been unpacked
- packageDir="$(find . -maxdepth 1 -type d | tail -1)"
-
- # Restore write permissions to make building work
- find "$packageDir" -type d -exec chmod u+x {} \;
- chmod -R u+w "$packageDir"
-
- # Move the extracted tarball into the output folder
- mv "$packageDir" "$DIR/$packageName"
- elif [ -d "$src" ]
- then
- # Get a stripped name (without hash) of the source directory.
- # On old nixpkgs it's already set internally.
- if [ -z "$strippedName" ]
- then
- strippedName="$(stripHash $src)"
- fi
-
- # Restore write permissions to make building work
- chmod -R u+w "$strippedName"
-
- # Move the extracted directory into the output folder
- mv "$strippedName" "$DIR/$packageName"
- fi
-
- # Change to the package directory to install dependencies
- cd "$DIR/$packageName"
- }
- '';
-
- # Bundle the dependencies of the package
- #
- # Only include dependencies if they don't exist. They may also be bundled in the package.
- includeDependencies = {dependencies}:
- lib.optionalString (dependencies != []) (
- ''
- mkdir -p node_modules
- cd node_modules
- ''
- + (lib.concatMapStrings (dependency:
- ''
- if [ ! -e "${dependency.packageName}" ]; then
- ${composePackage dependency}
- fi
- ''
- ) dependencies)
- + ''
- cd ..
- ''
- );
-
- # Recursively composes the dependencies of a package
- composePackage = { name, packageName, src, dependencies ? [], ... }@args:
- builtins.addErrorContext "while evaluating node package '${packageName}'" ''
- installPackage "${packageName}" "${src}"
- ${includeDependencies { inherit dependencies; }}
- cd ..
- ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
- '';
-
- pinpointDependencies = {dependencies, production}:
- let
- pinpointDependenciesFromPackageJSON = writeTextFile {
- name = "pinpointDependencies.js";
- text = ''
- var fs = require('fs');
- var path = require('path');
-
- function resolveDependencyVersion(location, name) {
- if(location == process.env['NIX_STORE']) {
- return null;
- } else {
- var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
-
- if(fs.existsSync(dependencyPackageJSON)) {
- var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
-
- if(dependencyPackageObj.name == name) {
- return dependencyPackageObj.version;
- }
- } else {
- return resolveDependencyVersion(path.resolve(location, ".."), name);
- }
- }
- }
-
- function replaceDependencies(dependencies) {
- if(typeof dependencies == "object" && dependencies !== null) {
- for(var dependency in dependencies) {
- var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
-
- if(resolvedVersion === null) {
- process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
- } else {
- dependencies[dependency] = resolvedVersion;
- }
- }
- }
- }
-
- /* Read the package.json configuration */
- var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-
- /* Pinpoint all dependencies */
- replaceDependencies(packageObj.dependencies);
- if(process.argv[2] == "development") {
- replaceDependencies(packageObj.devDependencies);
- }
- else {
- packageObj.devDependencies = {};
- }
- replaceDependencies(packageObj.optionalDependencies);
- replaceDependencies(packageObj.peerDependencies);
-
- /* Write the fixed package.json file */
- fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
- '';
- };
- in
- ''
- node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
-
- ${lib.optionalString (dependencies != [])
- ''
- if [ -d node_modules ]
- then
- cd node_modules
- ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
- cd ..
- fi
- ''}
- '';
-
- # Recursively traverses all dependencies of a package and pinpoints all
- # dependencies in the package.json file to the versions that are actually
- # being used.
-
- pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
- ''
- if [ -d "${packageName}" ]
- then
- cd "${packageName}"
- ${pinpointDependencies { inherit dependencies production; }}
- cd ..
- ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
- fi
- '';
-
- # Extract the Node.js source code which is used to compile packages with
- # native bindings
- nodeSources = runCommand "node-sources" {} ''
- tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
- mv node-* $out
- '';
-
- # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
- addIntegrityFieldsScript = writeTextFile {
- name = "addintegrityfields.js";
- text = ''
- var fs = require('fs');
- var path = require('path');
-
- function augmentDependencies(baseDir, dependencies) {
- for(var dependencyName in dependencies) {
- var dependency = dependencies[dependencyName];
-
- // Open package.json and augment metadata fields
- var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
- var packageJSONPath = path.join(packageJSONDir, "package.json");
-
- if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
- console.log("Adding metadata fields to: "+packageJSONPath);
- var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
-
- if(dependency.integrity) {
- packageObj["_integrity"] = dependency.integrity;
- } else {
- packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
- }
-
- if(dependency.resolved) {
- packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
- } else {
- packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
- }
-
- if(dependency.from !== undefined) { // Adopt from property if one has been provided
- packageObj["_from"] = dependency.from;
- }
-
- fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
- }
-
- // Augment transitive dependencies
- if(dependency.dependencies !== undefined) {
- augmentDependencies(packageJSONDir, dependency.dependencies);
- }
- }
- }
-
- if(fs.existsSync("./package-lock.json")) {
- var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
-
- if(![1, 2].includes(packageLock.lockfileVersion)) {
- process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
- process.exit(1);
- }
-
- if(packageLock.dependencies !== undefined) {
- augmentDependencies(".", packageLock.dependencies);
- }
- }
- '';
- };
-
- # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
- reconstructPackageLock = writeTextFile {
- name = "reconstructpackagelock.js";
- text = ''
- var fs = require('fs');
- var path = require('path');
-
- var packageObj = JSON.parse(fs.readFileSync("package.json"));
-
- var lockObj = {
- name: packageObj.name,
- version: packageObj.version,
- lockfileVersion: 2,
- requires: true,
- packages: {
- "": {
- name: packageObj.name,
- version: packageObj.version,
- license: packageObj.license,
- bin: packageObj.bin,
- dependencies: packageObj.dependencies,
- engines: packageObj.engines,
- optionalDependencies: packageObj.optionalDependencies
- }
- },
- dependencies: {}
- };
-
- function augmentPackageJSON(filePath, packages, dependencies) {
- var packageJSON = path.join(filePath, "package.json");
- if(fs.existsSync(packageJSON)) {
- var packageObj = JSON.parse(fs.readFileSync(packageJSON));
- packages[filePath] = {
- version: packageObj.version,
- integrity: "sha1-000000000000000000000000000=",
- dependencies: packageObj.dependencies,
- engines: packageObj.engines,
- optionalDependencies: packageObj.optionalDependencies
- };
- dependencies[packageObj.name] = {
- version: packageObj.version,
- integrity: "sha1-000000000000000000000000000=",
- dependencies: {}
- };
- processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies);
- }
- }
-
- function processDependencies(dir, packages, dependencies) {
- if(fs.existsSync(dir)) {
- var files = fs.readdirSync(dir);
-
- files.forEach(function(entry) {
- var filePath = path.join(dir, entry);
- var stats = fs.statSync(filePath);
-
- if(stats.isDirectory()) {
- if(entry.substr(0, 1) == "@") {
- // When we encounter a namespace folder, augment all packages belonging to the scope
- var pkgFiles = fs.readdirSync(filePath);
-
- pkgFiles.forEach(function(entry) {
- if(stats.isDirectory()) {
- var pkgFilePath = path.join(filePath, entry);
- augmentPackageJSON(pkgFilePath, packages, dependencies);
- }
- });
- } else {
- augmentPackageJSON(filePath, packages, dependencies);
- }
- }
- });
- }
- }
-
- processDependencies("node_modules", lockObj.packages, lockObj.dependencies);
-
- fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
- '';
- };
-
- # Script that links bins defined in package.json to the node_modules bin directory
- # NPM does not do this for top-level packages itself anymore as of v7
- linkBinsScript = writeTextFile {
- name = "linkbins.js";
- text = ''
- var fs = require('fs');
- var path = require('path');
-
- var packageObj = JSON.parse(fs.readFileSync("package.json"));
-
- var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep);
-
- if(packageObj.bin !== undefined) {
- fs.mkdirSync(path.join(nodeModules, ".bin"))
-
- if(typeof packageObj.bin == "object") {
- Object.keys(packageObj.bin).forEach(function(exe) {
- if(fs.existsSync(packageObj.bin[exe])) {
- console.log("linking bin '" + exe + "'");
- fs.symlinkSync(
- path.join("..", packageObj.name, packageObj.bin[exe]),
- path.join(nodeModules, ".bin", exe)
- );
- }
- else {
- console.log("skipping non-existent bin '" + exe + "'");
- }
- })
- }
- else {
- if(fs.existsSync(packageObj.bin)) {
- console.log("linking bin '" + packageObj.bin + "'");
- fs.symlinkSync(
- path.join("..", packageObj.name, packageObj.bin),
- path.join(nodeModules, ".bin", packageObj.name.split("/").pop())
- );
- }
- else {
- console.log("skipping non-existent bin '" + packageObj.bin + "'");
- }
- }
- }
- else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) {
- fs.mkdirSync(path.join(nodeModules, ".bin"))
-
- fs.readdirSync(packageObj.directories.bin).forEach(function(exe) {
- if(fs.existsSync(path.join(packageObj.directories.bin, exe))) {
- console.log("linking bin '" + exe + "'");
- fs.symlinkSync(
- path.join("..", packageObj.name, packageObj.directories.bin, exe),
- path.join(nodeModules, ".bin", exe)
- );
- }
- else {
- console.log("skipping non-existent bin '" + exe + "'");
- }
- })
- }
- '';
- };
-
- prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
- let
- forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
- in
- ''
- # Pinpoint the versions of all dependencies to the ones that are actually being used
- echo "pinpointing versions of dependencies..."
- source $pinpointDependenciesScriptPath
-
- # Patch the shebangs of the bundled modules to prevent them from
- # calling executables outside the Nix store as much as possible
- patchShebangs .
-
- # Deploy the Node.js package by running npm install. Since the
- # dependencies have been provided already by ourselves, it should not
- # attempt to install them again, which is good, because we want to make
- # it Nix's responsibility. If it needs to install any dependencies
- # anyway (e.g. because the dependency parameters are
- # incomplete/incorrect), it fails.
- #
- # The other responsibilities of NPM are kept -- version checks, build
- # steps, postprocessing etc.
-
- export HOME=$TMPDIR
- cd "${packageName}"
- runHook preRebuild
-
- ${lib.optionalString bypassCache ''
- ${lib.optionalString reconstructLock ''
- if [ -f package-lock.json ]
- then
- echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
- echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
- rm package-lock.json
- else
- echo "No package-lock.json file found, reconstructing..."
- fi
-
- node ${reconstructPackageLock}
- ''}
-
- node ${addIntegrityFieldsScript}
- ''}
-
- npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
-
- runHook postRebuild
-
- if [ "''${dontNpmInstall-}" != "1" ]
- then
- # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
- rm -f npm-shrinkwrap.json
-
- npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install
- fi
-
- # Link executables defined in package.json
- node ${linkBinsScript}
- '';
-
- # Builds and composes an NPM package including all its dependencies
- buildNodePackage =
- { name
- , packageName
- , version ? null
- , dependencies ? []
- , buildInputs ? []
- , production ? true
- , npmFlags ? ""
- , dontNpmInstall ? false
- , bypassCache ? false
- , reconstructLock ? false
- , preRebuild ? ""
- , dontStrip ? true
- , unpackPhase ? "true"
- , buildPhase ? "true"
- , meta ? {}
- , ... }@args:
-
- let
- extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
- in
- stdenv.mkDerivation ({
- name = "${name}${if version == null then "" else "-${version}"}";
- buildInputs = [ tarWrapper python nodejs ]
- ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux
- ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
- ++ buildInputs;
-
- inherit nodejs;
-
- inherit dontStrip; # Stripping may fail a build for some package deployments
- inherit dontNpmInstall preRebuild unpackPhase buildPhase;
-
- compositionScript = composePackage args;
- pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-
- passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
-
- installPhase = ''
- source ${installPackage}
-
- # Create and enter a root node_modules/ folder
- mkdir -p $out/lib/node_modules
- cd $out/lib/node_modules
-
- # Compose the package and all its dependencies
- source $compositionScriptPath
-
- ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
-
- # Create symlink to the deployed executable folder, if applicable
- if [ -d "$out/lib/node_modules/.bin" ]
- then
- ln -s $out/lib/node_modules/.bin $out/bin
-
- # Fixup all executables
- ls $out/bin/* | while read i
- do
- file="$(readlink -f "$i")"
- chmod u+rwx "$file"
- if isScript "$file"
- then
- sed -i 's/\r$//' "$file" # convert crlf to lf
- fi
- done
- fi
-
- # Create symlinks to the deployed manual page folders, if applicable
- if [ -d "$out/lib/node_modules/${packageName}/man" ]
- then
- mkdir -p $out/share
- for dir in "$out/lib/node_modules/${packageName}/man/"*
- do
- mkdir -p $out/share/man/$(basename "$dir")
- for page in "$dir"/*
- do
- ln -s $page $out/share/man/$(basename "$dir")
- done
- done
- fi
-
- # Run post install hook, if provided
- runHook postInstall
- '';
-
- meta = {
- # default to Node.js' platforms
- platforms = nodejs.meta.platforms;
- } // meta;
- } // extraArgs);
-
- # Builds a node environment (a node_modules folder and a set of binaries)
- buildNodeDependencies =
- { name
- , packageName
- , version ? null
- , src
- , dependencies ? []
- , buildInputs ? []
- , production ? true
- , npmFlags ? ""
- , dontNpmInstall ? false
- , bypassCache ? false
- , reconstructLock ? false
- , dontStrip ? true
- , unpackPhase ? "true"
- , buildPhase ? "true"
- , ... }@args:
-
- let
- extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
- in
- stdenv.mkDerivation ({
- name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
-
- buildInputs = [ tarWrapper python nodejs ]
- ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux
- ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
- ++ buildInputs;
-
- inherit dontStrip; # Stripping may fail a build for some package deployments
- inherit dontNpmInstall unpackPhase buildPhase;
-
- includeScript = includeDependencies { inherit dependencies; };
- pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-
- passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
-
- installPhase = ''
- source ${installPackage}
-
- mkdir -p $out/${packageName}
- cd $out/${packageName}
-
- source $includeScriptPath
-
- # Create fake package.json to make the npm commands work properly
- cp ${src}/package.json .
- chmod 644 package.json
- ${lib.optionalString bypassCache ''
- if [ -f ${src}/package-lock.json ]
- then
- cp ${src}/package-lock.json .
- chmod 644 package-lock.json
- fi
- ''}
-
- # Go to the parent folder to make sure that all packages are pinpointed
- cd ..
- ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
- ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
-
- # Expose the executables that were installed
- cd ..
- ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
- mv ${packageName} lib
- ln -s $out/lib/node_modules/.bin $out/bin
- '';
- } // extraArgs);
-
- # Builds a development shell
- buildNodeShell =
- { name
- , packageName
- , version ? null
- , src
- , dependencies ? []
- , buildInputs ? []
- , production ? true
- , npmFlags ? ""
- , dontNpmInstall ? false
- , bypassCache ? false
- , reconstructLock ? false
- , dontStrip ? true
- , unpackPhase ? "true"
- , buildPhase ? "true"
- , ... }@args:
-
- let
- nodeDependencies = buildNodeDependencies args;
- extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
- in
- stdenv.mkDerivation ({
- name = "node-shell-${name}${if version == null then "" else "-${version}"}";
-
- buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux ++ buildInputs;
- buildCommand = ''
- mkdir -p $out/bin
- cat > $out/bin/shell <netlify-cli.json
-
-if ! diff -U3 netlify-cli.json{.old,}; then
- echo New version detected\; generating expressions...
- ./generate.sh
-fi
-rm -f netlify-cli.json.old
From 801a9a90db2bc4e6408423141be661f772e53c7d Mon Sep 17 00:00:00 2001
From: Peter Waller
Date: Fri, 8 Nov 2024 12:25:09 +0000
Subject: [PATCH 0194/2159] llvmPackages.libcxx: Include libc sources in input
Without this, after llvm 6c4267fb1779bc5550bb413f33250f9365acfbc6 you
get a build failure because libcxx can't find headers which now live in
the libc tree.
Ref: https://discourse.llvm.org/t/rfc-project-hand-in-hand-llvm-libc-libc-code-sharing/77701/18
Ref: https://github.com/llvm/llvm-project/commit/6c4267fb1779bc5550bb413f33250f9365acfbc6
Signed-off-by: Peter Waller
---
pkgs/development/compilers/llvm/common/libcxx/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix
index d4b727bd50d2..453013cdbd27 100644
--- a/pkgs/development/compilers/llvm/common/libcxx/default.nix
+++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix
@@ -44,6 +44,8 @@ let
cp -r ${monorepoSrc}/llvm/utils "$out/llvm"
'' + (lib.optionalString (lib.versionAtLeast release_version "14") ''
cp -r ${monorepoSrc}/third-party "$out"
+ '') + (lib.optionalString (lib.versionAtLeast release_version "20") ''
+ cp -r ${monorepoSrc}/libc "$out"
'') + ''
cp -r ${monorepoSrc}/runtimes "$out"
'' + (lib.optionalString (cxxabi == null) ''
From 2a4fc94d33fbc4ca2ba1a52e34779cb1f4f88bc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=97=8D+85CD?= <50108258+kwaa@users.noreply.github.com>
Date: Fri, 8 Nov 2024 21:21:05 +0800
Subject: [PATCH 0195/2159] hatsu: 0.2.2 -> 0.3.0
https://github.com/importantimport/hatsu/releases/tag/v0.3.0
---
pkgs/by-name/ha/hatsu/package.nix | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/pkgs/by-name/ha/hatsu/package.nix b/pkgs/by-name/ha/hatsu/package.nix
index a5f5131d78ec..c395195a16a2 100644
--- a/pkgs/by-name/ha/hatsu/package.nix
+++ b/pkgs/by-name/ha/hatsu/package.nix
@@ -1,28 +1,21 @@
-{ cmake
-, fetchFromGitHub
-, gitUpdater
-, lib
-, openssl
-, pkg-config
-, rustPlatform
+{
+ fetchFromGitHub,
+ gitUpdater,
+ lib,
+ rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "hatsu";
- version = "0.2.2";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "importantimport";
repo = "hatsu";
- rev = "v${version}";
- hash = "sha256-iQrwqv5q002rJMcvUhlsLVN3O7mHyL5zmLGjegZDVG0=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-K+8X/bNPdjxBSJdlFIXUUOXlTq7Cgol3fFToj5KzbeE=";
};
- cargoHash = "sha256-LkGkifmHy7cEGrPg0WCf1nCGfcW60AGWQSB0Zb01mk0=";
-
- nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ openssl ];
-
- env = { OPENSSL_NO_VENDOR = true; };
+ cargoHash = "sha256-+fNFy3WnQKtDjpNU3veoR2JrBNHj6/Wz2MQP38SR23I=";
passthru.updateScript = gitUpdater {
rev-prefix = "v";
@@ -32,6 +25,7 @@ rustPlatform.buildRustPackage rec {
meta = {
description = "Self-hosted and fully-automated ActivityPub bridge for static sites";
homepage = "https://github.com/importantimport/hatsu";
+ changelog = "https://github.com/importantimport/hatsu/releases/tag/v${version}";
license = lib.licenses.agpl3Only;
mainProgram = "hatsu";
maintainers = with lib.maintainers; [ kwaa ];
From 45599a3be468204c76bd10751abd067bce4dbd0e Mon Sep 17 00:00:00 2001
From: Jordan Williams
Date: Fri, 8 Nov 2024 08:07:35 -0600
Subject: [PATCH 0196/2159] cbconvert: 1.0.4 -> 1.1.0
---
pkgs/by-name/cb/cbconvert/gui.nix | 27 ++++++++++++++----------
pkgs/by-name/cb/cbconvert/package.nix | 30 +++------------------------
2 files changed, 19 insertions(+), 38 deletions(-)
diff --git a/pkgs/by-name/cb/cbconvert/gui.nix b/pkgs/by-name/cb/cbconvert/gui.nix
index a5721401d31e..8c0c0fba4039 100644
--- a/pkgs/by-name/cb/cbconvert/gui.nix
+++ b/pkgs/by-name/cb/cbconvert/gui.nix
@@ -1,7 +1,10 @@
{
buildGoModule,
cbconvert,
+ cbconvert-gui,
gtk3,
+ pkg-config,
+ testers,
wrapGAppsHook3,
}:
@@ -10,18 +13,18 @@ buildGoModule rec {
inherit (cbconvert)
patches
- proxyVendor
src
tags
version
;
- nativeBuildInputs = cbconvert.nativeBuildInputs ++ [
+ nativeBuildInputs = [
+ pkg-config
wrapGAppsHook3
];
buildInputs = cbconvert.buildInputs ++ [ gtk3 ];
- vendorHash = "sha256-vvCvKecPszhNCQdgm3mQMb5+486BGZ9sz3R0b70eLeQ=";
+ vendorHash = "sha256-oMW5zfAw2VQSVaB+Z1pE51OtNIFr+PnRMM+oBYNLWxk=";
modRoot = "cmd/cbconvert-gui";
ldflags = [
@@ -31,16 +34,18 @@ buildGoModule rec {
];
postInstall = ''
- install -D --mode=0644 --target-directory=$out/share/applications/ dist/linux/cbconvert.desktop
- install -D --mode=0644 --target-directory=$out/icons/hicolor/256x256/apps dist/linux/cbconvert.png
- install -D --mode=0644 --target-directory=$out/share/thumbnailers dist/linux/cbconvert.thumbnailer
- install -D --mode=0644 dist/linux/flatpak/io.github.gen2brain.cbconvert.metainfo.xml $out/share/metainfo/cbconvert.metainfo.xml
+ install -D --mode=0644 --target-directory=$out/icons/hicolor/256x256/apps dist/linux/io.github.gen2brain.cbconvert.png
+ install -D --mode=0644 --target-directory=$out/share/applications/ dist/linux/io.github.gen2brain.cbconvert.desktop
+ install -D --mode=0644 --target-directory=$out/share/metainfo dist/linux/io.github.gen2brain.cbconvert.metainfo.xml
+ install -D --mode=0644 --target-directory=$out/share/thumbnailers dist/linux/io.github.gen2brain.cbconvert.thumbnailer
'';
- postFixup = ''
- substituteInPlace $out/share/metainfo/cbconvert.metainfo.xml \
- --replace-fail "io.github.gen2brain.cbconvert" "cbconvert"
- '';
+ passthru = {
+ tests.version = testers.testVersion {
+ package = cbconvert-gui;
+ command = "cbconvert-gui version";
+ };
+ };
meta = cbconvert.meta // {
mainProgram = "cbconvert-gui";
diff --git a/pkgs/by-name/cb/cbconvert/package.nix b/pkgs/by-name/cb/cbconvert/package.nix
index 9ab25d493c07..43af077e79c2 100644
--- a/pkgs/by-name/cb/cbconvert/package.nix
+++ b/pkgs/by-name/cb/cbconvert/package.nix
@@ -4,47 +4,28 @@
callPackage,
cbconvert,
fetchFromGitHub,
- fetchpatch2,
- imagemagick,
lib,
libunarr,
mupdf-headless,
nix-update-script,
- pkg-config,
testers,
zlib,
}:
buildGoModule rec {
pname = "cbconvert";
- version = "1.0.4";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "gen2brain";
repo = "cbconvert";
rev = "v${version}";
- hash = "sha256-9x7RXyiQoV2nIVFnG1XHcYfTQiMZ88Ck7uuY7NLK8CA=";
+ hash = "sha256-C2Eox6fpKS0fPB7KFgBn62HKbWYacSVMJK0CkT6+FBU=";
};
- # Update dependencies in order to use the extlib tag.
- patches = [
- (fetchpatch2 {
- name = "update-dependencies-1.patch";
- url = "https://github.com/gen2brain/cbconvert/commit/1a36ec17b2c012f278492d60d469b8e8457a6110.patch";
- hash = "sha256-E+HWYPz9FtU3JAktzIRflF/pHdLfoaciBmjb7UOQYLo=";
- })
- (fetchpatch2 {
- name = "update-dependencies-2.patch";
- url = "https://github.com/gen2brain/cbconvert/commit/74c5de699413e95133f97666b64a1866f88fedd5.patch";
- hash = "sha256-rrJsYJHcfNWF90vwUAT3J/gqg22e1gk6I48LsTrYbmU=";
- })
- ];
-
- vendorHash = "sha256-aVInsWvygNH+/h7uQs4hAPOO2gsSkBx+tI+TK77M/hg=";
+ vendorHash = "sha256-uV8aIUKy9HQdZvR3k8CTTrHsh9TyBw21gFTdjR1XJlg=";
modRoot = "cmd/cbconvert";
- proxyVendor = true;
-
# The extlib tag forces the github.com/gen2brain/go-unarr module to use external libraries instead of bundled ones.
tags = [ "extlib" ];
@@ -54,13 +35,8 @@ buildGoModule rec {
"-X main.appVersion=${version}"
];
- nativeBuildInputs = [
- pkg-config
- ];
-
buildInputs = [
bzip2
- imagemagick
libunarr
mupdf-headless
zlib
From d3f1862053ebbcd52ad6185b82b04166920bc935 Mon Sep 17 00:00:00 2001
From: Guanran Wang
Date: Fri, 8 Nov 2024 02:49:43 +0800
Subject: [PATCH 0197/2159] redlib: 0.35.1-unstable-2024-09-22 ->
0.35.1-unstable-2024-11-01
Diff: https://github.com/redlib-org/redlib/compare/d5f137ce47de39e2c8c4ed09d13ba1f809bee560...f03bdcf472d32d51a1093528071dc329b348379d
---
pkgs/by-name/re/redlib/package.nix | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix
index 51c80078e372..7db03a2b0153 100644
--- a/pkgs/by-name/re/redlib/package.nix
+++ b/pkgs/by-name/re/redlib/package.nix
@@ -9,16 +9,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "redlib";
- version = "0.35.1-unstable-2024-09-22";
+ version = "0.35.1-unstable-2024-11-01";
src = fetchFromGitHub {
owner = "redlib-org";
repo = "redlib";
- rev = "d5f137ce47de39e2c8c4ed09d13ba1f809bee560";
- hash = "sha256-12XKeBCKciKummI43oTbKGkkY0mghA82ir2C3LhnwSs=";
+ rev = "f03bdcf472d32d51a1093528071dc329b348379d";
+ hash = "sha256-fbk0m20NpaUCWvH/l9hfmx+VKw4U3pkTkXdAeHL7bHs=";
};
- cargoHash = "sha256-XSmeJAK18J9WxrG5orFbAB9hWVLQQ50oB223oHT3OOk=";
+ cargoHash = "sha256-PNqecQSx0Q+K3bBfbOJYWPdl7JdUTDQ4f95RUuW0vPw=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
@@ -35,6 +35,9 @@ rustPlatform.buildRustPackage rec {
"--skip=test_obfuscated_share_link"
"--skip=test_share_link_strip_json"
"--skip=test_localization_popular"
+ "--skip=test_private_sub"
+ "--skip=test_banned_sub"
+ "--skip=test_gated_sub"
# subreddit.rs
"--skip=test_fetching_subreddit"
@@ -48,6 +51,7 @@ rustPlatform.buildRustPackage rec {
"--skip=test_oauth_client"
"--skip=test_oauth_client_refresh"
"--skip=test_oauth_token_exists"
+ "--skip=test_oauth_headers_len"
];
env = {
From e5391307be12c765c9241dae93cab2a9f7694003 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Fri, 8 Nov 2024 16:50:17 +0000
Subject: [PATCH 0198/2159] python312Packages.pygithub: 2.4.0 -> 2.5.0
---
pkgs/development/python-modules/pygithub/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/pygithub/default.nix b/pkgs/development/python-modules/pygithub/default.nix
index 93232d3816af..41f902b1cf23 100644
--- a/pkgs/development/python-modules/pygithub/default.nix
+++ b/pkgs/development/python-modules/pygithub/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pygithub";
- version = "2.4.0";
+ version = "2.5.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "PyGithub";
repo = "PyGithub";
rev = "refs/tags/v${version}";
- hash = "sha256-VM3xxLa4MlR3vTpeOunsq4/bxZhuKXNKFZbFVul1cMw=";
+ hash = "sha256-rKa441hiO4M/sC6wxU9yeCu6IQJMZroyi7bad/j6brw=";
};
build-system = [
From 656e14918fbdcbe369013ab155ed2798cd2bd22f Mon Sep 17 00:00:00 2001
From: Matteo Pacini
Date: Fri, 8 Nov 2024 17:00:55 +0000
Subject: [PATCH 0199/2159] pcsx2-bin: 2.1.231 -> 2.3.10
---
pkgs/by-name/pc/pcsx2-bin/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix
index 71b64e23672f..11d008c559f2 100644
--- a/pkgs/by-name/pc/pcsx2-bin/package.nix
+++ b/pkgs/by-name/pc/pcsx2-bin/package.nix
@@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "pcsx2-bin";
- version = "2.1.231";
+ version = "2.3.10";
src = fetchurl {
url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz";
- hash = "sha256-c1Tvti8NatGct0OAwcWdFNBQhv6Zwiy2ECJ2qyCs9qA=";
+ hash = "sha256-szQgGIBH+h/mH18zY3RQGiyhoYwQ07+rq/zX3uNfgME=";
};
nativeBuildInputs = [ makeWrapper ];
From f10c51a7ac3df1ff298e7c54ab6da53fa9ec55ef Mon Sep 17 00:00:00 2001
From: Wolfgang
Date: Fri, 8 Nov 2024 18:06:10 +0100
Subject: [PATCH 0200/2159] maintainers: add notthebee
---
maintainers/maintainer-list.nix | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 68a646e14cce..0fc89144e450 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15633,6 +15633,12 @@
githubId = 30374463;
name = "Michal S.";
};
+ notthebee = {
+ email = "moe@notthebe.ee";
+ github = "notthebee";
+ githubId = 30384331;
+ name = "Wolfgang";
+ };
notthemessiah = {
email = "brian.cohen.88@gmail.com";
github = "NOTtheMessiah";
From 7edaf495a77c42f9837a3890f3f8e7649dc2dee0 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Fri, 8 Nov 2024 19:32:22 +0200
Subject: [PATCH 0201/2159] csharprepl: format with `nixfmt-rfc-style`
---
pkgs/by-name/cs/csharprepl/package.nix | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pkgs/by-name/cs/csharprepl/package.nix b/pkgs/by-name/cs/csharprepl/package.nix
index 5b7e8f2d7c93..38eff7c7add8 100644
--- a/pkgs/by-name/cs/csharprepl/package.nix
+++ b/pkgs/by-name/cs/csharprepl/package.nix
@@ -1,4 +1,8 @@
-{ buildDotnetGlobalTool, dotnetCorePackages, lib }:
+{
+ buildDotnetGlobalTool,
+ dotnetCorePackages,
+ lib,
+}:
buildDotnetGlobalTool {
pname = "csharprepl";
From dcd2da36a7abe85984d192fdef35dd566a13a44f Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Fri, 8 Nov 2024 19:32:54 +0200
Subject: [PATCH 0202/2159] csharprepl: remove `with lib;` from `meta`
---
pkgs/by-name/cs/csharprepl/package.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/by-name/cs/csharprepl/package.nix b/pkgs/by-name/cs/csharprepl/package.nix
index 38eff7c7add8..1279ccec03e8 100644
--- a/pkgs/by-name/cs/csharprepl/package.nix
+++ b/pkgs/by-name/cs/csharprepl/package.nix
@@ -14,13 +14,13 @@ buildDotnetGlobalTool {
nugetHash = "sha256-VkZGnfD8p6oAJ7i9tlfwJfmKfZBHJU7Wdq+K4YjPoRs=";
- meta = with lib; {
+ meta = {
description = "C# REPL with syntax highlighting";
homepage = "https://fuqua.io/CSharpRepl";
changelog = "https://github.com/waf/CSharpRepl/blob/main/CHANGELOG.md";
- license = licenses.mpl20;
- platforms = platforms.unix;
- maintainers = with maintainers; [ donteatoreo ];
+ license = lib.licenses.mpl20;
+ platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [ donteatoreo ];
mainProgram = "csharprepl";
};
}
From 2c070f69fa417382db58863c417f2f017ee2b079 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Fri, 8 Nov 2024 19:38:00 +0200
Subject: [PATCH 0203/2159] csharprepl: fix runtime environment
Use `dotnet-sdk` as runtime since the REPL tool requires SDK functionality to
work
---
pkgs/by-name/cs/csharprepl/package.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/by-name/cs/csharprepl/package.nix b/pkgs/by-name/cs/csharprepl/package.nix
index 1279ccec03e8..22a538c6e74b 100644
--- a/pkgs/by-name/cs/csharprepl/package.nix
+++ b/pkgs/by-name/cs/csharprepl/package.nix
@@ -10,7 +10,8 @@ buildDotnetGlobalTool {
version = "0.6.6";
dotnet-sdk = dotnetCorePackages.sdk_8_0;
- dotnet-runtime = dotnetCorePackages.runtime_8_0;
+ # We're using an SDK here because it's a REPL, and it requires an SDK instaed of a runtime
+ dotnet-runtime = dotnetCorePackages.sdk_8_0;
nugetHash = "sha256-VkZGnfD8p6oAJ7i9tlfwJfmKfZBHJU7Wdq+K4YjPoRs=";
From 8ba9801c3857dab2ce4beb7914c70f73a867aa27 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Fri, 8 Nov 2024 19:40:27 +0200
Subject: [PATCH 0204/2159] csharprepl: 0.6.6 -> 0.6.7
Diff: https://github.com/waf/CSharpRepl/compare/v0.6.6...v0.6.7
---
pkgs/by-name/cs/csharprepl/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/cs/csharprepl/package.nix b/pkgs/by-name/cs/csharprepl/package.nix
index 22a538c6e74b..427ca4c0e830 100644
--- a/pkgs/by-name/cs/csharprepl/package.nix
+++ b/pkgs/by-name/cs/csharprepl/package.nix
@@ -7,13 +7,13 @@
buildDotnetGlobalTool {
pname = "csharprepl";
nugetName = "CSharpRepl";
- version = "0.6.6";
+ version = "0.6.7";
dotnet-sdk = dotnetCorePackages.sdk_8_0;
# We're using an SDK here because it's a REPL, and it requires an SDK instaed of a runtime
dotnet-runtime = dotnetCorePackages.sdk_8_0;
- nugetHash = "sha256-VkZGnfD8p6oAJ7i9tlfwJfmKfZBHJU7Wdq+K4YjPoRs=";
+ nugetHash = "sha256-a0CiU3D6RZp1FF459NIUUry5TFRDgm4FRhqJZNAGYWs=";
meta = {
description = "C# REPL with syntax highlighting";
From a4a636d1237f3e9e9ee263917da950b757972836 Mon Sep 17 00:00:00 2001
From: Noa Aarts
Date: Thu, 7 Nov 2024 21:14:53 +0100
Subject: [PATCH 0205/2159] python312Packages.oddsprout: 0.1.0 -> 0.1.1
---
.../python-modules/oddsprout/default.nix | 21 +++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/oddsprout/default.nix b/pkgs/development/python-modules/oddsprout/default.nix
index 9aca78d9e063..00ae30c7eba0 100644
--- a/pkgs/development/python-modules/oddsprout/default.nix
+++ b/pkgs/development/python-modules/oddsprout/default.nix
@@ -3,24 +3,37 @@
buildPythonPackage,
fetchFromGitHub,
poetry-core,
+ pytestCheckHook,
+ pythonOlder,
dahlia,
- ixia
+ ixia,
}:
buildPythonPackage rec {
pname = "oddsprout";
- version = "0.1.0";
+ version = "0.1.1";
pyproject = true;
+ disabled = pythonOlder "3.9";
+
src = fetchFromGitHub {
owner = "trag1c";
repo = "oddsprout";
rev = "refs/tags/v${version}";
- hash = "sha256-k5/mBoW4PxGUbkwaZyHgS3MGI4533V/nNoGqEg+VXpM=";
+ hash = "sha256-BOUYq4yny3ScgzCzx2cpeK4e7nxxwTj8mJ42nr59mFA=";
};
build-system = [ poetry-core ];
- dependencies = [ dahlia ixia ];
+
+ dependencies = [
+ dahlia
+ ixia
+ ];
+
+ # has one test `test_main_recursion_error`
+ # that has a very low (~1%) but nonzero chance to fail,
+ # this is known upstream (https://github.com/trag1c/oddsprout/issues/5)
+ nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "oddsprout" ];
From 731e8265608fe0f2bec8b22ae2c77b07b3407453 Mon Sep 17 00:00:00 2001
From: Jun Matsushita
Date: Fri, 8 Nov 2024 19:10:21 +0100
Subject: [PATCH 0206/2159] release.nix: add
haskell.packages.ghc910.haskell-language-server to release
---
pkgs/top-level/release.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index bf69d13c98f1..bb8707cca6b6 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -288,6 +288,7 @@ let
"ghc94"
"ghc96"
"ghc98"
+ "ghc910"
] (compilerName: {
inherit (packagePlatforms pkgs.haskell.packages.${compilerName})
haskell-language-server;
From 7d05609d5b234d3c3ab4f0d6cdb2f1a26cad0ca3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Fri, 8 Nov 2024 19:42:07 +0000
Subject: [PATCH 0207/2159] netmaker-full: 0.25.0 -> 0.26.0
---
pkgs/applications/networking/netmaker/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix
index 20d4f831d78b..1a4edc965a7f 100644
--- a/pkgs/applications/networking/netmaker/default.nix
+++ b/pkgs/applications/networking/netmaker/default.nix
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "netmaker";
- version = "0.25.0";
+ version = "0.26.0";
src = fetchFromGitHub {
owner = "gravitl";
repo = pname;
rev = "v${version}";
- hash = "sha256-1mrodzW51nbqfWQjjmHYnInJd61FsWtQcYbKhJAiQ8Q=";
+ hash = "sha256-f6R7Dc5M3MUjsCXvQAqamU9FFuqYEZoxYKwKhk4ilPc=";
};
- vendorHash = "sha256-/iuXnnO8OhGhQWg5nU/hza4yZMSIHKOTPFqojgY8w74=";
+ vendorHash = "sha256-g9JyIuqYJZK47xQYM0+d1hcHcNBGLH3lW60hI6UkD84=";
inherit subPackages;
From 49245b838c5417fb6fb5eca8d69cb22e2f3427e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
Date: Fri, 8 Nov 2024 12:03:17 -0800
Subject: [PATCH 0208/2159] python312Packages.setuptools: 75.1.0 -> 75.1.1
Diff: https://github.com/pypa/setuptools/compare/refs/tags/v75.1.0...75.1.1
Changelog: https://setuptools.pypa.io/en/stable/history.html#v75-1-1
---
pkgs/development/python-modules/setuptools/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 8b53de0a4890..c39ae6917bcd 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "setuptools";
- version = "75.1.0";
+ version = "75.1.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "pypa";
repo = "setuptools";
rev = "refs/tags/v${version}";
- hash = "sha256-ZvhXfusayUHHFXl7ZBksFhxTi1p+Va6qAwq7Fo7Tg/s=";
+ hash = "sha256-b8O/DrDWAbD6ht9M762fFN6kPtV8hAbn1gAN9SS7H5g=";
};
patches = [
From ba8520ef16d00a8be29909437bed3aee6729b3ff Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt
Date: Fri, 8 Nov 2024 22:32:31 +0100
Subject: [PATCH 0209/2159] python312Packages.uarray: unbreak, switch to new
build system
---
.../python-modules/uarray/default.nix | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix
index a151ba1f1d80..b4233ea654eb 100644
--- a/pkgs/development/python-modules/uarray/default.nix
+++ b/pkgs/development/python-modules/uarray/default.nix
@@ -2,14 +2,17 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ scikit-build-core,
setuptools,
setuptools-scm,
+ cmake,
+ ninja,
matchpy,
numpy,
astunparse,
typing-extensions,
- pytest7CheckHook,
- pytest-cov,
+ pytestCheckHook,
+ pytest-cov-stub,
}:
buildPythonPackage rec {
@@ -24,11 +27,15 @@ buildPythonPackage rec {
hash = "sha256-q9lMU/xA+G2x38yZy3DxCpXTEmg1lZhZ8GFIHDIKE24=";
};
- nativeBuildInputs = [
+ build-system = [
+ scikit-build-core
setuptools
setuptools-scm
+ cmake
+ ninja
];
- build-system = [ setuptools ];
+
+ dontUseCmakeConfigure = true;
dependencies = [
astunparse
@@ -38,8 +45,8 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
- pytest7CheckHook
- pytest-cov
+ pytestCheckHook
+ pytest-cov-stub
];
# Tests must be run from outside the source directory
From 52ca7ce469a1a9ee8112096f1ef47ceb34daa819 Mon Sep 17 00:00:00 2001
From: Fabian Affolter
Date: Fri, 8 Nov 2024 22:55:33 +0100
Subject: [PATCH 0210/2159] python312Packages.publicsuffixlist: 1.0.2.20241102
-> 1.0.2.20241108
Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20241108-gha/CHANGES.md
---
pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 826e97b476c4..8802981fd3b5 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
- version = "1.0.2.20241102";
+ version = "1.0.2.20241108";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-dNnGnAybp11y8WGSvXiP0MNFRmw5TQgnrVBQGqwsDSQ=";
+ hash = "sha256-OsuirJ28KmKPnjntwXw6xrPKCX7wu/iGeeX/zIpf6qc=";
};
build-system = [ setuptools ];
From d777c8158f2f96706078b0e5888c956a4f21f613 Mon Sep 17 00:00:00 2001
From: Gavin John
Date: Fri, 8 Nov 2024 14:28:45 -0800
Subject: [PATCH 0211/2159] immersed: nixfmt
---
pkgs/by-name/im/immersed/darwin.nix | 20 ++++++++----
pkgs/by-name/im/immersed/linux.nix | 48 +++++++++++++++-------------
pkgs/by-name/im/immersed/package.nix | 38 ++++++++++++++++------
3 files changed, 67 insertions(+), 39 deletions(-)
diff --git a/pkgs/by-name/im/immersed/darwin.nix b/pkgs/by-name/im/immersed/darwin.nix
index c43d92ccfda1..e156cc493c8e 100644
--- a/pkgs/by-name/im/immersed/darwin.nix
+++ b/pkgs/by-name/im/immersed/darwin.nix
@@ -1,13 +1,19 @@
-{ stdenv
-, pname
-, version
-, src
-, meta
-, undmg
+{
+ stdenv,
+ pname,
+ version,
+ src,
+ meta,
+ undmg,
}:
stdenv.mkDerivation {
- inherit pname version src meta;
+ inherit
+ pname
+ version
+ src
+ meta
+ ;
nativeBuildInputs = [ undmg ];
diff --git a/pkgs/by-name/im/immersed/linux.nix b/pkgs/by-name/im/immersed/linux.nix
index fb989ef291c3..0447090c8231 100644
--- a/pkgs/by-name/im/immersed/linux.nix
+++ b/pkgs/by-name/im/immersed/linux.nix
@@ -1,9 +1,10 @@
-{ pname
-, version
-, src
-, meta
-, appimageTools
-, libgpg-error
+{
+ pname,
+ version,
+ src,
+ meta,
+ appimageTools,
+ libgpg-error,
}:
let
@@ -22,23 +23,24 @@ appimageTools.wrapAppImage rec {
inherit pname version meta;
src = src';
- extraPkgs = pkgs: with pkgs; [
- libgpg-error
- fontconfig
- libGL
- mesa
- wayland
- pipewire
- fribidi
- harfbuzz
- freetype
- libthai
- e2fsprogs
- zlib
- libp11
- xorg.libX11
- xorg.libSM
- ];
+ extraPkgs =
+ pkgs: with pkgs; [
+ libgpg-error
+ fontconfig
+ libGL
+ mesa
+ wayland
+ pipewire
+ fribidi
+ harfbuzz
+ freetype
+ libthai
+ e2fsprogs
+ zlib
+ libp11
+ xorg.libX11
+ xorg.libSM
+ ];
multiArch = true;
}
diff --git a/pkgs/by-name/im/immersed/package.nix b/pkgs/by-name/im/immersed/package.nix
index ece3cb1dbce3..6073d60fc309 100644
--- a/pkgs/by-name/im/immersed/package.nix
+++ b/pkgs/by-name/im/immersed/package.nix
@@ -1,8 +1,9 @@
-{ lib
-, appimageTools
-, callPackage
-, fetchurl
-, stdenv
+{
+ lib,
+ appimageTools,
+ callPackage,
+ fetchurl,
+ stdenv,
}:
let
pname = "immersed";
@@ -26,11 +27,30 @@ let
description = "VR coworking platform";
homepage = "https://immersed.com";
license = licenses.unfree;
- maintainers = with maintainers; [ haruki7049 pandapip1 ];
+ maintainers = with maintainers; [
+ haruki7049
+ pandapip1
+ ];
platforms = builtins.attrNames sources;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
-in if stdenv.hostPlatform.isDarwin
-then callPackage ./darwin.nix { inherit pname version src meta; }
-else callPackage ./linux.nix { inherit pname version src meta; }
+in
+if stdenv.hostPlatform.isDarwin then
+ callPackage ./darwin.nix {
+ inherit
+ pname
+ version
+ src
+ meta
+ ;
+ }
+else
+ callPackage ./linux.nix {
+ inherit
+ pname
+ version
+ src
+ meta
+ ;
+ }
From 09c363acdcc50fbf1127c67010a58e22bee94327 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Fri, 8 Nov 2024 23:11:34 +0000
Subject: [PATCH 0212/2159] raspberrypi-eeprom: 2024.09.23-2712 ->
2024.11.08-2712
---
pkgs/by-name/ra/raspberrypi-eeprom/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
index ab0948a03e73..b41b57360393 100644
--- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
+++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
@@ -13,13 +13,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raspberrypi-eeprom";
- version = "2024.09.23-2712";
+ version = "2024.11.08-2712";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "rpi-eeprom";
rev = "refs/tags/v${finalAttrs.version}";
- hash = "sha256-5qqcHMoRT5XfhIX392j4Q1DcKjYGq6NMqy1VrWxg5+4=";
+ hash = "sha256-reZFKuOtY+mjoq6ie7S+VwYnbcl9f488HzWFhR+dqC8=";
};
buildInputs = [ python3 ];
From 61098d62851ffd0155dfac173802c269feac75ec Mon Sep 17 00:00:00 2001
From: Noa Aarts
Date: Sat, 9 Nov 2024 00:17:13 +0100
Subject: [PATCH 0213/2159] python312Packages.oddsprout: add itepastra to
maintainer
---
pkgs/development/python-modules/oddsprout/default.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/oddsprout/default.nix b/pkgs/development/python-modules/oddsprout/default.nix
index 00ae30c7eba0..4f948f8dec59 100644
--- a/pkgs/development/python-modules/oddsprout/default.nix
+++ b/pkgs/development/python-modules/oddsprout/default.nix
@@ -42,6 +42,9 @@ buildPythonPackage rec {
description = "Generate random JSON with no schemas involved";
license = licenses.mit;
homepage = "https://trag1c.github.io/oddsprout";
- maintainers = with maintainers; [ sigmanificient ];
+ maintainers = with maintainers; [
+ itepastra
+ sigmanificient
+ ];
};
}
From c20abf409b2fa4572398ed7a5920699be0c735e0 Mon Sep 17 00:00:00 2001
From: nanari <>
Date: Sat, 9 Nov 2024 07:49:46 +0800
Subject: [PATCH 0214/2159] linux-wallpaperengine: 0-unstable-2024-10-13 ->
0-unstable-2024-11-8
---
pkgs/by-name/li/linux-wallpaperengine/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix
index 87fd5a7d73de..d4cf661455e8 100644
--- a/pkgs/by-name/li/linux-wallpaperengine/package.nix
+++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix
@@ -160,13 +160,13 @@ let
in
stdenv.mkDerivation {
pname = "linux-wallpaperengine";
- version = "0-unstable-2024-10-13";
+ version = "0-unstable-2024-11-8";
src = fetchFromGitHub {
owner = "Almamu";
repo = "linux-wallpaperengine";
- rev = "ec60a8a57153e49e3684c864a6d809fe9601336b";
- hash = "sha256-M77Wp6tCXO2oFgfZ0+mdBT07CCYLsDDyHjeHtaDVvu8=";
+ rev = "4a063d0b84d331a0086b3f4605358ee177328d41";
+ hash = "sha256-IRTGFxHPRRRSg0J07pq8fpo1XbMT4aZC+wMVimZlH/Y=";
};
nativeBuildInputs = [
From 7b6062b13d9e4bcb3a8a4911f4b78035c2f9df4c Mon Sep 17 00:00:00 2001
From: Wulfsta
Date: Fri, 8 Nov 2024 19:29:39 -0500
Subject: [PATCH 0215/2159] libfive: 0-unstable-2024-06-23 ->
0-unstable-2024-10-10
---
pkgs/development/libraries/libfive/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix
index 490f695fc101..9e71c5beaa5b 100644
--- a/pkgs/development/libraries/libfive/default.nix
+++ b/pkgs/development/libraries/libfive/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation {
pname = "libfive";
- version = "0-unstable-2024-06-23";
+ version = "0-unstable-2024-10-10";
src = fetchFromGitHub {
owner = "libfive";
repo = "libfive";
- rev = "302553e6aa6ca3cb13b2a149f57b6182ce2406dd";
- hash = "sha256-8J0Pe3lmZCg2YFffmIynxW35w4mHl5cSlLSenm50CWg=";
+ rev = "71899313d36ce14de6646ef760fa6bbc5c0cc067";
+ hash = "sha256-bA+4wGAygdbHcOMGFwNyzn2daQ8E7NeOTUF2Tr3RQww=";
};
nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config python.pkgs.pythonImportsCheckHook ];
From e7e25b9f3458a3fbf5c0ec89d88be19aeb741fdd Mon Sep 17 00:00:00 2001
From: r-vdp
Date: Sat, 9 Nov 2024 01:35:11 +0100
Subject: [PATCH 0216/2159] wstunnel: 10.1.5 -> 10.1.6
---
pkgs/by-name/ws/wstunnel/Cargo.lock | 468 ++++++++++++++++++++-------
pkgs/by-name/ws/wstunnel/package.nix | 4 +-
2 files changed, 361 insertions(+), 111 deletions(-)
diff --git a/pkgs/by-name/ws/wstunnel/Cargo.lock b/pkgs/by-name/ws/wstunnel/Cargo.lock
index 7339e0e99303..bc1b8a289775 100644
--- a/pkgs/by-name/ws/wstunnel/Cargo.lock
+++ b/pkgs/by-name/ws/wstunnel/Cargo.lock
@@ -56,9 +56,9 @@ dependencies = [
[[package]]
name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -71,43 +71,43 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
[[package]]
name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
dependencies = [
"anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "anyhow"
-version = "1.0.89"
+version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
[[package]]
name = "arc-swap"
@@ -246,9 +246,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "bb8"
-version = "0.8.5"
+version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b10cf871f3ff2ce56432fddc2615ac7acc3aa22ca321f8fea800846fbb32f188"
+checksum = "d89aabfae550a5c44b43ab941844ffcd2e993cb6900b342debf59e9ea74acdb8"
dependencies = [
"async-trait",
"futures-util",
@@ -322,7 +322,7 @@ dependencies = [
"hyperlocal",
"log",
"pin-project-lite",
- "rustls 0.23.14",
+ "rustls 0.23.16",
"rustls-native-certs 0.7.3",
"rustls-pemfile 2.2.0",
"rustls-pki-types",
@@ -364,15 +364,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.7.2"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
[[package]]
name = "cc"
-version = "1.1.30"
+version = "1.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
+checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf"
dependencies = [
"jobserver",
"libc",
@@ -475,9 +475,9 @@ dependencies = [
[[package]]
name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
[[package]]
name = "concurrent-queue"
@@ -513,15 +513,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
-dependencies = [
- "crossbeam-utils",
-]
-
[[package]]
name = "crossbeam-utils"
version = "0.8.20"
@@ -536,7 +527,7 @@ checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
dependencies = [
"bitflags 2.6.0",
"crossterm_winapi",
- "mio 1.0.2",
+ "mio",
"parking_lot",
"rustix",
"signal-hook",
@@ -765,6 +756,16 @@ dependencies = [
"utf-8",
]
+[[package]]
+name = "fdlimit"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5"
+dependencies = [
+ "libc",
+ "thiserror",
+]
+
[[package]]
name = "filetime"
version = "0.2.25"
@@ -977,9 +978,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "hashbrown"
-version = "0.15.0"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
[[package]]
name = "heck"
@@ -1133,9 +1134,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
[[package]]
name = "hyper"
-version = "1.4.1"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
dependencies = [
"bytes",
"futures-channel",
@@ -1177,7 +1178,7 @@ dependencies = [
"http 1.1.0",
"hyper",
"hyper-util",
- "rustls 0.23.14",
+ "rustls 0.23.16",
"rustls-pki-types",
"tokio",
"tokio-rustls 0.26.0",
@@ -1186,9 +1187,9 @@ dependencies = [
[[package]]
name = "hyper-util"
-version = "0.1.9"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
dependencies = [
"bytes",
"futures-channel",
@@ -1241,6 +1242,124 @@ dependencies = [
"cc",
]
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "ident_case"
version = "1.0.1"
@@ -1259,12 +1378,23 @@ dependencies = [
[[package]]
name = "idna"
-version = "0.5.0"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
]
[[package]]
@@ -1285,15 +1415,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
"serde",
]
[[package]]
name = "inotify"
-version = "0.9.6"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
dependencies = [
"bitflags 1.3.2",
"inotify-sys",
@@ -1309,6 +1439,15 @@ dependencies = [
"libc",
]
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
[[package]]
name = "ipconfig"
version = "0.3.2"
@@ -1416,9 +1555,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.159"
+version = "0.2.162"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
[[package]]
name = "libloading"
@@ -1453,6 +1592,12 @@ version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
[[package]]
name = "lock_api"
version = "0.4.12"
@@ -1523,18 +1668,6 @@ dependencies = [
"adler2",
]
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
[[package]]
name = "mio"
version = "1.0.2"
@@ -1579,21 +1712,30 @@ dependencies = [
[[package]]
name = "notify"
-version = "6.1.1"
+version = "7.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+checksum = "c533b4c39709f9ba5005d8002048266593c1cfaf3c5f0739d5b8ab0c6c504009"
dependencies = [
"bitflags 2.6.0",
- "crossbeam-channel",
"filetime",
"fsevent-sys",
"inotify",
"kqueue",
"libc",
"log",
- "mio 0.8.11",
+ "mio",
+ "notify-types",
"walkdir",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "notify-types"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7393c226621f817964ffb3dc5704f9509e107a8b024b489cc2c1b217378785df"
+dependencies = [
+ "instant",
]
[[package]]
@@ -1753,18 +1895,18 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "pin-project"
-version = "1.1.6"
+version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.1.6"
+version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
dependencies = [
"proc-macro2",
"quote",
@@ -1773,9 +1915,9 @@ dependencies = [
[[package]]
name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
[[package]]
name = "pin-utils"
@@ -1809,9 +1951,9 @@ dependencies = [
[[package]]
name = "prettyplease"
-version = "0.2.22"
+version = "0.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
dependencies = [
"proc-macro2",
"syn",
@@ -1819,9 +1961,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.87"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
@@ -1904,9 +2046,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.11.0"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick",
"memchr",
@@ -1994,9 +2136,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.37"
+version = "0.38.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee"
dependencies = [
"bitflags 2.6.0",
"errno",
@@ -2019,9 +2161,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.23.14"
+version = "0.23.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
+checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
dependencies = [
"aws-lc-rs",
"log",
@@ -2091,9 +2233,9 @@ dependencies = [
[[package]]
name = "rustls-pki-types"
-version = "1.9.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
[[package]]
name = "rustls-webpki"
@@ -2172,9 +2314,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.12.0"
+version = "2.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
dependencies = [
"core-foundation-sys",
"libc",
@@ -2182,18 +2324,18 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.210"
+version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.210"
+version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [
"proc-macro2",
"quote",
@@ -2202,9 +2344,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.128"
+version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"itoa",
"memchr",
@@ -2331,7 +2473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
dependencies = [
"libc",
- "mio 1.0.2",
+ "mio",
"signal-hook",
]
@@ -2381,6 +2523,12 @@ version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
[[package]]
name = "strsim"
version = "0.11.1"
@@ -2418,9 +2566,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "syn"
-version = "2.0.79"
+version = "2.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
dependencies = [
"proc-macro2",
"quote",
@@ -2469,18 +2617,18 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.64"
+version = "1.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e"
dependencies = [
"proc-macro2",
"quote",
@@ -2530,6 +2678,16 @@ dependencies = [
"time-core",
]
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
[[package]]
name = "tinyvec"
version = "1.8.0"
@@ -2547,14 +2705,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.40.0"
+version = "1.41.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
dependencies = [
"backtrace",
"bytes",
"libc",
- "mio 1.0.2",
+ "mio",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
@@ -2600,7 +2758,7 @@ version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
dependencies = [
- "rustls 0.23.14",
+ "rustls 0.23.16",
"rustls-pki-types",
"tokio",
]
@@ -2766,12 +2924,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "url"
-version = "2.5.2"
+version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
dependencies = [
"form_urlencoded",
- "idna 0.5.0",
+ "idna 1.0.3",
"percent-encoding",
"serde",
]
@@ -2788,6 +2946,18 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
[[package]]
name = "utf8parse"
version = "0.2.2"
@@ -2796,9 +2966,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
dependencies = [
"getrandom",
"serde",
@@ -3112,9 +3282,21 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
[[package]]
name = "wstunnel"
-version = "10.1.5"
+version = "10.1.6"
dependencies = [
"ahash",
"anyhow",
@@ -3128,6 +3310,7 @@ dependencies = [
"crossterm",
"fast-socks5",
"fastwebsockets",
+ "fdlimit",
"futures-util",
"hickory-resolver",
"http-body-util",
@@ -3201,6 +3384,30 @@ dependencies = [
"time",
]
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
[[package]]
name = "zerocopy"
version = "0.7.35"
@@ -3222,8 +3429,51 @@ dependencies = [
"syn",
]
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
[[package]]
name = "zeroize"
version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix
index b2b5e42062dc..12ab4cbf9040 100644
--- a/pkgs/by-name/ws/wstunnel/package.nix
+++ b/pkgs/by-name/ws/wstunnel/package.nix
@@ -10,7 +10,7 @@
}:
let
- version = "10.1.5";
+ version = "10.1.6";
in
rustPlatform.buildRustPackage {
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
owner = "erebe";
repo = "wstunnel";
rev = "v${version}";
- hash = "sha256-MomT9iwIsdou7lIfI7zBU9nEjjYGcsHKTlrYbK4p3BQ=";
+ hash = "sha256-ufssj7m5mly2B33e1DWY2e6AH0zTPh3SozYc663QjJ4=";
};
cargoLock = {
From ca49d19831ac90a954b44d9c3450bab543e2ff43 Mon Sep 17 00:00:00 2001
From: Fabian Affolter
Date: Sat, 9 Nov 2024 08:31:26 +0100
Subject: [PATCH 0217/2159] python312Packages.terminaltables3: init at
4.0.0-unstable-2024-07-21
Generate simple tables in terminals from a nested list of strings
https://github.com/matthewdeanmartin/terminaltables3
---
.../terminaltables3/default.nix | 58 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 2 +
2 files changed, 60 insertions(+)
create mode 100644 pkgs/development/python-modules/terminaltables3/default.nix
diff --git a/pkgs/development/python-modules/terminaltables3/default.nix b/pkgs/development/python-modules/terminaltables3/default.nix
new file mode 100644
index 000000000000..ea4351ea7007
--- /dev/null
+++ b/pkgs/development/python-modules/terminaltables3/default.nix
@@ -0,0 +1,58 @@
+{
+ lib,
+ buildPythonPackage,
+ colorama,
+ colorclass,
+ fetchFromGitHub,
+ poetry-core,
+ pytest-cov-stub,
+ pytest-xdist,
+ pytestCheckHook,
+ pythonOlder,
+ termcolor,
+}:
+
+buildPythonPackage rec {
+ pname = "terminaltables3";
+ version = "4.0.0-unstable-2024-07-21";
+ pyproject = true;
+
+ disabled = pythonOlder "3.11";
+
+ src = fetchFromGitHub {
+ owner = "matthewdeanmartin";
+ repo = "terminaltables3";
+ #rev = "refs/tags/v${version}";
+ rev = "f1c465b36eb9b91a984d8864b21376e7c37075b8";
+ hash = "sha256-UcEovh1Eb4QNPwLGDjCphPlJSSkOdhCJ2fK3tuSWOTc=";
+ };
+
+ build-system = [ poetry-core ];
+
+ nativeCheckInputs = [
+ colorama
+ colorclass
+ pytest-cov-stub
+ pytest-xdist
+ pytestCheckHook
+ termcolor
+ ];
+
+ pythonImportsCheck = [ "terminaltables3" ];
+
+ disabledTests = [
+ # Tests are comparing CLI output
+ "test_color"
+ "test_colors"
+ "test_height"
+ "test_width"
+ ];
+
+ meta = {
+ description = "Generate simple tables in terminals from a nested list of strings";
+ homepage = "https://github.com/matthewdeanmartin/terminaltables3";
+ changelog = "https://github.com/matthewdeanmartin/terminaltables3/blob/${src.rev}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 48a04dffe93b..5343c8c0fe05 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15660,6 +15660,8 @@ self: super: with self; {
terminaltables = callPackage ../development/python-modules/terminaltables { };
+ terminaltables3 = callPackage ../development/python-modules/terminaltables3 { };
+
terminaltexteffects = callPackage ../development/python-modules/terminaltexteffects { };
termplotlib = callPackage ../development/python-modules/termplotlib { };
From 4185e95891ac734cda1d3e8cc7bc75f1265b6270 Mon Sep 17 00:00:00 2001
From: r-vdp
Date: Sat, 9 Nov 2024 11:42:09 +0100
Subject: [PATCH 0218/2159] wstunnel: adapt to new darwin sdk pattern
---
pkgs/by-name/ws/wstunnel/package.nix | 4 ----
1 file changed, 4 deletions(-)
diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix
index 12ab4cbf9040..5776a400be80 100644
--- a/pkgs/by-name/ws/wstunnel/package.nix
+++ b/pkgs/by-name/ws/wstunnel/package.nix
@@ -6,7 +6,6 @@
nixosTests,
nix-update-script,
versionCheckHook,
- darwin,
}:
let
@@ -32,9 +31,6 @@ rustPlatform.buildRustPackage {
};
nativeBuildInputs = [ versionCheckHook ];
- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
- darwin.apple_sdk.frameworks.CoreServices
- ];
doInstallCheck = true;
From 00a1d54cbf6c70f1ca6b9dc326ff828a0ef9b018 Mon Sep 17 00:00:00 2001
From: Guanran Wang
Date: Sat, 9 Nov 2024 20:49:17 +0800
Subject: [PATCH 0219/2159] fcitx5-pinyin-moegirl: 20241009 -> 20241109
Diff: https://github.com/outloudvi/mw2fcitx/compare/20241009...20241109
---
pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix
index 7f9bb24d6f13..fe6b89e33dc1 100644
--- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix
+++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix
@@ -6,11 +6,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "fcitx5-pinyin-moegirl";
- version = "20241009";
+ version = "20241109";
src = fetchurl {
url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict";
- hash = "sha256-tb+Z7ja6yG7n6DcxSvdFhMq2xTNs6mJ6pdPfEKeRUww=";
+ hash = "sha256-Vg1Kx/7m1gNEJAe3bhxoIogXsNV8I0NYyhGt9SvqfM4=";
};
dontUnpack = true;
From efb38a84aefbb92c05146681842c44e9dea31313 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sat, 9 Nov 2024 12:57:39 +0000
Subject: [PATCH 0220/2159] openfga: 1.6.2 -> 1.8.0
---
pkgs/by-name/op/openfga/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix
index 78978e5cbba1..cb5d48decdfe 100644
--- a/pkgs/by-name/op/openfga/package.nix
+++ b/pkgs/by-name/op/openfga/package.nix
@@ -7,7 +7,7 @@
let
pname = "openfga";
- version = "1.6.2";
+ version = "1.8.0";
in
buildGoModule {
@@ -17,10 +17,10 @@ buildGoModule {
owner = "openfga";
repo = "openfga";
rev = "v${version}";
- hash = "sha256-4XDyrzvZuFULGE9ki3qXaW7FJXZyx4tLyQ24gyCY5q4=";
+ hash = "sha256-Xps7Bhy+fldScCexijzoAkQ+pAJTay+5vU+J4MxtUZs=";
};
- vendorHash = "sha256-ABPR+0aYShr02C+OJoSxa0+Z4rqe2/z7gOyo/tZ1jRw=";
+ vendorHash = "sha256-6V/ab5TCbWJuELZnpdcTAbCZ3lDnoG+vC/T8iuLRbyk=";
nativeBuildInputs = [ installShellFiles ];
From bf5220e0254c589de5b65e32c393a4d74d764437 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther
Date: Sat, 9 Nov 2024 14:19:38 +0100
Subject: [PATCH 0221/2159] python3Packages.mygpoclient: fix package name
Typo in the package's name.
---
pkgs/development/python-modules/mygpoclient/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix
index 8205ba66befe..badf6d899708 100644
--- a/pkgs/development/python-modules/mygpoclient/default.nix
+++ b/pkgs/development/python-modules/mygpoclient/default.nix
@@ -8,7 +8,7 @@
}:
buildPythonPackage rec {
- pname = "mypgoclient";
+ pname = "mygpoclient";
version = "1.9";
pyproject = true;
From 80e376ba5c7f09fcf1035cf042cecdfe09deccff Mon Sep 17 00:00:00 2001
From: Jan Philipp Tebernum
Date: Sat, 9 Nov 2024 02:05:41 +0100
Subject: [PATCH 0222/2159] stm32cubemx: 6.11.1 -> 6.12.1
---
pkgs/by-name/st/stm32cubemx/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix
index 6d58322767d3..5bca483b1af1 100644
--- a/pkgs/by-name/st/stm32cubemx/package.nix
+++ b/pkgs/by-name/st/stm32cubemx/package.nix
@@ -13,11 +13,11 @@ let
iconame = "STM32CubeMX";
package = stdenvNoCC.mkDerivation rec {
pname = "stm32cubemx";
- version = "6.11.1";
+ version = "6.12.1";
src = fetchzip {
url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip";
- hash = "sha256-By9T43GLM1J63TkRi3kl05h1RflBorU1QHgYOrXQ9N0=";
+ hash = "sha256-6VDvvKx68U47soBUWiaBuDu6enINLDhJd0he7sSCzeg=";
stripRoot = false;
};
From a8a46ebd57989a4d737c4a83b809a8f570a03616 Mon Sep 17 00:00:00 2001
From: a-kenji
Date: Sat, 9 Nov 2024 15:03:46 +0100
Subject: [PATCH 0223/2159] cosmic-randr: 1.0.0-alpha.2 -> 1.0.0-alpha.3
---
pkgs/by-name/co/cosmic-randr/Cargo.lock | 196 ++++++++++++-----------
pkgs/by-name/co/cosmic-randr/package.nix | 6 +-
2 files changed, 105 insertions(+), 97 deletions(-)
diff --git a/pkgs/by-name/co/cosmic-randr/Cargo.lock b/pkgs/by-name/co/cosmic-randr/Cargo.lock
index 8fb13c8f859e..25ba269635d2 100644
--- a/pkgs/by-name/co/cosmic-randr/Cargo.lock
+++ b/pkgs/by-name/co/cosmic-randr/Cargo.lock
@@ -4,18 +4,18 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
dependencies = [
"gimli",
]
[[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
[[package]]
name = "aho-corasick"
@@ -87,17 +87,17 @@ dependencies = [
[[package]]
name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
dependencies = [
"addr2line",
- "cc",
"cfg-if",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -108,15 +108,18 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "bytes"
-version = "1.6.1"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
[[package]]
name = "cc"
-version = "1.1.7"
+version = "1.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
+dependencies = [
+ "shlex",
+]
[[package]]
name = "cfg-if"
@@ -126,9 +129,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
-version = "4.5.11"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
dependencies = [
"clap_builder",
"clap_derive",
@@ -136,9 +139,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.11"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
dependencies = [
"anstream",
"anstyle",
@@ -148,9 +151,9 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.11"
+version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck",
"proc-macro2",
@@ -173,7 +176,7 @@ checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
[[package]]
name = "cosmic-protocols"
version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-protocols.git#bd65e0f2d55429954839c9e6c7bc5b0d198b85f0"
+source = "git+https://github.com/pop-os/cosmic-protocols.git#91aeb55052a8e6e15a7ddd53e039a9350f16fa69"
dependencies = [
"bitflags",
"wayland-backend",
@@ -272,9 +275,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fomat-macros"
@@ -284,15 +287,15 @@ checksum = "3f722aa875298d34a0ebb6004699f6f4ea830d36dec8ac2effdbbc840248a096"
[[package]]
name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]]
name = "futures-lite"
@@ -322,15 +325,15 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
[[package]]
name = "hashbrown"
-version = "0.14.5"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
[[package]]
name = "heck"
@@ -346,9 +349,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
[[package]]
name = "indexmap"
-version = "2.2.6"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
"hashbrown",
@@ -385,9 +388,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
-version = "0.2.155"
+version = "0.2.161"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
[[package]]
name = "libloading"
@@ -470,18 +473,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
dependencies = [
- "adler",
+ "adler2",
]
[[package]]
name = "mio"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
dependencies = [
"hermit-abi",
"libc",
@@ -520,18 +523,18 @@ dependencies = [
[[package]]
name = "object"
-version = "0.36.2"
+version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "overload"
@@ -541,9 +544,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "parking"
-version = "2.2.0"
+version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]]
name = "pin-project-lite"
@@ -553,47 +556,47 @@ checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
[[package]]
name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.88"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quick-xml"
-version = "0.34.0"
+version = "0.36.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
dependencies = [
"memchr",
]
[[package]]
name = "quote"
-version = "1.0.36"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
[[package]]
name = "regex"
-version = "1.10.5"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
dependencies = [
"aho-corasick",
"memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -607,13 +610,13 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -624,9 +627,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "rustc-demangle"
@@ -636,9 +639,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
[[package]]
name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
"bitflags",
"errno",
@@ -649,9 +652,9 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.17"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
[[package]]
name = "scoped-tls"
@@ -668,6 +671,12 @@ dependencies = [
"lazy_static",
]
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
[[package]]
name = "signal-hook-registry"
version = "1.4.2"
@@ -710,9 +719,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "syn"
-version = "2.0.72"
+version = "2.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
dependencies = [
"proc-macro2",
"quote",
@@ -721,32 +730,31 @@ dependencies = [
[[package]]
name = "tachyonix"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1924ef47bc3b427ea2a0b55ba97d0e9116e9103483ecd75a43f47a66443527c5"
+checksum = "86c3eafa053bbcc63bb4bfc5eb26362a33ea0bc2e589f28bce00287d1c167d45"
dependencies = [
"async-event",
"crossbeam-utils",
"diatomic-waker",
"futures-core",
- "loom",
"pin-project-lite",
]
[[package]]
name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [
"proc-macro2",
"quote",
@@ -765,9 +773,9 @@ dependencies = [
[[package]]
name = "tokio"
-version = "1.39.2"
+version = "1.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
dependencies = [
"backtrace",
"bytes",
@@ -854,15 +862,15 @@ dependencies = [
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "utf8parse"
@@ -896,9 +904,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wayland-backend"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993"
+checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6"
dependencies = [
"cc",
"downcast-rs",
@@ -910,9 +918,9 @@ dependencies = [
[[package]]
name = "wayland-client"
-version = "0.31.5"
+version = "0.31.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943"
+checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d"
dependencies = [
"bitflags",
"rustix",
@@ -922,9 +930,9 @@ dependencies = [
[[package]]
name = "wayland-protocols"
-version = "0.32.3"
+version = "0.32.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa"
+checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0"
dependencies = [
"bitflags",
"wayland-backend",
@@ -935,9 +943,9 @@ dependencies = [
[[package]]
name = "wayland-protocols-wlr"
-version = "0.3.3"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953"
+checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109"
dependencies = [
"bitflags",
"wayland-backend",
@@ -949,9 +957,9 @@ dependencies = [
[[package]]
name = "wayland-scanner"
-version = "0.31.4"
+version = "0.31.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6"
+checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3"
dependencies = [
"proc-macro2",
"quick-xml",
@@ -960,9 +968,9 @@ dependencies = [
[[package]]
name = "wayland-server"
-version = "0.31.4"
+version = "0.31.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a4bab6d420ee4a609b63ef4d5f9b5d309c6b93a029fccab70f2594c0cb3ae"
+checksum = "0f18d47038c0b10479e695d99ed073e400ccd9bdbb60e6e503c96f62adcb12b6"
dependencies = [
"bitflags",
"downcast-rs",
@@ -974,9 +982,9 @@ dependencies = [
[[package]]
name = "wayland-sys"
-version = "0.31.4"
+version = "0.31.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148"
+checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09"
dependencies = [
"dlib",
"log",
diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index 2c5673483444..9892ede72acd 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -9,19 +9,19 @@
rustPlatform.buildRustPackage rec {
pname = "cosmic-randr";
- version = "1.0.0-alpha.2";
+ version = "1.0.0-alpha.3";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-randr";
rev = "epoch-${version}";
- hash = "sha256-g9zoqjPHRv6Tw/Xn8VtFS3H/66tfHSl/DR2lH3Z2ysA=";
+ hash = "sha256-xakK4APhlNKuWbCMP6nJXLyOaQ0hFCvzOht3P8CkV/0=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
- "cosmic-protocols-0.1.0" = "sha256-zWuvZrg39REZpviQPfLNyfmWBzMS7A7IBUTi8ZRhxXs=";
+ "cosmic-protocols-0.1.0" = "sha256-6XM6kcM2CEGAziCkal4uO0EL1nEWOKb3rFs7hFh6r7Y=";
};
};
From 457241dab4b6e9423009d2bd9c1db6fbcaef209a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther
Date: Thu, 31 Oct 2024 17:08:57 +0100
Subject: [PATCH 0224/2159] python3Packages.pytest-xdist: change
pytestFlagsArray in preCheck hook
We don't want to depend on bash eval in pytestFlagsArray to be able to
remove it, thus move it to bash code in preCheck.
---
pkgs/development/python-modules/pytest-xdist/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 555c84031144..972d0bdf23c7 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -45,10 +45,10 @@ buildPythonPackage rec {
setproctitle = [ setproctitle ];
};
- pytestFlagsArray = [
- # pytest can already use xdist at this point
- "--numprocesses=$NIX_BUILD_CORES"
- ];
+ # pytest can already use xdist at this point
+ preCheck = ''
+ appendToVar pytestFlagsArray "--numprocesses=$NIX_BUILD_CORES"
+ '';
# access file system
disabledTests = [
From 298ab049674b4f033aa6242ae849bb97627c6dee Mon Sep 17 00:00:00 2001
From: Zhong Jianxin
Date: Sat, 9 Nov 2024 23:20:45 +0800
Subject: [PATCH 0225/2159] snet: format using nixfmt-rfc-style, remove `with
lib` usage
---
pkgs/by-name/sn/snet/package.nix | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/pkgs/by-name/sn/snet/package.nix b/pkgs/by-name/sn/snet/package.nix
index 47f70a21d33b..793c3285bd55 100644
--- a/pkgs/by-name/sn/snet/package.nix
+++ b/pkgs/by-name/sn/snet/package.nix
@@ -1,6 +1,10 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+}:
-buildGoModule rec {
+buildGoModule {
pname = "snet";
version = "unstable-2021-11-26";
@@ -13,11 +17,11 @@ buildGoModule rec {
vendorHash = "sha256-dubmCLeD8Fwe1msfLN+5WzdbFkfTRnZDU3F49gjWTS4=";
- meta = with lib; {
+ meta = {
description = "Transparent proxy works on linux desktop, MacOS, router";
homepage = "https://github.com/monsterxx03/snet";
- license = licenses.mit;
- maintainers = with maintainers; [ azuwis ];
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ azuwis ];
mainProgram = "snet";
};
}
From 35cc8ee6c68501cc1b7d7ac602ccecbc6deb726f Mon Sep 17 00:00:00 2001
From: Zhong Jianxin
Date: Wed, 9 Oct 2024 19:57:59 +0800
Subject: [PATCH 0226/2159] snet: disable flaky test
---
pkgs/by-name/sn/snet/package.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkgs/by-name/sn/snet/package.nix b/pkgs/by-name/sn/snet/package.nix
index 793c3285bd55..6b58ee56338b 100644
--- a/pkgs/by-name/sn/snet/package.nix
+++ b/pkgs/by-name/sn/snet/package.nix
@@ -17,6 +17,9 @@ buildGoModule {
vendorHash = "sha256-dubmCLeD8Fwe1msfLN+5WzdbFkfTRnZDU3F49gjWTS4=";
+ # flaky test, random failures
+ checkFlags = [ "-skip=TestBloomfilter" ];
+
meta = {
description = "Transparent proxy works on linux desktop, MacOS, router";
homepage = "https://github.com/monsterxx03/snet";
From 938fc7c681e18335f368c18c198a7924317463e1 Mon Sep 17 00:00:00 2001
From: John Chadwick
Date: Fri, 8 Nov 2024 10:21:16 -0500
Subject: [PATCH 0227/2159] ruffle: nightly-2024-09-12 -> nightly-2024-11-07
---
pkgs/by-name/ru/ruffle/Cargo.lock | 768 +++++++++++++----------------
pkgs/by-name/ru/ruffle/package.nix | 10 +-
2 files changed, 359 insertions(+), 419 deletions(-)
diff --git a/pkgs/by-name/ru/ruffle/Cargo.lock b/pkgs/by-name/ru/ruffle/Cargo.lock
index 1c52ff074d54..65241a3ba40d 100644
--- a/pkgs/by-name/ru/ruffle/Cargo.lock
+++ b/pkgs/by-name/ru/ruffle/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
[[package]]
name = "ab_glyph"
-version = "0.2.28"
+version = "0.2.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb"
+checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0"
dependencies = [
"ab_glyph_rasterizer",
"owned_ttf_parser",
@@ -20,19 +20,13 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
[[package]]
name = "addr2line"
-version = "0.22.0"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
dependencies = [
"gimli",
]
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
[[package]]
name = "adler2"
version = "2.0.0"
@@ -182,9 +176,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.87"
+version = "1.0.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8"
+checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
[[package]]
name = "approx"
@@ -206,9 +200,9 @@ dependencies = [
[[package]]
name = "arboard"
-version = "3.4.0"
+version = "3.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89"
+checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4"
dependencies = [
"clipboard-win",
"log",
@@ -221,9 +215,9 @@ dependencies = [
[[package]]
name = "arrayref"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
[[package]]
name = "arrayvec"
@@ -248,9 +242,9 @@ dependencies = [
[[package]]
name = "ashpd"
-version = "0.9.1"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a"
+checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9"
dependencies = [
"async-fs",
"async-net",
@@ -294,9 +288,9 @@ dependencies = [
[[package]]
name = "async-executor"
-version = "1.13.0"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
+checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
dependencies = [
"async-task",
"concurrent-queue",
@@ -359,9 +353,9 @@ dependencies = [
[[package]]
name = "async-process"
-version = "2.2.4"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374"
+checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
dependencies = [
"async-channel",
"async-io",
@@ -374,7 +368,6 @@ dependencies = [
"futures-lite",
"rustix",
"tracing",
- "windows-sys 0.59.0",
]
[[package]]
@@ -385,7 +378,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -414,13 +407,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
[[package]]
name = "async-trait"
-version = "0.1.81"
+version = "0.1.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -437,17 +430,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]]
name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
dependencies = [
"addr2line",
- "cc",
"cfg-if",
"libc",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
"object",
"rustc-demangle",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -458,16 +451,14 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "bindgen"
-version = "0.69.4"
+version = "0.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
dependencies = [
"bitflags 2.6.0",
"cexpr",
"clang-sys",
- "itertools 0.12.1",
- "lazy_static",
- "lazycell",
+ "itertools",
"log",
"prettyplease",
"proc-macro2",
@@ -475,8 +466,7 @@ dependencies = [
"regex",
"rustc-hash 1.1.0",
"shlex",
- "syn 2.0.77",
- "which",
+ "syn 2.0.85",
]
[[package]]
@@ -580,9 +570,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "bytemuck"
-version = "1.18.0"
+version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
dependencies = [
"bytemuck_derive",
]
@@ -595,7 +585,7 @@ checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -612,9 +602,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
[[package]]
name = "bytes"
-version = "1.7.1"
+version = "1.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
[[package]]
name = "bzip2"
@@ -697,9 +687,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.1.15"
+version = "1.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
dependencies = [
"jobserver",
"libc",
@@ -777,9 +767,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.17"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
dependencies = [
"clap_builder",
"clap_derive",
@@ -787,9 +777,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.17"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
dependencies = [
"anstream",
"anstyle",
@@ -799,14 +789,14 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -966,6 +956,16 @@ dependencies = [
"libc",
]
+[[package]]
+name = "core-foundation"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
[[package]]
name = "core-foundation-sys"
version = "0.8.7"
@@ -979,7 +979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
dependencies = [
"bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
"core-graphics-types",
"foreign-types",
"libc",
@@ -992,7 +992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
dependencies = [
"bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
"libc",
]
@@ -1018,9 +1018,9 @@ dependencies = [
[[package]]
name = "coreaudio-sys"
-version = "0.2.15"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9"
+checksum = "2ce857aa0b77d77287acc1ac3e37a05a8c95a2af3647d23b15f263bdaeb7562b"
dependencies = [
"bindgen",
]
@@ -1050,9 +1050,9 @@ dependencies = [
[[package]]
name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
dependencies = [
"libc",
]
@@ -1183,7 +1183,7 @@ dependencies = [
"ident_case",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -1194,7 +1194,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -1333,7 +1333,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -1387,7 +1387,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -1422,8 +1422,9 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
[[package]]
name = "ecolor"
-version = "0.28.1"
-source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "775cfde491852059e386c4e1deb4aef381c617dc364184c6f6afee99b87c402b"
dependencies = [
"bytemuck",
"emath",
@@ -1431,8 +1432,9 @@ dependencies = [
[[package]]
name = "egui"
-version = "0.28.1"
-source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53eafabcce0cb2325a59a98736efe0bf060585b437763f8c476957fb274bb974"
dependencies = [
"ahash",
"emath",
@@ -1443,8 +1445,9 @@ dependencies = [
[[package]]
name = "egui-wgpu"
-version = "0.28.1"
-source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d00fd5d06d8405397e64a928fa0ef3934b3c30273ea7603e3dc4627b1f7a1a82"
dependencies = [
"ahash",
"bytemuck",
@@ -1461,8 +1464,9 @@ dependencies = [
[[package]]
name = "egui-winit"
-version = "0.28.1"
-source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a9c430f4f816340e8e8c1b20eec274186b1be6bc4c7dfc467ed50d57abc36c6"
dependencies = [
"ahash",
"arboard",
@@ -1477,8 +1481,9 @@ dependencies = [
[[package]]
name = "egui_extras"
-version = "0.28.1"
-source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf3c1f5cd8dfe2ade470a218696c66cf556fcfd701e7830fa2e9f4428292a2a1"
dependencies = [
"ahash",
"egui",
@@ -1495,17 +1500,18 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "emath"
-version = "0.28.1"
-source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1fe0049ce51d0fb414d029e668dd72eb30bc2b739bf34296ed97bd33df544f3"
dependencies = [
"bytemuck",
]
[[package]]
name = "embed-resource"
-version = "2.4.3"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602"
+checksum = "f4e24052d7be71f0efb50c201557f6fe7d237cfd5a64fd5bcd7fd8fe32dbbffa"
dependencies = [
"cc",
"memchr",
@@ -1523,9 +1529,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
[[package]]
name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
dependencies = [
"cfg-if",
]
@@ -1554,7 +1560,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -1575,7 +1581,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -1596,7 +1602,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -1624,8 +1630,9 @@ dependencies = [
[[package]]
name = "epaint"
-version = "0.28.1"
-source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a32af8da821bd4f43f2c137e295459ee2e1661d87ca8779dfa0eaf45d870e20f"
dependencies = [
"ab_glyph",
"ahash",
@@ -1640,8 +1647,9 @@ dependencies = [
[[package]]
name = "epaint_default_fonts"
-version = "0.28.1"
-source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "483440db0b7993cf77a20314f08311dbe95675092405518c0677aa08c151a3ea"
[[package]]
name = "equivalent"
@@ -1661,9 +1669,9 @@ dependencies = [
[[package]]
name = "error-code"
-version = "3.2.0"
+version = "3.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
+checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
[[package]]
name = "escape8259"
@@ -1673,9 +1681,9 @@ checksum = "5692dd7b5a1978a5aeb0ce83b7655c58ca8efdcb79d21036ea249da95afec2c6"
[[package]]
name = "euclid"
-version = "0.22.10"
+version = "0.22.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20"
+checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48"
dependencies = [
"num-traits",
]
@@ -1724,29 +1732,29 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fdeflate"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab"
dependencies = [
"simd-adler32",
]
[[package]]
name = "filetime"
-version = "0.2.24"
+version = "0.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
dependencies = [
"cfg-if",
"libc",
- "libredox 0.1.3",
+ "libredox",
"windows-sys 0.59.0",
]
[[package]]
name = "flash-lso"
version = "0.6.0"
-source = "git+https://github.com/ruffle-rs/rust-flash-lso?rev=98679aa0cdcad5fecc5c7321b2eac35b69dbcd5f#98679aa0cdcad5fecc5c7321b2eac35b69dbcd5f"
+source = "git+https://github.com/ruffle-rs/rust-flash-lso?rev=cbd18e1a79cf902f8ff1d2bf551801c4021b3be6#cbd18e1a79cf902f8ff1d2bf551801c4021b3be6"
dependencies = [
"enumset",
"nom",
@@ -1755,12 +1763,12 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.33"
+version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
dependencies = [
"crc32fast",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
]
[[package]]
@@ -1814,24 +1822,24 @@ dependencies = [
[[package]]
name = "fluent-template-macros"
-version = "0.10.1"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b86ebacac709a063f57ee83d37c451d60dc873554f9bd828531fd1ec43209c80"
+checksum = "007d176e568a4f73ad4225df02aa29ccfecffd8eda31ce78da0bc8b4b310f20a"
dependencies = [
"flume",
"ignore",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
"unic-langid",
]
[[package]]
name = "fluent-templates"
-version = "0.10.1"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f339cc149c01ba2f7b0feba2acde6dd6e4a48472daffe2ddfdd6073e564c60b3"
+checksum = "74f22f61b2c8551163ea13c16a381484e5360b089401c6e47c4bfcf6b62bb7ac"
dependencies = [
"fluent-bundle",
"fluent-langneg",
@@ -1869,6 +1877,12 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
[[package]]
name = "fontconfig-parser"
version = "0.5.7"
@@ -1880,9 +1894,9 @@ dependencies = [
[[package]]
name = "fontdb"
-version = "0.21.0"
+version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37be9fc20d966be438cd57a45767f73349477fb0f85ce86e000557f787298afb"
+checksum = "457e789b3d1202543297a350643cf459f836cade38934e7a4cf6a39e7cde2905"
dependencies = [
"fontconfig-parser",
"log",
@@ -1910,7 +1924,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -1930,9 +1944,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
dependencies = [
"futures-channel",
"futures-core",
@@ -1945,9 +1959,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
dependencies = [
"futures-core",
"futures-sink",
@@ -1955,15 +1969,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
dependencies = [
"futures-core",
"futures-task",
@@ -1972,9 +1986,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]]
name = "futures-lite"
@@ -1991,32 +2005,32 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
[[package]]
name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]]
name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [
"futures-channel",
"futures-core",
@@ -2037,7 +2051,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3cd70cf88a32937834aae9614ff2569b5d9467fa0c42c5d7762fd94a8de88266"
dependencies = [
"gc-arena-derive",
- "hashbrown",
+ "hashbrown 0.14.5",
"sptr",
]
@@ -2049,7 +2063,7 @@ checksum = "c612a69f5557a11046b77a7408d2836fe77077f842171cd211c5ef504bd3cddd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
"synstructure",
]
@@ -2112,9 +2126,9 @@ dependencies = [
[[package]]
name = "gilrs"
-version = "0.10.9"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb8c78963a8856a5b10015c9349176ff5edbc8095384d52aada467a848bc03a"
+checksum = "bbb2c998745a3c1ac90f64f4f7b3a54219fd3612d7705e7798212935641ed18f"
dependencies = [
"fnv",
"gilrs-core",
@@ -2125,11 +2139,11 @@ dependencies = [
[[package]]
name = "gilrs-core"
-version = "0.5.15"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732dadc05170599ddec9a89653f10d7a2af54da9181b3fa6e2bd49907ec8f7e4"
+checksum = "495af945e45efd6386227613cd9fb7bd7c43d3c095040e30c5304c489e6abed5"
dependencies = [
- "core-foundation",
+ "core-foundation 0.10.0",
"inotify",
"io-kit-sys",
"js-sys",
@@ -2146,9 +2160,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.29.0"
+version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
[[package]]
name = "gl_generator"
@@ -2169,15 +2183,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "globset"
-version = "0.4.14"
+version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
+checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
dependencies = [
"aho-corasick",
"bstr",
"log",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -2271,7 +2285,7 @@ checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557"
dependencies = [
"bitflags 2.6.0",
"gpu-descriptor-types",
- "hashbrown",
+ "hashbrown 0.14.5",
]
[[package]]
@@ -2318,7 +2332,7 @@ name = "h263-rs-deblock"
version = "0.1.0"
source = "git+https://github.com/ruffle-rs/h263-rs?rev=f0fa94c366a1d0383df99aa835add175658d6bad#f0fa94c366a1d0383df99aa835add175658d6bad"
dependencies = [
- "itertools 0.13.0",
+ "itertools",
"wide",
]
@@ -2341,6 +2355,17 @@ dependencies = [
"allocator-api2",
]
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
[[package]]
name = "hassle-rs"
version = "0.11.0"
@@ -2457,9 +2482,9 @@ dependencies = [
[[package]]
name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
dependencies = [
"futures-util",
"http",
@@ -2475,9 +2500,9 @@ dependencies = [
[[package]]
name = "hyper-util"
-version = "0.1.7"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
dependencies = [
"bytes",
"futures-channel",
@@ -2488,16 +2513,15 @@ dependencies = [
"pin-project-lite",
"socket2",
"tokio",
- "tower",
"tower-service",
"tracing",
]
[[package]]
name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
dependencies = [
"android_system_properties",
"core-foundation-sys",
@@ -2555,15 +2579,15 @@ dependencies = [
[[package]]
name = "ignore"
-version = "0.4.22"
+version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
+checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b"
dependencies = [
"crossbeam-deque",
"globset",
"log",
"memchr",
- "regex-automata 0.4.7",
+ "regex-automata 0.4.8",
"same-file",
"walkdir",
"winapi-util",
@@ -2571,9 +2595,9 @@ dependencies = [
[[package]]
name = "image"
-version = "0.25.2"
+version = "0.25.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
+checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
dependencies = [
"bytemuck",
"byteorder-lite",
@@ -2584,12 +2608,12 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
- "hashbrown",
+ "hashbrown 0.15.0",
]
[[package]]
@@ -2607,11 +2631,11 @@ dependencies = [
[[package]]
name = "inotify"
-version = "0.10.2"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
+checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
"inotify-sys",
"libc",
]
@@ -2627,9 +2651,9 @@ dependencies = [
[[package]]
name = "insta"
-version = "1.40.0"
+version = "1.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60"
+checksum = "a1f72d3e19488cf7d8ea52d2fc0f8754fc933398b337cd3cbdb28aaeb35159ef"
dependencies = [
"console",
"lazy_static",
@@ -2677,9 +2701,9 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.9.0"
+version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
[[package]]
name = "is_terminal_polyfill"
@@ -2687,15 +2711,6 @@ version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
[[package]]
name = "itertools"
version = "0.13.0"
@@ -2751,7 +2766,7 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
[[package]]
name = "jpegxr"
version = "0.3.1"
-source = "git+https://github.com/ruffle-rs/jpegxr?rev=db88651220688d2883a90d5477048071507b0493#db88651220688d2883a90d5477048071507b0493"
+source = "git+https://github.com/ruffle-rs/jpegxr?rev=71dbe614c02c30a2e9fd1e9e2e7c7a749abe2798#71dbe614c02c30a2e9fd1e9e2e7c7a749abe2798"
dependencies = [
"bindgen",
"cc",
@@ -2761,9 +2776,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
dependencies = [
"wasm-bindgen",
]
@@ -2791,17 +2806,11 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
[[package]]
name = "libc"
-version = "0.2.158"
+version = "0.2.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
[[package]]
name = "libloading"
@@ -2819,17 +2828,6 @@ version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
-[[package]]
-name = "libredox"
-version = "0.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
-dependencies = [
- "bitflags 2.6.0",
- "libc",
- "redox_syscall 0.4.1",
-]
-
[[package]]
name = "libredox"
version = "0.1.3"
@@ -2838,19 +2836,19 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
"bitflags 2.6.0",
"libc",
- "redox_syscall 0.5.1",
+ "redox_syscall 0.5.4",
]
[[package]]
name = "libtest-mimic"
-version = "0.7.3"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc0bda45ed5b3a2904262c1bb91e526127aa70e7ef3758aba2ef93cf896b9b58"
+checksum = "5297962ef19edda4ce33aaa484386e0a5b3d7f2f4e037cbeee00503ef6b29d33"
dependencies = [
+ "anstream",
+ "anstyle",
"clap",
"escape8259",
- "termcolor",
- "threadpool",
]
[[package]]
@@ -2871,22 +2869,22 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linkme"
-version = "0.3.28"
+version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c943daedff228392b791b33bba32e75737756e80a613e32e246c6ce9cbab20a"
+checksum = "70fe496a7af8c406f877635cbf3cd6a9fac9d6f443f58691cd8afe6ce0971af4"
dependencies = [
"linkme-impl",
]
[[package]]
name = "linkme-impl"
-version = "0.3.28"
+version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb26336e6dc7cc76e7927d2c9e7e3bb376d7af65a6f56a0b16c47d18a9b1abc5"
+checksum = "b01f197a15988fb5b2ec0a5a9800c97e70771499c456ad757d63b3c5e9b96e75"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -2938,11 +2936,11 @@ dependencies = [
[[package]]
name = "lru"
-version = "0.12.4"
+version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
dependencies = [
- "hashbrown",
+ "hashbrown 0.15.0",
]
[[package]]
@@ -2967,9 +2965,9 @@ dependencies = [
[[package]]
name = "lyon_geom"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9"
+checksum = "8af69edc087272df438b3ee436c4bb6d7c04aa8af665cfd398feae627dbd8570"
dependencies = [
"arrayvec",
"euclid",
@@ -3058,9 +3056,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memmap2"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
dependencies = [
"libc",
]
@@ -3101,16 +3099,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
- "simd-adler32",
-]
-
[[package]]
name = "miniz_oxide"
version = "0.8.0"
@@ -3118,6 +3106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
dependencies = [
"adler2",
+ "simd-adler32",
]
[[package]]
@@ -3341,7 +3330,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -3363,16 +3352,6 @@ dependencies = [
"libm",
]
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
[[package]]
name = "num_enum"
version = "0.7.3"
@@ -3391,7 +3370,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -3623,9 +3602,9 @@ dependencies = [
[[package]]
name = "object"
-version = "0.36.3"
+version = "0.36.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
dependencies = [
"memchr",
]
@@ -3667,11 +3646,11 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
[[package]]
name = "orbclient"
-version = "0.3.47"
+version = "0.3.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166"
+checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43"
dependencies = [
- "libredox 0.0.2",
+ "libredox",
]
[[package]]
@@ -3702,18 +3681,18 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "owned_ttf_parser"
-version = "0.24.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90"
+checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4"
dependencies = [
"ttf-parser",
]
[[package]]
name = "parking"
-version = "2.2.0"
+version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]]
name = "parking_lot"
@@ -3733,7 +3712,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.5.1",
+ "redox_syscall 0.5.4",
"smallvec",
"windows-targets 0.52.6",
]
@@ -3773,7 +3752,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -3801,21 +3780,21 @@ dependencies = [
[[package]]
name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "png"
-version = "0.17.13"
+version = "0.17.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0"
dependencies = [
"bitflags 1.3.2",
"crc32fast",
"fdeflate",
"flate2",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
]
[[package]]
@@ -3841,9 +3820,9 @@ checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2"
[[package]]
name = "portable-atomic"
-version = "1.7.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce"
[[package]]
name = "powerfmt"
@@ -3868,9 +3847,9 @@ checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
[[package]]
name = "pretty_assertions"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
dependencies = [
"diff",
"yansi",
@@ -3883,7 +3862,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
dependencies = [
"proc-macro2",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -3912,9 +3891,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
@@ -3936,7 +3915,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
dependencies = [
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -3957,25 +3936,26 @@ dependencies = [
[[package]]
name = "quick-xml"
-version = "0.36.1"
+version = "0.36.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
dependencies = [
"memchr",
]
[[package]]
name = "quinn"
-version = "0.11.2"
+version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad"
+checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
dependencies = [
"bytes",
"pin-project-lite",
"quinn-proto",
"quinn-udp",
- "rustc-hash 1.1.0",
+ "rustc-hash 2.0.0",
"rustls",
+ "socket2",
"thiserror",
"tokio",
"tracing",
@@ -4000,15 +3980,15 @@ dependencies = [
[[package]]
name = "quinn-udp"
-version = "0.5.2"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46"
+checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
dependencies = [
"libc",
"once_cell",
"socket2",
"tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -4084,9 +4064,9 @@ dependencies = [
[[package]]
name = "realfft"
-version = "3.3.0"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953d9f7e5cdd80963547b456251296efc2626ed4e3cbf36c869d9564e0220571"
+checksum = "390252372b7f2aac8360fc5e72eba10136b166d6faeed97e6d0c8324eb99b2b1"
dependencies = [
"rustfft",
]
@@ -4102,34 +4082,34 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
dependencies = [
"bitflags 2.6.0",
]
[[package]]
name = "redox_users"
-version = "0.4.5"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
dependencies = [
"getrandom",
- "libredox 0.1.3",
+ "libredox",
"thiserror",
]
[[package]]
name = "regex"
-version = "1.10.6"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick",
"memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -4143,13 +4123,13 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -4160,9 +4140,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "regress"
@@ -4170,7 +4150,7 @@ version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1541daf4e4ed43a0922b7969bdc2170178bcacc5dabf7e39bc508a9fa3953a7a"
dependencies = [
- "hashbrown",
+ "hashbrown 0.14.5",
"memchr",
]
@@ -4197,9 +4177,9 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
[[package]]
name = "reqwest"
-version = "0.12.7"
+version = "0.12.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
dependencies = [
"base64",
"bytes",
@@ -4245,8 +4225,9 @@ dependencies = [
[[package]]
name = "rfd"
-version = "0.14.1"
-source = "git+https://github.com/PolyMeilex/rfd.git?rev=e0e725ec9a426acf7c93d9877c41e230fcee3fac#e0e725ec9a426acf7c93d9877c41e230fcee3fac"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8af382a047821a08aa6bfc09ab0d80ff48d45d8726f7cd8e44891f7cb4a4278e"
dependencies = [
"ashpd",
"block2",
@@ -4312,7 +4293,7 @@ dependencies = [
"flv-rs",
"fnv",
"futures",
- "hashbrown",
+ "hashbrown 0.14.5",
"id3",
"image",
"indexmap",
@@ -4357,6 +4338,7 @@ name = "ruffle_desktop"
version = "0.1.0"
dependencies = [
"anyhow",
+ "ashpd",
"bytemuck",
"chrono",
"clap",
@@ -4396,7 +4378,6 @@ dependencies = [
"wgpu",
"winapi",
"winit",
- "zbus",
]
[[package]]
@@ -4405,6 +4386,8 @@ version = "0.1.0"
dependencies = [
"async-channel",
"async-io",
+ "bytemuck",
+ "cpal",
"futures-lite",
"macro_rules_attribute",
"reqwest",
@@ -4442,7 +4425,7 @@ name = "ruffle_macros"
version = "0.1.0"
dependencies = [
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -4601,6 +4584,7 @@ dependencies = [
"slotmap",
"swf",
"tempfile",
+ "thiserror",
"tracing",
]
@@ -4698,9 +4682,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
[[package]]
name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
dependencies = [
"semver",
]
@@ -4731,9 +4715,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
"bitflags 2.6.0",
"errno",
@@ -4744,9 +4728,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.23.12"
+version = "0.23.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
dependencies = [
"once_cell",
"ring",
@@ -4774,9 +4758,9 @@ checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
[[package]]
name = "rustls-webpki"
-version = "0.102.6"
+version = "0.102.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
dependencies = [
"ring",
"rustls-pki-types",
@@ -4864,9 +4848,9 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.210"
+version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
dependencies = [
"serde_derive",
]
@@ -4884,20 +4868,20 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.210"
+version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
name = "serde_json"
-version = "1.0.128"
+version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"indexmap",
"itoa",
@@ -4914,7 +4898,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -5229,9 +5213,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.77"
+version = "2.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
dependencies = [
"proc-macro2",
"quote",
@@ -5255,7 +5239,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -5274,7 +5258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
dependencies = [
"bitflags 2.6.0",
- "core-foundation",
+ "core-foundation 0.9.4",
"system-configuration-sys",
]
@@ -5290,9 +5274,9 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
dependencies = [
"cfg-if",
"fastrand",
@@ -5330,22 +5314,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.63"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -5358,15 +5342,6 @@ dependencies = [
"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 = "tiff"
version = "0.9.1"
@@ -5462,9 +5437,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.40.0"
+version = "1.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
dependencies = [
"backtrace",
"bytes",
@@ -5484,7 +5459,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -5500,9 +5475,9 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
dependencies = [
"bytes",
"futures-core",
@@ -5534,9 +5509,9 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.22.20"
+version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [
"indexmap",
"serde",
@@ -5545,27 +5520,6 @@ dependencies = [
"winnow",
]
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
[[package]]
name = "tower-service"
version = "0.3.3"
@@ -5604,7 +5558,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -5707,9 +5661,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "ttf-parser"
-version = "0.24.1"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a"
+checksum = "5902c5d130972a0000f60860bfbf46f7ca3db5391eddfedd1b8728bd9dc96c0e"
dependencies = [
"core_maths",
]
@@ -5800,7 +5754,7 @@ checksum = "1ed7f4237ba393424195053097c1516bd4590dc82b84f2f97c5c69e12704555b"
dependencies = [
"proc-macro-hack",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
"unic-langid-impl",
]
@@ -5841,36 +5795,36 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]]
name = "untrusted"
@@ -5996,9 +5950,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
dependencies = [
"cfg-if",
"once_cell",
@@ -6007,24 +5961,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
dependencies = [
"cfg-if",
"js-sys",
@@ -6034,9 +5988,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -6044,28 +5998,28 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
[[package]]
name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
dependencies = [
"futures-util",
"js-sys",
@@ -6191,9 +6145,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549"
[[package]]
name = "web-sys"
-version = "0.3.70"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -6211,12 +6165,12 @@ dependencies = [
[[package]]
name = "webbrowser"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e"
+checksum = "2e5f07fb9bc8de2ddfe6b24a71a75430673fd679e568c48b52716cef1cfae923"
dependencies = [
"block2",
- "core-foundation",
+ "core-foundation 0.10.0",
"home",
"jni",
"log",
@@ -6229,9 +6183,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "0.26.3"
+version = "0.26.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
dependencies = [
"rustls-pki-types",
]
@@ -6348,18 +6302,6 @@ dependencies = [
"web-sys",
]
-[[package]]
-name = "which"
-version = "4.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
-dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix",
-]
-
[[package]]
name = "wide"
version = "0.7.28"
@@ -6394,11 +6336,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -6714,7 +6656,7 @@ dependencies = [
"calloop",
"cfg_aliases 0.2.1",
"concurrent-queue",
- "core-foundation",
+ "core-foundation 0.9.4",
"core-graphics",
"cursor-icon",
"dpi",
@@ -6848,15 +6790,15 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
[[package]]
name = "xml-rs"
-version = "0.8.21"
+version = "0.8.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601"
+checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26"
[[package]]
name = "yansi"
-version = "0.5.1"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
[[package]]
name = "zbus"
@@ -6905,7 +6847,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
"zvariant_utils",
]
@@ -6938,7 +6880,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -7001,7 +6943,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
"zvariant_utils",
]
@@ -7013,5 +6955,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 55b2ce67fc9b..c1581fb0f7fb 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -23,7 +23,7 @@
}:
let
- version = "nightly-2024-09-12";
+ version = "nightly-2024-11-07";
in
rustPlatform.buildRustPackage {
pname = "ruffle";
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage {
owner = "ruffle-rs";
repo = "ruffle";
rev = version;
- hash = "sha256-wvgx6581vvUPb9evvJl328oTP/F8+LhpeHX3vCsHXCc=";
+ hash = "sha256-eufp3myszqguoHGYGqIpv5gMkVx1d4L/GflRgvnxPTQ=";
};
nativeBuildInputs =
@@ -98,13 +98,11 @@ rustPlatform.buildRustPackage {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
- "ecolor-0.28.1" = "sha256-X1prQIc3jzmWyEmpfQMgowW2qM1r+2T12Nd7HCsPtpc=";
- "flash-lso-0.6.0" = "sha256-X9XYj88GmkPRy+RxvGM6vFdBxif2XYesKtqwwW2DTw4=";
+ "flash-lso-0.6.0" = "sha256-dhOAnVfxZw9JaOrY17xAeN7/y/aWZP+KUoDQuCf6D3Q=";
"h263-rs-0.1.0" = "sha256-dyQHnCe7LwwZYlF57sbRzir9vUavN3K8wLhwPIWlmik=";
- "jpegxr-0.3.1" = "sha256-03gbXA5T02ofgfRaanaixqfrFpxw/UOOftgKZ7hPHY4=";
+ "jpegxr-0.3.1" = "sha256-aV4Qh9ea0CirWU3lScjSKi4mii0cDTnx+miTcqWzxGg=";
"nellymoser-rs-0.1.2" = "sha256-66yt+CKaw/QFIPeNkZA2mb9ke64rKcAw/6k/pjNYY04=";
"nihav_codec_support-0.1.0" = "sha256-HAJS4I6yyzQzCf+vmaFp1MWXpcUgFAHPxLhfMVXmN1c=";
- "rfd-0.14.1" = "sha256-eq4OONgYrtWCogIpjws/1uRxmv3oyIdrimDVaLJ9IMo=";
};
};
From 116732a9158048a8751537940793825aafc81c4a Mon Sep 17 00:00:00 2001
From: fliiiix
Date: Sat, 2 Nov 2024 17:33:58 +0100
Subject: [PATCH 0228/2159] python312Packages.radish-bdd: fix missing yaml
dependency
```
Traceback (most recent call last):
File "/nix/store/m7wyckhw6ll6q2azfpivb0jqk9q9fm8z-python3.12-radish-bdd-0.17.1/bin/.radish-test-wrapped", line 6, in
from radish.testing.__main__ import main
File "/nix/store/m7wyckhw6ll6q2azfpivb0jqk9q9fm8z-python3.12-radish-bdd-0.17.1/lib/python3.12/site-packages/radish/testing/__main__.py", line 15, in
from radish.testing.matches import test_step_matches_configs
File "/nix/store/m7wyckhw6ll6q2azfpivb0jqk9q9fm8z-python3.12-radish-bdd-0.17.1/lib/python3.12/site-packages/radish/testing/matches.py", line 12, in
import yaml
ModuleNotFoundError: No module named 'yaml'
```
radish-test requires pyyaml at runtime.
---
pkgs/development/python-modules/radish-bdd/default.nix | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix
index 6e350cbccf71..37661847952b 100644
--- a/pkgs/development/python-modules/radish-bdd/default.nix
+++ b/pkgs/development/python-modules/radish-bdd/default.nix
@@ -41,6 +41,7 @@ buildPythonPackage rec {
lxml
parse-type
pysingleton
+ pyyaml
tag-expressions
];
@@ -48,7 +49,6 @@ buildPythonPackage rec {
freezegun
pytest-mock
pytestCheckHook
- pyyaml
];
pythonImportsCheck = [ "radish" ];
@@ -60,6 +60,9 @@ buildPythonPackage rec {
homepage = "https://radish-bdd.github.io/";
changelog = "https://github.com/radish-bdd/radish/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
- maintainers = with maintainers; [ kalbasit ];
+ maintainers = with maintainers; [
+ kalbasit
+ l33tname
+ ];
};
}
From 7e479605998792ca339e82947b4a3e9b328a6e8b Mon Sep 17 00:00:00 2001
From: fliiiix
Date: Sat, 9 Nov 2024 17:49:36 +0100
Subject: [PATCH 0229/2159] python312Packages.radish-bdd: remove unused
dependencies
---
pkgs/development/python-modules/radish-bdd/default.nix | 4 ----
1 file changed, 4 deletions(-)
diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix
index 37661847952b..501ef441dd45 100644
--- a/pkgs/development/python-modules/radish-bdd/default.nix
+++ b/pkgs/development/python-modules/radish-bdd/default.nix
@@ -1,13 +1,11 @@
{
lib,
buildPythonPackage,
- click,
colorful,
docopt,
fetchFromGitHub,
freezegun,
humanize,
- lark,
lxml,
parse-type,
pysingleton,
@@ -33,11 +31,9 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- click
colorful
docopt
humanize
- lark
lxml
parse-type
pysingleton
From 729a3efc568d7beb3a3aae3fb4055cd2d8dbc4d1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther
Date: Wed, 30 Oct 2024 20:37:17 +0100
Subject: [PATCH 0230/2159] chipsec: pass --build-libs without relying on bash
eval of setupPyBuildFlags
We'd like to remove bash eval for setupByBuildFlags, thus use
appendToVar in the hook instead.
Tested that linuxPackages.chipsec still builds, including the driver in
the right place.
---
pkgs/tools/security/chipsec/default.nix | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix
index 73c1ade5bd63..f38764b79163 100644
--- a/pkgs/tools/security/chipsec/default.nix
+++ b/pkgs/tools/security/chipsec/default.nix
@@ -44,6 +44,7 @@ python3.pkgs.buildPythonApplication rec {
preBuild = lib.optionalString withDriver ''
export CHIPSEC_BUILD_LIB=$(mktemp -d)
mkdir -p $CHIPSEC_BUILD_LIB/chipsec/helper/linux
+ appendToVar setupPyBuildFlags "--build-lib=$CHIPSEC_BUILD_LIB"
'';
env.NIX_CFLAGS_COMPILE = toString [
@@ -57,9 +58,7 @@ python3.pkgs.buildPythonApplication rec {
$out/${python3.pkgs.python.sitePackages}/drivers/linux/chipsec.ko
'';
- setupPyBuildFlags = [
- "--build-lib=$CHIPSEC_BUILD_LIB"
- ] ++ lib.optionals (!withDriver) [
+ setupPyBuildFlags = lib.optionals (!withDriver) [
"--skip-driver"
];
From 3f9135d88bbc9b26d81027d4e6977f796c255100 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther
Date: Wed, 30 Oct 2024 21:50:35 +0100
Subject: [PATCH 0231/2159] python3Packages: disable pytest cache
Instead of putting pytest's cache in a temporary directory, which will
never be re-used anyway - let's just disable it outright. This avoids
depending on bash eval in pytestFlagsArray, which we'd like to move away
from.
psycopg's testsuite somehow depends explicitly on this cache, thus we
keep it enabled there.
---
.../python-modules/certbot-dns-cloudflare/default.nix | 2 +-
pkgs/development/python-modules/certbot-dns-google/default.nix | 2 +-
pkgs/development/python-modules/certbot-dns-ovh/default.nix | 2 +-
.../development/python-modules/certbot-dns-rfc2136/default.nix | 2 +-
.../development/python-modules/certbot-dns-route53/default.nix | 2 +-
pkgs/development/python-modules/certbot/default.nix | 2 +-
pkgs/development/python-modules/psycopg/default.nix | 3 +--
7 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix
index 1d0a48549c16..d610e7ec573a 100644
--- a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [
- "-o cache_dir=$(mktemp -d)"
+ "-p no:cacheprovider"
# Monitor https://github.com/certbot/certbot/issues/9606 for a solution
"-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'"
diff --git a/pkgs/development/python-modules/certbot-dns-google/default.nix b/pkgs/development/python-modules/certbot-dns-google/default.nix
index 8e3f51299081..1061502b7bac 100644
--- a/pkgs/development/python-modules/certbot-dns-google/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-google/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [
- "-o cache_dir=$(mktemp -d)"
+ "-p no:cacheprovider"
# https://github.com/certbot/certbot/issues/9988
"-Wignore::DeprecationWarning"
];
diff --git a/pkgs/development/python-modules/certbot-dns-ovh/default.nix b/pkgs/development/python-modules/certbot-dns-ovh/default.nix
index 4858b5827969..10ae8527d1d7 100644
--- a/pkgs/development/python-modules/certbot-dns-ovh/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-ovh/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [
- "-o cache_dir=$(mktemp -d)"
+ "-p no:cacheprovider"
# Monitor https://github.com/certbot/certbot/issues/9606 for a solution
"-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'"
diff --git a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix
index d4883bd2ad02..08329f625ebe 100644
--- a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [
- "-o cache_dir=$(mktemp -d)"
+ "-p no:cacheprovider"
# Monitor https://github.com/certbot/certbot/issues/9606 for a solution
"-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'"
diff --git a/pkgs/development/python-modules/certbot-dns-route53/default.nix b/pkgs/development/python-modules/certbot-dns-route53/default.nix
index 798631b0c79e..b7ac522bb8fc 100644
--- a/pkgs/development/python-modules/certbot-dns-route53/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-route53/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [
- "-o cache_dir=$(mktemp -d)"
+ "-p no:cacheprovider"
# Monitor https://github.com/certbot/certbot/issues/9606 for a solution
"-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'"
diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index f04d2b2a793b..bf8fc8333b40 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -72,7 +72,7 @@ buildPythonPackage rec {
];
pytestFlagsArray = [
- "-o cache_dir=$(mktemp -d)"
+ "-p no:cacheprovider"
"-W"
"ignore::DeprecationWarning"
];
diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index 3338ad86ce2e..ed02d3321da6 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -211,8 +211,7 @@ buildPythonPackage rec {
];
pytestFlagsArray = [
- "-o"
- "cache_dir=$TMPDIR"
+ "-o cache_dir=.cache"
"-m"
"'not refcount and not timing and not flakey'"
# pytest.PytestRemovedIn9Warning: Marks applied to fixtures have no effect
From 6af5508cbc487e236b00384613ac54c81301daa5 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther
Date: Wed, 30 Oct 2024 22:22:42 +0100
Subject: [PATCH 0232/2159] python3Packages.numcodecs: avoid bash eval in
pytestFlagsArray
We can just cd to $out to let the tests run from that folder
automatically. Additionally we get better test output, because the
/nix/store component is missing from file names.
---
pkgs/development/python-modules/numcodecs/default.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix
index 403d5ea16051..e7d2a690f140 100644
--- a/pkgs/development/python-modules/numcodecs/default.nix
+++ b/pkgs/development/python-modules/numcodecs/default.nix
@@ -58,7 +58,8 @@ buildPythonPackage rec {
];
# https://github.com/NixOS/nixpkgs/issues/255262
- pytestFlagsArray = [ "$out/${python.sitePackages}/numcodecs" ];
+ preCheck = "pushd $out";
+ postCheck = "popd";
meta = {
homepage = "https://github.com/zarr-developers/numcodecs";
From e4525288a6662939abdf9871d7ab0815a55aad1c Mon Sep 17 00:00:00 2001
From: fliiiix
Date: Sat, 9 Nov 2024 18:12:33 +0100
Subject: [PATCH 0233/2159] python312Packages.radish-bdd: re-enable all tests
---
pkgs/development/python-modules/radish-bdd/default.nix | 2 --
1 file changed, 2 deletions(-)
diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix
index 501ef441dd45..06e41abca237 100644
--- a/pkgs/development/python-modules/radish-bdd/default.nix
+++ b/pkgs/development/python-modules/radish-bdd/default.nix
@@ -49,8 +49,6 @@ buildPythonPackage rec {
pythonImportsCheck = [ "radish" ];
- disabledTests = [ "test_main_cli_calls" ];
-
meta = with lib; {
description = "Behaviour-Driven-Development tool for python";
homepage = "https://radish-bdd.github.io/";
From bcf8a7f4e0edb7cd5fa84b158a9b0cda43824825 Mon Sep 17 00:00:00 2001
From: fliiiix
Date: Sat, 9 Nov 2024 19:21:03 +0100
Subject: [PATCH 0234/2159] python312Packages.radish-bdd: disable 3.9 and older
since it breaks
---
pkgs/development/python-modules/radish-bdd/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix
index 06e41abca237..6ce30ff6f81c 100644
--- a/pkgs/development/python-modules/radish-bdd/default.nix
+++ b/pkgs/development/python-modules/radish-bdd/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
version = "0.17.1";
format = "setuptools";
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = pname;
From b43cf9aaba2834621999f74ea5b0794ad49cb43c Mon Sep 17 00:00:00 2001
From: Tomodachi94
Date: Sun, 3 Nov 2024 08:14:16 +0000
Subject: [PATCH 0235/2159] ant: add update script
Currently only updates the main ant
package (and not the ant-contrib part
included in this derivation).
---
pkgs/by-name/ap/apacheAnt/package.nix | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pkgs/by-name/ap/apacheAnt/package.nix b/pkgs/by-name/ap/apacheAnt/package.nix
index 5e00d302ac4c..c29d1c4c6f62 100644
--- a/pkgs/by-name/ap/apacheAnt/package.nix
+++ b/pkgs/by-name/ap/apacheAnt/package.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, coreutils, makeWrapper }:
+{ fetchurl, lib, stdenv, coreutils, makeWrapper, gitUpdater }:
stdenv.mkDerivation rec {
pname = "ant";
@@ -78,6 +78,13 @@ stdenv.mkDerivation rec {
chmod +x $out/bin/ant
''; # */
+ passthru = {
+ updateScript = gitUpdater {
+ rev-prefix = "rel/";
+ url = "https://gitbox.apache.org/repos/asf/ant";
+ };
+ };
+
meta = {
homepage = "https://ant.apache.org/";
description = "Java-based build tool";
From c2bc3a39f411cf9c3765862fa1044b08b94b18a0 Mon Sep 17 00:00:00 2001
From: Tomodachi94
Date: Sun, 3 Nov 2024 08:15:07 +0000
Subject: [PATCH 0236/2159] ant: 1.10.11 -> 1.10.15
Changelogs: https://downloads.apache.org/ant/
---
pkgs/by-name/ap/apacheAnt/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/ap/apacheAnt/package.nix b/pkgs/by-name/ap/apacheAnt/package.nix
index c29d1c4c6f62..e16f5343481d 100644
--- a/pkgs/by-name/ap/apacheAnt/package.nix
+++ b/pkgs/by-name/ap/apacheAnt/package.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ant";
- version = "1.10.11";
+ version = "1.10.15";
nativeBuildInputs = [ makeWrapper ];
src = fetchurl {
url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
- sha256 = "19m8xb7h6xm4jykzb79kakbx1pa4awaglw6z31pbfg8m5pmwkipz";
+ hash = "sha256-h/SNGLoRwRVojDfvl1g+xv+J6mAz+J2BimckjaRxDEs=";
};
contrib = fetchurl {
From aa38b72f51467ae613facdb3e00446cb80255a67 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu
Date: Sat, 9 Nov 2024 16:57:50 +0100
Subject: [PATCH 0237/2159] =?UTF-8?q?ibus:=201.5.30=20=E2=86=92=201.5.31?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Diff: https://github.com/ibus/ibus/compare/1.5.30...1.5.31
---
pkgs/tools/inputmethods/ibus/default.nix | 4 ++--
pkgs/tools/inputmethods/ibus/fix-paths.patch | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index e396b6f06444..c5b8b1c6e00a 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -58,13 +58,13 @@ in
stdenv.mkDerivation rec {
pname = "ibus";
- version = "1.5.30";
+ version = "1.5.31";
src = fetchFromGitHub {
owner = "ibus";
repo = "ibus";
rev = version;
- sha256 = "sha256-VgSjeKF9DCkDfE9lHEaWpgZb6ibdgoDf/I6qeJf8Ah4=";
+ sha256 = "sha256-YMCtLIK/9iUdS37Oiow7WMhFFPKhomNXvzWbLzlUkdQ=";
};
patches = [
diff --git a/pkgs/tools/inputmethods/ibus/fix-paths.patch b/pkgs/tools/inputmethods/ibus/fix-paths.patch
index 340ec22130f0..a97f22171c1e 100644
--- a/pkgs/tools/inputmethods/ibus/fix-paths.patch
+++ b/pkgs/tools/inputmethods/ibus/fix-paths.patch
@@ -2,12 +2,13 @@ diff --git a/configure.ac b/configure.ac
index a3cdb2da..cade9466 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -469,11 +469,11 @@ PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED],
- if test "x$enable_pygobject" = "xyes"; then
+@@ -531,12 +531,12 @@
PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED])
-- pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"`
-+ pyoverridesdir="$prefix/@pythonSitePackages@/gi/overrides"
+ if test x"$pyoverridesdir" = x""; then
+- pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"`
++ pyoverridesdir="$prefix/@pythonSitePackages@/gi/overrides"
+ fi
AC_SUBST(pyoverridesdir)
if test x"$enable_python2" = x"yes"; then
From 9b83f4c1249fe7d9dcd136089af0e930e1f9d9d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
Date: Sat, 9 Nov 2024 11:15:56 -0800
Subject: [PATCH 0238/2159] python312Packages.nextcord: depends on setuptools
It uses pkg_resources.
---
pkgs/development/python-modules/nextcord/default.nix | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix
index 83b34084a0a5..d9c1fcc82742 100644
--- a/pkgs/development/python-modules/nextcord/default.nix
+++ b/pkgs/development/python-modules/nextcord/default.nix
@@ -13,13 +13,13 @@
faust-cchardet,
orjson,
pynacl,
+ setuptools,
}:
buildPythonPackage rec {
pname = "nextcord";
version = "2.6.1";
-
- format = "setuptools";
+ pyproject = true;
disabled = pythonOlder "3.8";
@@ -38,13 +38,18 @@ buildPythonPackage rec {
})
];
- propagatedBuildInputs = [
+ build-system = [
+ setuptools
+ ];
+
+ dependencies = [
aiodns
aiohttp
brotli
faust-cchardet
orjson
pynacl
+ setuptools # for pkg_resources, remove with next release
];
# upstream has no tests
From 04a4f839a48e5d75df926b3b7e3fd36a8a5a2203 Mon Sep 17 00:00:00 2001
From: "R. Ryantm"
Date: Sat, 9 Nov 2024 19:50:56 +0000
Subject: [PATCH 0239/2159] storj-uplink: 1.114.3 -> 1.116.5
---
pkgs/by-name/st/storj-uplink/package.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/st/storj-uplink/package.nix b/pkgs/by-name/st/storj-uplink/package.nix
index 09e87c260e39..008c456719f5 100644
--- a/pkgs/by-name/st/storj-uplink/package.nix
+++ b/pkgs/by-name/st/storj-uplink/package.nix
@@ -5,18 +5,18 @@
buildGoModule rec {
pname = "storj-uplink";
- version = "1.114.3";
+ version = "1.116.5";
src = fetchFromGitHub {
owner = "storj";
repo = "storj";
rev = "v${version}";
- hash = "sha256-V7Vl2sViRl6olhCdJF4xtR7iyJCqJCrm39/Aq1T9GFQ=";
+ hash = "sha256-vQftcQU7WUDfVFKYswtpEHbSyReIcWF83vEQrEbzbHk=";
};
subPackages = [ "cmd/uplink" ];
- vendorHash = "sha256-+eqT3VNqw3fOLwfCKPacIEcoXjuzPaY1EAZI95rgLDs=";
+ vendorHash = "sha256-4wkgQQGbQi9ZcBaExRQysL6r/rJZez9z7keaJReuAeg=";
ldflags = [ "-s" "-w" ];
From d385091084625390437a159ae31746be35f80553 Mon Sep 17 00:00:00 2001
From: Gavin John
Date: Sat, 9 Nov 2024 01:17:56 -0800
Subject: [PATCH 0240/2159] .github: Use consistent (and correct) formatting
across issue templates
---
.github/ISSUE_TEMPLATE/bug_report.md | 34 ++++++++++++-------
.github/ISSUE_TEMPLATE/build_failure.md | 28 ++++++++++-----
.../ISSUE_TEMPLATE/missing_documentation.md | 15 ++++----
.github/ISSUE_TEMPLATE/module_request.md | 4 +--
.../out_of_date_package_report.md | 13 +++++--
.github/ISSUE_TEMPLATE/packaging_request.md | 8 +++--
.../ISSUE_TEMPLATE/unreproducible_package.md | 24 +++++++++----
7 files changed, 86 insertions(+), 40 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd9e22e9a689..a4b757e9b4f4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,34 +7,44 @@ assignees: ''
---
-### Describe the bug
-A clear and concise description of what the bug is.
+## Describe the bug
+
+
+
+## Steps To Reproduce
-### Steps To Reproduce
Steps to reproduce the behavior:
+
1. ...
2. ...
3. ...
-### Expected behavior
-A clear and concise description of what you expected to happen.
+## Expected behavior
-### Screenshots
-If applicable, add screenshots to help explain your problem.
+
-### Additional context
-Add any other context about the problem here.
+## Screenshots
-### Notify maintainers
+
+
+## Additional context
+
+
+
+## Metadata
+
+
+
+## Notify maintainers
-### Metadata
+---
-
+Note for maintainers: Please tag this issue in your PR.
---
diff --git a/.github/ISSUE_TEMPLATE/build_failure.md b/.github/ISSUE_TEMPLATE/build_failure.md
index 5e6c300b56d3..6df42832765b 100644
--- a/.github/ISSUE_TEMPLATE/build_failure.md
+++ b/.github/ISSUE_TEMPLATE/build_failure.md
@@ -7,31 +7,43 @@ assignees: ''
---
-### Steps To Reproduce
+## Steps To Reproduce
Steps to reproduce the behavior:
+
1. build *X*
-### Build log
+## Build log
+
+
+
+
+
+Build Log
```
-log here if short otherwise a link to a gist
```
-### Additional context
+
-Add any other context about the problem here.
+## Additional context
-### Notify maintainers
+
+
+## Metadata
+
+
+
+## Notify maintainers
-### Metadata
+---
-
+Note for maintainers: Please tag this issue in your PR.
---
diff --git a/.github/ISSUE_TEMPLATE/missing_documentation.md b/.github/ISSUE_TEMPLATE/missing_documentation.md
index 6f8e583bd346..a7f0fd83c5bc 100644
--- a/.github/ISSUE_TEMPLATE/missing_documentation.md
+++ b/.github/ISSUE_TEMPLATE/missing_documentation.md
@@ -23,12 +23,9 @@ assignees: ''
- [ ] checked [open documentation issues] for possible duplicates
- [ ] checked [open documentation pull requests] for possible solutions
-[latest Nixpkgs manual]: https://nixos.org/manual/nixpkgs/unstable/
-[latest NixOS manual]: https://nixos.org/manual/nixos/unstable/
-[nixpkgs-source]: https://github.com/NixOS/nixpkgs/tree/master/doc
-[nixos-source]: https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual
-[open documentation issues]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+documentation%22
-[open documentation pull requests]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+documentation%22%2C%226.topic%3A+documentation%22
+---
+
+Note for maintainers: Please tag this issue in your PR.
---
@@ -36,3 +33,9 @@ Add a :+1: [reaction] to [issues you find important].
[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc
+[latest Nixpkgs manual]: https://nixos.org/manual/nixpkgs/unstable/
+[latest NixOS manual]: https://nixos.org/manual/nixos/unstable/
+[nixpkgs-source]: https://github.com/NixOS/nixpkgs/tree/master/doc
+[nixos-source]: https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual
+[open documentation issues]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+documentation%22
+[open documentation pull requests]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+documentation%22%2C%226.topic%3A+documentation%22
diff --git a/.github/ISSUE_TEMPLATE/module_request.md b/.github/ISSUE_TEMPLATE/module_request.md
index db0b68cfe453..752011fb5449 100644
--- a/.github/ISSUE_TEMPLATE/module_request.md
+++ b/.github/ISSUE_TEMPLATE/module_request.md
@@ -7,11 +7,11 @@ assignees: ''
---
-### Description
+## Description
-### Notify maintainers
+## Notify maintainers
diff --git a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md
index 802f47935aee..da42c82ca4ea 100644
--- a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md
+++ b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md
@@ -7,23 +7,30 @@ assignees: ''
---
+## Package Information
+
+
+
- Package name:
- Latest released version:
-
- Current version on the unstable channel:
- Current version on the stable/release channel:
+
+## Checklist
+
+
- [ ] Checked the [nixpkgs pull requests](https://github.com/NixOS/nixpkgs/pulls)
-**Notify maintainers**
+## Notify maintainers
------
+---
Note for maintainers: Please tag this issue in your PR.
diff --git a/.github/ISSUE_TEMPLATE/packaging_request.md b/.github/ISSUE_TEMPLATE/packaging_request.md
index 021c9060ebe5..91175402bed3 100644
--- a/.github/ISSUE_TEMPLATE/packaging_request.md
+++ b/.github/ISSUE_TEMPLATE/packaging_request.md
@@ -7,11 +7,11 @@ assignees: ''
---
-**Project description**
+## Project description
-**Metadata**
+## Metadata
* homepage URL:
* source URL:
@@ -20,6 +20,10 @@ assignees: ''
---
+Note for maintainers: Please tag this issue in your PR.
+
+---
+
Add a :+1: [reaction] to [issues you find important].
[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
diff --git a/.github/ISSUE_TEMPLATE/unreproducible_package.md b/.github/ISSUE_TEMPLATE/unreproducible_package.md
index dd19abaf7588..83b672be31b3 100644
--- a/.github/ISSUE_TEMPLATE/unreproducible_package.md
+++ b/.github/ISSUE_TEMPLATE/unreproducible_package.md
@@ -31,12 +31,12 @@ Fixing bit-by-bit reproducibility also has additional advantages, such as
avoiding hard-to-reproduce bugs, making content-addressed storage more effective
and reducing rebuilds in such systems.
-### Steps To Reproduce
+## Steps To Reproduce
In the following steps, replace `` with the canonical name of the
package.
-#### 1. Build the package
+### 1. Build the package
This step will build the package. Specific arguments are passed to the command
to keep the build artifacts so we can compare them in case of differences.
@@ -53,7 +53,7 @@ Or using the new command line style:
nix build nixpkgs# && nix build nixpkgs# --rebuild --keep-failed
```
-#### 2. Compare the build artifacts
+### 2. Compare the build artifacts
If the previous command completes successfully, no differences were found and
there's nothing to do, builds are reproducible.
@@ -67,7 +67,7 @@ metadata (*e.g. timestamp*) differences.
nix run nixpkgs#diffoscopeMinimal -- --exclude-directory-metadata recursive
```
-#### 3. Examine the build log
+### 3. Examine the build log
To examine the build log, use:
@@ -81,10 +81,20 @@ Or with the new command line style:
nix log $(nix path-info --derivation nixpkgs#)
```
-### Additional context
+## Additional context
-(please share the relevant fragment of the diffoscope output here, and any
-additional analysis you may have done)
+(please share the relevant fragment of the diffoscope output here, and any additional analysis you may have done)
+
+## Notify maintainers
+
+
+
+---
+
+Note for maintainers: Please tag this issue in your PR.
---
From 9563f469c17e05274be15ee13d276f3e6fb4fbcc Mon Sep 17 00:00:00 2001
From: Wolfgang
Date: Fri, 8 Nov 2024 18:07:51 +0100
Subject: [PATCH 0241/2159] nixos/duckdns: init module
---
nixos/modules/services/misc/duckdns.nix | 125 ++++++++++++++++++++++++
1 file changed, 125 insertions(+)
create mode 100644 nixos/modules/services/misc/duckdns.nix
diff --git a/nixos/modules/services/misc/duckdns.nix b/nixos/modules/services/misc/duckdns.nix
new file mode 100644
index 000000000000..a4ea0a09e313
--- /dev/null
+++ b/nixos/modules/services/misc/duckdns.nix
@@ -0,0 +1,125 @@
+{
+ config,
+ pkgs,
+ lib,
+ ...
+}:
+let
+ cfg = config.services.duckdns;
+ duckdns = pkgs.writeShellScriptBin "duckdns" ''
+ DRESPONSE=$(curl -sS --max-time 60 --no-progress-meter -k -K- <<< "url = \"https://www.duckdns.org/update?verbose=true&domains=$DUCKDNS_DOMAINS&token=$DUCKDNS_TOKEN&ip=\"")
+ IPV4=$(echo "$DRESPONSE" | awk 'NR==2')
+ IPV6=$(echo "$DRESPONSE" | awk 'NR==3')
+ RESPONSE=$(echo "$DRESPONSE" | awk 'NR==1')
+ IPCHANGE=$(echo "$DRESPONSE" | awk 'NR==4')
+
+ if [[ "$RESPONSE" = "OK" ]] && [[ "$IPCHANGE" = "UPDATED" ]]; then
+ if [[ "$IPV4" != "" ]] && [[ "$IPV6" == "" ]]; then
+ echo "Your IP was updated at $(date) to IPv4: $IPV4"
+ elif [[ "$IPV4" == "" ]] && [[ "$IPV6" != "" ]]; then
+ echo "Your IP was updated at $(date) to IPv6: $IPV6"
+ else
+ echo "Your IP was updated at $(date) to IPv4: $IPV4 & IPv6 to: $IPV6"
+ fi
+ elif [[ "$RESPONSE" = "OK" ]] && [[ "$IPCHANGE" = "NOCHANGE" ]]; then
+ echo "DuckDNS request at $(date) successful. IP(s) unchanged."
+ else
+ echo -e "Something went wrong, please check your settings\nThe response returned was:\n$DRESPONSE\n"
+ exit 1
+ fi
+ '';
+in
+{
+ options.services.duckdns = {
+ enable = lib.mkEnableOption "DuckDNS Dynamic DNS Client";
+ tokenFile = lib.mkOption {
+ default = null;
+ type = lib.types.path;
+ description = ''
+ The path to a file containing the token
+ used to authenticate with DuckDNS.
+ '';
+ };
+
+ domains = lib.mkOption {
+ default = null;
+ type = lib.types.nullOr (lib.types.listOf lib.types.str);
+ example = [ "examplehost" ];
+ description = ''
+ The domain(s) to update in DuckDNS
+ (without the .duckdns.org suffix)
+ '';
+ };
+
+ domainsFile = lib.mkOption {
+ default = null;
+ type = lib.types.nullOr lib.types.path;
+ example = lib.literalExpression ''
+ pkgs.writeText "duckdns-domains.txt" '''
+ examplehost
+ examplehost2
+ examplehost3
+ '''
+ '';
+ description = ''
+ The path to a file containing a
+ newline-separated list of DuckDNS
+ domain(s) to be updated
+ (without the .duckdns.org suffix)
+ '';
+ };
+
+ };
+
+ config = lib.mkIf cfg.enable {
+ assertions = [
+ {
+ assertion = cfg.domains != null || cfg.domainsFile != null;
+ message = "Either services.duckdns.domains or services.duckdns.domainsFile has to be defined";
+ }
+ {
+ assertion = !(cfg.domains != null && cfg.domainsFile != null);
+ message = "services.duckdns.domains and services.duckdns.domainsFile can't both be defined at the same time";
+ }
+ {
+ assertion = (cfg.tokenFile != null);
+ message = "services.duckdns.tokenFile has to be defined";
+ }
+ ];
+
+ environment.systemPackages = [ duckdns ];
+
+ systemd.services.duckdns = {
+ description = "DuckDNS Dynamic DNS Client";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ startAt = "*:0/5";
+ path = [
+ pkgs.gnused
+ pkgs.systemd
+ pkgs.curl
+ pkgs.gawk
+ duckdns
+ ];
+ serviceConfig = {
+ Type = "simple";
+ LoadCredential = [
+ "DUCKDNS_TOKEN_FILE:${cfg.tokenFile}"
+ ] ++ lib.optionals (cfg.domainsFile != null) [ "DUCKDNS_DOMAINS_FILE:${cfg.domainsFile}" ];
+ DynamicUser = true;
+ };
+ script = ''
+ export DUCKDNS_TOKEN=$(systemd-creds cat DUCKDNS_TOKEN_FILE)
+ ${lib.optionalString (cfg.domains != null) ''
+ export DUCKDNS_DOMAINS='${lib.strings.concatStringsSep "," cfg.domains}'
+ ''}
+ ${lib.optionalString (cfg.domainsFile != null) ''
+ export DUCKDNS_DOMAINS=$(systemd-creds cat DUCKDNS_DOMAINS_FILE | sed -z 's/\n/,/g')
+ ''}
+ exec ${lib.getExe duckdns}
+ '';
+ };
+ };
+
+ meta.maintainers = with lib.maintainers; [ notthebee ];
+}
From da4bf61402cd30013f586bb51f4189179a625bf9 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sun, 10 Nov 2024 05:35:55 +0800
Subject: [PATCH 0242/2159] dart.fvp: init
---
.../dart/package-source-builders/default.nix | 1 +
.../package-source-builders/fvp/default.nix | 20 +++++++++++++++++++
2 files changed, 21 insertions(+)
create mode 100644 pkgs/development/compilers/dart/package-source-builders/fvp/default.nix
diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix
index 48c31cc28cdd..00bee092f69e 100644
--- a/pkgs/development/compilers/dart/package-source-builders/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/default.nix
@@ -2,6 +2,7 @@
{
flutter_secure_storage_linux = callPackage ./flutter-secure-storage-linux { };
+ fvp = callPackage ./fvp { };
handy_window = callPackage ./handy-window { };
matrix = callPackage ./matrix { };
media_kit_libs_linux = callPackage ./media_kit_libs_linux { };
diff --git a/pkgs/development/compilers/dart/package-source-builders/fvp/default.nix b/pkgs/development/compilers/dart/package-source-builders/fvp/default.nix
new file mode 100644
index 000000000000..4393d9825d4d
--- /dev/null
+++ b/pkgs/development/compilers/dart/package-source-builders/fvp/default.nix
@@ -0,0 +1,20 @@
+{
+ stdenv,
+ mdk-sdk,
+}:
+
+{ version, src, ... }:
+
+stdenv.mkDerivation rec {
+ pname = "fvp";
+ inherit version src;
+ inherit (src) passthru;
+
+ installPhase = ''
+ runHook preInstall
+ mkdir $out
+ tar -xf ${mdk-sdk.src} -C ./linux
+ cp -r ./* $out/
+ runHook postInstall
+ '';
+}
From a2143e6870204313596c502aa921ec68a31742d9 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sun, 10 Nov 2024 05:40:39 +0800
Subject: [PATCH 0243/2159] dart.flutter_volume_controller: init
---
.../dart/package-source-builders/default.nix | 1 +
.../flutter_volume_controller/default.nix | 25 +++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 100644 pkgs/development/compilers/dart/package-source-builders/flutter_volume_controller/default.nix
diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix
index 00bee092f69e..73bd36b9dfb7 100644
--- a/pkgs/development/compilers/dart/package-source-builders/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/default.nix
@@ -2,6 +2,7 @@
{
flutter_secure_storage_linux = callPackage ./flutter-secure-storage-linux { };
+ flutter_volume_controller = callPackage ./flutter_volume_controller { };
fvp = callPackage ./fvp { };
handy_window = callPackage ./handy-window { };
matrix = callPackage ./matrix { };
diff --git a/pkgs/development/compilers/dart/package-source-builders/flutter_volume_controller/default.nix b/pkgs/development/compilers/dart/package-source-builders/flutter_volume_controller/default.nix
new file mode 100644
index 000000000000..b582ac0448c0
--- /dev/null
+++ b/pkgs/development/compilers/dart/package-source-builders/flutter_volume_controller/default.nix
@@ -0,0 +1,25 @@
+{
+ stdenv,
+ mdk-sdk,
+}:
+
+{ version, src, ... }:
+
+stdenv.mkDerivation rec {
+ pname = "flutter_volume_controller";
+ inherit version src;
+ inherit (src) passthru;
+
+ postPatch = ''
+ substituteInPlace linux/CMakeLists.txt \
+ --replace-fail '# Include ALSA' 'find_package(PkgConfig REQUIRED)' \
+ --replace-fail 'find_package(ALSA REQUIRED)' 'pkg_check_modules(ALSA REQUIRED alsa)'
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir $out
+ cp -r ./* $out/
+ runHook postInstall
+ '';
+}
From b3c8c88550fb8e96e5e8072866871e783d3cfa0c Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sun, 10 Nov 2024 05:43:18 +0800
Subject: [PATCH 0244/2159] kazumi: remove customSourceBuilders
---
pkgs/by-name/ka/kazumi/package.nix | 48 ++----------------------------
1 file changed, 3 insertions(+), 45 deletions(-)
diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index f42f1f48afd8..2b12a9d88184 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -2,7 +2,6 @@
lib,
fetchFromGitHub,
flutter,
- stdenv,
webkitgtk_4_1,
alsa-lib,
libayatana-appindicator,
@@ -11,7 +10,6 @@
wrapGAppsHook3,
gst_all_1,
at-spi2-atk,
- fetchurl,
}:
let
version = "1.4.1";
@@ -21,14 +19,9 @@ let
rev = version;
hash = "sha256-LRlJo2zuE3Y3i4vBcjxIYQEDVJ2x85Fn77K4LVtTlg8=";
};
- mdk-sdk = fetchurl {
- url = "https://github.com/wang-bin/mdk-sdk/releases/download/v0.29.1/mdk-sdk-linux-x64.tar.xz";
- hash = "sha256-7dkvm5kP3gcQwXOE9DrjoOTzKRiwk/PVeRr7poLdCU0=";
- };
in
flutter.buildFlutterApplication {
pname = "kazumi";
-
inherit version src;
pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -52,41 +45,6 @@ flutter.buildFlutterApplication {
gst_all_1.gst-plugins-base
];
- customSourceBuilders = {
- flutter_volume_controller =
- { version, src, ... }:
- stdenv.mkDerivation rec {
- pname = "flutter_volume_controller";
- inherit version src;
- inherit (src) passthru;
- postPatch = ''
- substituteInPlace linux/CMakeLists.txt \
- --replace-fail '# Include ALSA' 'find_package(PkgConfig REQUIRED)' \
- --replace-fail 'find_package(ALSA REQUIRED)' 'pkg_check_modules(ALSA REQUIRED alsa)'
- '';
- installPhase = ''
- runHook preInstall
- mkdir $out
- cp -r ./* $out/
- runHook postInstall
- '';
- };
- fvp =
- { version, src, ... }:
- stdenv.mkDerivation rec {
- pname = "fvp";
- inherit version src;
- inherit (src) passthru;
- installPhase = ''
- runHook preInstall
- tar -xf ${mdk-sdk} -C ./linux
- mkdir $out
- cp -r ./* $out/
- runHook postInstall
- '';
- };
- };
-
gitHashes = {
desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM=";
webview_windows = "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE=";
@@ -94,8 +52,8 @@ flutter.buildFlutterApplication {
postInstall = ''
mkdir -p $out/share/applications/ $out/share/icons/hicolor/512x512/apps/
- cp ./assets/linux/io.github.Predidit.Kazumi.desktop $out/share/applications
- cp ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png
+ install -Dm0644 ./assets/linux/io.github.Predidit.Kazumi.desktop $out/share/applications/io.github.Predidit.Kazumi.desktop
+ install -Dm0644 ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png
'';
meta = {
@@ -104,6 +62,6 @@ flutter.buildFlutterApplication {
mainProgram = "kazumi";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
- platforms = lib.platforms.linux;
+ platforms = [ "x86_64-linux" ];
};
}
From 77cbf2a1b176be674f1d12ce1b1eb01f33ca102e Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 9 Nov 2024 22:46:01 +0100
Subject: [PATCH 0245/2159] trimage: migrate to pkgs/by-name
---
.../tr/trimage/package.nix} | 26 ++++++++++---------
pkgs/top-level/all-packages.nix | 2 --
2 files changed, 14 insertions(+), 14 deletions(-)
rename pkgs/{applications/graphics/trimage/default.nix => by-name/tr/trimage/package.nix} (88%)
diff --git a/pkgs/applications/graphics/trimage/default.nix b/pkgs/by-name/tr/trimage/package.nix
similarity index 88%
rename from pkgs/applications/graphics/trimage/default.nix
rename to pkgs/by-name/tr/trimage/package.nix
index 6f38e22de14f..594930775a1c 100644
--- a/pkgs/applications/graphics/trimage/default.nix
+++ b/pkgs/by-name/tr/trimage/package.nix
@@ -1,20 +1,22 @@
-{ lib
-, stdenv
-, fetchFromGitHub
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
-, python3
-, installShellFiles
-, makeWrapper
-, wrapQtAppsHook
+ python3,
+ installShellFiles,
+ makeWrapper,
+ qt5,
-, advancecomp
-, jpegoptim
-, optipng
-, pngcrush
+ advancecomp,
+ jpegoptim,
+ optipng,
+ pngcrush,
}:
let
pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 ]);
+
binPath = lib.makeBinPath [
advancecomp
jpegoptim
@@ -36,7 +38,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
installShellFiles
makeWrapper
- wrapQtAppsHook
+ qt5.wrapQtAppsHook
];
dontWrapQtApps = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3226511390c..0d0f20c92215 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1143,8 +1143,6 @@ with pkgs;
inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security;
};
- trimage = callPackage ../applications/graphics/trimage { inherit (qt5) wrapQtAppsHook; };
-
ufolint = with python3Packages; toPythonApplication ufolint;
valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { };
From e393fe8e343a2424917f05dc2e357f7987d37d6e Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 9 Nov 2024 22:51:53 +0100
Subject: [PATCH 0246/2159] texturepacker: migrate to pkgs/by-name
---
.../te/texturepacker/package.nix} | 24 +++++++++----------
pkgs/top-level/all-packages.nix | 2 --
2 files changed, 11 insertions(+), 15 deletions(-)
rename pkgs/{applications/graphics/texturepacker/default.nix => by-name/te/texturepacker/package.nix} (86%)
diff --git a/pkgs/applications/graphics/texturepacker/default.nix b/pkgs/by-name/te/texturepacker/package.nix
similarity index 86%
rename from pkgs/applications/graphics/texturepacker/default.nix
rename to pkgs/by-name/te/texturepacker/package.nix
index 37f07e9657a2..902f9e5f27e6 100644
--- a/pkgs/applications/graphics/texturepacker/default.nix
+++ b/pkgs/by-name/te/texturepacker/package.nix
@@ -1,12 +1,10 @@
-{ lib
-, stdenv
-, fetchurl
-, dpkg
-, autoPatchelfHook
-, wrapQtAppsHook
-, qtbase
-, qtdeclarative
-, qtsvg
+{
+ lib,
+ stdenv,
+ fetchurl,
+ dpkg,
+ autoPatchelfHook,
+ qt6,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -21,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
dpkg
autoPatchelfHook
- wrapQtAppsHook
+ qt6.wrapQtAppsHook
];
buildInputs = [
- qtbase
- qtdeclarative
- qtsvg
+ qt6.qtbase
+ qt6.qtdeclarative
+ qt6.qtsvg
];
installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3226511390c..36db12d410fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16105,8 +16105,6 @@ with pkgs;
terminaltexteffects = with python3Packages; toPythonApplication terminaltexteffects ;
- texturepacker = qt6.callPackage ../applications/graphics/texturepacker { };
-
inherit (callPackage ../applications/graphics/tesseract {
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
})
From 46c4c6b55337643b0a8eedf09d8282a98430cb80 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 9 Nov 2024 22:53:33 +0100
Subject: [PATCH 0247/2159] texturepacker: 7.4.0 -> 7.5.0
---
pkgs/by-name/te/texturepacker/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/te/texturepacker/package.nix b/pkgs/by-name/te/texturepacker/package.nix
index 902f9e5f27e6..c9fbd2efd2af 100644
--- a/pkgs/by-name/te/texturepacker/package.nix
+++ b/pkgs/by-name/te/texturepacker/package.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "texturepacker";
- version = "7.4.0";
+ version = "7.5.0";
src = fetchurl {
url = "https://www.codeandweb.com/download/texturepacker/${finalAttrs.version}/TexturePacker-${finalAttrs.version}.deb";
- hash = "sha256-v+azjIIscmp72WB3gki0CKb+z+FYsuJxIx9jvdfs+qM=";
+ hash = "sha256-zUT9NnBNtgFqNr7e9IAqWuK61MjrQuC+gCi1D2m1kGc=";
};
nativeBuildInputs = [
From 7b55da73c009b92caa741b28a0d1451792528b33 Mon Sep 17 00:00:00 2001
From: Arthur Gautier
Date: Fri, 8 Nov 2024 22:24:36 -0800
Subject: [PATCH 0248/2159] pkgsLLVM.tpm2-tss: fixup tests
---
pkgs/development/libraries/tpm2-tss/default.nix | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index bea611224444..e33d8f717955 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -78,7 +78,16 @@ stdenv.mkDerivation rec {
--replace-fail '"libtpms.so"' '"${libtpms.out}/lib/libtpms.so"' \
--replace-fail '"libtpms.so.0"' '"${libtpms.out}/lib/libtpms.so.0"'
done
- '';
+ ''
+ # tcti tests rely on mocking function calls, which appears not to be supported
+ # on clang
+ + lib.optionalString stdenv.cc.isClang ''
+ sed -i '/TESTS_UNIT / {
+ /test\/unit\/tcti-swtpm/d;
+ /test\/unit\/tcti-mssim/d;
+ /test\/unit\/tcti-device/d
+ }' Makefile-test.am
+ '';
configureFlags = lib.optionals doInstallCheck [
"--enable-unit"
From 963d55910869f1b38de3c1c0a426243c662d61ed Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Sat, 9 Nov 2024 05:59:14 +0100
Subject: [PATCH 0249/2159] remarshal_0_17: init at 0.17.1
Introduced for pkgs.formats.yaml_1_1.
---
pkgs/by-name/re/remarshal_0_17/package.nix | 62 ++++++++++++++++++++++
1 file changed, 62 insertions(+)
create mode 100644 pkgs/by-name/re/remarshal_0_17/package.nix
diff --git a/pkgs/by-name/re/remarshal_0_17/package.nix b/pkgs/by-name/re/remarshal_0_17/package.nix
new file mode 100644
index 000000000000..1a178a236e0e
--- /dev/null
+++ b/pkgs/by-name/re/remarshal_0_17/package.nix
@@ -0,0 +1,62 @@
+{
+ lib,
+ python3Packages,
+ fetchFromGitHub,
+ fetchPypi,
+}:
+
+let
+ python = python3Packages.python.override {
+ self = python3Packages.python;
+ packageOverrides = self: super: {
+ tomlkit = super.tomlkit.overridePythonAttrs (oldAttrs: rec {
+ version = "0.12.5";
+ src = fetchPypi {
+ pname = "tomlkit";
+ inherit version;
+ hash = "sha256-7vNPujmDTU1rc8m6fz5NHEF6Tlb4mn6W4JDdDSS4+zw=";
+ };
+ });
+ };
+ };
+ pythonPackages = python.pkgs;
+in
+pythonPackages.buildPythonApplication rec {
+ pname = "remarshal";
+ version = "0.17.1"; # last version with YAML 1.1 support, do not update
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "dbohdan";
+ repo = "remarshal";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-2WxMh5P/8NvElymnMU3JzQU0P4DMXFF6j15OxLaS+VA=";
+ };
+
+ pythonRemoveDeps = [ "pytest" ];
+
+ build-system = [ pythonPackages.poetry-core ];
+
+ dependencies = with pythonPackages; [
+ cbor2
+ colorama
+ python-dateutil
+ pyyaml
+ rich-argparse
+ ruamel-yaml
+ tomlkit
+ u-msgpack-python
+ ];
+
+ nativeCheckInputs = [ pythonPackages.pytestCheckHook ];
+
+ passthru.updateScript = throw "This package is pinned to 0.17.1 for YAML 1.1 support";
+
+ meta = with lib; {
+ changelog = "https://github.com/remarshal-project/remarshal/releases/tag/v${version}";
+ description = "Convert between TOML, YAML and JSON";
+ license = licenses.mit;
+ homepage = "https://github.com/dbohdan/remarshal";
+ maintainers = with maintainers; [ hexa ];
+ };
+}
From 29dafe503f88eea36e87079adb87ace6b1cb680a Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Sat, 9 Nov 2024 06:04:36 +0100
Subject: [PATCH 0250/2159] pkgs.formats.yaml: retain YAML 1.1 output
---
pkgs/pkgs-lib/formats.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index 03663ad96b97..556290be5f4e 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -78,8 +78,8 @@ rec {
yaml = {}: {
- generate = name: value: pkgs.callPackage ({ runCommand, remarshal }: runCommand name {
- nativeBuildInputs = [ remarshal ];
+ generate = name: value: pkgs.callPackage ({ runCommand, remarshal_0_17 }: runCommand name {
+ nativeBuildInputs = [ remarshal_0_17 ];
value = builtins.toJSON value;
passAsFile = [ "value" ];
preferLocalBuild = true;
From 29fbef9adbe8c4851d0b00649adf885ccab0aafa Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Sat, 9 Nov 2024 06:20:33 +0100
Subject: [PATCH 0251/2159] pkgs.formats.yaml: create an alias for yaml_1_1
To keep assumptions about pkgs.formats.yaml in tact we pin it to a format
that will emit YAML 1.1.
Future usage should specify the YAML version explicitly.
---
pkgs/pkgs-lib/formats.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index 556290be5f4e..8afccf3e0348 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -76,8 +76,9 @@ rec {
};
- yaml = {}: {
+ yaml = yaml_1_1;
+ yaml_1_1 = {}: {
generate = name: value: pkgs.callPackage ({ runCommand, remarshal_0_17 }: runCommand name {
nativeBuildInputs = [ remarshal_0_17 ];
value = builtins.toJSON value;
From 80a4fc03f030c340f3d3190f6d99e541e6f33b5f Mon Sep 17 00:00:00 2001
From: Martin Weinelt
Date: Sat, 9 Nov 2024 06:27:37 +0100
Subject: [PATCH 0252/2159] pkgs/lib/formats: test more explicitly for YAML 1.1
compat
---
pkgs/pkgs-lib/tests/formats.nix | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix
index 5f6f3b93e280..1c6f741353fa 100644
--- a/pkgs/pkgs-lib/tests/formats.nix
+++ b/pkgs/pkgs-lib/tests/formats.nix
@@ -118,7 +118,7 @@ in runBuildTests {
'';
};
- yamlAtoms = shouldPass {
+ yaml_1_1Atoms = shouldPass {
format = formats.yaml {};
input = {
null = null;
@@ -129,6 +129,8 @@ in runBuildTests {
attrs.foo = null;
list = [ null null ];
path = ./formats.nix;
+ no = "no";
+ time = "22:30:00";
};
expected = ''
attrs:
@@ -138,9 +140,11 @@ in runBuildTests {
list:
- null
- null
+ 'no': 'no'
'null': null
path: ${./formats.nix}
str: foo
+ time: '22:30:00'
'true': true
'';
};
From cc2ba7a1d349758c0e53996700cd9079279441ee Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich
Date: Thu, 31 Oct 2024 06:35:35 +0000
Subject: [PATCH 0253/2159] log4cplus: 2.1.1 -> 2.1.2
Changes: https://github.com/log4cplus/log4cplus/releases/tag/REL_2_1_2
---
pkgs/by-name/lo/log4cplus/package.nix | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/lo/log4cplus/package.nix b/pkgs/by-name/lo/log4cplus/package.nix
index 0dc8051c35f2..8dd86f47046e 100644
--- a/pkgs/by-name/lo/log4cplus/package.nix
+++ b/pkgs/by-name/lo/log4cplus/package.nix
@@ -1,14 +1,20 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, pkg-config }:
stdenv.mkDerivation rec {
pname = "log4cplus";
- version = "2.1.1";
+ version = "2.1.2";
src = fetchurl {
url = "mirror://sourceforge/log4cplus/log4cplus-${version}.tar.bz2";
- sha256 = "sha256-ZZfeeCd15OD7qP3K2TjDcJ/YOagITEtu3648xQRuJog=";
+ hash = "sha256-JFDfu0qzXdLJ5k2MdQxRS/cpO4HY8yr3qxJEF/cK360=";
};
+ nativeBuildInputs = [ pkg-config ];
+
+ enableParallelBuilding = true;
+
+ strictDeps = true;
+
meta = {
homepage = "http://log4cplus.sourceforge.net/";
description = "Port the log4j library from Java to C++";
From bed5c8a503874f55b08acc88f51a218fe103bcb4 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra
Date: Sat, 9 Nov 2024 23:37:01 +0100
Subject: [PATCH 0254/2159] maintainers: add kiara as maintainer
---
maintainers/maintainer-list.nix | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 90ac8b9459f1..df821de0c802 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11429,6 +11429,13 @@
name = "Khushraj Rathod";
keys = [ { fingerprint = "1988 3FD8 EA2E B4EC 0A93 1E22 B77B 2A40 E770 2F19"; } ];
};
+ kiara = {
+ name = "kiara";
+ email = "cinereal@riseup.net";
+ github = "KiaraGrouwstra";
+ githubId = 3059397;
+ matrix = "@cinerealkiara:matrix.org";
+ };
KibaFox = {
email = "kiba.fox@foxypossibilities.com";
github = "KibaFox";
From e65ff18e52b093cda46d922521778d1aea9e97c0 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich
Date: Thu, 24 Oct 2024 07:02:39 +0100
Subject: [PATCH 0255/2159] s2n-tls: 1.5.5 -> 1.5.7
Changes:
- https://github.com/aws/s2n-tls/releases/tag/v1.5.6
- https://github.com/aws/s2n-tls/releases/tag/v1.5.7
---
pkgs/by-name/s2/s2n-tls/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix
index d2d8de6b4306..656a02a4147e 100644
--- a/pkgs/by-name/s2/s2n-tls/package.nix
+++ b/pkgs/by-name/s2/s2n-tls/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "s2n-tls";
- version = "1.5.5";
+ version = "1.5.7";
src = fetchFromGitHub {
owner = "aws";
repo = "s2n-tls";
rev = "v${version}";
- hash = "sha256-vIwhV8kFP7sN0tz8ZE3bDGD/v08pq2PCl1ea5w+ejHg=";
+ hash = "sha256-VexgPuuGlBWnlWildlyJd/bVZMS3PNhBnQllsYXYC8I=";
};
nativeBuildInputs = [ cmake ];
From 2c89bfca9c6b7202ba933f6be7720e77aeadd1cc Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich
Date: Fri, 18 Oct 2024 06:40:10 +0100
Subject: [PATCH 0256/2159] libtirpc: 1.3.5 -> 1.3.6
Changes: https://git.linux-nfs.org/?p=steved/libtirpc.git;a=shortlog;h=refs/tags/libtirpc-1-3-6
---
pkgs/by-name/li/libtirpc/package.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/by-name/li/libtirpc/package.nix b/pkgs/by-name/li/libtirpc/package.nix
index 1a1cf14c9ea8..369eddff60d5 100644
--- a/pkgs/by-name/li/libtirpc/package.nix
+++ b/pkgs/by-name/li/libtirpc/package.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libtirpc";
- version = "1.3.5";
+ version = "1.3.6";
src = fetchurl {
url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=refs/tags/libtirpc-${lib.replaceStrings ["."] ["-"] version};sf=tgz";
- hash = "sha256-bq2zfqfMJsJ6gezLCUTlNiRXJhFxFslY4iW+4kpOPVE=";
+ hash = "sha256-pTUfqnfHOQKCV0svKF/lo4hq1GlD/+YFjXP2CNygx9I=";
name = "${pname}-${version}.tar.gz";
};
From cf0033968af69cee994162a2798097ea8c0ba506 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 6 Nov 2024 20:54:06 +0800
Subject: [PATCH 0257/2159] tree-from-tags: move to by-name
---
pkgs/{applications/audio => by-name/tr}/tree-from-tags/Gemfile | 0
.../audio => by-name/tr}/tree-from-tags/Gemfile.lock | 0
.../audio => by-name/tr}/tree-from-tags/gemset.nix | 0
.../default.nix => by-name/tr/tree-from-tags/package.nix} | 0
pkgs/top-level/all-packages.nix | 2 --
5 files changed, 2 deletions(-)
rename pkgs/{applications/audio => by-name/tr}/tree-from-tags/Gemfile (100%)
rename pkgs/{applications/audio => by-name/tr}/tree-from-tags/Gemfile.lock (100%)
rename pkgs/{applications/audio => by-name/tr}/tree-from-tags/gemset.nix (100%)
rename pkgs/{applications/audio/tree-from-tags/default.nix => by-name/tr/tree-from-tags/package.nix} (100%)
diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile b/pkgs/by-name/tr/tree-from-tags/Gemfile
similarity index 100%
rename from pkgs/applications/audio/tree-from-tags/Gemfile
rename to pkgs/by-name/tr/tree-from-tags/Gemfile
diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile.lock b/pkgs/by-name/tr/tree-from-tags/Gemfile.lock
similarity index 100%
rename from pkgs/applications/audio/tree-from-tags/Gemfile.lock
rename to pkgs/by-name/tr/tree-from-tags/Gemfile.lock
diff --git a/pkgs/applications/audio/tree-from-tags/gemset.nix b/pkgs/by-name/tr/tree-from-tags/gemset.nix
similarity index 100%
rename from pkgs/applications/audio/tree-from-tags/gemset.nix
rename to pkgs/by-name/tr/tree-from-tags/gemset.nix
diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/by-name/tr/tree-from-tags/package.nix
similarity index 100%
rename from pkgs/applications/audio/tree-from-tags/default.nix
rename to pkgs/by-name/tr/tree-from-tags/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3226511390c..b8fb941dff00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16211,8 +16211,6 @@ with pkgs;
wlroots = wlroots_0_18;
};
- tree-from-tags = callPackage ../applications/audio/tree-from-tags { };
-
treesheets = callPackage ../applications/office/treesheets {
wxGTK = wxGTK32;
inherit (darwin.apple_sdk.frameworks) Cocoa;
From 5396211e60280d9987067cf19867feb5eba8aaaa Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 6 Nov 2024 20:54:21 +0800
Subject: [PATCH 0258/2159] tree-from-tags: nixfmt
---
pkgs/by-name/tr/tree-from-tags/gemset.nix | 2 +-
pkgs/by-name/tr/tree-from-tags/package.nix | 47 ++++++++++++++--------
2 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/pkgs/by-name/tr/tree-from-tags/gemset.nix b/pkgs/by-name/tr/tree-from-tags/gemset.nix
index f482d174ebc2..67fd0af05823 100644
--- a/pkgs/by-name/tr/tree-from-tags/gemset.nix
+++ b/pkgs/by-name/tr/tree-from-tags/gemset.nix
@@ -1,7 +1,7 @@
{
taglib-ruby = {
source = {
- remotes = ["https://rubygems.org"];
+ remotes = [ "https://rubygems.org" ];
sha256 = "0r8g7zdncc6243d000jn0grc1n70rn9mx16vggy3q7c4wgsa37xi";
type = "gem";
};
diff --git a/pkgs/by-name/tr/tree-from-tags/package.nix b/pkgs/by-name/tr/tree-from-tags/package.nix
index 9b81cc250c1b..05d8af544857 100644
--- a/pkgs/by-name/tr/tree-from-tags/package.nix
+++ b/pkgs/by-name/tr/tree-from-tags/package.nix
@@ -1,38 +1,51 @@
-{ lib, stdenv, bundlerEnv, ruby, fetchFromGitHub }:
+{
+ lib,
+ stdenv,
+ bundlerEnv,
+ ruby,
+ fetchFromGitHub,
+}:
let
version = "1.1";
gems = bundlerEnv {
name = "tree-from-tags-${version}-gems";
inherit ruby;
- gemdir = ./.;
+ gemdir = ./.;
};
-in stdenv.mkDerivation {
+in
+stdenv.mkDerivation {
pname = "tree-from-tags";
inherit version;
src = fetchFromGitHub {
- owner = "dbrock";
- repo = "bongo";
- rev = version;
+ owner = "dbrock";
+ repo = "bongo";
+ rev = version;
sha256 = "1nszph9mn98flyhn1jq3y6mdh6jymjkvj5ng36ql016dj92apvhv";
};
- buildInputs = [ gems ruby ];
+ buildInputs = [
+ gems
+ ruby
+ ];
installPhase = ''
- mkdir -p $out/{bin,share}
- cp tree-from-tags.rb $out/share/
- bin=$out/bin/tree-from-tags
-# we are using bundle exec to start in the bundled environment
- cat > $bin < $bin <