From d4955c5e58077ac73d6db3b54be1226490fb4e86 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 25 Nov 2023 11:03:34 +0100 Subject: [PATCH 01/49] tpm2-tools: 5.5 -> 5.6 --- pkgs/tools/security/tpm2-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index 4e8fd919f9ae5..d622ab5b93da6 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tpm2-tools"; - version = "5.5"; + version = "5.6"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-H9tJxzBTe/2u0IiISIGmHjv9Eh6VfsC9zu7AJhI2wSM="; + sha256 = "sha256-Usi8uq3KCCq/5et+5JZ9LWMthLFndnXy8HG20uwizsM="; }; patches = [ From df0ebc03b85c3a13f0fa347ed685154bc25bd50c Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Tue, 28 Nov 2023 17:16:07 -0800 Subject: [PATCH 02/49] libbacktrace: disable tests on musl Resolves #266420 --- pkgs/development/libraries/libbacktrace/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix index bc998563a7328..b188a9cfc38c8 100644 --- a/pkgs/development/libraries/libbacktrace/default.nix +++ b/pkgs/development/libraries/libbacktrace/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { (lib.enableFeature enableShared "shared") ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.isLinux && !stdenv.hostPlatform.isMusl; passthru = { updateScript = unstableGitUpdater { }; From 016d7891e95afb5d3e4d2eb59f7e701c2edd1e97 Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Thu, 30 Nov 2023 09:05:31 +0100 Subject: [PATCH 03/49] {libqalculate, qalculate-gtk, qalculate-qt}: 4.8.1 -> 4.9.0 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++-- pkgs/applications/science/math/qalculate-qt/default.nix | 4 ++-- pkgs/development/libraries/libqalculate/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index ade614c89b0fb..0ba584875e517 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; - version = "4.8.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-bG0hui5GjHWHny/8Rq5sZGz3s5rYnYlpc+K8I/LwDto="; + sha256 = "sha256-rQxOOxM4TazkDs/H3KEPbdo6WBl0ptyAlZwv8nnGMss="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index adc43b5f9dab2..93abb0dda36dd 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "4.8.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-hH+orU+5PmPcrhkLKCdsDhVCrD8Mvxp2RPTGSlsUP7Y="; + hash = "sha256-Ac8RRxLheaenlR7JqKzfBpPxsq7PHfE9qXFf3Vx4GSg="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 87e3049c6c852..2502673b398ea 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqalculate"; - version = "4.8.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-4WqKlwVf4/ixVr98lPFVfNL6EOIfHHfL55xLsYqxkhY="; + sha256 = "sha256-6W65dg2pZeio3ZVgVLQZrz/eReYcPiYf52zjcaRfE8E="; }; outputs = [ "out" "dev" "doc" ]; From 90a5c36a854f6965115a6f6a6c1b6bf122dccb20 Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Thu, 30 Nov 2023 09:48:44 +0100 Subject: [PATCH 04/49] {libqalculate, qalculate-gtk}: change sha256 attribute to hash --- pkgs/applications/science/math/qalculate-gtk/default.nix | 2 +- pkgs/development/libraries/libqalculate/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 0ba584875e517..09b4701415507 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-rQxOOxM4TazkDs/H3KEPbdo6WBl0ptyAlZwv8nnGMss="; + hash = "sha256-rQxOOxM4TazkDs/H3KEPbdo6WBl0ptyAlZwv8nnGMss="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 2502673b398ea..84623e7459fca 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "qalculate"; repo = "libqalculate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-6W65dg2pZeio3ZVgVLQZrz/eReYcPiYf52zjcaRfE8E="; + hash = "sha256-6W65dg2pZeio3ZVgVLQZrz/eReYcPiYf52zjcaRfE8E="; }; outputs = [ "out" "dev" "doc" ]; From 3d0affa9c9c6e54759ca65c8f7f59af35877d1e8 Mon Sep 17 00:00:00 2001 From: Yifei Sun Date: Sun, 3 Dec 2023 15:17:48 -0500 Subject: [PATCH 05/49] python3Packages.z3-solver: rename from z3 --- pkgs/applications/science/logic/z3/default.nix | 2 +- pkgs/development/compilers/solc/default.nix | 2 +- pkgs/development/interpreters/acl2/default.nix | 2 +- pkgs/development/python-modules/claripy/default.nix | 10 ++-------- .../development/python-modules/deal-solver/default.nix | 8 +++----- .../python-modules/qiskit-terra/default.nix | 4 ++-- pkgs/tools/security/amoco/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 6 ++++-- 9 files changed, 16 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 6165cfe8bd22a..26848e1397aa4 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -24,7 +24,7 @@ let common = { version, sha256, patches ? [ ], tag ? "z3" }: inherit version sha256 patches; src = fetchFromGitHub { owner = "Z3Prover"; - repo = pname; + repo = "z3"; rev = "${tag}-${version}"; sha256 = sha256; }; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 986f6f169e8ba..0603706164ae6 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -86,7 +86,7 @@ let buildInputs = [ boost ] ++ lib.optionals z3Support [ z3 ] ++ lib.optionals cvc4Support [ cvc4 cln gmp ]; - nativeCheckInputs = [ jq ncurses (python3.withPackages (ps: with ps; [ colorama deepdiff devtools docopt docutils requests sphinx tabulate z3 ])) ]; # contextlib2 glob2 textwrap3 traceback2 urllib3 + nativeCheckInputs = [ jq ncurses (python3.withPackages (ps: with ps; [ colorama deepdiff devtools docopt docutils requests sphinx tabulate z3-solver ])) ]; # contextlib2 glob2 textwrap3 traceback2 urllib3 # tests take 60+ minutes to complete, only run as part of passthru tests doCheck = false; diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 9953eaa3144c1..bf37d19cd8c4d 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { which perl hostname # Some of the books require one or more of these external tools: glucose minisat abc-verifier libipasir - z3 (python3.withPackages (ps: [ ps.z3 ])) + z3 (python3.withPackages (ps: [ ps.z3-solver ])) ]; # NOTE: Parallel building can be memory-intensive depending on the number of diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index c343f7f3e8723..fb0c8dbdf297e 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -8,7 +8,7 @@ , pysmt , pythonOlder , pytestCheckHook -, z3 +, z3-solver }: buildPythonPackage rec { @@ -34,19 +34,13 @@ buildPythonPackage rec { decorator future pysmt - z3 + z3-solver ]; nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - # Use upstream z3 implementation - substituteInPlace setup.cfg \ - --replace "z3-solver==4.10.2.0" "" - ''; - pythonImportsCheck = [ "claripy" ]; diff --git a/pkgs/development/python-modules/deal-solver/default.nix b/pkgs/development/python-modules/deal-solver/default.nix index 5c91d6d925594..28eee72a99d23 100644 --- a/pkgs/development/python-modules/deal-solver/default.nix +++ b/pkgs/development/python-modules/deal-solver/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pythonOlder , flit-core -, z3 +, z3-solver , astroid , pytestCheckHook , hypothesis @@ -28,9 +28,7 @@ buildPythonPackage rec { ]; postPatch = '' - # Use upstream z3 implementation substituteInPlace pyproject.toml \ - --replace "\"z3-solver\"," "" \ --replace "\"--cov=deal_solver\"," "" \ --replace "\"--cov-report=html\"," "" \ --replace "\"--cov-report=xml\"," "" \ @@ -39,9 +37,9 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - z3 + z3-solver astroid - ] ++ z3.requiredPythonModules; + ] ++ z3-solver.requiredPythonModules; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 2c290493b063d..0bd4118836274 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -33,7 +33,7 @@ , seaborn # Crosstalk-adaptive layout pass , withCrosstalkPass ? false -, z3 +, z3-solver # test requirements , ddt , hypothesis @@ -53,7 +53,7 @@ let pylatexenc seaborn ]; - crosstalkPackages = [ z3 ]; + crosstalkPackages = [ z3-solver ]; in buildPythonPackage rec { diff --git a/pkgs/tools/security/amoco/default.nix b/pkgs/tools/security/amoco/default.nix index a9c182ca4cbc6..fe16ad9596dd5 100644 --- a/pkgs/tools/security/amoco/default.nix +++ b/pkgs/tools/security/amoco/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { prompt-toolkit pygments # pyside6 - z3 + z3-solver ]; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 39ba30a93b7dd..b76adc80e765b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -462,6 +462,7 @@ mapAliases ({ xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 XlsxWriter = xlsxwriter; # added 2023-02-19 Yapsy = yapsy; # added 2023-02-19 + z3 = z3-solver; # added 2023-12-03 zake = throw "zake has been removed because it is abandoned"; # added 2023-06-20 zc-buildout221 = zc-buildout; # added 2021-07-21 zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d285a37393a60..27f8fa89b5d9e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16113,9 +16113,11 @@ self: super: with self; { z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; - z3 = (toPythonModule (pkgs.z3.override { + z3-solver = (toPythonModule ((pkgs.z3.override { inherit python; - })).python; + }).overrideAttrs (_: { + pname = "z3-solver"; + }))).python; zadnegoale = callPackage ../development/python-modules/zadnegoale { }; From 08cdc6a005fd3e6936f862d4d29cedb212d9daa2 Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Thu, 7 Dec 2023 20:19:52 +0100 Subject: [PATCH 06/49] qalculate-{gtk, qt}: add meta.mainProgram --- pkgs/applications/science/math/qalculate-gtk/default.nix | 1 + pkgs/applications/science/math/qalculate-qt/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 09b4701415507..0c859fd95bea7 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ gebner doronbehar alyaeanyx ]; license = licenses.gpl2Plus; + mainProgram = "qalculate-gtk"; platforms = platforms.all; }; }) diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index 93abb0dda36dd..9932c7c2dcd91 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ _4825764518 ]; license = licenses.gpl2Plus; + mainProgram = "qalculate-qt"; platforms = platforms.unix; }; }) From f5dafbfa830337ea4c0d3227b27f957007342e47 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 5 Dec 2023 03:33:53 +0100 Subject: [PATCH 07/49] doc: Rename to Nixpkgs reference manual and state purpose For the time being, we're moving towards https://nix.dev/ containing all tutorials and guides. The Nixpkgs manual is reinforced to be a _reference_ manual. While it's not just reference for now, that's what the docs team is working towards. This commits rewrites the Nixpkgs manual introduction to reflect that and point to some more useful links. The contribution docs are updated similarly so it's not missed. Co-authored-by: Valentin Gagarin Co-authored-by: Robert Hensing --- doc/README.md | 16 ++++++++++------ doc/manual.md.in | 2 +- doc/preface.chapter.md | 14 +++++++++----- lib/README.md | 2 +- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/doc/README.md b/doc/README.md index 9dee2d30d7305..d441a3b7204a5 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,13 +1,17 @@ -# Contributing to the Nixpkgs manual +# Contributing to the Nixpkgs reference manual -This directory houses the sources files for the Nixpkgs manual. +This directory houses the sources files for the Nixpkgs reference manual. -You can find the [rendered documentation for Nixpkgs `unstable` on nixos.org](https://nixos.org/manual/nixpkgs/unstable/). -The rendering tool is [nixos-render-docs](../pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs), sometimes abbreviated `nrd`. +Going forward, it should only contain [reference](https://nix.dev/contributing/documentation/diataxis#reference) documentation. +For tutorials, guides and explanations, contribute to instead. + +For documentation only relevant for contributors, use Markdown files and code comments in the source code. -[Docs for Nixpkgs stable](https://nixos.org/manual/nixpkgs/stable/) are also available. +Rendered documentation: +- [Unstable (from master)](https://nixos.org/manual/nixpkgs/unstable/) +- [Stable (from latest release)](https://nixos.org/manual/nixpkgs/stable/) -If you're only getting started with Nix, go to [nixos.org/learn](https://nixos.org/learn). +The rendering tool is [nixos-render-docs](../pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs), sometimes abbreviated `nrd`. ## Contributing to this documentation diff --git a/doc/manual.md.in b/doc/manual.md.in index 52971ff526c28..642247e166125 100644 --- a/doc/manual.md.in +++ b/doc/manual.md.in @@ -1,4 +1,4 @@ -# Nixpkgs Manual {#nixpkgs-manual} +# Nixpkgs Reference Manual {#nixpkgs-manual} ## Version @MANUAL_VERSION@ ```{=include=} chapters diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index aa6acca1217a7..93cd1a00b4f24 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -6,11 +6,15 @@ The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the Packages are available for several platforms, and can be used with the Nix package manager on most GNU/Linux distributions as well as [NixOS](https://nixos.org/nixos). -This manual primarily describes how to write packages for the Nix Packages collection -(Nixpkgs). Thus it’s mainly for packagers and developers who want to add packages to -Nixpkgs. If you like to learn more about the Nix package manager and the Nix -expression language, then you are kindly referred to the [Nix manual](https://nixos.org/nix/manual/). -The NixOS distribution is documented in the [NixOS manual](https://nixos.org/nixos/manual/). +This document is the user [_reference_](https://nix.dev/contributing/documentation/diataxis#reference) manual for Nixpkgs. +It describes entire public interface of Nixpkgs in a concise and orderly manner, and all relevant behaviors, with examples and cross-references. + +To discover other kinds of documentation: +- [nix.dev](https://nix.dev/): Tutorials and guides for getting things done with Nix +- [NixOS **Option Search**](https://search.nixos.org/options) and reference documentation +- [Nixpkgs **Package Search**](https://search.nixos.org/packages) +- [**NixOS** manual](https://nixos.org/manual/nixos/stable/): Reference documentation for the NixOS Linux distribution +- [`CONTRIBUTING.md`](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md): Contributing to Nixpkgs, including this manual ## Overview of Nixpkgs {#overview-of-nixpkgs} diff --git a/lib/README.md b/lib/README.md index 220940bc21224..a886cf5bfb555 100644 --- a/lib/README.md +++ b/lib/README.md @@ -42,7 +42,7 @@ Reference documentation for library functions is written above each function as These comments are processed using [nixdoc](https://github.com/nix-community/nixdoc) and [rendered in the Nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/#chap-functions). The nixdoc README describes the [comment format](https://github.com/nix-community/nixdoc#comment-format). -See the [chapter on contributing to the Nixpkgs manual](https://nixos.org/manual/nixpkgs/#chap-contributing) for how to build the manual. +See [doc/README.md](../doc/README.md) for how to build the manual. ## Running tests From eaa581b5c3923a2043cf6020e9616debc2c1abc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Dec 2023 15:02:54 +0100 Subject: [PATCH 08/49] nixos/nextcloud: allow phpOptions to contain ints --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 6c50ea3c81ef7..e5f7c39faf87a 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -238,7 +238,7 @@ in { }; phpOptions = mkOption { - type = types.attrsOf types.str; + type = with types; attrsOf (oneOf [ str int ]); defaultText = literalExpression (generators.toPretty { } defaultPHPSettings); description = lib.mdDoc '' Options for PHP's php.ini file for nextcloud. From 8d3978c149352de6b7e8b72946b58a16427eda2c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 7 Dec 2023 22:08:00 +0100 Subject: [PATCH 09/49] lib.types.boolByOr: init This type is necessary to have correct merging behavior for `allowUnfreePredicate` and `allowInsecurePredicate` Co-authored-by: Robert Hensing --- lib/tests/modules.sh | 6 ++++++ lib/tests/modules/boolByOr.nix | 14 ++++++++++++++ lib/types.nix | 16 ++++++++++++++++ .../manual/development/option-types.section.md | 7 +++++++ 4 files changed, 43 insertions(+) create mode 100644 lib/tests/modules/boolByOr.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 21d4978a11609..0eb976c1f4978 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -111,6 +111,12 @@ checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*' checkConfigError 'while evaluating a definition from `.*/define-enable-abort.nix' config.enable ./define-enable-abort.nix checkConfigError 'while evaluating the error message for definitions for .enable., which is an option that does not exist' config.enable ./define-enable-abort.nix +# Check boolByOr type. +checkConfigOutput '^false$' config.value.falseFalse ./boolByOr.nix +checkConfigOutput '^true$' config.value.trueFalse ./boolByOr.nix +checkConfigOutput '^true$' config.value.falseTrue ./boolByOr.nix +checkConfigOutput '^true$' config.value.trueTrue ./boolByOr.nix + checkConfigOutput '^1$' config.bare-submodule.nested ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix checkConfigOutput '^2$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix checkConfigOutput '^42$' config.bare-submodule.nested ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix ./declare-bare-submodule-deep-option.nix ./define-bare-submodule-values.nix diff --git a/lib/tests/modules/boolByOr.nix b/lib/tests/modules/boolByOr.nix new file mode 100644 index 0000000000000..ff86e2dfc8599 --- /dev/null +++ b/lib/tests/modules/boolByOr.nix @@ -0,0 +1,14 @@ +{ lib, ... }: { + + options.value = lib.mkOption { + type = lib.types.lazyAttrsOf lib.types.boolByOr; + }; + + config.value = { + falseFalse = lib.mkMerge [ false false ]; + trueFalse = lib.mkMerge [ true false ]; + falseTrue = lib.mkMerge [ false true ]; + trueTrue = lib.mkMerge [ true true ]; + }; +} + diff --git a/lib/types.nix b/lib/types.nix index 5ffbecda5db39..51e58eaa8ab51 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -275,6 +275,22 @@ rec { merge = mergeEqualOption; }; + boolByOr = mkOptionType { + name = "boolByOr"; + description = "boolean (merged using or)"; + descriptionClass = "noun"; + check = isBool; + merge = loc: defs: + foldl' + (result: def: + # Under the assumption that .check always runs before merge, we can assume that all defs.*.value + # have been forced, and therefore we assume we don't introduce order-dependent strictness here + result || def.value + ) + false + defs; + }; + int = mkOptionType { name = "int"; description = "signed integer"; diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md index 2ad3d6c4f9495..f9c7ac80018e4 100644 --- a/nixos/doc/manual/development/option-types.section.md +++ b/nixos/doc/manual/development/option-types.section.md @@ -13,6 +13,13 @@ merging is handled. `types.bool` : A boolean, its values can be `true` or `false`. + All definitions must have the same value, after priorities. An error is thrown in case of a conflict. + +`types.boolByOr` + +: A boolean, its values can be `true` or `false`. + The result is `true` if _any_ of multiple definitions is `true`. + In other words, definitions are merged with the logical _OR_ operator. `types.path` From 87fb1c480d3b1316ffa005e756875c930dfc1c36 Mon Sep 17 00:00:00 2001 From: ewuuwe Date: Fri, 8 Dec 2023 22:24:45 +0100 Subject: [PATCH 10/49] gnome-resources: init at 1.2.1 --- pkgs/tools/system/gnome-resources/default.nix | 77 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/tools/system/gnome-resources/default.nix diff --git a/pkgs/tools/system/gnome-resources/default.nix b/pkgs/tools/system/gnome-resources/default.nix new file mode 100644 index 0000000000000..93c25e9b19d48 --- /dev/null +++ b/pkgs/tools/system/gnome-resources/default.nix @@ -0,0 +1,77 @@ +{ pkgs +, fetchFromGitHub +, stdenv +, lib +, appstream-glib +, cargo +, desktop-file-utils +, meson +, pkg-config +, rustPlatform +, rustc +, glib +, wrapGAppsHook4 +, systemd +, polkit +, dmidecode +, gtk4 +, libadwaita +, ninja +}: +stdenv.mkDerivation rec { + pname = "gnome-resources"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "nokyan"; + repo = "resources"; + rev = "v${version}"; + hash = "sha256-faZ6MDOu/y4+DX9ObjPyVkxKwmLffMJZ93Adf/t8nxQ="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = "${src}/Cargo.lock"; + outputHashes = { + "plotters-cairo-0.4.0" = "sha256-m7ZT5F7WxjZSGQwuytqdMWUgYvcK2UCU/ntJGIJE+UA="; + }; + }; + + nativeBuildInputs = [ + pkg-config + desktop-file-utils + appstream-glib + meson + ninja + rustc + cargo + rustPlatform.cargoSetupHook + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + polkit + systemd + ]; + + wrapperPath = lib.makeBinPath ([ + dmidecode + ]); + + postFixup = '' + # Ensure all dependencies are in PATH + wrapProgram $out/bin/resources \ + --prefix PATH : "${wrapperPath}" + ''; + + meta = with lib; { + homepage = "https://github.com/nokyan/resources"; + description = "Monitor your system resources and processes"; + license = licenses.gpl3; + mainProgram = "resources"; + maintainers = with maintainers; [ ewuuwe ]; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47e6879dd8aa3..4b94dde920923 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8665,6 +8665,8 @@ with pkgs; gnome-randr = callPackage ../tools/wayland/gnome-randr { }; + gnome-resources = callPackage ../tools/system/gnome-resources { }; + gnuapl = callPackage ../development/interpreters/gnu-apl { }; gnu-shepherd = callPackage ../misc/gnu-shepherd { }; From aa7dad9e8efd5a55da3cf07ffde40ff0e297cca3 Mon Sep 17 00:00:00 2001 From: ewuuwe Date: Fri, 8 Dec 2023 22:25:26 +0100 Subject: [PATCH 11/49] maintainers: add ewuuwe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index aa09b1fe5e459..0749174e65a14 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5676,6 +5676,12 @@ githubId = 454695; name = "Artur Taranchiev"; }; + ewuuwe = { + email = "ewu.uweq@pm.me"; + github = "ewuuwe"; + githubId = 63652646; + name = "Xaver Oswald"; + }; exarkun = { email = "exarkun@twistedmatrix.com"; github = "exarkun"; From aab87b6b1f1192b171aa7642b42db6b854d2a521 Mon Sep 17 00:00:00 2001 From: ewuuwe Date: Fri, 8 Dec 2023 22:37:03 +0100 Subject: [PATCH 12/49] fix missing newline at the end of default.nix --- pkgs/tools/system/gnome-resources/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/gnome-resources/default.nix b/pkgs/tools/system/gnome-resources/default.nix index 93c25e9b19d48..d84403acdf60a 100644 --- a/pkgs/tools/system/gnome-resources/default.nix +++ b/pkgs/tools/system/gnome-resources/default.nix @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ewuuwe ]; platforms = platforms.linux; }; -} \ No newline at end of file +} From 87c91fb4b64fc13def863f776246c5ec6185b7d5 Mon Sep 17 00:00:00 2001 From: "Janik H." Date: Tue, 31 Oct 2023 12:02:03 +0100 Subject: [PATCH 13/49] octodns: init at 1.4.0 --- pkgs/tools/networking/octodns/default.nix | 63 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/tools/networking/octodns/default.nix diff --git a/pkgs/tools/networking/octodns/default.nix b/pkgs/tools/networking/octodns/default.nix new file mode 100644 index 0000000000000..56226c29d0e9f --- /dev/null +++ b/pkgs/tools/networking/octodns/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, wheel +, pytestCheckHook +, dnspython +, fqdn +, idna +, natsort +, python-dateutil +, pyyaml +, python +, runCommand +}: + +buildPythonPackage rec { + pname = "octodns"; + version = "1.4.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns"; + rev = "v${version}"; + hash = "sha256-l4JGodbUmFxHFeEaxgClEozHcbyYP0F2yj5gDqV88IA="; + }; + + nativeBuildInputs = [ + setuptools + wheel + pytestCheckHook + ]; + + propagatedBuildInputs = [ + dnspython + fqdn + idna + natsort + python-dateutil + pyyaml + ]; + + pythonImportsCheck = [ "octodns" ]; + + passthru.withProviders = ps: let + pyEnv = python.withPackages ps; + in runCommand "octodns-with-providers" { } '' + mkdir -p $out/bin + ln -st $out/bin ${pyEnv}/bin/octodns-* + ''; + + meta = with lib; { + description = "Tools for managing DNS across multiple providers"; + homepage = "https://github.com/octodns/octodns"; + changelog = "https://github.com/octodns/octodns/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d86b30b3a4de4..51f45881f7bfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -823,6 +823,8 @@ with pkgs; oauth2c = callPackage ../tools/security/oauth2c { }; + octodns = python3Packages.callPackage ../tools/networking/octodns { }; + octosuite = callPackage ../tools/security/octosuite { }; octosql = callPackage ../tools/misc/octosql { }; From 548841426b8f6b82b7a62d1646fc1b1f7affd804 Mon Sep 17 00:00:00 2001 From: "Janik H." Date: Tue, 31 Oct 2023 12:03:16 +0100 Subject: [PATCH 14/49] octodns-providers.hetzner: init at 0.0.2 --- .../octodns/providers/hetzner/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/tools/networking/octodns/providers/hetzner/default.nix diff --git a/pkgs/tools/networking/octodns/providers/hetzner/default.nix b/pkgs/tools/networking/octodns/providers/hetzner/default.nix new file mode 100644 index 0000000000000..eb0903964b71c --- /dev/null +++ b/pkgs/tools/networking/octodns/providers/hetzner/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, octodns +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "octodns-hetzner"; + # the latest release tag is over a year behind. + version = "0.0.2-unstable-2023-09-29"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-hetzner"; + rev = "620840593a520dac9e365240b3ab361ded309c8e"; + hash = "sha256-WdYy8tc0+PYsKuyp3uqOzbxwhLSZ+06L3JVaTSATEKM="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + octodns + requests + ]; + + pythonImportsCheck = [ "octodns_hetzner" ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + meta = with lib; { + description = "Hetzner DNS provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-hetzner/"; + changelog = "https://github.com/octodns/octodns-hetzner/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51f45881f7bfd..65f67ecff6a4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -825,6 +825,10 @@ with pkgs; octodns = python3Packages.callPackage ../tools/networking/octodns { }; + octodns-providers = recurseIntoAttrs { + hetzner = python3Packages.callPackage ../tools/networking/octodns/providers/hetzner { }; + }; + octosuite = callPackage ../tools/security/octosuite { }; octosql = callPackage ../tools/misc/octosql { }; From fa8bd5fd41ea279b55d205ec03fa197ca5935e6f Mon Sep 17 00:00:00 2001 From: "Janik H." Date: Tue, 31 Oct 2023 12:04:06 +0100 Subject: [PATCH 15/49] octodns-providers.powerdns: init at 0.0.5 --- .../octodns/providers/powerdns/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/tools/networking/octodns/providers/powerdns/default.nix diff --git a/pkgs/tools/networking/octodns/providers/powerdns/default.nix b/pkgs/tools/networking/octodns/providers/powerdns/default.nix new file mode 100644 index 0000000000000..68ddc56112b25 --- /dev/null +++ b/pkgs/tools/networking/octodns/providers/powerdns/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, octodns +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "octodns-powerdns"; + version = "0.0.5"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-powerdns"; + rev = "v${version}"; + hash = "sha256-jt0+JnpCgvsoqMcC9mANX7uq2WPTiI2JQjwQi7LGWj0="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + octodns + requests + ]; + + env.OCTODNS_RELEASE = 1; + + pythonImportsCheck = [ "octodns_powerdns" ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + meta = with lib; { + description = "PowerDNS API provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-powerdns/"; + changelog = "https://github.com/octodns/octodns-powerdns/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65f67ecff6a4c..fcb02a7869605 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -827,6 +827,7 @@ with pkgs; octodns-providers = recurseIntoAttrs { hetzner = python3Packages.callPackage ../tools/networking/octodns/providers/hetzner { }; + powerdns = python3Packages.callPackage ../tools/networking/octodns/providers/powerdns { }; }; octosuite = callPackage ../tools/security/octosuite { }; From b063d25df60d1636bee05ff88dbd3607b078c44b Mon Sep 17 00:00:00 2001 From: "Janik H." Date: Tue, 5 Dec 2023 21:30:29 +0100 Subject: [PATCH 16/49] octodns-providers.bind: init at 0.0.5 --- .../octodns/providers/bind/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/tools/networking/octodns/providers/bind/default.nix diff --git a/pkgs/tools/networking/octodns/providers/bind/default.nix b/pkgs/tools/networking/octodns/providers/bind/default.nix new file mode 100644 index 0000000000000..46631ebd8e155 --- /dev/null +++ b/pkgs/tools/networking/octodns/providers/bind/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, octodns +, pytestCheckHook +, pythonOlder +, dnspython +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "octodns-bind"; + version = "0.0.5"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-bind"; + rev = "v${version}"; + hash = "sha256-0ia/xYarrOiLZa8KU0s5wtCGtXIyxSl6OcwNkSJb/rA="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + octodns + dnspython + ]; + + env.OCTODNS_RELEASE = 1; + + pythonImportsCheck = [ "octodns_bind" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = " RFC compliant (Bind9) provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-bind"; + changelog = "https://github.com/octodns/octodns-bind/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcb02a7869605..a332cd7faacfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -826,6 +826,7 @@ with pkgs; octodns = python3Packages.callPackage ../tools/networking/octodns { }; octodns-providers = recurseIntoAttrs { + bind = python3Packages.callPackage ../tools/networking/octodns/providers/bind { }; hetzner = python3Packages.callPackage ../tools/networking/octodns/providers/hetzner { }; powerdns = python3Packages.callPackage ../tools/networking/octodns/providers/powerdns { }; }; From 26a09d8980b6f479ea1fc6968c642d1236f76962 Mon Sep 17 00:00:00 2001 From: ewuuwe Date: Sat, 9 Dec 2023 12:23:42 +0100 Subject: [PATCH 17/49] Update version 1.2.0 -> 1.2.1, update license --- pkgs/tools/system/gnome-resources/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/gnome-resources/default.nix b/pkgs/tools/system/gnome-resources/default.nix index d84403acdf60a..083836d275f0e 100644 --- a/pkgs/tools/system/gnome-resources/default.nix +++ b/pkgs/tools/system/gnome-resources/default.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation rec { pname = "gnome-resources"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "nokyan"; repo = "resources"; rev = "v${version}"; - hash = "sha256-faZ6MDOu/y4+DX9ObjPyVkxKwmLffMJZ93Adf/t8nxQ="; + hash = "sha256-OVz1vsmOtH/5sEuyl2BfDqG2/9D1HGtHA0FtPntKQT0="; }; cargoDeps = rustPlatform.importCargoLock { @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/nokyan/resources"; description = "Monitor your system resources and processes"; - license = licenses.gpl3; + license = licenses.gpl3Plus; mainProgram = "resources"; maintainers = with maintainers; [ ewuuwe ]; platforms = platforms.linux; From 7e67497d5229008da1cc3b410f146906b8ca4648 Mon Sep 17 00:00:00 2001 From: ewuuwe Date: Sat, 9 Dec 2023 12:24:33 +0100 Subject: [PATCH 18/49] Fix double wrapping --- pkgs/tools/system/gnome-resources/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/system/gnome-resources/default.nix b/pkgs/tools/system/gnome-resources/default.nix index 083836d275f0e..6a9b59ff7eba7 100644 --- a/pkgs/tools/system/gnome-resources/default.nix +++ b/pkgs/tools/system/gnome-resources/default.nix @@ -56,16 +56,13 @@ stdenv.mkDerivation rec { systemd ]; - wrapperPath = lib.makeBinPath ([ - dmidecode - ]); - - postFixup = '' - # Ensure all dependencies are in PATH - wrapProgram $out/bin/resources \ - --prefix PATH : "${wrapperPath}" + postPatch = '' + substituteInPlace src/utils/memory.rs \ + --replace '"dmidecode"' '"${dmidecode}/bin/dmidecode"' ''; + mesonFlags = [ "-Dprofile=default" ]; + meta = with lib; { homepage = "https://github.com/nokyan/resources"; description = "Monitor your system resources and processes"; From 28894232137e4bc0281d75d021c721152dbc1019 Mon Sep 17 00:00:00 2001 From: ewuuwe Date: Sat, 9 Dec 2023 12:24:42 +0100 Subject: [PATCH 19/49] Add cargo.lock --- pkgs/tools/system/gnome-resources/Cargo.lock | 2268 +++++++++++++++++ pkgs/tools/system/gnome-resources/default.nix | 8 +- 2 files changed, 2271 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/system/gnome-resources/Cargo.lock diff --git a/pkgs/tools/system/gnome-resources/Cargo.lock b/pkgs/tools/system/gnome-resources/Cargo.lock new file mode 100644 index 0000000000000..46b646ab28c83 --- /dev/null +++ b/pkgs/tools/system/gnome-resources/Cargo.lock @@ -0,0 +1,2268 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ahash" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "async-attributes" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[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 2.5.3", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite", + "slab", +] + +[[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.26", + "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 2.5.3", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io", + "async-lock", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.0.0", + "futures-lite", + "rustix 0.38.20", + "windows-sys", +] + +[[package]] +name = "async-signal" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.20", + "signal-hook-registry", + "slab", + "windows-sys", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-attributes", + "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.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "blake2b_simd" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +dependencies = [ + "arrayref", + "arrayvec", + "constant_time_eq", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "blocking" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite", + "piper", + "tracing", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cairo-rs" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c0466dfa8c0ee78deef390c274ad756801e0a6dbb86c5ef0924a298c5761c4d" +dependencies = [ + "bitflags 2.4.1", + "cairo-sys-rs", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +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 = "concurrent-queue" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-random" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11df32a13d7892ec42d51d3d175faba5211ffe13ed25d4fb348ac9e9ce835593" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.10", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[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 = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "darling" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "dirs" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "dlv-list" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aead04dc46b5f263c25721cf25c9e595951d15055f8063f92392fa0d7f64cf4" +dependencies = [ + "const-random", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "errno" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "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 = "event-listener" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "expanduser" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14e0b79235da57db6b6c2beed9af6e5de867d63a973ae3e91910ddc33ba40bc0" +dependencies = [ + "dirs", + "lazy_static", + "pwd", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[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.38", +] + +[[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-macro", + "futures-task", + "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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" +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 = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57052f84e8e5999b258e8adf8f5f2af0ac69033864936b8b6838321db2f759b1" +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 0.3.9", +] + +[[package]] +name = "glib" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c316afb01ce8067c5eaab1fc4f2cd47dc21ce7b6296358605e2ffab23ccbd19" +dependencies = [ + "bitflags 2.4.1", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8da903822b136d42360518653fcf154455defc437d3e7a81475bf9a95ff1e47" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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 = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" +dependencies = [ + "cairo-rs", + "gdk4", + "glib", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gsk4-sys" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a" + +[[package]] +name = "gtk4" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" +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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" +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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +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 = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix 0.38.20", + "windows-sys", +] + +[[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 = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" +dependencies = [ + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libadwaita-sys", + "libc", + "pango", +] + +[[package]] +name = "libadwaita-sys" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" +dependencies = [ + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "libc" +version = "0.2.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi 0.3.9", +] + +[[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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[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 0.3.9", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +dependencies = [ + "value-bag", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nparse" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82a74fc6e63871766ea52a13d5e6292f62339cd951b5b3f820d64480253bdc82" +dependencies = [ + "nom", + "serde_json", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "nvml-wrapper" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd21b9f5a1cce3c3515c9ffa85f5c7443e07162dae0ccf4339bb7ca38ad3454" +dependencies = [ + "bitflags 1.3.2", + "libloading", + "nvml-wrapper-sys", + "static_assertions", + "thiserror", + "wrapcenum-derive", +] + +[[package]] +name = "nvml-wrapper-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c961a2ea9e91c59a69b78e69090f6f5b867bb46c0c56de9482da232437c4987e" +dependencies = [ + "libloading", +] + +[[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 = "ordered-multimap" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f" +dependencies = [ + "dlv-list", + "hashbrown", +] + +[[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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pci-ids" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d88ae3281b415d856e9c2ddbcdd5961e71c1a3e90138512c04d720241853a6af" +dependencies = [ + "nom", + "phf", + "phf_codegen", + "proc-macro2", + "quote", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "plotters" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +dependencies = [ + "num-traits", + "plotters-backend", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" + +[[package]] +name = "plotters-cairo" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a73c5d841cec447bc191e932df2d58ef6bfa349e37027bf29a3e8d759d4c85b" +dependencies = [ + "cairo-rs", + "plotters-backend", +] + +[[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 = "pretty_env_logger" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" +dependencies = [ + "env_logger", + "log", +] + +[[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 0.19.15", +] + +[[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.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "process-data" +version = "1.2.1" +dependencies = [ + "anyhow", + "async-std", + "glob", + "nparse", + "once_cell", + "regex", + "rmp-serde", + "serde", + "sysconf", + "unescape", +] + +[[package]] +name = "pwd" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72c71c0c79b9701efe4e1e4b563b2016dd4ee789eb99badcb09d61ac4b92e4a2" +dependencies = [ + "libc", + "thiserror", +] + +[[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 = [ + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + +[[package]] +name = "redox_syscall" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + +[[package]] +name = "redox_users" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +dependencies = [ + "getrandom 0.1.16", + "redox_syscall", + "rust-argon2", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "resources" +version = "1.2.1" +dependencies = [ + "anyhow", + "async-process", + "async-std", + "expanduser", + "futures-util", + "gettext-rs", + "glob", + "gtk-macros", + "gtk4", + "hashbrown", + "libadwaita", + "log", + "nix", + "nparse", + "nvml-wrapper", + "once_cell", + "pci-ids", + "plotters", + "plotters-cairo", + "pretty_env_logger", + "process-data", + "regex", + "rmp-serde", + "rust-ini", + "serde", + "serde_json", + "strum", + "strum_macros", + "sysconf", + "unescape", + "uzers", +] + +[[package]] +name = "rmp" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + +[[package]] +name = "rust-argon2" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" +dependencies = [ + "base64", + "blake2b_simd", + "constant_time_eq", + "crossbeam-utils", +] + +[[package]] +name = "rust-ini" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[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.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" +dependencies = [ + "bitflags 1.3.2", + "errno 0.3.5", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +dependencies = [ + "bitflags 2.4.1", + "errno 0.3.5", + "libc", + "linux-raw-sys 0.4.10", + "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 = "semver" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" + +[[package]] +name = "serde" +version = "1.0.189" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.189" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "serde_json" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +dependencies = [ + "serde", +] + +[[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 = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.38", +] + +[[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.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sysconf" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e93f5d45535f49b6a05ef7ac2f0f795d28de494cf53a512751602c9849bea3" +dependencies = [ + "errno 0.2.8", + "kernel32-sys", + "libc", + "winapi 0.2.8", +] + +[[package]] +name = "system-deps" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af52f9402f94aac4948a2518b43359be8d9ce6cd9efc1c4de3b2f7b7e897d6" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" + +[[package]] +name = "temp-dir" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" + +[[package]] +name = "termcolor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "toml" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ef75d881185fd2df4a040793927c153d863651108a93c7e17a9e591baa95cc6" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.4", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380f9e8120405471f7c9ad1860a713ef5ece6a670c7eae39225e477340f32fc4" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" + +[[package]] +name = "unescape" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "uzers" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d283dc7e8c901e79e32d077866eaf599156cbf427fffa8289aecc52c5c3f63" +dependencies = [ + "libc", + "log", +] + +[[package]] +name = "value-bag" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.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.38", + "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.38", + "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.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[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-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +dependencies = [ + "memchr", +] + +[[package]] +name = "wrapcenum-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bcc065c85ad2c3bd12aa4118bf164835712e25080c392557801a13292c60aec" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "zerocopy" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] \ No newline at end of file diff --git a/pkgs/tools/system/gnome-resources/default.nix b/pkgs/tools/system/gnome-resources/default.nix index 6a9b59ff7eba7..f21af2da47d1e 100644 --- a/pkgs/tools/system/gnome-resources/default.nix +++ b/pkgs/tools/system/gnome-resources/default.nix @@ -29,11 +29,9 @@ stdenv.mkDerivation rec { hash = "sha256-OVz1vsmOtH/5sEuyl2BfDqG2/9D1HGtHA0FtPntKQT0="; }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = "${src}/Cargo.lock"; - outputHashes = { - "plotters-cairo-0.4.0" = "sha256-m7ZT5F7WxjZSGQwuytqdMWUgYvcK2UCU/ntJGIJE+UA="; - }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-SkCEA9CKqzy0wSIUj0DG6asIysD7G9i3nJ9jwhwAUqY="; }; nativeBuildInputs = [ From b27c9d91eedca34267febaa0dc5352b16004c9f8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 9 Dec 2023 11:19:13 +0000 Subject: [PATCH 20/49] =?UTF-8?q?gnome.zenity:=203.99.2=20=E2=86=92=204.0.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/zenity/-/compare/3.99.2...4.0.0 --- pkgs/desktops/gnome/core/zenity/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index e8be274a1f608..277d00f19d619 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -14,13 +14,13 @@ , wrapGAppsHook4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zenity"; - version = "3.99.2"; + version = "4.0.0"; src = fetchurl { - url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "oZR4kGuYi082fl6mOlkh5PmMuCVbugXrXK2LWhikFo8="; + url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz"; + sha256 = "C4yN7xjasFzEm9RkuQyn+UWuUv9eCSQtpwKhXZTT6N0="; }; nativeBuildInputs = [ @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = teams.gnome.members; }; -} +}) From 0918edb59f99c16bab0147d9b19786ad9bc444a3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 9 Dec 2023 11:19:02 +0000 Subject: [PATCH 21/49] =?UTF-8?q?gnome.mutter:=2045.1=20=E2=86=92=2045.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/45.1...45.2 --- pkgs/desktops/gnome/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 03414346f6435..119ee0efeb54e 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -67,13 +67,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "45.1"; + version = "45.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "LNPF77Itt2x5MRyxiJoaqy/rNbSk3QPzgiqreZnaISw="; + sha256 = "rz+Ym/IqVg3CSS+44Z+do3zm1xRLPgUZgLDVUFiWANw="; }; mesonFlags = [ From d18b7d65682d486ba05284b8dff1fed5a8f4a5b5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 9 Dec 2023 11:18:49 +0000 Subject: [PATCH 22/49] =?UTF-8?q?gnome.gnome-shell:=2045.1=20=E2=86=92=204?= =?UTF-8?q?5.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/45.1...45.2 --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 2471061ae4f09..85f5b5d42cb04 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -65,15 +65,15 @@ let pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "45.1"; + version = "45.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "FfykvWEpqLP5kBl/vR7ljXS2QVEK+q8Igqf6NmNPxfI="; + url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; + sha256 = "igz7+HKxp2JpbIbhPe/p82dekteVFOup0AC1thHCaiM="; }; patches = [ @@ -231,4 +231,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; -} +}) From a072ff94f518632c5b1fa2f048d748123f57d0b0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 9 Dec 2023 11:18:50 +0000 Subject: [PATCH 23/49] =?UTF-8?q?gnome.gnome-shell-extensions:=2045.1=20?= =?UTF-8?q?=E2=86=92=2045.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/compare/45.1...45.2 --- .../gnome/core/gnome-shell-extensions/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 493e0342333f1..5c17a3eb59064 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -11,13 +11,13 @@ , substituteAll }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "45.1"; + version = "45.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JC4VoMBuggw/2N1q6sGo74Zc5YiC5Zda8dZZNLtNQmE="; + url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; + sha256 = "7jL2OHotGK2/96lWaJvHR4ZrSocS1zeQwAKr6uTMqq8="; }; patches = [ @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-shell-extensions"; + attrPath = "gnome.gnome-shell-extensions"; }; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; }; -} +}) From 3b7892c7292d7d0d113d544fb37e9b600bfd389f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 9 Dec 2023 11:18:35 +0000 Subject: [PATCH 24/49] =?UTF-8?q?gnome.gnome-control-center:=2045.1=20?= =?UTF-8?q?=E2=86=92=2045.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/45.1...45.2 --- .../core/gnome-control-center/default.nix | 14 +++--- .../core/gnome-control-center/paths.patch | 45 +++++++++---------- 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index d59b5a1390655..69feddaaa84bf 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -66,13 +66,13 @@ , xvfb-run }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "45.1"; + version = "45.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-0obHYnFQ4RKqy7S3uRcX+tjokHYGFHnfxhCy3XRLV3o="; + url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-DPo8My1u2stz0GxrJv/KEHjob/WerIGbKTHglndT33A="; }; patches = [ @@ -201,8 +201,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-control-center"; + attrPath = "gnome.gnome-control-center"; }; }; @@ -212,4 +212,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch index 165497f11e2a7..be2ca4b5e09e6 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch @@ -38,7 +38,7 @@ index f6c84e3d2..cd897f8f5 100644 else gtk_widget_set_sensitive (self->toolbutton_profile_view, FALSE); diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h -index a2376f8a4..98769e08f 100644 +index feef16580..4b88ef7b1 100644 --- a/panels/datetime/tz.h +++ b/panels/datetime/tz.h @@ -27,11 +27,7 @@ @@ -55,26 +55,23 @@ index a2376f8a4..98769e08f 100644 typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c -index 505b8ee25..62e94009f 100644 +index ec5a905a5..689fdbebe 100644 --- a/panels/network/connection-editor/net-connection-editor.c +++ b/panels/network/connection-editor/net-connection-editor.c -@@ -267,9 +267,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) - g_autoptr(GError) error = NULL; +@@ -377,7 +377,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) + GPid child_pid; - if (self->is_new_connection) { -- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type); -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type); - } else { -- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'", -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'", - nm_connection_get_uuid (self->connection)); - } + builder = g_strv_builder_new (); +- g_strv_builder_add (builder, "nm-connection-editor"); ++ g_strv_builder_add (builder, "@networkmanagerapplet@/bin/nm-connection-editor"); + if (self->is_new_connection) { + g_autofree gchar *type_str = NULL; diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c -index 74dfb0e9a..5f53d1a20 100644 +index 303f4a8af..e5afc4dff 100644 --- a/panels/network/net-device-bluetooth.c +++ b/panels/network/net-device-bluetooth.c -@@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) +@@ -80,7 +80,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) update_off_switch_from_device_state (self->device_off_switch, state, self); /* set up the Options button */ @@ -83,7 +80,7 @@ index 74dfb0e9a..5f53d1a20 100644 gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL); } -@@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) +@@ -131,7 +131,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) connection = net_device_get_find_connection (self->client, self->device); uuid = nm_connection_get_uuid (connection); @@ -92,7 +89,7 @@ index 74dfb0e9a..5f53d1a20 100644 g_debug ("Launching '%s'\n", cmdline); if (!g_spawn_command_line_async (cmdline, &error)) g_warning ("Failed to launch nm-connection-editor: %s", error->message); -@@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) +@@ -173,7 +173,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) gtk_widget_init_template (GTK_WIDGET (self)); @@ -102,10 +99,10 @@ index 74dfb0e9a..5f53d1a20 100644 } diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c -index 34eb86241..50d0a2bed 100644 +index 166670224..36f720d36 100644 --- a/panels/network/net-device-mobile.c +++ b/panels/network/net-device-mobile.c -@@ -508,7 +508,7 @@ options_button_clicked_cb (NetDeviceMobile *self) +@@ -521,7 +521,7 @@ options_button_clicked_cb (NetDeviceMobile *self) connection = net_device_get_find_connection (self->client, self->device); uuid = nm_connection_get_uuid (connection); @@ -114,7 +111,7 @@ index 34eb86241..50d0a2bed 100644 g_debug ("Launching '%s'\n", cmdline); if (!g_spawn_command_line_async (cmdline, &error)) g_warning ("Failed to launch nm-connection-editor: %s", error->message); -@@ -797,7 +797,7 @@ net_device_mobile_init (NetDeviceMobile *self) +@@ -810,7 +810,7 @@ net_device_mobile_init (NetDeviceMobile *self) self->cancellable = g_cancellable_new (); @@ -137,12 +134,12 @@ index a31a606e3..ed5133d29 100644 /* Use SNMP to get printer's informations */ diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c -index 86f53d4fc..0b052856f 100644 +index edbc99830..1e1d90141 100644 --- a/panels/user-accounts/run-passwd.c +++ b/panels/user-accounts/run-passwd.c -@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) +@@ -152,7 +152,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) gchar **envp; - gint my_stdin, my_stdout, my_stderr; + gint my_stdin, my_stdout; - argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ + argv[0] = "/run/wrappers/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ @@ -150,10 +147,10 @@ index 86f53d4fc..0b052856f 100644 envp = g_get_environ (); diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c -index 83d4cd091..e8784c722 100644 +index 5b7bc1f02..13ffe6ca8 100644 --- a/panels/user-accounts/user-utils.c +++ b/panels/user-accounts/user-utils.c -@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *username, +@@ -215,7 +215,7 @@ is_valid_username_async (const gchar *username, * future, so it would be nice to have some official way for this * instead of relying on the current "--login" implementation. */ From a2001ba817f10e6d3614b57f170163d8152c4ec9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 9 Dec 2023 11:19:01 +0000 Subject: [PATCH 25/49] =?UTF-8?q?gnome.nautilus:=2045.1=20=E2=86=92=2045.2?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/45.1...45.2.1 --- pkgs/desktops/gnome/core/nautilus/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 395b4f41c76b6..6c96c54f86b5d 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -36,15 +36,15 @@ , gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "45.1"; + version = "45.2.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "I72qmoVGbFk3qJ2t3QgO0DvMK0notkr2ByBjU73oL+M="; + url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; + sha256 = "ul1T3zmhVVYt+XHvXjHoJwdJBdDEjqseskIaEChLmQ0="; }; patches = [ @@ -119,8 +119,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "nautilus"; + attrPath = "gnome.nautilus"; }; }; @@ -131,4 +131,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = teams.gnome.members; }; -} +}) From cfa2990cfe7f6858662a5a3f1e819b36f26523cd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 8 Dec 2023 06:37:59 +0000 Subject: [PATCH 26/49] =?UTF-8?q?gnome.file-roller:=2043.0=20=E2=86=92=204?= =?UTF-8?q?3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/file-roller/-/compare/43.0...43.1 --- pkgs/desktops/gnome/apps/file-roller/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index 97508ed418c1a..650a2a2d2b0cc 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -23,13 +23,13 @@ , nautilus }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "file-roller"; - version = "43.0"; + version = "43.1"; src = fetchurl { - url = "mirror://gnome/sources/file-roller/${lib.versions.major version}/file-roller-${version}.tar.xz"; - sha256 = "KYcp/b252oEywLvGCQdRfWVoWwVhiuBRZzNeZIT1c6E="; + url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz"; + sha256 = "hJlAI5lyk76zRdl5Pbj18Lu0H6oVXG/7SDKPIDlXrQg="; }; nativeBuildInputs = [ @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members ++ teams.pantheon.members; mainProgram = "file-roller"; }; -} +}) From b89d5dbf861550e423d346e3dd2593e5baa86457 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 9 Dec 2023 11:18:41 +0000 Subject: [PATCH 27/49] =?UTF-8?q?gnome.gnome-maps:=2045.1=20=E2=86=92=2045?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/v45.1...v45.2 --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 03a3c63afd61a..5203941d06f1e 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -26,13 +26,13 @@ , geocode-glib_2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-maps"; - version = "45.1"; + version = "45.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-v2nFDi4ZsV280KDvOCfUAqGVq0ogKbm2LlSr8472334="; + url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz"; + hash = "sha256-6es3CnlxtPhC+qME0xpIXb2P+K7EKnZScvL8GnqAmPI="; }; doCheck = true; @@ -84,8 +84,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-maps"; + attrPath = "gnome.gnome-maps"; }; }; @@ -96,4 +96,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; }; -} +}) From 64e3e7eeaea58240c3f6a0da1fc6cf8718f0ed2c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 9 Dec 2023 11:20:11 +0000 Subject: [PATCH 28/49] =?UTF-8?q?shotwell:=200.32.3=20=E2=86=92=200.32.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/shotwell/-/compare/shotwell-0.32.3...shotwell-0.32.4 --- pkgs/applications/graphics/shotwell/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 6f624747d688c..d93423e075218 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -38,13 +38,13 @@ # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; - version = "0.32.3"; + version = "0.32.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-4AD+5bPzYseRFPDs/44is0yaKGW1nkGi2j5NxdLKLDw="; + url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-3iqUUIRtHOwUxqEDA3X9SeGvJNySCtZIA0QST5zLhW8="; }; nativeBuildInputs = [ @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "shotwell"; versionPolicy = "odd-unstable"; }; }; @@ -103,4 +103,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; []; platforms = platforms.linux; }; -} +}) From 640248f313fc06fad9fe77a77206c75a25a57e17 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 9 Dec 2023 11:20:12 +0000 Subject: [PATCH 29/49] =?UTF-8?q?snapshot:=2045.0=20=E2=86=92=2045.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/snapshot/-/compare/45.0...45.1 --- .../graphics/snapshot/default.nix | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/graphics/snapshot/default.nix b/pkgs/applications/graphics/snapshot/default.nix index a47016e379daf..4b0c5f5f2cc2f 100644 --- a/pkgs/applications/graphics/snapshot/default.nix +++ b/pkgs/applications/graphics/snapshot/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , cargo , desktop-file-utils , meson @@ -17,24 +16,15 @@ , gnome }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snapshot"; - version = "45.0"; + version = "45.1"; src = fetchurl { - url = "mirror://gnome/sources/snapshot/${lib.versions.major version}/snapshot-${version}.tar.xz"; - hash = "sha256-7keO4JBzGgsIJLZrsXRr2ADcv+h6yDWEmUSa85z822c="; + url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz"; + hash = "sha256-/kRifa7zrZbBaaLlRhDmZxj4k9cN/SXUDTBskYQ7zjk="; }; - patches = [ - # Fix portal requests - # https://gitlab.gnome.org/GNOME/snapshot/-/merge_requests/168 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/snapshot/-/commit/6aec0f56d6bb994731c1309ac6e2cb822b82067e.patch"; - hash = "sha256-6tnOhhTQ3Rfl3nCw/rliLKkvZknvZKCQyeMKaTxYmok="; - }) - ]; - nativeBuildInputs = [ cargo desktop-file-utils @@ -75,4 +65,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "snapshot"; }; -} +}) From 5d26d7dce876cfedc0d2daeff696deaaf65d3d88 Mon Sep 17 00:00:00 2001 From: ewuuwe Date: Sat, 9 Dec 2023 16:43:34 +0100 Subject: [PATCH 30/49] Fix Cargo.lock not being used --- pkgs/tools/system/gnome-resources/Cargo.lock | 2 +- pkgs/tools/system/gnome-resources/default.nix | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/gnome-resources/Cargo.lock b/pkgs/tools/system/gnome-resources/Cargo.lock index 46b646ab28c83..bae2fc648411c 100644 --- a/pkgs/tools/system/gnome-resources/Cargo.lock +++ b/pkgs/tools/system/gnome-resources/Cargo.lock @@ -2265,4 +2265,4 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.38", -] \ No newline at end of file +] diff --git a/pkgs/tools/system/gnome-resources/default.nix b/pkgs/tools/system/gnome-resources/default.nix index f21af2da47d1e..eeff74818de12 100644 --- a/pkgs/tools/system/gnome-resources/default.nix +++ b/pkgs/tools/system/gnome-resources/default.nix @@ -29,9 +29,8 @@ stdenv.mkDerivation rec { hash = "sha256-OVz1vsmOtH/5sEuyl2BfDqG2/9D1HGtHA0FtPntKQT0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - hash = "sha256-SkCEA9CKqzy0wSIUj0DG6asIysD7G9i3nJ9jwhwAUqY="; + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; }; nativeBuildInputs = [ From affcea3ff7dd21792ae3aa2c8a08137e1a713e06 Mon Sep 17 00:00:00 2001 From: ewuuwe Date: Sat, 9 Dec 2023 19:17:50 +0100 Subject: [PATCH 31/49] Remove Cargo.lock --- pkgs/tools/system/gnome-resources/Cargo.lock | 2268 ----------------- pkgs/tools/system/gnome-resources/default.nix | 5 +- 2 files changed, 3 insertions(+), 2270 deletions(-) delete mode 100644 pkgs/tools/system/gnome-resources/Cargo.lock diff --git a/pkgs/tools/system/gnome-resources/Cargo.lock b/pkgs/tools/system/gnome-resources/Cargo.lock deleted file mode 100644 index bae2fc648411c..0000000000000 --- a/pkgs/tools/system/gnome-resources/Cargo.lock +++ /dev/null @@ -1,2268 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "async-attributes" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[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 2.5.3", - "futures-core", -] - -[[package]] -name = "async-executor" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" -dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand 2.0.1", - "futures-lite", - "slab", -] - -[[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.26", - "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 2.5.3", -] - -[[package]] -name = "async-process" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" -dependencies = [ - "async-io", - "async-lock", - "async-signal", - "blocking", - "cfg-if", - "event-listener 3.0.0", - "futures-lite", - "rustix 0.38.20", - "windows-sys", -] - -[[package]] -name = "async-signal" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" -dependencies = [ - "async-io", - "async-lock", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 0.38.20", - "signal-hook-registry", - "slab", - "windows-sys", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-attributes", - "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.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "blocking" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "fastrand 2.0.1", - "futures-io", - "futures-lite", - "piper", - "tracing", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "cairo-rs" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c0466dfa8c0ee78deef390c274ad756801e0a6dbb86c5ef0924a298c5761c4d" -dependencies = [ - "bitflags 2.4.1", - "cairo-sys-rs", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" -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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" -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 = "concurrent-queue" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "const-random" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11df32a13d7892ec42d51d3d175faba5211ffe13ed25d4fb348ac9e9ce835593" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom 0.2.10", - "once_cell", - "tiny-keccak", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[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 = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "dlv-list" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aead04dc46b5f263c25721cf25c9e595951d15055f8063f92392fa0d7f64cf4" -dependencies = [ - "const-random", -] - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "errno" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" -dependencies = [ - "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 = "event-listener" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "expanduser" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e0b79235da57db6b6c2beed9af6e5de867d63a973ae3e91910ddc33ba40bc0" -dependencies = [ - "dirs", - "lazy_static", - "pwd", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset", - "rustc_version", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[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.38", -] - -[[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-macro", - "futures-task", - "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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" -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 = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57052f84e8e5999b258e8adf8f5f2af0ac69033864936b8b6838321db2f759b1" -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 0.3.9", -] - -[[package]] -name = "glib" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c316afb01ce8067c5eaab1fc4f2cd47dc21ce7b6296358605e2ffab23ccbd19" -dependencies = [ - "bitflags 2.4.1", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8da903822b136d42360518653fcf154455defc437d3e7a81475bf9a95ff1e47" -dependencies = [ - "heck", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[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 = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" -dependencies = [ - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk-macros" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a" - -[[package]] -name = "gtk4" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" -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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" -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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "indexmap" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" -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 = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix 0.38.20", - "windows-sys", -] - -[[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 = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" -dependencies = [ - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "pango", -] - -[[package]] -name = "libadwaita-sys" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "libc" -version = "0.2.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi 0.3.9", -] - -[[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.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" - -[[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 0.3.9", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -dependencies = [ - "value-bag", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "libc", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "nparse" -version = "0.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a74fc6e63871766ea52a13d5e6292f62339cd951b5b3f820d64480253bdc82" -dependencies = [ - "nom", - "serde_json", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "nvml-wrapper" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd21b9f5a1cce3c3515c9ffa85f5c7443e07162dae0ccf4339bb7ca38ad3454" -dependencies = [ - "bitflags 1.3.2", - "libloading", - "nvml-wrapper-sys", - "static_assertions", - "thiserror", - "wrapcenum-derive", -] - -[[package]] -name = "nvml-wrapper-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c961a2ea9e91c59a69b78e69090f6f5b867bb46c0c56de9482da232437c4987e" -dependencies = [ - "libloading", -] - -[[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 = "ordered-multimap" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f" -dependencies = [ - "dlv-list", - "hashbrown", -] - -[[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.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pci-ids" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d88ae3281b415d856e9c2ddbcdd5961e71c1a3e90138512c04d720241853a6af" -dependencies = [ - "nom", - "phf", - "phf_codegen", - "proc-macro2", - "quote", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" -dependencies = [ - "atomic-waker", - "fastrand 2.0.1", - "futures-io", -] - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "plotters" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" -dependencies = [ - "num-traits", - "plotters-backend", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-cairo" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a73c5d841cec447bc191e932df2d58ef6bfa349e37027bf29a3e8d759d4c85b" -dependencies = [ - "cairo-rs", - "plotters-backend", -] - -[[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 = "pretty_env_logger" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" -dependencies = [ - "env_logger", - "log", -] - -[[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 0.19.15", -] - -[[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.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "process-data" -version = "1.2.1" -dependencies = [ - "anyhow", - "async-std", - "glob", - "nparse", - "once_cell", - "regex", - "rmp-serde", - "serde", - "sysconf", - "unescape", -] - -[[package]] -name = "pwd" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c71c0c79b9701efe4e1e4b563b2016dd4ee789eb99badcb09d61ac4b92e4a2" -dependencies = [ - "libc", - "thiserror", -] - -[[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 = [ - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall", - "rust-argon2", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "resources" -version = "1.2.1" -dependencies = [ - "anyhow", - "async-process", - "async-std", - "expanduser", - "futures-util", - "gettext-rs", - "glob", - "gtk-macros", - "gtk4", - "hashbrown", - "libadwaita", - "log", - "nix", - "nparse", - "nvml-wrapper", - "once_cell", - "pci-ids", - "plotters", - "plotters-cairo", - "pretty_env_logger", - "process-data", - "regex", - "rmp-serde", - "rust-ini", - "serde", - "serde_json", - "strum", - "strum_macros", - "sysconf", - "unescape", - "uzers", -] - -[[package]] -name = "rmp" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", -] - -[[package]] -name = "rust-ini" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" -dependencies = [ - "cfg-if", - "ordered-multimap", -] - -[[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.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" -dependencies = [ - "bitflags 1.3.2", - "errno 0.3.5", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" -dependencies = [ - "bitflags 2.4.1", - "errno 0.3.5", - "libc", - "linux-raw-sys 0.4.10", - "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 = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" - -[[package]] -name = "serde" -version = "1.0.189" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.189" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "serde_json" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" -dependencies = [ - "serde", -] - -[[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 = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" - -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.38", -] - -[[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.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sysconf" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e93f5d45535f49b6a05ef7ac2f0f795d28de494cf53a512751602c9849bea3" -dependencies = [ - "errno 0.2.8", - "kernel32-sys", - "libc", - "winapi 0.2.8", -] - -[[package]] -name = "system-deps" -version = "6.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af52f9402f94aac4948a2518b43359be8d9ce6cd9efc1c4de3b2f7b7e897d6" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "target-lexicon" -version = "0.12.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" - -[[package]] -name = "temp-dir" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" - -[[package]] -name = "termcolor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "toml" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef75d881185fd2df4a040793927c153d863651108a93c7e17a9e591baa95cc6" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.20.4", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380f9e8120405471f7c9ad1860a713ef5ece6a670c7eae39225e477340f32fc4" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" - -[[package]] -name = "unescape" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "uzers" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d283dc7e8c901e79e32d077866eaf599156cbf427fffa8289aecc52c5c3f63" -dependencies = [ - "libc", - "log", -] - -[[package]] -name = "value-bag" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.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.38", - "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.38", - "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.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[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-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.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.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" -dependencies = [ - "memchr", -] - -[[package]] -name = "wrapcenum-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bcc065c85ad2c3bd12aa4118bf164835712e25080c392557801a13292c60aec" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "zerocopy" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] diff --git a/pkgs/tools/system/gnome-resources/default.nix b/pkgs/tools/system/gnome-resources/default.nix index eeff74818de12..f21af2da47d1e 100644 --- a/pkgs/tools/system/gnome-resources/default.nix +++ b/pkgs/tools/system/gnome-resources/default.nix @@ -29,8 +29,9 @@ stdenv.mkDerivation rec { hash = "sha256-OVz1vsmOtH/5sEuyl2BfDqG2/9D1HGtHA0FtPntKQT0="; }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-SkCEA9CKqzy0wSIUj0DG6asIysD7G9i3nJ9jwhwAUqY="; }; nativeBuildInputs = [ From 99817acca6f96f6d4b3e0ca75e91544234a32142 Mon Sep 17 00:00:00 2001 From: ewuuwe Date: Sat, 9 Dec 2023 20:01:55 +0100 Subject: [PATCH 32/49] Remove unnecessary pkgs argument --- pkgs/tools/system/gnome-resources/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/system/gnome-resources/default.nix b/pkgs/tools/system/gnome-resources/default.nix index f21af2da47d1e..4a6bdbcf95dea 100644 --- a/pkgs/tools/system/gnome-resources/default.nix +++ b/pkgs/tools/system/gnome-resources/default.nix @@ -1,5 +1,4 @@ -{ pkgs -, fetchFromGitHub +{ fetchFromGitHub , stdenv , lib , appstream-glib From 6154391555c635acd72fc1b70b8c4f7612b6bff6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Dec 2023 23:01:01 +0000 Subject: [PATCH 33/49] ttyplot: 1.5.1 -> 1.5.2 --- pkgs/tools/misc/ttyplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix index 594c6de654afc..4e8d7ca8f9fee 100644 --- a/pkgs/tools/misc/ttyplot/default.nix +++ b/pkgs/tools/misc/ttyplot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ttyplot"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; rev = version; - sha256 = "sha256-lZLjTmSKxGJhUMELcIPjycpuRR3m9oz/Vh1/FEUzMOQ="; + sha256 = "sha256-BYMdGNDl8HUin1Hu4Fqgx305a/tTt1fztqlT2vDeTh8="; }; buildInputs = [ ncurses ]; From 9635e941146747a51fb727d804f89ff20bc20eec Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 10 Dec 2023 00:41:20 +0100 Subject: [PATCH 34/49] pylyzer: 0.0.49 -> 0.0.50 Diff: https://github.com/mtshiba/pylyzer/compare/v0.0.49...v0.0.50 Changelog: https://github.com/mtshiba/pylyzer/releases/tag/v0.0.50 --- .../tools/language-servers/pylyzer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/language-servers/pylyzer/default.nix b/pkgs/development/tools/language-servers/pylyzer/default.nix index f6cd1d9a1f2b1..b00ab1ccf0cfd 100644 --- a/pkgs/development/tools/language-servers/pylyzer/default.nix +++ b/pkgs/development/tools/language-servers/pylyzer/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.49"; + version = "0.0.50"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; - rev = "v${version}"; - hash = "sha256-1BExqeIL6jaonJVB3aRYDDHRw7xdxHoouH5BlooJDW8="; + rev = "refs/tags/v${version}"; + hash = "sha256-w6CXKBbELkPNido0bldMDqoLZbqLd0gKBv576uLAX3Y="; }; - cargoHash = "sha256-HBRczmEqqH+lMgnHeP/WpqHD05tkovJmR12hXwCrw8k="; + cargoHash = "sha256-/s6ZXvgFXED17CwdmR8lLZDQ3otV334U4Uly90MPV1Y="; nativeBuildInputs = [ git From d79ef7e97fe8567048ce66a3af24c80b842eb7d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Dec 2023 01:38:28 +0000 Subject: [PATCH 35/49] werf: 1.2.269 -> 1.2.270 --- pkgs/applications/networking/cluster/werf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 9895729c29eb9..4c727ce140480 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.269"; + version = "1.2.270"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-LUHENANM+3wGftTVXaQsGykKayzEAIQ3TQ5qM77TJVA="; + hash = "sha256-8AF+D/kbRkalUOQmpGamyhq5LEu1Uyxj6NuzWviDKRM="; }; vendorHash = "sha256-20bPsBRya7Gg7p/hSSnnYLoSHf/fRwk1UrA/KlMT3Jk="; From cade36169a9e51229a6c8dad5ee04fad787ab684 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 10 Dec 2023 03:26:43 +0000 Subject: [PATCH 36/49] volatility: remove --- pkgs/tools/security/volatility/default.nix | 25 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/tools/security/volatility/default.nix diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix deleted file mode 100644 index 9a4f27a0debc4..0000000000000 --- a/pkgs/tools/security/volatility/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchFromGitHub, python2Packages }: - -python2Packages.buildPythonApplication rec { - pname = "volatility"; - version = "2.6.1"; - - src = fetchFromGitHub { - owner = "volatilityfoundation"; - repo = pname; - rev = version; - sha256 = "1v92allp3cv3akk71kljcwxr27h1k067dsq7j9h8jnlwk9jxh6rf"; - }; - - doCheck = false; - - propagatedBuildInputs = with python2Packages; [ pycrypto distorm3 pillow ]; - - meta = with lib; { - homepage = "https://www.volatilityfoundation.org/"; - description = "Advanced memory forensics framework"; - maintainers = with maintainers; [ bosu ]; - license = licenses.gpl2Plus; - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6756b0a58ef90..9466a2c52587c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -994,6 +994,7 @@ mapAliases ({ varnish72Packages = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 varnish73Packages = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17 + volatility = throw "'volatility' has been removed, as it was broken and unmaintained"; # Added 2023-12-10 ### W ### waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9808b35edcb61..a4950374fbaef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14392,8 +14392,6 @@ with pkgs; vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger { }; - volatility = callPackage ../tools/security/volatility { }; - volatility3 = callPackage ../tools/security/volatility3 { }; vbetool = callPackage ../tools/system/vbetool { }; From 18746a0211439c97ee0f256abc350e60c24928ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Dec 2023 01:40:22 +0000 Subject: [PATCH 37/49] whisper-ctranslate2: 0.3.2 -> 0.3.4 --- pkgs/tools/audio/whisper-ctranslate2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/whisper-ctranslate2/default.nix b/pkgs/tools/audio/whisper-ctranslate2/default.nix index 452af0a18b402..c8121e8ffbaf3 100644 --- a/pkgs/tools/audio/whisper-ctranslate2/default.nix +++ b/pkgs/tools/audio/whisper-ctranslate2/default.nix @@ -5,7 +5,7 @@ }: let pname = "whisper-ctranslate2"; - version = "0.3.2"; + version = "0.3.4"; in python3.pkgs.buildPythonApplication { inherit pname version; @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication { owner = "Softcatala"; repo = "whisper-ctranslate2"; rev = version; - hash = "sha256-9Y9y7DihDnbREaeARCGC7ctwwBAoZPpIWDAOdeDnB6E="; + hash = "sha256-6tbCEvoOd97/rWC8XwKUS2FJXaB7PKReCctWRaYqUGU="; }; propagatedBuildInputs = with python3.pkgs; [ From 60274ea008dc98dc234c89506f8d21e05629189e Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sat, 2 Dec 2023 02:03:49 +0100 Subject: [PATCH 38/49] Revert "nixos/mobilizon: fix integration test by using postgresql_14" This reverts commit 80ba58361d92044864109b96f6ecef8e49e73f1d. --- nixos/tests/mobilizon.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/tests/mobilizon.nix b/nixos/tests/mobilizon.nix index 398c8530dc565..2b070ca9d9609 100644 --- a/nixos/tests/mobilizon.nix +++ b/nixos/tests/mobilizon.nix @@ -10,7 +10,7 @@ import ./make-test-python.nix ({ lib, ... }: meta.maintainers = with lib.maintainers; [ minijackson erictapen ]; nodes.server = - { pkgs, ... }: + { ... }: { services.mobilizon = { enable = true; @@ -25,8 +25,6 @@ import ./make-test-python.nix ({ lib, ... }: }; }; - services.postgresql.package = pkgs.postgresql_14; - security.pki.certificateFiles = [ certs.ca.cert ]; services.nginx.virtualHosts."${mobilizonDomain}" = { From db3bd72ed27a5b2b96c3e6cca463117d27bb052b Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sat, 2 Dec 2023 02:32:38 +0100 Subject: [PATCH 39/49] mobilizon: 3.2.0 -> 4.0.0 --- pkgs/servers/mobilizon/cacerts_get.patch | 16 +++ pkgs/servers/mobilizon/common.nix | 15 +-- pkgs/servers/mobilizon/default.nix | 48 +++---- pkgs/servers/mobilizon/frontend.nix | 33 +---- pkgs/servers/mobilizon/mix.nix | 158 +++++++++++------------ pkgs/servers/mobilizon/package.json | 140 -------------------- 6 files changed, 125 insertions(+), 285 deletions(-) create mode 100644 pkgs/servers/mobilizon/cacerts_get.patch delete mode 100644 pkgs/servers/mobilizon/package.json diff --git a/pkgs/servers/mobilizon/cacerts_get.patch b/pkgs/servers/mobilizon/cacerts_get.patch new file mode 100644 index 0000000000000..6fb8aed11f95a --- /dev/null +++ b/pkgs/servers/mobilizon/cacerts_get.patch @@ -0,0 +1,16 @@ +diff --git a/config/config.exs b/config/config.exs +index d75b2e10a..d46ebffd2 100644 +--- a/config/config.exs ++++ b/config/config.exs +@@ -128,7 +128,9 @@ config :mobilizon, Mobilizon.Web.Email.Mailer, + tls_options: [ + verify: :verify_peer, + versions: [:"tlsv1.2", :"tlsv1.3"], +- cacerts: :public_key.cacerts_get(), ++ cacerts: if System.get_env("SSL_CERT_FILE") != nil and :public_key.cacerts_load(System.get_env("SSL_CERT_FILE")) == :ok do ++ :public_key.cacerts_get() ++ end, + server_name_indication: ~c"localhost", + depth: 99 + ], + diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix index 7a4707322b653..33075646c6753 100644 --- a/pkgs/servers/mobilizon/common.nix +++ b/pkgs/servers/mobilizon/common.nix @@ -1,7 +1,7 @@ -{ fetchFromGitLab, applyPatches, fetchpatch }: rec { +{ fetchFromGitLab, applyPatches }: rec { pname = "mobilizon"; - version = "3.2.0"; + version = "4.0.0"; src = applyPatches { src = fetchFromGitLab { @@ -9,18 +9,11 @@ owner = "framasoft"; repo = pname; rev = version; - sha256 = "sha256-zgHR0taMMMwAoJEJr5s1rmSwJh31+qAfPQW9DSDuC8A="; + sha256 = "sha256-PslcIS+HjGTx8UYhb7BG2OgLXfIWHDouuiogA/rq/7M="; }; patches = [ # See https://framagit.org/framasoft/mobilizon/-/merge_requests/1452 - (fetchpatch { - url = "https://framagit.org/framasoft/mobilizon/-/commit/856d236b141c96705e1211e780e3f0e8950bb48e.patch"; - sha256 = "sha256-uEPvoTPVWHdg/KPWMG/Ck2qUjC+EUO3hyZnzpFxuoL0="; - }) - (fetchpatch { - url = "https://framagit.org/framasoft/mobilizon/-/commit/3936eb4cc5125b838b73adc7e49ca6ce3b2f73ce.patch"; - sha256 = "sha256-Srq691J1DbG3d26AKYZxkiMg0DfM33o3AllZpCjG2PQ="; - }) + ./cacerts_get.patch ]; }; } diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index a4dca53c0802d..191952f646813 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -18,10 +18,6 @@ in mixRelease rec { inherit (common) pname version src; - # See https://github.com/whitfin/cachex/issues/205 - # This circumvents a startup error for now - stripDebug = false; - nativeBuildInputs = [ git cmake ]; mixNixDeps = import ./mix.nix { @@ -35,15 +31,15 @@ mixRelease rec { fast_html = prev.fast_html.override { nativeBuildInputs = [ cmake ]; }; - ex_cldr = prev.ex_cldr.overrideAttrs (old: rec { - version = "2.37.2"; + ex_cldr = prev.ex_cldr.overrideAttrs (old: { # We have to use the GitHub sources, as it otherwise tries to download # the locales at build time. src = fetchFromGitHub { owner = "elixir-cldr"; repo = "cldr"; - rev = "v${version}"; - sha256 = "sha256-dDOQzLIi3zjb9xPyR7Baul96i9Mb3CFHUA+AWSexrk4="; + rev = "v${old.version}"; + sha256 = assert old.version == "2.37.5"; + "sha256-T5Qvuo+xPwpgBsqHNZYnTCA4loToeBn1LKTMsDcCdYs="; }; postInstall = '' cp $src/priv/cldr/locales/* $out/lib/erlang/lib/ex_cldr-${old.version}/priv/cldr/locales/ @@ -55,7 +51,7 @@ mixRelease rec { }); # The remainder are Git dependencies (and their deps) that are not supported by mix2nix currently. - web_push_encryption = buildMix { + web_push_encryption = buildMix rec { name = "web_push_encryption"; version = "0.3.1"; src = fetchFromGitHub { @@ -77,40 +73,36 @@ mixRelease rec { }; beamDeps = with final; [ mix_test_watch ex_doc timex ]; }; - exkismet = buildMix rec { - name = "exkismet"; - version = "0.0.1"; + rajska = buildMix rec { + name = "rajska"; + version = "1.3.3"; src = fetchFromGitHub { owner = "tcitworld"; repo = name; - rev = "8b5485fde00fafbde20f315bec387a77f7358334"; - sha256 = "sha256-ttgCWoBKU7VTjZJBhZNtqVF4kN7psBr/qOeR65MbTqw="; + rev = "0c036448e261e8be6a512581c592fadf48982d84"; + sha256 = "sha256-4pfply1vTAIT2Xvm3kONmrCK05xKfXFvcb8EKoSCXBE="; }; - beamDeps = with final; [ httpoison ]; + beamDeps = with final; [ ex_doc credo absinthe excoveralls hammer mock ]; }; - rajska = buildMix rec { - name = "rajska"; - version = "0.0.1"; + exkismet = buildMix rec { + name = "exkismet"; + version = "0.0.3"; src = fetchFromGitHub { owner = "tcitworld"; repo = name; - rev = "0c036448e261e8be6a512581c592fadf48982d84"; - sha256 = "sha256-4pfply1vTAIT2Xvm3kONmrCK05xKfXFvcb8EKoSCXBE="; + rev = "8b5485fde00fafbde20f315bec387a77f7358334"; + sha256 = "sha256-ttgCWoBKU7VTjZJBhZNtqVF4kN7psBr/qOeR65MbTqw="; }; - beamDeps = with final; [ httpoison absinthe ]; + beamDeps = with final; [ httpoison ex_doc credo doctor dialyxir ]; }; }); }; - preConfigure = '' - export LANG=C.UTF-8 # fix elixir locale warning - ''; - # Install the compiled js part preBuild = '' - cp -a "${mobilizon-frontend}/libexec/mobilizon/deps/priv/static" ./priv + cp -a "${mobilizon-frontend}/static" ./priv chmod 770 -R ./priv ''; @@ -123,9 +115,7 @@ mixRelease rec { updateScript = writeShellScriptBin "update.sh" '' set -eou pipefail - SRC=$(nix path-info .#mobilizon.src) - ${mix2nix}/bin/mix2nix $SRC/mix.lock > pkgs/servers/mobilizon/mix.nix - cat $SRC/js/package.json > pkgs/servers/mobilizon/package.json + ${mix2nix}/bin/mix2nix '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix ''; elixirPackage = beamPackages.elixir; }; diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix index 220138c33406a..5ea6242c5bdcf 100644 --- a/pkgs/servers/mobilizon/frontend.nix +++ b/pkgs/servers/mobilizon/frontend.nix @@ -1,38 +1,19 @@ -{ lib, callPackage, mkYarnPackage, fetchYarnDeps, imagemagick }: +{ lib, callPackage, buildNpmPackage, imagemagick }: let common = callPackage ./common.nix { }; in -mkYarnPackage rec { - src = "${common.src}/js"; +buildNpmPackage { + inherit (common) pname version src; - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = "sha256-VkJ6vBt9EFoQVMWMV8FhPJBHcLJDDfOxd+NLb+DZy3U="; - }; - - packageJSON = ./package.json; - - # Somehow $out/deps/mobilizon/node_modules ends up only containing nothing - # more than a .bin directory otherwise. - yarnPostBuild = '' - rm -rf $out/deps/mobilizon/node_modules - ln -s $out/node_modules $out/deps/mobilizon/node_modules - ''; - - buildPhase = '' - runHook preBuild + npmDepsHash = "sha256-z/xWumL1wri63cGGMHMBq6WVDe81bp8tILsZa53a7FM="; - yarn run build + nativeBuildInputs = [ imagemagick ]; - runHook postBuild + postInstall = '' + cp -r priv/static $out/static ''; - doCheck = true; - checkPhase = "yarn run test"; - - nativeBuildInputs = [ imagemagick ]; - meta = with lib; { description = "Frontend for the Mobilizon server"; homepage = "https://joinmobilizon.org/"; diff --git a/pkgs/servers/mobilizon/mix.nix b/pkgs/servers/mobilizon/mix.nix index c6707e62494b1..a21b75926ce58 100644 --- a/pkgs/servers/mobilizon/mix.nix +++ b/pkgs/servers/mobilizon/mix.nix @@ -10,12 +10,12 @@ let packages = with beamPackages; with self; { absinthe = buildMix rec { name = "absinthe"; - version = "1.7.5"; + version = "1.7.6"; src = fetchHex { pkg = "absinthe"; version = "${version}"; - sha256 = "22a9a38adca26294ad0ee91226168f5d215b401efd770b8a1b8fd9c9b21ec316"; + sha256 = "e7626951ca5eec627da960615b51009f3a774765406ff02722b1d818f17e5778"; }; beamDeps = [ dataloader decimal nimble_parsec telemetry ]; @@ -49,12 +49,12 @@ let argon2_elixir = buildMix rec { name = "argon2_elixir"; - version = "3.2.1"; + version = "4.0.0"; src = fetchHex { pkg = "argon2_elixir"; version = "${version}"; - sha256 = "a813b78217394530b5fcf4c8070feee43df03ffef938d044019169c766315690"; + sha256 = "f9da27cf060c9ea61b1bd47837a28d7e48a8f6fa13a745e252556c14f9132c7f"; }; beamDeps = [ comeonin elixir_make ]; @@ -101,12 +101,12 @@ let castore = buildMix rec { name = "castore"; - version = "1.0.3"; + version = "1.0.4"; src = fetchHex { pkg = "castore"; version = "${version}"; - sha256 = "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"; + sha256 = "9418c1b8144e11656f0be99943db4caf04612e3eaecefb5dae9a2a87565584f8"; }; beamDeps = []; @@ -127,12 +127,12 @@ let cldr_utils = buildMix rec { name = "cldr_utils"; - version = "2.24.1"; + version = "2.24.2"; src = fetchHex { pkg = "cldr_utils"; version = "${version}"; - sha256 = "1820300531b5b849d0bc468e5a87cd64f8f2c5191916f548cbe69b2efc203780"; + sha256 = "3362b838836a9f0fa309de09a7127e36e67310e797d556db92f71b548832c7cf"; }; beamDeps = [ castore certifi decimal ]; @@ -244,12 +244,12 @@ let credo = buildMix rec { name = "credo"; - version = "1.7.0"; + version = "1.7.1"; src = fetchHex { pkg = "credo"; version = "${version}"; - sha256 = "6839fcf63d1f0d1c0f450abc8564a57c43d644077ab96f2934563e68b8a769d7"; + sha256 = "e9871c6095a4c0381c89b6aa98bc6260a8ba6addccf7f6a53da8849c748a58a2"; }; beamDeps = [ bunt file_system jason ]; @@ -309,12 +309,12 @@ let dialyxir = buildMix rec { name = "dialyxir"; - version = "1.4.1"; + version = "1.4.2"; src = fetchHex { pkg = "dialyxir"; version = "${version}"; - sha256 = "84b795d6d7796297cca5a3118444b80c7d94f7ce247d49886e7c291e1ae49801"; + sha256 = "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"; }; beamDeps = [ erlex ]; @@ -348,12 +348,12 @@ let earmark_parser = buildMix rec { name = "earmark_parser"; - version = "1.4.33"; + version = "1.4.38"; src = fetchHex { pkg = "earmark_parser"; version = "${version}"; - sha256 = "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"; + sha256 = "2cd0907795aaef0c7e8442e376633c5b3bd6edc8dbbdc539b22f095501c1cdb6"; }; beamDeps = []; @@ -374,12 +374,12 @@ let ecto = buildMix rec { name = "ecto"; - version = "3.10.3"; + version = "3.11.0"; src = fetchHex { pkg = "ecto"; version = "${version}"; - sha256 = "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"; + sha256 = "7769dad267ef967310d6e988e92d772659b11b09a0c015f101ce0fff81ce1f81"; }; beamDeps = [ decimal jason telemetry ]; @@ -439,12 +439,12 @@ let ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.10.2"; + version = "3.11.0"; src = fetchHex { pkg = "ecto_sql"; version = "${version}"; - sha256 = "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"; + sha256 = "77aa3677169f55c2714dda7352d563002d180eb33c0dc29cd36d39c0a1a971f5"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -517,12 +517,12 @@ let ex_cldr = buildMix rec { name = "ex_cldr"; - version = "2.37.2"; + version = "2.37.5"; src = fetchHex { pkg = "ex_cldr"; version = "${version}"; - sha256 = "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"; + sha256 = "74ad5ddff791112ce4156382e171a5f5d3766af9d5c4675e0571f081fe136479"; }; beamDeps = [ cldr_utils decimal gettext jason nimble_parsec ]; @@ -543,12 +543,12 @@ let ex_cldr_currencies = buildMix rec { name = "ex_cldr_currencies"; - version = "2.15.0"; + version = "2.15.1"; src = fetchHex { pkg = "ex_cldr_currencies"; version = "${version}"; - sha256 = "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"; + sha256 = "31df8bd37688340f8819bdd770eb17d659652078d34db632b85d4a32864d6a25"; }; beamDeps = [ ex_cldr jason ]; @@ -556,12 +556,12 @@ let ex_cldr_dates_times = buildMix rec { name = "ex_cldr_dates_times"; - version = "2.14.0"; + version = "2.16.0"; src = fetchHex { pkg = "ex_cldr_dates_times"; version = "${version}"; - sha256 = "f85a8b00546f6aecc2df7a97f15b9de66662d81578653128699c839f7a40bf94"; + sha256 = "0f2f250d479cadda4e0ef3a5e3d936ae7ba1a3f1199db6791e284e86203495b1"; }; beamDeps = [ ex_cldr_calendars ex_cldr_numbers jason ]; @@ -582,12 +582,12 @@ let ex_cldr_numbers = buildMix rec { name = "ex_cldr_numbers"; - version = "2.32.0"; + version = "2.32.3"; src = fetchHex { pkg = "ex_cldr_numbers"; version = "${version}"; - sha256 = "08c43c26b8605b56b5856bb9277d2a0282f2e29b43c57dfbfd7bf9c28b4a504a"; + sha256 = "7b626ff1e59a0ec9c3c5db5ce9ca91a6995e2ab56426b71f3cbf67181ea225f5"; }; beamDeps = [ decimal digital_token ex_cldr ex_cldr_currencies jason ]; @@ -595,12 +595,12 @@ let ex_cldr_plugs = buildMix rec { name = "ex_cldr_plugs"; - version = "1.3.0"; + version = "1.3.1"; src = fetchHex { pkg = "ex_cldr_plugs"; version = "${version}"; - sha256 = "699a98543ea14a7c849fae768041c40f49aa611aa55866025d227796e4858bff"; + sha256 = "4f7b4a5fe061734cef7b62ff29118ed6ac72698cdd7bcfc97495db73611fe0fe"; }; beamDeps = [ ex_cldr gettext jason plug ]; @@ -608,12 +608,12 @@ let ex_doc = buildMix rec { name = "ex_doc"; - version = "0.30.6"; + version = "0.30.9"; src = fetchHex { pkg = "ex_doc"; version = "${version}"; - sha256 = "bd48f2ddacf4e482c727f9293d9498e0881597eae6ddc3d9562bd7923375109f"; + sha256 = "d7aaaf21e95dc5cddabf89063327e96867d00013963eadf2c6ad135506a8bc10"; }; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; @@ -673,12 +673,12 @@ let excoveralls = buildMix rec { name = "excoveralls"; - version = "0.17.1"; + version = "0.18.0"; src = fetchHex { pkg = "excoveralls"; version = "${version}"; - sha256 = "95bc6fda953e84c60f14da4a198880336205464e75383ec0f570180567985ae0"; + sha256 = "1109bb911f3cb583401760be49c02cbbd16aed66ea9509fc5479335d284da60b"; }; beamDeps = [ castore jason ]; @@ -699,12 +699,12 @@ let expo = buildMix rec { name = "expo"; - version = "0.1.0"; + version = "0.4.1"; src = fetchHex { pkg = "expo"; version = "${version}"; - sha256 = "c22c536021c56de058aaeedeabb4744eb5d48137bacf8c29f04d25b6c6bbbf45"; + sha256 = "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"; }; beamDeps = []; @@ -777,12 +777,12 @@ let floki = buildMix rec { name = "floki"; - version = "0.34.3"; + version = "0.35.2"; src = fetchHex { pkg = "floki"; version = "${version}"; - sha256 = "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"; + sha256 = "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9"; }; beamDeps = []; @@ -868,25 +868,25 @@ let gettext = buildMix rec { name = "gettext"; - version = "0.20.0"; + version = "0.23.1"; src = fetchHex { pkg = "gettext"; version = "${version}"; - sha256 = "1c03b177435e93a47441d7f681a7040bd2a816ece9e2666d1c9001035121eb3d"; + sha256 = "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db"; }; - beamDeps = []; + beamDeps = [ expo ]; }; guardian = buildMix rec { name = "guardian"; - version = "2.3.1"; + version = "2.3.2"; src = fetchHex { pkg = "guardian"; version = "${version}"; - sha256 = "bbe241f9ca1b09fad916ad42d6049d2600bbc688aba5b3c4a6c82592a54274c3"; + sha256 = "b189ff38cd46a22a8a824866a6867ca8722942347f13c33f7d23126af8821b52"; }; beamDeps = [ jose plug ]; @@ -894,12 +894,12 @@ let guardian_db = buildMix rec { name = "guardian_db"; - version = "2.1.0"; + version = "3.0.0"; src = fetchHex { pkg = "guardian_db"; version = "${version}"; - sha256 = "f8e7d543ac92c395f3a7fd5acbe6829faeade57d688f7562e2f0fca8f94a0d70"; + sha256 = "9c2ec4278efa34f9f1cc6ba795e552d41fdc7ffba5319d67eeb533b89392d183"; }; beamDeps = [ ecto ecto_sql guardian postgrex ]; @@ -920,12 +920,12 @@ let hackney = buildRebar3 rec { name = "hackney"; - version = "1.18.2"; + version = "1.20.1"; src = fetchHex { pkg = "hackney"; version = "${version}"; - sha256 = "af94d5c9f97857db257090a4a10e5426ecb6f4918aa5cc666798566ae14b65fd"; + sha256 = "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"; }; beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; @@ -1102,12 +1102,12 @@ let makeup = buildMix rec { name = "makeup"; - version = "1.1.0"; + version = "1.1.1"; src = fetchHex { pkg = "makeup"; version = "${version}"; - sha256 = "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"; + sha256 = "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48"; }; beamDeps = [ nimble_parsec ]; @@ -1258,12 +1258,12 @@ let mox = buildMix rec { name = "mox"; - version = "1.0.2"; + version = "1.1.0"; src = fetchHex { pkg = "mox"; version = "${version}"; - sha256 = "f9864921b3aaf763c8741b5b8e6f908f44566f1e427b2630e89e9a73b981fef2"; + sha256 = "d44474c50be02d5b72131070281a5d3895c0e7a95c780e90bc0cfe712f633a13"; }; beamDeps = []; @@ -1284,12 +1284,12 @@ let nimble_parsec = buildMix rec { name = "nimble_parsec"; - version = "1.3.1"; + version = "1.4.0"; src = fetchHex { pkg = "nimble_parsec"; version = "${version}"; - sha256 = "2682e3c0b2eb58d90c6375fc0cc30bc7be06f365bf72608804fb9cffa5e1b167"; + sha256 = "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"; }; beamDeps = []; @@ -1336,12 +1336,12 @@ let oban = buildMix rec { name = "oban"; - version = "2.15.4"; + version = "2.16.3"; src = fetchHex { pkg = "oban"; version = "${version}"; - sha256 = "5fce611fdfffb13e9148df883116e5201adf1e731eb302cc88cde0588510079c"; + sha256 = "4d8a7fb62f63cf2f2080c78954425f5fd8916ef57196b7f79b5bc657abb2ac5f"; }; beamDeps = [ ecto_sql jason postgrex telemetry ]; @@ -1375,12 +1375,12 @@ let phoenix = buildMix rec { name = "phoenix"; - version = "1.7.7"; + version = "1.7.10"; src = fetchHex { pkg = "phoenix"; version = "${version}"; - sha256 = "8966e15c395e5e37591b6ed0bd2ae7f48e961f0f60ac4c733f9566b519453085"; + sha256 = "cf784932e010fd736d656d7fead6a584a4498efefe5b8227e9f383bf15bb79d0"; }; beamDeps = [ castore jason phoenix_pubsub phoenix_template phoenix_view plug plug_cowboy plug_crypto telemetry websock_adapter ]; @@ -1388,12 +1388,12 @@ let phoenix_ecto = buildMix rec { name = "phoenix_ecto"; - version = "4.4.2"; + version = "4.4.3"; src = fetchHex { pkg = "phoenix_ecto"; version = "${version}"; - sha256 = "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"; + sha256 = "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"; }; beamDeps = [ ecto phoenix_html plug ]; @@ -1401,12 +1401,12 @@ let phoenix_html = buildMix rec { name = "phoenix_html"; - version = "3.3.2"; + version = "3.3.3"; src = fetchHex { pkg = "phoenix_html"; version = "${version}"; - sha256 = "44adaf8e667c1c20fb9d284b6b0fa8dc7946ce29e81ce621860aa7e96de9a11d"; + sha256 = "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"; }; beamDeps = [ plug ]; @@ -1427,15 +1427,15 @@ let phoenix_live_view = buildMix rec { name = "phoenix_live_view"; - version = "0.19.5"; + version = "0.20.1"; src = fetchHex { pkg = "phoenix_live_view"; version = "${version}"; - sha256 = "b2eaa0dd3cfb9bd7fb949b88217df9f25aed915e986a28ad5c8a0d054e7ca9d3"; + sha256 = "be494fd1215052729298b0e97d5c2ce8e719c00854b82cd8cf15c1cd7fcf6294"; }; - beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view telemetry ]; + beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view plug telemetry ]; }; phoenix_pubsub = buildMix rec { @@ -1479,12 +1479,12 @@ let phoenix_view = buildMix rec { name = "phoenix_view"; - version = "2.0.2"; + version = "2.0.3"; src = fetchHex { pkg = "phoenix_view"; version = "${version}"; - sha256 = "a929e7230ea5c7ee0e149ffcf44ce7cf7f4b6d2bfe1752dd7c084cdff152d36f"; + sha256 = "cd34049af41be2c627df99cd4eaa71fc52a328c0c3d8e7d4aa28f880c30e7f64"; }; beamDeps = [ phoenix_html phoenix_template ]; @@ -1492,12 +1492,12 @@ let plug = buildMix rec { name = "plug"; - version = "1.14.2"; + version = "1.15.2"; src = fetchHex { pkg = "plug"; version = "${version}"; - sha256 = "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"; + sha256 = "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1518,12 +1518,12 @@ let plug_crypto = buildMix rec { name = "plug_crypto"; - version = "1.2.5"; + version = "2.0.0"; src = fetchHex { pkg = "plug_crypto"; version = "${version}"; - sha256 = "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"; + sha256 = "53695bae57cc4e54566d993eb01074e4d894b65a3766f1c43e2c61a1b0f45ea9"; }; beamDeps = []; @@ -1739,15 +1739,15 @@ let swoosh = buildMix rec { name = "swoosh"; - version = "1.11.5"; + version = "1.14.1"; src = fetchHex { pkg = "swoosh"; version = "${version}"; - sha256 = "21ee57dcd68d2f56d3bbe11e76d56d142b221bb12b6018c551cc68442b800040"; + sha256 = "87da72260b4351678f96aec61db5c2acc8a88cda2cf2c4f534eb4c9c461350c7"; }; - beamDeps = [ cowboy gen_smtp hackney jason mime plug_cowboy telemetry ]; + beamDeps = [ cowboy gen_smtp hackney jason mime plug plug_cowboy telemetry ]; }; telemetry = buildRebar3 rec { @@ -1765,12 +1765,12 @@ let tesla = buildMix rec { name = "tesla"; - version = "1.7.0"; + version = "1.8.0"; src = fetchHex { pkg = "tesla"; version = "${version}"; - sha256 = "2e64f01ebfdb026209b47bc651a0e65203fcff4ae79c11efb73c4852b00dc313"; + sha256 = "10501f360cd926a309501287470372af1a6e1cbed0f43949203a4c13300bc79f"; }; beamDeps = [ castore hackney jason mime telemetry ]; @@ -1791,12 +1791,12 @@ let tz_world = buildMix rec { name = "tz_world"; - version = "1.3.0"; + version = "1.3.1"; src = fetchHex { pkg = "tz_world"; version = "${version}"; - sha256 = "78b565aa0899b48ce34686319119dfdadff07a255ec43fd9ed6e7d60cc8d1390"; + sha256 = "901ed2b4a4430ecab3765244da4a19e6f19141867c2ab3753924919b87ed2224"; }; beamDeps = [ castore certifi geo jason ]; @@ -1895,12 +1895,12 @@ let ueberauth_google = buildMix rec { name = "ueberauth_google"; - version = "0.10.3"; + version = "0.12.1"; src = fetchHex { pkg = "ueberauth_google"; version = "${version}"; - sha256 = "2462ca9652acc936e0738691869d024e3e262f83ba9f6b4e874b961812290038"; + sha256 = "7f7deacd679b2b66e3bffb68ecc77aa1b5396a0cbac2941815f253128e458c38"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1999,12 +1999,12 @@ let websock_adapter = buildMix rec { name = "websock_adapter"; - version = "0.5.4"; + version = "0.5.5"; src = fetchHex { pkg = "websock_adapter"; version = "${version}"; - sha256 = "d2c238c79c52cbe223fcdae22ca0bb5007a735b9e933870e241fce66afb4f4ab"; + sha256 = "4b977ba4a01918acbf77045ff88de7f6972c2a009213c515a445c48f224ffce9"; }; beamDeps = [ plug plug_cowboy websock ]; diff --git a/pkgs/servers/mobilizon/package.json b/pkgs/servers/mobilizon/package.json deleted file mode 100644 index 662bcfa0daf25..0000000000000 --- a/pkgs/servers/mobilizon/package.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "name": "mobilizon", - "version": "3.2.0", - "private": true, - "scripts": { - "dev": "vite", - "preview": "vite preview", - "build": "yarn run build:assets && yarn run build:pictures", - "lint": "eslint --ext .ts,.vue --ignore-path .gitignore --fix src", - "format": "prettier . --write", - "build:assets": "vite build", - "build:pictures": "bash ./scripts/build/pictures.sh", - "story:dev": "histoire dev", - "story:build": "histoire build", - "story:preview": "histoire preview", - "test": "vitest", - "coverage": "vitest run --coverage", - "prepare": "cd ../ && husky install" - }, - "lint-staged": { - "**/*.{js,ts,vue}": [ - "eslint --fix", - "prettier --write" - ] - }, - "dependencies": { - "@absinthe/socket": "^0.2.1", - "@absinthe/socket-apollo-link": "^0.2.1", - "@apollo/client": "^3.3.16", - "@oruga-ui/oruga-next": "^0.6.0", - "@sentry/tracing": "^7.1", - "@sentry/vue": "^7.1", - "@tiptap/core": "^2.0.0-beta.41", - "@tiptap/extension-blockquote": "^2.0.0-beta.25", - "@tiptap/extension-bold": "^2.0.0-beta.24", - "@tiptap/extension-bubble-menu": "^2.0.0-beta.9", - "@tiptap/extension-bullet-list": "^2.0.0-beta.23", - "@tiptap/extension-document": "^2.0.0-beta.15", - "@tiptap/extension-dropcursor": "^2.0.0-beta.25", - "@tiptap/extension-gapcursor": "^2.0.0-beta.33", - "@tiptap/extension-heading": "^2.0.0-beta.23", - "@tiptap/extension-history": "^2.0.0-beta.21", - "@tiptap/extension-image": "^2.0.0-beta.6", - "@tiptap/extension-italic": "^2.0.0-beta.24", - "@tiptap/extension-link": "^2.0.0-beta.8", - "@tiptap/extension-list-item": "^2.0.0-beta.19", - "@tiptap/extension-mention": "^2.0.0-beta.42", - "@tiptap/extension-ordered-list": "^2.0.0-beta.24", - "@tiptap/extension-paragraph": "^2.0.0-beta.22", - "@tiptap/extension-placeholder": "^2.0.0-beta.199", - "@tiptap/extension-strike": "^2.0.0-beta.26", - "@tiptap/extension-text": "^2.0.0-beta.15", - "@tiptap/extension-underline": "^2.0.0-beta.7", - "@tiptap/pm": "^2.0.0-beta.220", - "@tiptap/suggestion": "^2.0.0-beta.195", - "@tiptap/vue-3": "^2.0.0-beta.96", - "@vue-a11y/announcer": "^2.1.0", - "@vue-a11y/skip-to": "^2.1.2", - "@vue-leaflet/vue-leaflet": "^0.10.1", - "@vue/apollo-composable": "^4.0.0-beta.9", - "@vue/compiler-sfc": "^3.2.37", - "@vueuse/core": "^10.0.2", - "@vueuse/head": "^1.0", - "@vueuse/router": "^10.0.2", - "apollo-absinthe-upload-link": "^1.5.0", - "autoprefixer": "^10", - "blurhash": "^2.0.0", - "date-fns": "^2.16.0", - "date-fns-tz": "^2.0.0", - "floating-vue": "^2.0.0-beta.24", - "graphql": "^15.8.0", - "graphql-tag": "^2.10.3", - "hammerjs": "^2.0.8", - "intersection-observer": "^0.12.0", - "jwt-decode": "^3.1.2", - "leaflet": "^1.4.0", - "leaflet.locatecontrol": "^0.79", - "leaflet.markercluster": "^1.5.3", - "lodash": "^4.17.11", - "ngeohash": "^0.6.3", - "p-debounce": "^4.0.0", - "phoenix": "^1.6", - "postcss": "^8", - "register-service-worker": "^1.7.2", - "sanitize-html": "^2.5.3", - "tailwindcss": "^3", - "tippy.js": "^6.2.3", - "unfetch": "^5.0.0", - "vue": "^3.2.37", - "vue-i18n": "9", - "vue-material-design-icons": "^5.1.2", - "vue-matomo": "^4.1.0", - "vue-plausible": "^1.3.1", - "vue-router": "4", - "vue-scrollto": "^2.17.1", - "vue-use-route-query": "^1.1.0", - "zhyswan-vuedraggable": "^4.1.3" - }, - "devDependencies": { - "@histoire/plugin-vue": "^0.17.1", - "@playwright/test": "^1.25.1", - "@rushstack/eslint-patch": "^1.1.4", - "@tailwindcss/forms": "^0.5.2", - "@tailwindcss/typography": "^0.5.4", - "@types/hammerjs": "^2.0.41", - "@types/leaflet": "^1.5.2", - "@types/leaflet.locatecontrol": "^0.74", - "@types/leaflet.markercluster": "^1.5.1", - "@types/lodash": "^4.14.141", - "@types/ngeohash": "^0.6.2", - "@types/phoenix": "^1.5.2", - "@types/sanitize-html": "^2.5.0", - "@vitejs/plugin-vue": "^4.0.0", - "@vitest/coverage-v8": "^0.34.1", - "@vitest/ui": "^0.34.1", - "@vue/eslint-config-prettier": "^8.0.0", - "@vue/eslint-config-typescript": "^11.0.0", - "@vue/test-utils": "^2.0.2", - "eslint": "^8.21.0", - "eslint-config-prettier": "^9.0.0", - "eslint-plugin-import": "^2.20.2", - "eslint-plugin-prettier": "^5.0.0", - "eslint-plugin-vue": "^9.3.0", - "flush-promises": "^1.0.2", - "histoire": "^0.17.0", - "husky": "^8.0.3", - "jsdom": "^22.0.0", - "lint-staged": "^14.0.1", - "mock-apollo-client": "^1.1.0", - "prettier": "^3.0.0", - "prettier-eslint": "^15.0.1", - "rollup-plugin-visualizer": "^5.7.1", - "sass": "^1.34.1", - "typescript": "~5.1.3", - "vite": "^4.0.4", - "vite-plugin-pwa": "^0.16.4", - "vitest": "^0.34.1", - "vue-i18n-extract": "^2.0.4" - } -} From 3b40e1bd33b442bb705f88a2bada2f6ace51e607 Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Wed, 6 Dec 2023 09:44:17 +0100 Subject: [PATCH 40/49] buildNimPackage: allow overriding nim package args Without this, it's impossible to override the lockFile as the default overrideAttrs is applied after the composition in buildNimPackage has read the lock file and generated the nim flags from it. --- doc/languages-frameworks/nim.section.md | 17 +++++++++++++-- .../compilers/nim/build-nim-package.nix | 21 +++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/nim.section.md b/doc/languages-frameworks/nim.section.md index 45cd07b3a3d85..c6ebf49b83f66 100644 --- a/doc/languages-frameworks/nim.section.md +++ b/doc/languages-frameworks/nim.section.md @@ -50,7 +50,20 @@ $ nix build -f . ttop.src $ nix run -f . nim_lk ./result | jq --sort-keys > pkgs/by-name/tt/ttop/lock.json ``` -## Lockfile dependency overrides {#nimoverrides} +## Overriding Nim packages {#nim-overrides} + +The `buildNimPackage` function generates flags and additional build dependencies from the `lockFile` parameter passed to `buildNimPackage`. Using [`overrideAttrs`](#sec-pkg-overrideAttrs) on the final package will apply after this has already been generated, so this can't be used to override the `lockFile` in a package built with `buildNimPackage`. To be able to override parameters before flags and build dependencies are generated from the `lockFile`, use `overrideNimAttrs` instead with the same syntax as `overrideAttrs`: + +```nix +pkgs.nitter.overrideNimAttrs { + # using a different source which has different dependencies from the standard package + src = pkgs.fetchFromGithub { /* … */ }; + # new lock file generated from the source + lockFile = ./custom-lock.json; +} +``` + +## Lockfile dependency overrides {#nim-lock-overrides} The `buildNimPackage` function matches the libraries specified by `lockFile` to attrset of override functions that are then applied to the package derivation. The default overrides are maintained as the top-level `nimOverrides` attrset at `pkgs/top-level/nim-overrides.nix`. @@ -81,7 +94,7 @@ The annotations in the `nim-overrides.nix` set are functions that take three arg - finalAttrs: the final attrset passed by `buildNimPackage` to `stdenv.mkDerivation`. - prevAttrs: the attrset produced by initial arguments to `buildNimPackage` and any preceding lockfile overlays. -### Overriding an Nim library override {#nimoverrides-overrides} +### Overriding an Nim library override {#nim-lock-overrides-overrides} The `nimOverrides` attrset makes it possible to modify overrides in a few different ways. diff --git a/pkgs/development/compilers/nim/build-nim-package.nix b/pkgs/development/compilers/nim/build-nim-package.nix index 5085edf90a762..a22fb45b507bc 100644 --- a/pkgs/development/compilers/nim/build-nim-package.nix +++ b/pkgs/development/compilers/nim/build-nim-package.nix @@ -7,6 +7,7 @@ , nim_builder , defaultNimVersion ? 2 , nimOverrides +, buildNimPackage }: let @@ -90,6 +91,7 @@ let , nativeBuildInputs ? [ ] , nimFlags ? [ ] , requiredNimVersion ? defaultNimVersion + , passthru ? { } , ... }: (if requiredNimVersion == 1 then { @@ -102,6 +104,25 @@ let throw "requiredNimVersion ${toString requiredNimVersion} is not valid") // { nimFlags = lockFileNimFlags ++ nimFlags; + passthru = passthru // { + # allow overriding the result of buildNimPackageArgs before this composition is applied + # this allows overriding the lockFile for packages built using buildNimPackage + # this is adapted from mkDerivationExtensible in stdenv.mkDerivation + overrideNimAttrs = f0: + let + f = self: super: + let x = f0 super; + in + if builtins.isFunction x + then f0 self super + else x; + in + buildNimPackage + (self: + let super = (asFunc ((asFunc buildNimPackageArgs) self)) baseAttrs; + in + super // (if builtins.isFunction f0 || f0?__functor then f self super else f0)); + }; }; attrs = postLock // finalOverride postLock; From acb20c175f3708944fe3ce4759df7db22297f156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Dec 2023 02:52:54 +0100 Subject: [PATCH 41/49] nixos/no-x-libs: add mupdf --- nixos/modules/config/no-x-libs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index b2eb46f273b14..ec26d4b12eff0 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -51,6 +51,7 @@ with lib; mc = super.mc.override { x11Support = false; }; mpv-unwrapped = super.mpv-unwrapped.override { sdl2Support = false; x11Support = false; waylandSupport = false; }; msmtp = super.msmtp.override { withKeyring = false; }; + mupdf = super.mupdf.override { enableGL = false; enableX11 = false; }; neofetch = super.neofetch.override { x11Support = false; }; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; From 0ee3c7813135bf471578e45d83b4b78c6b00d13d Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 28 Nov 2023 17:32:56 +0200 Subject: [PATCH 42/49] alephone, alephone-*: move to pkgs/by-name --- .../al/alephone-apotheosis-x/package.nix} | 0 .../al/alephone-durandal/package.nix} | 0 .../al/alephone-eternal/package.nix} | 0 .../al/alephone-evil/package.nix} | 0 .../al/alephone-infinity/package.nix} | 0 .../al/alephone-marathon/package.nix} | 0 .../alephone-pathways-into-darkness/package.nix} | 0 .../al/alephone-pheonix/package.nix} | 0 .../al/alephone-red/package.nix} | 0 .../al/alephone-rubicon-x/package.nix} | 0 .../al/alephone-yuge/package.nix} | 0 .../al/alephone/package.nix} | 0 pkgs/top-level/all-packages.nix | 15 --------------- 13 files changed, 15 deletions(-) rename pkgs/{games/alephone/apotheosis-x/default.nix => by-name/al/alephone-apotheosis-x/package.nix} (100%) rename pkgs/{games/alephone/durandal/default.nix => by-name/al/alephone-durandal/package.nix} (100%) rename pkgs/{games/alephone/eternal/default.nix => by-name/al/alephone-eternal/package.nix} (100%) rename pkgs/{games/alephone/evil/default.nix => by-name/al/alephone-evil/package.nix} (100%) rename pkgs/{games/alephone/infinity/default.nix => by-name/al/alephone-infinity/package.nix} (100%) rename pkgs/{games/alephone/marathon/default.nix => by-name/al/alephone-marathon/package.nix} (100%) rename pkgs/{games/alephone/pathways-into-darkness/default.nix => by-name/al/alephone-pathways-into-darkness/package.nix} (100%) rename pkgs/{games/alephone/pheonix/default.nix => by-name/al/alephone-pheonix/package.nix} (100%) rename pkgs/{games/alephone/red/default.nix => by-name/al/alephone-red/package.nix} (100%) rename pkgs/{games/alephone/rubicon-x/default.nix => by-name/al/alephone-rubicon-x/package.nix} (100%) rename pkgs/{games/alephone/yuge/default.nix => by-name/al/alephone-yuge/package.nix} (100%) rename pkgs/{games/alephone/default.nix => by-name/al/alephone/package.nix} (100%) diff --git a/pkgs/games/alephone/apotheosis-x/default.nix b/pkgs/by-name/al/alephone-apotheosis-x/package.nix similarity index 100% rename from pkgs/games/alephone/apotheosis-x/default.nix rename to pkgs/by-name/al/alephone-apotheosis-x/package.nix diff --git a/pkgs/games/alephone/durandal/default.nix b/pkgs/by-name/al/alephone-durandal/package.nix similarity index 100% rename from pkgs/games/alephone/durandal/default.nix rename to pkgs/by-name/al/alephone-durandal/package.nix diff --git a/pkgs/games/alephone/eternal/default.nix b/pkgs/by-name/al/alephone-eternal/package.nix similarity index 100% rename from pkgs/games/alephone/eternal/default.nix rename to pkgs/by-name/al/alephone-eternal/package.nix diff --git a/pkgs/games/alephone/evil/default.nix b/pkgs/by-name/al/alephone-evil/package.nix similarity index 100% rename from pkgs/games/alephone/evil/default.nix rename to pkgs/by-name/al/alephone-evil/package.nix diff --git a/pkgs/games/alephone/infinity/default.nix b/pkgs/by-name/al/alephone-infinity/package.nix similarity index 100% rename from pkgs/games/alephone/infinity/default.nix rename to pkgs/by-name/al/alephone-infinity/package.nix diff --git a/pkgs/games/alephone/marathon/default.nix b/pkgs/by-name/al/alephone-marathon/package.nix similarity index 100% rename from pkgs/games/alephone/marathon/default.nix rename to pkgs/by-name/al/alephone-marathon/package.nix diff --git a/pkgs/games/alephone/pathways-into-darkness/default.nix b/pkgs/by-name/al/alephone-pathways-into-darkness/package.nix similarity index 100% rename from pkgs/games/alephone/pathways-into-darkness/default.nix rename to pkgs/by-name/al/alephone-pathways-into-darkness/package.nix diff --git a/pkgs/games/alephone/pheonix/default.nix b/pkgs/by-name/al/alephone-pheonix/package.nix similarity index 100% rename from pkgs/games/alephone/pheonix/default.nix rename to pkgs/by-name/al/alephone-pheonix/package.nix diff --git a/pkgs/games/alephone/red/default.nix b/pkgs/by-name/al/alephone-red/package.nix similarity index 100% rename from pkgs/games/alephone/red/default.nix rename to pkgs/by-name/al/alephone-red/package.nix diff --git a/pkgs/games/alephone/rubicon-x/default.nix b/pkgs/by-name/al/alephone-rubicon-x/package.nix similarity index 100% rename from pkgs/games/alephone/rubicon-x/default.nix rename to pkgs/by-name/al/alephone-rubicon-x/package.nix diff --git a/pkgs/games/alephone/yuge/default.nix b/pkgs/by-name/al/alephone-yuge/package.nix similarity index 100% rename from pkgs/games/alephone/yuge/default.nix rename to pkgs/by-name/al/alephone-yuge/package.nix diff --git a/pkgs/games/alephone/default.nix b/pkgs/by-name/al/alephone/package.nix similarity index 100% rename from pkgs/games/alephone/default.nix rename to pkgs/by-name/al/alephone/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58074ad35a5e9..367fc091fc15b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37519,21 +37519,6 @@ with pkgs; airstrike = callPackage ../games/airstrike { }; - alephone = callPackage ../games/alephone { }; - alephone-apotheosis-x = callPackage ../games/alephone/apotheosis-x { }; - alephone-durandal = callPackage ../games/alephone/durandal { }; - alephone-eternal = callPackage ../games/alephone/eternal { }; - alephone-evil = callPackage ../games/alephone/evil { }; - alephone-infinity = callPackage ../games/alephone/infinity { }; - alephone-marathon = callPackage ../games/alephone/marathon { }; - alephone-pheonix = callPackage ../games/alephone/pheonix { }; - alephone-red = callPackage ../games/alephone/red { }; - alephone-rubicon-x = callPackage ../games/alephone/rubicon-x { }; - alephone-pathways-into-darkness = - callPackage ../games/alephone/pathways-into-darkness { }; - alephone-yuge = - callPackage ../games/alephone/yuge { }; - alienarena = callPackage ../games/alienarena { }; amoeba = callPackage ../games/amoeba { }; From 6fb94a8e0f02696c831a6c161b0ba7cd6375c742 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 28 Nov 2023 17:34:44 +0200 Subject: [PATCH 43/49] alephone: 1.6.2 -> 1.7 --- pkgs/by-name/al/alephone/package.nix | 151 ++++++++++++++++----------- 1 file changed, 92 insertions(+), 59 deletions(-) diff --git a/pkgs/by-name/al/alephone/package.nix b/pkgs/by-name/al/alephone/package.nix index 1bf732e446bfd..44349b7621e52 100644 --- a/pkgs/by-name/al/alephone/package.nix +++ b/pkgs/by-name/al/alephone/package.nix @@ -1,72 +1,104 @@ -{ lib, stdenv, fetchurl, alsa-lib, boost, curl, ffmpeg_4, icoutils, libGLU -, libmad, libogg, libpng, libsndfile, libvorbis, lua, miniupnpc, pkg-config -, SDL2, SDL2_image, SDL2_net, SDL2_ttf, speex, zziplib, zlib, makeWrapper -, makeDesktopItem, unzip, alephone }: +{ lib +, stdenv +, fetchurl +, alsa-lib +, boost +, curl +, ffmpeg_4 +, icoutils +, libGLU +, libmad +, libogg +, libpng +, libsndfile +, libvorbis +, lua +, makeDesktopItem +, makeWrapper +, miniupnpc +, openal +, pkg-config +, SDL2 +, SDL2_image +, SDL2_net +, SDL2_ttf +, speex +, unzip +, zlib +, zziplib +, alephone +}: -let - self = stdenv.mkDerivation rec { - outputs = [ "out" "icons" ]; - pname = "alephone"; - version = "1.6.2"; +stdenv.mkDerivation (finalAttrs: { + outputs = [ "out" "icons" ]; + pname = "alephone"; + version = "1.7"; - src = fetchurl { - url = let date = "20230529"; + src = fetchurl { + url = + let date = "20231125"; in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2"; - sha256 = "sha256-UqhZvOMOxU4W0eLRRTQvGXaqTpWD5KIdXULClHW7Iyc="; - }; + sha256 = "sha256-qRHmtkzPi6PKeAzoMPdSbboiilG+L2fCXvXXu3vIchs="; + }; - nativeBuildInputs = [ pkg-config icoutils ]; + nativeBuildInputs = [ pkg-config icoutils ]; - buildInputs = [ - alsa-lib - boost - curl - ffmpeg_4 - libGLU - libmad - libsndfile - libogg - libpng - libvorbis - lua - miniupnpc - SDL2 - SDL2_image - SDL2_net - SDL2_ttf - speex - zziplib - zlib - ]; + buildInputs = [ + alsa-lib + boost + curl + ffmpeg_4 + libGLU + libmad + libogg + libpng + libsndfile + libvorbis + lua + miniupnpc + openal + SDL2 + SDL2_image + SDL2_net + SDL2_ttf + speex + zlib + zziplib + ]; - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; - makeFlags = [ "AR:=$(AR)" ]; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + makeFlags = [ "AR:=$(AR)" ]; - enableParallelBuilding = true; + enableParallelBuilding = true; - postInstall = '' - mkdir $icons - icotool -x -i 5 -o $icons Resources/Windows/*.ico - pushd $icons - for x in *_5_48x48x32.png; do - mv $x ''${x%_5_48x48x32.png}.png - done - popd - ''; + postInstall = '' + mkdir $icons + icotool -x -i 5 -o $icons Resources/Windows/*.ico + pushd $icons + for x in *_5_48x48x32.png; do + mv $x ''${x%_5_48x48x32.png}.png + done + popd + ''; - meta = with lib; { - description = - "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine"; - homepage = "https://alephone.lhowon.org/"; - license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ ehmry ]; - platforms = platforms.linux; - }; + meta = { + description = + "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine"; + homepage = "https://alephone.lhowon.org/"; + license = [ lib.licenses.gpl3 ]; + maintainers = with lib.maintainers; [ ehmry ]; + platforms = lib.platforms.linux; }; -in self // { - makeWrapper = { pname, desktopName, version, zip, meta - , icon ? alephone.icons + "/alephone.png", ... }@extraArgs: + passthru.makeWrapper = + { pname + , desktopName + , version + , zip + , meta + , icon ? alephone.icons + "/alephone.png" + , ... + }@extraArgs: stdenv.mkDerivation ({ inherit pname version; @@ -96,7 +128,8 @@ in self // { } // extraArgs // { meta = alephone.meta // { license = lib.licenses.free; + mainProgram = pname; hydraPlatforms = [ ]; } // meta; }); -} +}) From c3b531d8aa5d05e0abf27d84007593e74f5956b5 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 30 Nov 2023 11:42:24 +0200 Subject: [PATCH 44/49] nimOverrides: warn on bad version of hashlib --- pkgs/top-level/nim-overrides.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/nim-overrides.nix b/pkgs/top-level/nim-overrides.nix index 910f5c8bcae41..34db79a6a4ead 100644 --- a/pkgs/top-level/nim-overrides.nix +++ b/pkgs/top-level/nim-overrides.nix @@ -32,6 +32,14 @@ buildInputs = buildInputs ++ [ getdns ]; }; + hashlib = lockAttrs: + lib.trivial.warnIf + (lockAttrs.rev == "84e0247555e4488594975900401baaf5bbbfb531") + "the selected version of the hashlib Nim library is hardware specific" + # https://github.com/khchen/hashlib/pull/4 + # remove when fixed upstream + (_: _: { }); + nimraylib_now = lockAttrs: finalAttrs: { buildInputs ? [ ], ... }: { buildInputs = buildInputs ++ [ raylib ]; From 4d8e10e3124746ccd24c6c5dc849032aa7f5dc32 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 30 Nov 2023 11:43:02 +0200 Subject: [PATCH 45/49] syndicate_utils: init at 20231130 https://git.syndicate-lang.org/ehmry/syndicate_utils --- pkgs/by-name/sy/syndicate_utils/lock.json | 75 +++++++++++++++++++++ pkgs/by-name/sy/syndicate_utils/package.nix | 23 +++++++ 2 files changed, 98 insertions(+) create mode 100644 pkgs/by-name/sy/syndicate_utils/lock.json create mode 100644 pkgs/by-name/sy/syndicate_utils/package.nix diff --git a/pkgs/by-name/sy/syndicate_utils/lock.json b/pkgs/by-name/sy/syndicate_utils/lock.json new file mode 100644 index 0000000000000..4c58bce17c8fd --- /dev/null +++ b/pkgs/by-name/sy/syndicate_utils/lock.json @@ -0,0 +1,75 @@ +{ + "depends": [ + { + "method": "fetchzip", + "packages": [ + "hashlib" + ], + "path": "/nix/store/fav82xdbicvlk34nmcbl89zx99lr3mbs-source", + "rev": "f9455d4be988e14e3dc7933eb7cc7d7c4820b7ac", + "sha256": "1sx6j952lj98629qfgr7ds5aipyw9d6lldcnnqs205wpj4pkcjb3", + "srcDir": "", + "url": "https://github.com/ehmry/hashlib/archive/f9455d4be988e14e3dc7933eb7cc7d7c4820b7ac.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "illwill" + ], + "path": "/nix/store/3lmm3z36qn4gz7bfa209zv0pqrpm3di9-source", + "ref": "v0.3.2", + "rev": "1d12cb36ab7b76c31d2d25fa421013ecb382e625", + "sha256": "0f9yncl5gbdja18mrqf5ixrdgrh95k0khda923dm1jd1x1b7ar8z", + "srcDir": "", + "url": "https://github.com/johnnovak/illwill/archive/1d12cb36ab7b76c31d2d25fa421013ecb382e625.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "nimcrypto" + ], + "path": "/nix/store/zyr8zwh7vaiycn1s4r8cxwc71f2k5l0h-source", + "ref": "traditional-api", + "rev": "602c5d20c69c76137201b5d41f788f72afb95aa8", + "sha256": "1dmdmgb6b9m5f8dyxk781nnd61dsk3hdxqks7idk9ncnpj9fng65", + "srcDir": "", + "url": "https://github.com/cheatfate/nimcrypto/archive/602c5d20c69c76137201b5d41f788f72afb95aa8.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "npeg" + ], + "path": "/nix/store/ffkxmjmigfs7zhhiiqm0iw2c34smyciy-source", + "ref": "1.2.1", + "rev": "26d62fdc40feb84c6533956dc11d5ee9ea9b6c09", + "sha256": "0xpzifjkfp49w76qmaylan8q181bs45anmp46l4bwr3lkrr7bpwh", + "srcDir": "src", + "url": "https://github.com/zevv/npeg/archive/26d62fdc40feb84c6533956dc11d5ee9ea9b6c09.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "preserves" + ], + "path": "/nix/store/fmb2yckksz7iv3qdkk5gk1j060kppkq9-source", + "ref": "20231102", + "rev": "4faeb766dc3945bcfacaa1a836ef6ab29b20ceb0", + "sha256": "1a3g5bk1l1h250q3p6sqv6r1lpsplp330qqyp48r0i4a5r0jksq3", + "srcDir": "src", + "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/4faeb766dc3945bcfacaa1a836ef6ab29b20ceb0.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "syndicate" + ], + "path": "/nix/store/nhpvl223vbzdrlzikw7pgyfxs344w7ma-source", + "ref": "20231108", + "rev": "095418032180e360ea27ec7fcd63193944b68e2c", + "sha256": "09pbml2chzz0v5zpz67fs7raj0mfmg8qrih2vz85xxc51h7ncqvw", + "srcDir": "src", + "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/095418032180e360ea27ec7fcd63193944b68e2c.tar.gz" + } + ] +} diff --git a/pkgs/by-name/sy/syndicate_utils/package.nix b/pkgs/by-name/sy/syndicate_utils/package.nix new file mode 100644 index 0000000000000..a467c3925fdc9 --- /dev/null +++ b/pkgs/by-name/sy/syndicate_utils/package.nix @@ -0,0 +1,23 @@ +{ lib, buildNimPackage, fetchFromGitea }: + +buildNimPackage (finalAttrs: { + pname = "syndicate_utils"; + version = "20231130"; + + src = fetchFromGitea { + domain = "git.syndicate-lang.org"; + owner = "ehmry"; + repo = "syndicate_utils"; + rev = finalAttrs.version; + hash = "sha256-a9EjHSrLyWoP4qUQM+fRjZrNavQfT+SUO44pnPK1j/Q="; + }; + + lockFile = ./lock.json; + + meta = finalAttrs.src.meta // { + description = "Utilities for the Syndicated Actor Model"; + homepage = "https://git.syndicate-lang.org/ehmry/syndicate_utils"; + maintainers = [ lib.maintainers.ehmry ]; + license = lib.licenses.unlicense; + }; +}) From 1f8d62a69936dd899d0e7c955537b2f4ca5bc623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Dec 2023 09:46:58 +0100 Subject: [PATCH 46/49] nix-eval-jobs: 2.18.0 -> 2.19.0 Diff: https://github.com/nix-community/nix-eval-jobs/compare/v2.18.0...v2.19.0 --- pkgs/tools/package-management/nix-eval-jobs/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index defc680968d41..f2326f9794124 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-k/yMWbtMHpiNHeR0ihNPV/idOUSRJuhf0RSCodxmOhc="; + hash = "sha256-5HtkRw7QERr+cvImFnBOXuR7wFk/BH4Nn6HaiEnBrfk="; }; buildInputs = [ boost diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc8f39e25e412..f5480d9375dde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40732,7 +40732,7 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_18; + nix = nixVersions.nix_2_19; }; nix-doc = callPackage ../tools/package-management/nix-doc { }; From 92ec31fbeea2dc0acee932a1c84771a2df03b3c2 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 10 Dec 2023 04:28:05 -0700 Subject: [PATCH 47/49] bambu-studio: init at 01.06.02.04 (#206495) * wxGTK31: Support enabling WebRequest component * wxGTK31: Support enabling private fonts * bambu-studio: init at 01.06.02.04 Co-authored-by: Phileas Lebada * bambu-studio: 01.06.02.04 -> 01.07.00.65 * bambu-studio: 01.07.00.65 -> 01.07.06.92 The OpenSSL pin is no longer needed. * bambu-studio: 01.07.06.92 -> 01.08.00.62 * Switch to newer tbb version tbb was broken up into two versions for backwards compability https://github.com/NixOS/nixpkgs/pull/217585/files and put into prusa-slicer https://github.com/NixOS/nixpkgs/pull/238921/files Which fixes for 1.8 beta build ``` bambu-studio> CMake Error at src/libslic3r/CMakeLists.txt:490 (target_link_libraries): bambu-studio> Target "libslic3r" links to: bambu-studio> TBB::tbbmalloc bambu-studio> but the target was not found. Possible reasons include: bambu-studio> * There is a typo in the target name. bambu-studio> * A find_package call is missing for an IMPORTED target. bambu-studio> * An ALIAS target is missing. bambu-studio> bambu-studio> -- Generating done (0.2s) bambu-studio> CMake Warning: bambu-studio> Manually-specified variables were not used by the project: bambu-studio> CMAKE_EXPORT_NO_PACKAGE_REGISTRY bambu-studio> DEP_WX_GTK3 bambu-studio> bambu-studio> CMake Generate step failed. Build files cannot be regenerated correctly. error: builder for '/nix/store/rzgx01p1ni2xbx5ddg0133pjjlzs8618-bambu-studio-01.08.00.57.drv' failed with exit code 1; ``` * bambu-studio: switch to custom openvdb tbb version * Downgrade boost to 179 (181 is current default) --------- Co-authored-by: Phileas Lebada --- ...-CMakeLists-Link-against-webkit2gtk-.patch | 34 ++++ .../misc/bambu-studio/default.nix | 172 ++++++++++++++++++ .../libraries/wxwidgets/wxGTK31.nix | 6 + pkgs/top-level/all-packages.nix | 12 ++ 4 files changed, 224 insertions(+) create mode 100644 pkgs/applications/misc/bambu-studio/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch create mode 100644 pkgs/applications/misc/bambu-studio/default.nix diff --git a/pkgs/applications/misc/bambu-studio/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch b/pkgs/applications/misc/bambu-studio/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch new file mode 100644 index 0000000000000..15f1bf8f0b59e --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch @@ -0,0 +1,34 @@ +From 7eed499898226222a949a792e0400ec10db4a1c9 Mon Sep 17 00:00:00 2001 +From: Zhaofeng Li +Date: Tue, 22 Nov 2022 13:00:39 -0700 +Subject: [PATCH] [not for upstream] CMakeLists: Link against webkit2gtk in + libslic3r_gui + +WebView.cpp uses symbols from webkitgtk directly. Upstream setup +links wxGTK statically so webkitgtk is already pulled in. + +> /nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: slic3r/liblibslic3r_gui.a(WebView.cpp.o): undefined reference to symbol 'webkit_web_view_run_javascript_finish' +> /nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/8yvy428jy2nwq4dhmrcs7gj5r27a2pv6-webkitgtk-2.38.2+abi=4.0/lib/libwebkit2gtk-4.0.so.37: error adding symbols: DSO missing from command line +--- + src/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9c5cb96..e92a0e3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -175,6 +175,11 @@ if (WIN32) + target_link_libraries(BambuStudio_app_gui PRIVATE boost_headeronly) + endif () + ++# We link against webkit2gtk symbols in src/slic3r/GUI/Widgets/WebView.cpp ++if (CMAKE_SYSTEM_NAME STREQUAL "Linux") ++ target_link_libraries(libslic3r_gui "-lwebkit2gtk-4.0") ++endif () ++ + # Link the resources dir to where Slic3r GUI expects it + set(output_dlls_Release "") + set(output_dlls_Debug "") +-- +2.38.1 + diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix new file mode 100644 index 0000000000000..fc6acd3d177dd --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -0,0 +1,172 @@ +{ stdenv +, lib +, openexr +, jemalloc +, c-blosc +, binutils +, fetchFromGitHub +, cmake +, pkg-config +, wrapGAppsHook +, boost179 +, cereal +, cgal_5 +, curl +, dbus +, eigen +, expat +, gcc-unwrapped +, glew +, glfw +, glib +, glib-networking +, gmp +, gstreamer +, gst-plugins-base +, gst-plugins-bad +, gtest +, gtk3 +, hicolor-icon-theme +, ilmbase +, libpng +, mesa +, mpfr +, nlopt +, opencascade-occt +, openvdb +, pcre +, qhull +, systemd +, tbb_2021_8 +, webkitgtk +, wxGTK31 +, xorg +, fetchpatch +, withSystemd ? stdenv.isLinux +}: +let + wxGTK31' = wxGTK31.overrideAttrs (old: { + configureFlags = old.configureFlags ++ [ + # Disable noisy debug dialogs + "--enable-debug=no" + ]; + }); + openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec { + buildInputs = [ openexr boost179 tbb_2021_8 jemalloc c-blosc ilmbase ]; + }); +in +stdenv.mkDerivation rec { + pname = "bambu-studio"; + version = "01.08.00.62"; + + src = fetchFromGitHub { + owner = "bambulab"; + repo = "BambuStudio"; + rev = "v${version}"; + hash = "sha256-Rb8YNf+ZQ8+9jAP/ZLze0PfY/liE7Rr2bJX33AENsbg="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + binutils + boost179 + cereal + cgal_5 + curl + dbus + eigen + expat + gcc-unwrapped + glew + glfw + glib + glib-networking + gmp + gstreamer + gst-plugins-base + gst-plugins-bad + gtk3 + hicolor-icon-theme + ilmbase + libpng + mesa.osmesa + mpfr + nlopt + opencascade-occt + openvdb_tbb_2021_8 + pcre + tbb_2021_8 + webkitgtk + wxGTK31' + xorg.libX11 + ] ++ lib.optionals withSystemd [ + systemd + ] ++ checkInputs; + + patches = [ + # Fix for webkitgtk linking + ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch + ]; + + doCheck = true; + checkInputs = [ gtest ]; + + separateDebugInfo = true; + + # The build system uses custom logic - defined in + # cmake/modules/FindNLopt.cmake in the package source - for finding the nlopt + # library, which doesn't pick up the package in the nix store. We + # additionally need to set the path via the NLOPT environment variable. + NLOPT = nlopt; + + # Disable compiler warnings that clutter the build log. + # It seems to be a known issue for Eigen: + # http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221 + NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes"; + + # prusa-slicer uses dlopen on `libudev.so` at runtime + NIX_LDFLAGS = lib.optionalString withSystemd "-ludev"; + + # TODO: macOS + prePatch = '' + # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx + # now seems to be integrated into the main lib. + sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake + ''; + + cmakeFlags = [ + "-DSLIC3R_STATIC=0" + "-DSLIC3R_FHS=1" + "-DSLIC3R_GTK=3" + + # BambuStudio-specific + "-DBBL_RELEASE_TO_PUBLIC=1" + "-DBBL_INTERNAL_TESTING=0" + "-DDEP_WX_GTK3=ON" + "-DSLIC3R_BUILD_TESTS=0" + "-DCMAKE_CXX_FLAGS=-DBOOST_LOG_DYN_LINK" + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "$out/lib" + + # Fixes intermittent crash + # The upstream setup links in glew statically + --prefix LD_PRELOAD : "${glew.out}/lib/libGLEW.so" + ) + ''; + + meta = with lib; { + description = "PC Software for BambuLab's 3D printers"; + homepage = "https://github.com/bambulab/BambuStudio"; + license = licenses.agpl3; + maintainers = with maintainers; [ zhaofengli ]; + mainProgram = "bambu-studio"; + }; +} diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index c05fcef2557a6..13052747eb5ea 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, curl , gst_all_1 , gtk3 , libGL @@ -14,6 +15,8 @@ , compat28 ? false , compat30 ? true , unicode ? true +, withCurl ? false +, withPrivateFonts ? false , withEGL ? true , withMesa ? !stdenv.isDarwin , withWebKit ? stdenv.isDarwin @@ -59,6 +62,7 @@ stdenv.mkDerivation rec { libXxf86vm xorgproto ] + ++ lib.optional withCurl curl ++ lib.optional withMesa libGLU ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit @@ -85,6 +89,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!withEGL) "--disable-glcanvasegl" ++ lib.optional unicode "--enable-unicode" + ++ lib.optional withCurl "--enable-webrequest" + ++ lib.optional withPrivateFonts "--enable-privatefonts" ++ lib.optional withMesa "--with-opengl" ++ lib.optionals stdenv.isDarwin [ "--with-osx_cocoa" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5480d9375dde..819738946fc2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35476,6 +35476,18 @@ with pkgs; super-slicer-latest = super-slicer.latest; + bambu-studio = callPackage ../applications/misc/bambu-studio { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; + + glew = glew-egl; + + wxGTK31 = wxGTK31.override { + withCurl = true; + withPrivateFonts = true; + withWebKit = true; + }; + }; + snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; From 886eb57ad4a5779531394bec3ce41d0ad31d4a27 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 10 Dec 2023 12:37:44 +0100 Subject: [PATCH 48/49] phpPackages.box: 4.5.1 -> 4.6.0 --- pkgs/development/php-packages/box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index 0a1595ca6b91c..e51c1e431f337 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -2,16 +2,16 @@ php.buildComposerProject (finalAttrs: { pname = "box"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "box-project"; repo = "box"; rev = finalAttrs.version; - hash = "sha256-3YfnFd8OZ15nQnXOkhNz2FQygElFn+JOrenKUeyTkXA="; + hash = "sha256-s3FnpfKWmsLLXwa/xI80NZ1030fB9LcrMVzNWGeFkn4="; }; - vendorHash = "sha256-0ul4NLGK+Z+VN1nv4xSGsh2JcJEXeYAYFhxDn7r3kVY="; + vendorHash = "sha256-t1DvlcgTSq4n8xVUMcEIfs5ZAq9XIqL3qUqabheVVrs="; meta = { changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}"; From cbead7e37fbb1abaa39a8f5596c6ce5d9bd91272 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 10 Dec 2023 12:42:34 +0100 Subject: [PATCH 49/49] phpPackages.box: use `php82` --- pkgs/development/php-packages/box/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index e51c1e431f337..d504d73397c84 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -1,6 +1,6 @@ -{ lib, php, fetchFromGitHub }: +{ lib, php82, fetchFromGitHub }: -php.buildComposerProject (finalAttrs: { +php82.buildComposerProject (finalAttrs: { pname = "box"; version = "4.6.0";