From dffd88e5160038a2881c656b566745c2945d518d Mon Sep 17 00:00:00 2001 From: Ansho Rei Date: Fri, 2 Jul 2021 10:47:18 +0000 Subject: [PATCH 0001/1054] nixos/zeronet: fix settings option --- nixos/modules/services/networking/zeronet.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix index f354a9d42c79..93693ae4f96b 100644 --- a/nixos/modules/services/networking/zeronet.nix +++ b/nixos/modules/services/networking/zeronet.nix @@ -20,7 +20,7 @@ in with lib; { enable = mkEnableOption "zeronet"; settings = mkOption { - type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); + type = with types; attrsOf (attrsOf (oneOf [ str int bool (listOf str) ])); default = {}; example = literalExample "global.tor = enable;"; From e9ab2de5ed0d1ce725dbc8b6fe6161264f513416 Mon Sep 17 00:00:00 2001 From: Jelle Besseling Date: Wed, 24 Jan 2024 17:15:36 +0100 Subject: [PATCH 0002/1054] nixos/vault-agent: make template value optional The template value in vault agent is not actually required to start the service. This is useful when only using vault agent for auto auth. --- nixos/modules/services/security/vault-agent.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/vault-agent.nix b/nixos/modules/services/security/vault-agent.nix index f8c281442f5f..f578abe53672 100644 --- a/nixos/modules/services/security/vault-agent.nix +++ b/nixos/modules/services/security/vault-agent.nix @@ -46,8 +46,8 @@ let }; template = mkOption { - default = [ ]; - type = with types; listOf (attrsOf anything); + default = null; + type = with types; nullOr (listOf (attrsOf anything)); description = let upstreamDocs = if flavour == "vault-agent" From f7d21be1d3aae0c4b1e32145b57cb50f4d965850 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Thu, 1 Feb 2024 18:42:56 +0100 Subject: [PATCH 0003/1054] nixos/wrapper: pass trusted argv[0] to the privileged executable Vulnerabilities caused by argv[0] mishandling in privileged code keep coming up, recently CVE-2021-4034 in polkit and CVE-2023-6246 in glibc. On the other hand, legitimate handling of argv[0] is mostly limited to logging and multiplexing different functionality depending on the basename of the link (an example for the latter is sudo/sudoedit). On NixOS, by far the most common source of untrusted argv[0] to privileged processes should be the wrapper, and it is not used for multiplexing (separate wrappers are used instead). So we always pass the path of the wrapped program as argv[0]. Obsolete mitigations for older argv[0]-based issues are deleted. --- nixos/modules/security/wrappers/wrapper.c | 25 +++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixos/modules/security/wrappers/wrapper.c index 3e126875c687..6d0be0879440 100644 --- a/nixos/modules/security/wrappers/wrapper.c +++ b/nixos/modules/security/wrappers/wrapper.c @@ -170,15 +170,6 @@ static int make_caps_ambient(const char *self_path) { "MALLOC_ARENA_TEST\0" int main(int argc, char **argv) { - ASSERT(argc >= 1); - - // argv[0] goes into a lot of places, to a far greater degree than other elements - // of argv. glibc has had buffer overflows relating to argv[0], eg CVE-2023-6246. - // Since we expect the wrappers to be invoked from either $PATH or /run/wrappers/bin, - // there should be no reason to pass any particularly large values here, so we can - // be strict for strictness' sake. - ASSERT(strlen(argv[0]) < 512); - int debug = getenv(wrapper_debug) != NULL; // Drop insecure environment variables explicitly @@ -209,10 +200,22 @@ int main(int argc, char **argv) { return 1; } + char *replacement_argv[2] = {SOURCE_PROG, NULL}; + char *old_argv0; + // Replace untrusted or missing argv[0] by the wrapped program path. + // This mitigates vulnerabilities caused by incorrect handling in privileged code. + if (argv[0]) { + old_argv0 = argv[0]; + argv[0] = SOURCE_PROG; + } else { + old_argv0 = "«nullptr»"; + argv = replacement_argv; + } + execve(SOURCE_PROG, argv, environ); - + fprintf(stderr, "%s: cannot run `%s': %s\n", - argv[0], SOURCE_PROG, strerror(errno)); + old_argv0, SOURCE_PROG, strerror(errno)); return 1; } From 8f582b0ebb792b1bba40acdf7e6217eaa52033a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 21 Feb 2024 05:30:38 +0000 Subject: [PATCH 0004/1054] nsncd: 3 seconds is way too low for a default timeout --- nixos/modules/services/system/nscd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index 971dffbadc13..f52afad9eddd 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -134,6 +134,8 @@ in Group = cfg.group; RemoveIPC = true; PrivateTmp = true; + # https://github.com/twosigma/nsncd/pull/33/files#r1496927653 + Environment = [ "NSNCD_HANDOFF_TIMEOUT=10" ]; NoNewPrivileges = true; RestrictSUIDSGID = true; ProtectSystem = "strict"; From cb8d3762a6b0f65e08dd848f54bc48bc8966e9a3 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Sun, 31 Mar 2024 00:26:52 -0400 Subject: [PATCH 0005/1054] mlton: bootstrap with 20210117 version This includes fixes for the incorrect hashes copied from 20180207-binary.nix. --- .../compilers/mlton/20210117-binary.nix | 17 +++++++++++++---- pkgs/development/compilers/mlton/default.nix | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/mlton/20210117-binary.nix b/pkgs/development/compilers/mlton/20210117-binary.nix index d4e55d47b94c..60bd31f0fda8 100644 --- a/pkgs/development/compilers/mlton/20210117-binary.nix +++ b/pkgs/development/compilers/mlton/20210117-binary.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, patchelf, gmp }: +{ lib, stdenv, fetchpatch, fetchurl, patchelf, gmp }: let dynamic-linker = stdenv.cc.bintools.dynamicLinker; in @@ -9,17 +9,26 @@ stdenv.mkDerivation rec { src = if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux-glibc2.31.tgz.tgz"; - sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf"; + url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux-glibc2.31.tgz"; + sha256 = "1lj51xg9p75qj1x5036lvjvd4a2j21kfi6vh8d0n9kdcdffvb73l"; }) else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl { url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin-19.6.gmp-static.tgz"; - sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv"; + sha256 = "0xndr2awlxdqr81j6snl9zqjx8r6f5fy9x65j1w899kf2dh9zsjv"; }) else throw "Architecture not supported"; + patches = [ + (fetchpatch { + name = "remove-duplicate-if.patch"; + url = "https://github.com/MLton/mlton/commit/22002cd0a53a1ab84491d74cb8dc6a4e50c1f7b7.patch"; + decode = "sed -e 's|Makefile\.binary|Makefile|g'"; + hash = "sha256-Gtmc+OIh+m7ordSn74fpOKVDQDtYyLHe6Le2snNCBYQ="; + }) + ]; + buildInputs = [ gmp ]; nativeBuildInputs = lib.optional stdenv.isLinux patchelf; diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index d2704a4093d0..a74d1d85455b 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -15,14 +15,14 @@ rec { mlton20210117Binary = callPackage ./20210117-binary.nix { }; mlton20210117 = callPackage ./from-git-source.nix { - mltonBootstrap = mlton20180207Binary; + mltonBootstrap = mlton20210117Binary; version = "20210117"; rev = "on-20210117-release"; sha256 = "sha256-rqL8lnzVVR+5Hc7sWXK8dCXN92dU76qSoii3/4StODM="; }; mltonHEAD = callPackage ./from-git-source.nix { - mltonBootstrap = mlton20180207Binary; + mltonBootstrap = mlton20210117Binary; version = "HEAD"; rev = "875f7912a0b135a9a7e86a04ecac9cacf0bfe5e5"; sha256 = "sha256-/MIoVqqv8qrJPehU7VRFpXtAAo8UUzE3waEvB7WnS9A="; From 83280493512a550f3d44f226573c4c8da043faab Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Sun, 31 Mar 2024 22:13:28 -0400 Subject: [PATCH 0006/1054] mlton: enable aarch64-darwin --- pkgs/development/compilers/mlton/20210117-binary.nix | 5 +++++ pkgs/development/compilers/mlton/meta.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mlton/20210117-binary.nix b/pkgs/development/compilers/mlton/20210117-binary.nix index 60bd31f0fda8..810974e61ac4 100644 --- a/pkgs/development/compilers/mlton/20210117-binary.nix +++ b/pkgs/development/compilers/mlton/20210117-binary.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin-19.6.gmp-static.tgz"; sha256 = "0xndr2awlxdqr81j6snl9zqjx8r6f5fy9x65j1w899kf2dh9zsjv"; }) + else if stdenv.hostPlatform.system == "aarch64-darwin" then + (fetchurl { + url = "https://projects.laas.fr/tina/software/mlton-${version}-1.arm64-darwin-21.6-gmp-static.tgz"; + sha256 = "1s61ayk3yj2xw8ilqk3fhb03x5x1wcakkmbhhvcsfb2hdw2c932x"; + }) else throw "Architecture not supported"; diff --git a/pkgs/development/compilers/mlton/meta.nix b/pkgs/development/compilers/mlton/meta.nix index 1e4c0aacfc3c..afb11847adb6 100644 --- a/pkgs/development/compilers/mlton/meta.nix +++ b/pkgs/development/compilers/mlton/meta.nix @@ -11,5 +11,5 @@ homepage = "http://mlton.org/"; license = "bsd"; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-darwin"]; } From bd87a38b86f889a6902a356ab415eeead881766b Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 26 Apr 2024 11:59:58 +0000 Subject: [PATCH 0007/1054] nixos/lemmy: fix nginx backend to proxy needed headers the nix `recommendedProxySettings` optiononly takes effect if `proxyPass` is set, but since we manually invoke `proxy_pass` inside nginx we need to also manually specify proxy settings. failing to do so leads to symptoms such as "Incoming activity has invalid signature". see: --- nixos/modules/services/web-apps/lemmy.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index 3185f9a4263c..11608418e978 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -204,7 +204,6 @@ in }; "/" = { # mixed frontend and backend requests, based on the request headers - recommendedProxySettings = true; extraConfig = '' set $proxpass "${ui}"; if ($http_accept = "application/activity+json") { @@ -221,6 +220,11 @@ in rewrite ^(.+)/+$ $1 permanent; proxy_pass $proxpass; + # Proxied `Host` header is required to validate ActivityPub HTTP signatures for incoming events. + # The other headers are optional, for the sake of better log data. + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; ''; }; }; From 831f9b6052383685fb2ab536b10b021405742d9d Mon Sep 17 00:00:00 2001 From: Mathias Sven Date: Tue, 28 May 2024 18:32:38 +0100 Subject: [PATCH 0008/1054] languagetool: fix description on allowOrigin option --- nixos/modules/services/misc/languagetool.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/languagetool.nix b/nixos/modules/services/misc/languagetool.nix index ba563dace473..c7c9eef88c2d 100644 --- a/nixos/modules/services/misc/languagetool.nix +++ b/nixos/modules/services/misc/languagetool.nix @@ -27,7 +27,7 @@ in { description = '' Set the Access-Control-Allow-Origin header in the HTTP response, used for direct (non-proxy) JavaScript-based access from browsers. - `null` to allow access from all sites. + `"*"` to allow access from all sites. ''; }; From dd1e48cc9e452c4ff1e4f26a255dd354b54169b7 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 31 May 2024 13:05:31 +0200 Subject: [PATCH 0009/1054] .github/ISSUE_TEMPLATE: Add an issue template for tracking --- .github/ISSUE_TEMPLATE/tracking_issue.md | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/tracking_issue.md diff --git a/.github/ISSUE_TEMPLATE/tracking_issue.md b/.github/ISSUE_TEMPLATE/tracking_issue.md new file mode 100644 index 000000000000..a9572f5ea506 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/tracking_issue.md @@ -0,0 +1,39 @@ +--- +name: Tracking issue +about: Provide an overview on a multi-step effort +title: 'Tracking issue: ISSUENAME' +labels: '5.scope: tracking' +assignees: '' + +--- + +### Tracking description + + + +#### Reference Issue(s)/PR(s) + +- ... + +### Follow-up issues/notes + + + +#### Additional context +Add any other context about the problem here. + +--- + +Add a :+1: [reaction] to [issues you find important]. + +[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ +[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc From 50534c32b80968004a89f851afebee2466fc71d6 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 5 Jul 2024 19:01:23 +0000 Subject: [PATCH 0010/1054] python3Packages.pynput: Add `updateScript` --- pkgs/development/python-modules/pynput/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index ed6b964f0ca5..56a06a1bd47d 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + gitUpdater, # build-system setuptools, @@ -30,6 +31,9 @@ buildPythonPackage rec { rev = "refs/tags/v${version}"; hash = "sha256-gRq4LS9NvPL98N0Jk09Z0GfoHS09o3zM284BEWS+NW4="; }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; postPatch = '' substituteInPlace setup.py \ From 259db30f0bac37121a01e7005483875f01e22a8c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 15 Jul 2024 14:29:29 +0200 Subject: [PATCH 0011/1054] nixos/lib/qemu-common: fix cross to x86_64 qemu-kvm won't be the right thing if the build platform isn't x86_64. --- nixos/lib/qemu-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix index f1e19c5b3b72..ca3c250b5555 100644 --- a/nixos/lib/qemu-common.nix +++ b/nixos/lib/qemu-common.nix @@ -30,14 +30,14 @@ rec { guestSystem = pkgs.stdenv.hostPlatform.system; linuxHostGuestMatrix = { - x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max"; + x86_64-linux = "${qemuPkg}/bin/qemu-system-x86_64 -machine accel=kvm:tcg -cpu max"; armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -machine virt,accel=kvm:tcg -cpu max"; aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=max,accel=kvm:tcg -cpu max"; powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv"; powerpc64-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv"; riscv32-linux = "${qemuPkg}/bin/qemu-system-riscv32 -machine virt"; riscv64-linux = "${qemuPkg}/bin/qemu-system-riscv64 -machine virt"; - x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu max"; + x86_64-darwin = "${qemuPkg}/bin/qemu-system-x86_64 -machine accel=kvm:tcg -cpu max"; }; otherHostGuestMatrix = { aarch64-darwin = { From 17555cad7965ff70ee857463f69e8b2c696dbb64 Mon Sep 17 00:00:00 2001 From: Graham Dennis Date: Thu, 25 Jul 2024 12:35:37 +1000 Subject: [PATCH 0012/1054] Count hard links when sizing virtual disks cptofs does not preserve hard links, so each hard link needs to be accounted for separately when sizing virtual disks --- nixos/lib/make-disk-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 208eaf59dc5c..e5b3d1db70c9 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -470,7 +470,7 @@ let format' = format; in let additionalSpace=$(( $(numfmt --from=iec '${additionalSpace}') + reservedSpace )) # Compute required space in filesystem blocks - diskUsage=$(find . ! -type d -print0 | du --files0-from=- --apparent-size --block-size "${blockSize}" | cut -f1 | sum_lines) + diskUsage=$(find . ! -type d -print0 | du --files0-from=- --apparent-size --count-links --block-size "${blockSize}" | cut -f1 | sum_lines) # Each inode takes space! numInodes=$(find . | wc -l) # Convert to bytes, inodes take two blocks each! From 60e499c17cefe0685c9ab42d7c8161c691d44bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Wed, 31 Jul 2024 09:16:39 +0200 Subject: [PATCH 0013/1054] nixos/netboot: Fix netbootRamdisk build --- nixos/modules/installer/netboot/netboot.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 93f806b75eb1..33301c6423db 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -88,8 +88,8 @@ with lib; prepend = [ "${config.system.build.initialRamdisk}/initrd" ]; contents = - [ { object = config.system.build.squashfsStore; - symlink = "/nix-store.squashfs"; + [ { source = config.system.build.squashfsStore; + target = "/nix-store.squashfs"; } ]; }; From 437d92c6ade842199fb2befd476fa7d966b0a04a Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 24 Aug 2024 01:01:22 -0400 Subject: [PATCH 0014/1054] prometheus-nats-exporter: add updateScript and testVersion --- .../monitoring/prometheus/nats-exporter.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/nats-exporter.nix b/pkgs/servers/monitoring/prometheus/nats-exporter.nix index fc8d360fc97a..3bad1d97ac44 100644 --- a/pkgs/servers/monitoring/prometheus/nats-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nats-exporter.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, gitUpdater, testers, prometheus-nats-exporter }: buildGoModule rec { pname = "prometheus-nats-exporter"; @@ -18,6 +18,21 @@ buildGoModule rec { export GODEBUG=x509sha1=1; ''; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests = { + prometheus-nats-exporter-version = testers.testVersion { + package = prometheus-nats-exporter; + }; + }; + }; + meta = with lib; { description = "Exporter for NATS metrics"; homepage = "https://github.com/nats-io/prometheus-nats-exporter"; From 0a58f69255f3d3e8f0b8e8dc83a7447939b234e1 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 3 Aug 2024 23:52:43 +0000 Subject: [PATCH 0015/1054] nixos/pam: replace apparmor warnings with assertions see for details. --- nixos/modules/security/pam.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 2ff08cbfde81..a301a9dfea83 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1592,13 +1592,11 @@ in (lib.concatMap lib.attrValues) (lib.filter (rule: rule.enable)) (lib.catAttrs "modulePath") - # TODO(@uninsane): replace this warning + lib.filter with just an assertion - (map (modulePath: lib.warnIfNot + (map (modulePath: lib.throwIfNot (lib.hasPrefix "/" modulePath) - ''non-absolute PAM modulePath "${modulePath}" is unsupported by apparmor and will be treated as an error by future versions of nixpkgs; see '' + ''non-absolute PAM modulePath "${modulePath}" is unsupported by apparmor'' modulePath )) - (lib.filter (lib.hasPrefix "/")) lib.unique (map (module: "mr ${module},")) concatLines From 249d4a97d51c33b94fb2653c3bfd2659d45f9889 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 27 Aug 2024 00:32:49 +0200 Subject: [PATCH 0016/1054] workflows/check-nix-format: Improve error message Looks like the error message could be a bit clearer still: https://github.com/NixOS/nixpkgs/pull/337109#issuecomment-2311175326 --- .github/workflows/check-nix-format.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 22ad83ba953b..854d3eaf45fe 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -83,7 +83,7 @@ jobs: if (( "${#unformattedFiles[@]}" > 0 )); then echo "Some new/changed Nix files are not properly formatted" - echo "Please go to the Nixpkgs root directory, run \`nix-shell\`, then:" + echo "Please format them using the Nixpkgs-specific \`nixfmt\` by going to the Nixpkgs root directory, running \`nix-shell\`, then:" echo "nixfmt ${unformattedFiles[*]@Q}" echo "If you're having trouble, please ping @NixOS/nix-formatting" exit 1 From 526239b118321e06811ac05848e4256f00fd6086 Mon Sep 17 00:00:00 2001 From: Nathan Henrie Date: Wed, 4 Sep 2024 07:21:02 -0600 Subject: [PATCH 0017/1054] nixos/espanso: remove unused wayland option This option is unused in the module. As discussed in https://github.com/NixOS/nixpkgs/pull/317457 and https://github.com/NixOS/nixpkgs/pull/285138#discussion_r1478367044 users should just set the `package` option. --- nixos/modules/services/desktops/espanso.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/desktops/espanso.nix b/nixos/modules/services/desktops/espanso.nix index a2c4b77b9046..a6b8a078247b 100644 --- a/nixos/modules/services/desktops/espanso.nix +++ b/nixos/modules/services/desktops/espanso.nix @@ -8,7 +8,6 @@ in { options = { services.espanso = { enable = mkEnableOption "Espanso"; - wayland = mkEnableOption "use the Wayland compatible espanso package"; package = mkPackageOption pkgs "espanso" { example = "pkgs.espanso-wayland"; }; From f40bcf1bd28cf8412c2469e4a8d349def652165a Mon Sep 17 00:00:00 2001 From: ChaotiCryptidz Date: Wed, 4 Sep 2024 16:23:29 +0000 Subject: [PATCH 0018/1054] inputstream-adaptive: add symlink to libcdm_aarch64_loader.so --- .../video/kodi/addons/inputstream-adaptive/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 1a82cd1c19b9..c8f0bd7101a2 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -32,6 +32,7 @@ buildKodiBinaryAddon rec { extraInstallPhase = let n = namespace; in '' ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so + ln -s $out/lib/addons/${n}/libcdm_aarch64_loader.so $out/${addonDir}/${n}/libcdm_aarch64_loader.so ''; meta = with lib; { From 7acf6b2e9bfbe69b730fd708792f132d8d16ee2a Mon Sep 17 00:00:00 2001 From: ChaotiCryptidz Date: Wed, 4 Sep 2024 16:28:21 +0000 Subject: [PATCH 0019/1054] inputstream-adaptive: remove symlink for libssd_wv.so --- .../video/kodi/addons/inputstream-adaptive/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index c8f0bd7101a2..6d0643294a04 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -31,7 +31,6 @@ buildKodiBinaryAddon rec { extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; extraInstallPhase = let n = namespace; in '' - ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so ln -s $out/lib/addons/${n}/libcdm_aarch64_loader.so $out/${addonDir}/${n}/libcdm_aarch64_loader.so ''; From 11c4e6b9dfe91e8ad99d82705e6f28cdb97cd055 Mon Sep 17 00:00:00 2001 From: chaos Date: Wed, 4 Sep 2024 19:22:15 +0100 Subject: [PATCH 0020/1054] inputstream-adaptive: only create symlink for libcdm_aarch64_loader.so on aarch64 --- .../video/kodi/addons/inputstream-adaptive/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 6d0643294a04..95c85463353a 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -31,7 +31,7 @@ buildKodiBinaryAddon rec { extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; extraInstallPhase = let n = namespace; in '' - ln -s $out/lib/addons/${n}/libcdm_aarch64_loader.so $out/${addonDir}/${n}/libcdm_aarch64_loader.so + ${lib.optionalString stdenv.hostPlatform.isAarch64 "ln -s $out/lib/addons/${n}/libcdm_aarch64_loader.so $out/${addonDir}/${n}/libcdm_aarch64_loader.so"} ''; meta = with lib; { From 4147f4a424d92d0d350e80eca4669ffa0755e26d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Sep 2024 11:40:38 +0200 Subject: [PATCH 0021/1054] osmscout-server: 3.0.0 -> 3.1.0 --- .../misc/osmscout-server/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix index 05688d22bd18..4772ac454fc6 100644 --- a/pkgs/applications/misc/osmscout-server/default.nix +++ b/pkgs/applications/misc/osmscout-server/default.nix @@ -30,13 +30,13 @@ let in mkDerivation rec { pname = "osmscout-server"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "rinigus"; repo = "osmscout-server"; rev = version; - hash = "sha256-jcg/0SKeLviEC+vszh5DployKDAI7N+a8lzvImzFTvY="; + hash = "sha256-GqUXHn3ZK8gdDlm3TitEp/jhBpQoVeQZUCfAyiyrDEg="; fetchSubmodules = true; }; @@ -47,19 +47,6 @@ mkDerivation rec { libpostal sqlite marisa kyotocabinet boost protobuf date ]; - patches = [ - # Valhalla 3.2.1 support. Only required for next patch to apply cleanly - (fetchpatch { - url = "https://github.com/rinigus/osmscout-server/commit/1df9d383e61dd14cbe9e5b52412a2e951cee2ee4.patch"; - hash = "sha256-h+YTyHr4RYgwH5bfVgyujSekbL2LfV8vJgVkjXT0I10="; - }) - # Valhalla 3.4.0 support - (fetchpatch { - url = "https://github.com/rinigus/osmscout-server/commit/fe6562a4c3ba5da2735232ea8fdc7f71d7e7e714.patch"; - hash = "sha256-wibLTFk3cFS5mcC71TgMA9ZAAHS3mbjboFHqax6nCxs="; - }) - ]; - qmakeFlags = [ "SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant "CONFIG+=disable_mapnik" # Disable the optional mapnik backend From 5619b33e5a378212a6689af8ca6882477b7de67f Mon Sep 17 00:00:00 2001 From: eilvelia Date: Tue, 10 Sep 2024 19:54:31 +0000 Subject: [PATCH 0022/1054] maintainers: add eilvelia --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 41f9005cbc97..f8cb635cd775 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5936,6 +5936,12 @@ githubId = 701128; name = "Eike Kettner"; }; + eilvelia = { + email = "hi@eilvelia.cat"; + github = "eilvelia"; + githubId = 10106819; + name = "eilvelia"; + }; eken = { email = "edvin.kallstrom@protonmail.com"; github = "Eken-beep"; From a60eddf7211d15aff5ace9a87686ad6ad6eafccd Mon Sep 17 00:00:00 2001 From: eilvelia Date: Tue, 10 Sep 2024 19:56:36 +0000 Subject: [PATCH 0023/1054] benzene: init at 0-unstable-2022-12-18 --- pkgs/by-name/be/benzene/package.nix | 48 +++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/be/benzene/package.nix diff --git a/pkgs/by-name/be/benzene/package.nix b/pkgs/by-name/be/benzene/package.nix new file mode 100644 index 000000000000..db669662e2d0 --- /dev/null +++ b/pkgs/by-name/be/benzene/package.nix @@ -0,0 +1,48 @@ +{ + stdenv, + lib, + fetchFromGitHub, + boost, + cmake, + db, +}: +stdenv.mkDerivation { + pname = "benzene"; + version = "0-unstable-2022-12-18"; + + src = fetchFromGitHub { + owner = "cgao3"; + repo = "benzene-vanilla-cmake"; + rev = "95614769bafc9850a3cc54974660bb1795db6086"; + hash = "sha256-3DX/OVjKXyeOmO6P6iz1FTkNQ0n7vUFkKQ5Ac+7t3l4="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + boost + db + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail '-DABS_TOP_SRCDIR="''${top_srcdir}"' '-DABS_TOP_SRCDIR="$ENV{out}"' \ + --replace-fail '-DDATADIR="''${pkgdatadir}"' '-DDATADIR="$ENV{out}/share"' + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp src/mohex/mohex $out/bin/mohex + cp src/wolve/wolve $out/bin/wolve + cp -r ../share $out/share/ + runHook postInstall + ''; + + meta = { + description = "Software for playing and solving the game of Hex"; + homepage = "https://github.com/cgao3/benzene-vanilla-cmake"; + license = lib.licenses.lgpl3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ eilvelia ]; + }; +} From 25ff73017d9268a2034c92af2ffc7d2405e0be25 Mon Sep 17 00:00:00 2001 From: Sean Murphy Date: Sat, 17 Aug 2024 16:09:04 +0200 Subject: [PATCH 0024/1054] ogen: init at 1.4.1 --- .../og/ogen/modify-version-handling.patch | 16 +++++++++ pkgs/by-name/og/ogen/package.nix | 35 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/by-name/og/ogen/modify-version-handling.patch create mode 100644 pkgs/by-name/og/ogen/package.nix diff --git a/pkgs/by-name/og/ogen/modify-version-handling.patch b/pkgs/by-name/og/ogen/modify-version-handling.patch new file mode 100644 index 000000000000..892c29a24e9a --- /dev/null +++ b/pkgs/by-name/og/ogen/modify-version-handling.patch @@ -0,0 +1,16 @@ +diff --git a/internal/ogenversion/ogenversion.go b/internal/ogenversion/ogenversion.go +index 5db622d3..fe71f95e 100644 +--- a/internal/ogenversion/ogenversion.go ++++ b/internal/ogenversion/ogenversion.go +@@ -17,9 +17,9 @@ var getOnce struct { + + func getOgenVersion(m *debug.Module) (string, bool) { + if m == nil || m.Path != "github.com/ogen-go/ogen" { +- return "", false ++ return "1.4.1", true + } +- return m.Version, true ++ return "1.4.1", true + } + + func getInfo() (Info, bool) { diff --git a/pkgs/by-name/og/ogen/package.nix b/pkgs/by-name/og/ogen/package.nix new file mode 100644 index 000000000000..b65631cc89a8 --- /dev/null +++ b/pkgs/by-name/og/ogen/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "ogen"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "ogen-go"; + repo = "ogen"; + rev = "refs/tags/v${version}"; + hash = "sha256-SwJY9VQafclAxEQ/cbRJALvMLlnSIItIOz92XzuCoCk="; + }; + + vendorHash = "sha256-IxG7y0Zy0DerCh5DRdSWSaD643BG/8Wj2wuYvkn+XzE="; + + patches = [ ./modify-version-handling.patch ]; + + subPackages = [ + "cmd/ogen" + "cmd/jschemagen" + ]; + + meta = { + description = "OpenAPI v3 Code Generator for Go"; + homepage = "https://github.com/ogen-go/ogen"; + changelog = "https://github.com/ogen-go/ogen/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ seanrmurphy ]; + mainProgram = "ogen"; + }; +} From 2a8f33535502cf5918a6636030a8d9ea17b311cd Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Sun, 22 Sep 2024 23:09:55 +0200 Subject: [PATCH 0025/1054] nixos/postfix: add missing mkDefault for smtpd tls config --- nixos/modules/services/mail/postfix.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 244ce49ee63b..f842a219910d 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -853,7 +853,8 @@ in smtpd_tls_cert_file = cfg.sslCert; smtpd_tls_key_file = cfg.sslKey; - smtpd_tls_security_level = "may"; + smtpd_tls_security_level = lib.mkDefault "may"; + }; services.postfix.masterConfig = { From ac80f2cc333c8c8a73289199d0c21959a9d880b7 Mon Sep 17 00:00:00 2001 From: Maroka-chan <64618598+Maroka-chan@users.noreply.github.com> Date: Sat, 28 Sep 2024 01:29:19 +0200 Subject: [PATCH 0026/1054] nixos/prometheus-restic-exporter: add repositoryFile option This commit makes it possible to keep the backup repository for restic secret by using a file outside the nix store. The restic module has an equivalent option `services.restic.backups..repositoryFile`, which is rendered pointless when using the cleartext `repository` option for this exporter. --- .../prometheus/exporters/restic.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix index ef44803ba053..2eeb76f6f12b 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix @@ -10,6 +10,7 @@ let mapAttrs' splitString toUpper + optional optionalAttrs nameValuePair ; @@ -18,13 +19,22 @@ in port = 9753; extraOpts = { repository = mkOption { - type = types.str; + type = with lib.types; nullOr str; + default = null; description = '' URI pointing to the repository to monitor. ''; example = "sftp:backup@192.168.1.100:/backups/example"; }; + repositoryFile = mkOption { + type = with lib.types; nullOr path; + default = null; + description = '' + Path to the file containing the URI for the repository to monitor. + ''; + }; + passwordFile = mkOption { type = types.path; description = '' @@ -103,13 +113,21 @@ in serviceOpts = { script = '' + export RESTIC_REPOSITORY=${ + if cfg.repositoryFile != null + then "$(cat $CREDENTIALS_DIRECTORY/RESTIC_REPOSITORY)" + else "${cfg.repository}" + } export RESTIC_PASSWORD_FILE=$CREDENTIALS_DIRECTORY/RESTIC_PASSWORD_FILE ${pkgs.prometheus-restic-exporter}/bin/restic-exporter.py \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; serviceConfig = { EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; - LoadCredential = [ "RESTIC_PASSWORD_FILE:${cfg.passwordFile}" ]; + LoadCredential = + [ "RESTIC_PASSWORD_FILE:${cfg.passwordFile}" ] + ++ optional (cfg.repositoryFile != null) + [ "RESTIC_REPOSITORY:${cfg.repositoryFile}" ]; }; environment = let @@ -119,7 +137,6 @@ in toRcloneVal = v: if lib.isBool v then lib.boolToString v else v; in { - RESTIC_REPOSITORY = cfg.repository; LISTEN_ADDRESS = cfg.listenAddress; LISTEN_PORT = toString cfg.port; REFRESH_INTERVAL = toString cfg.refreshInterval; From 92121e43ea9b5f4ec6d636098f2349ada91716e7 Mon Sep 17 00:00:00 2001 From: Maroka-chan <64618598+Maroka-chan@users.noreply.github.com> Date: Sat, 28 Sep 2024 01:46:16 +0200 Subject: [PATCH 0027/1054] nixos/prometheus-exporters: add assertion for restic repository options to make them mutually exclusive This commit ensures that exactly one of either the `repository` or `repositoryFile` option is set. Specifying a repository is required, but only *one* of the two options will be used, so instead of arguing about a precedence that will only cause confusion, it makes more sense to make them mutually exclusive. --- nixos/modules/services/monitoring/prometheus/exporters.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 29a30e938e75..0a40e87b16c2 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -330,6 +330,13 @@ in Config file specified in `services.prometheus.exporters.ipmi.webConfigFile' must not reside within /tmp - it won't be visible to the systemd service. ''; + } { + assertion = + cfg.restic.enable -> ((cfg.restic.repository == null) != (cfg.restic.repositoryFile == null)); + message = '' + Please specify either 'services.prometheus.exporters.restic.repository' + or 'services.prometheus.exporters.restic.repositoryFile'. + ''; } { assertion = cfg.snmp.enable -> ( (cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null) From 9264b0fd2a3c5a38faef02ccbd33ab4ce5f3d992 Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 3 Oct 2024 05:02:35 +0000 Subject: [PATCH 0028/1054] ibus: fix cross compilation --- pkgs/tools/inputmethods/ibus/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index e396b6f06444..e2c2383ae399 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -37,7 +37,7 @@ let python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]); - python3BuildEnv = python3.buildEnv.override { + python3BuildEnv = python3.pythonOnBuildForHost.buildEnv.override { # ImportError: No module named site postBuild = '' makeWrapper ${glib.dev}/bin/gdbus-codegen $out/bin/gdbus-codegen --unset PYTHONPATH @@ -97,8 +97,10 @@ stdenv.mkDerivation rec { # The `AX_PROG_{CC,CXX}_FOR_BUILD` autoconf macros can pick up unwrapped GCC binaries, # so we set `{CC,CXX}_FOR_BUILD` to override that behavior. # https://github.com/NixOS/nixpkgs/issues/21751 - "CC_FOR_BUILD=${stdenv.cc}/bin/cc" - "CXX_FOR_BUILD=${stdenv.cc}/bin/c++" + "CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" + "CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++" + "GLIB_COMPILE_RESOURCES=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" + "PKG_CONFIG_VAPIGEN_VAPIGEN=${lib.getBin buildPackages.vala}/bin/vapigen" "--disable-memconf" (lib.enableFeature (dconf != null) "dconf") (lib.enableFeature (libnotify != null) "libnotify") @@ -109,6 +111,7 @@ stdenv.mkDerivation rec { "--enable-install-tests" "--with-unicode-emoji-dir=${unicode-emoji}/share/unicode/emoji" "--with-emoji-annotation-dir=${cldr-annotations}/share/unicode/cldr/common/annotations" + "--with-python=${python3BuildEnv.interpreter}" "--with-ucd-dir=${unicode-character-database}/share/unicode" ]; @@ -117,6 +120,11 @@ stdenv.mkDerivation rec { "test_sourcesdir=${placeholder "installedTests"}/share/installed-tests/ibus" ]; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ autoreconfHook gtk-doc @@ -146,6 +154,7 @@ stdenv.mkDerivation rec { json-glib libnotify libdbusmenu-gtk3 + vala # for share/vala/Makefile.vapigen (PKG_CONFIG_VAPIGEN_VAPIGEN) ] ++ lib.optionals withWayland [ libxkbcommon wayland From 65664d6ba2909eb5a6d3ee260d659b89cccf73e6 Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Sat, 5 Oct 2024 11:50:55 +0200 Subject: [PATCH 0029/1054] nixos/gotenberg: fix service config for chromium --- nixos/modules/services/misc/gotenberg.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/gotenberg.nix b/nixos/modules/services/misc/gotenberg.nix index ed8629a7fa46..e92e11b50c71 100644 --- a/nixos/modules/services/misc/gotenberg.nix +++ b/nixos/modules/services/misc/gotenberg.nix @@ -228,7 +228,6 @@ in ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; - ProcSubset = "pid"; RestrictAddressFamilies = [ "AF_UNIX" @@ -240,11 +239,10 @@ in RestrictRealtime = true; LockPersonality = true; - MemoryDenyWriteExecute = true; SystemCallFilter = [ + "@sandbox" "@system-service" - "~@privileged" ]; SystemCallArchitectures = "native"; From 3f6d80d322dd00052ccff6f4073779e74c6e2ba0 Mon Sep 17 00:00:00 2001 From: michaelBelsanti Date: Thu, 10 Oct 2024 20:43:50 -0400 Subject: [PATCH 0030/1054] appimageTools: add libmpg123 to the environment --- pkgs/build-support/appimage/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index a6b08042db99..6eca2251de8a 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -207,6 +207,7 @@ rec { pipewire # immersed-vr wayland support libsecret # For bitwarden + libmpg123 # Slippi launcher ]; }; } From 666ed31e64111c86957c5392a48fd04ad71c4582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joel=20H=C3=B6ner?= Date: Sat, 12 Oct 2024 16:22:41 +0200 Subject: [PATCH 0031/1054] zydis: propagate zycore dependency This fixes issues with using CMake `find_package` to link Zydis, which in turn attempts to `find_package` Zycore. --- pkgs/by-name/zy/zydis/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/zy/zydis/package.nix b/pkgs/by-name/zy/zydis/package.nix index 610989ce9f2e..94acc6dbb4a1 100644 --- a/pkgs/by-name/zy/zydis/package.nix +++ b/pkgs/by-name/zy/zydis/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ zycore ]; + propagatedBuildInputs = [ zycore ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" From 4fe3724ce401441e991f63a163e53f3b64883266 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 16 Oct 2024 16:36:07 +0200 Subject: [PATCH 0032/1054] joypixels: Reflect redistributability in the license --- pkgs/data/fonts/joypixels/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index 29e4eb118888..5e999f88dbea 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -104,6 +104,7 @@ stdenv.mkDerivation rec { url = free-license.url; appendixUrl = appendix.url; free = false; + redistributable = true; }; maintainers = with maintainers; [ toonn jtojnar ]; # Not quite accurate since it's a font, not a program, but clearly From 176d86712b014681412ae2e89c70fdbb85086fab Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 17 Oct 2024 02:19:13 +0900 Subject: [PATCH 0033/1054] beedii: init at 1.0.0 --- pkgs/by-name/be/beedii/package.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/be/beedii/package.nix diff --git a/pkgs/by-name/be/beedii/package.nix b/pkgs/by-name/be/beedii/package.nix new file mode 100644 index 000000000000..3a21a13296aa --- /dev/null +++ b/pkgs/by-name/be/beedii/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenvNoCC, + fetchzip, +}: + +stdenvNoCC.mkDerivation rec { + pname = "beedii"; + + # 1.2.0 does not include font files. + # https://github.com/webkul/beedii/issues/1 + version = "1.0.0"; + + src = fetchzip { + url = "https://github.com/webkul/beedii/releases/download/v${version}/beedii.zip"; + hash = "sha256-MefkmWl7LdhQiePpixKcatoIeOTlrRaO3QA9xWAxJ4Q="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -Dm444 Fonts/*.ttf -t $out/share/fonts/truetype/${pname} + + runHook postInstall + ''; + + meta = { + description = "Free Hand Drawn Emoji Font"; + homepage = "https://github.com/webkul/beedii"; + license = lib.licenses.cc0; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ + kachick + ]; + }; +} From 9477947a1a79967ffb6ac2e0d39b75185cf0c389 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 17 Feb 2024 21:51:25 +0100 Subject: [PATCH 0034/1054] openseeface: init at 1.20.4-unstable-2024-09-21 --- pkgs/by-name/op/openseeface/package.nix | 52 +++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/op/openseeface/package.nix diff --git a/pkgs/by-name/op/openseeface/package.nix b/pkgs/by-name/op/openseeface/package.nix new file mode 100644 index 000000000000..e2cef476ed41 --- /dev/null +++ b/pkgs/by-name/op/openseeface/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenvNoCC, + python3, + fetchFromGitHub, + makeWrapper, + enableVisualization ? false, +}: + +let + python = python3.withPackages ( + ps: with ps; [ + (opencv4.override { enableGtk3 = enableVisualization; }) + onnxruntime + pillow + numpy + ] + ); +in +stdenvNoCC.mkDerivation { + pname = "openseeface"; + version = "1.20.4-unstable-2024-09-21"; + + src = fetchFromGitHub { + owner = "emilianavt"; + repo = "OpenSeeFace"; + rev = "e6e24efd2038ab778ac094bab21c2c18a7efbeb2"; + hash = "sha256-pSZXD6UiKPd8sTagdA/I6bI8nWdF1c6SX2Bho+X7pX8="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/openseeface + cp -r *.py models $out/share/openseeface + + makeWrapper ${python.interpreter} "$out/bin/facetracker" \ + --add-flags "$out/share/openseeface/facetracker.py" + + runHook postInstall + ''; + + meta = { + description = "Robust realtime face and facial landmark tracking on CPU with Unity integration"; + homepage = "https://github.com/emilianavt/OpenSeeFace"; + license = lib.licenses.bsd2; + mainProgram = "facetracker"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} From 2367be910aabbf30490ebcbbd98748702ff9607f Mon Sep 17 00:00:00 2001 From: Zitrone Date: Tue, 22 Oct 2024 23:43:10 +0200 Subject: [PATCH 0035/1054] python3Packages.dirsearch: init at 0.4.3 closes #191097 --- .../python-modules/dirsearch/default.nix | 95 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 97 insertions(+) create mode 100644 pkgs/development/python-modules/dirsearch/default.nix diff --git a/pkgs/development/python-modules/dirsearch/default.nix b/pkgs/development/python-modules/dirsearch/default.nix new file mode 100644 index 000000000000..4eebafa6397a --- /dev/null +++ b/pkgs/development/python-modules/dirsearch/default.nix @@ -0,0 +1,95 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + python, + # deps + /* + ntlm-auth is in the requirements.txt, however nixpkgs tells me + > ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead. + Not sure if pyspnego is a drop in replacement. + The simple functionality dirsearch seems not to depend on this package. + */ + #ntlm-auth, + #pyspnego, + beautifulsoup4, + certifi, + cffi, + chardet, + charset-normalizer, + colorama, + cryptography, + defusedxml, + idna, + jinja2, + markupsafe, + pyopenssl, + pyparsing, + pysocks, + requests, + requests-ntlm, + setuptools, + urllib3, +}: + +buildPythonPackage rec { + pname = "dirsearch"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "maurosoria"; + repo = "dirsearch"; + rev = "v${version}"; + hash = "sha256-eXB103qUB3m7V/9hlq2xv3Y3bIz89/pGJsbPZQ+AZXs="; + }; + + # setup.py does some weird stuff with mktemp + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'os.chdir(env_dir)' "" \ + --replace-fail 'shutil.copytree(os.path.abspath(os.getcwd()), os.path.join(env_dir, "dirsearch"))' "" + ''; + + dependencies = [ + # maybe needed, see above + #pyspnego + #ntlm-auth + beautifulsoup4 + certifi + cffi + chardet + charset-normalizer + colorama + cryptography + defusedxml + idna + jinja2 + markupsafe + pyopenssl + pyparsing + pysocks + requests + requests-ntlm + setuptools + urllib3 + ]; + + # the library files get installed in the wrong location + # and dirsearch.py, __init__.py and db/ are missing + postInstall = '' + dirsearchpath=$out/lib/python${lib.versions.majorMinor python.version}/site-packages/ + mkdir -p $dirsearchpath/dirsearch + mv $dirsearchpath/{lib,dirsearch} + cp $src/{dirsearch,__init__}.py $dirsearchpath/dirsearch + cp -r $src/db $dirsearchpath/dirsearch + ''; + + meta = { + changelog = "https://github.com/maurosoria/dirsearch/releases/tag/${version}"; + description = "command-line tool for brute-forcing directories and files in webservers, AKA a web path scanner"; + homepage = "https://github.com/maurosoria/dirsearch"; + license = lib.licenses.gpl2Only; + mainProgram = "dirsearch"; + maintainers = with lib.maintainers; [ quantenzitrone ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b4ce7eebdcc..82fbcfd718ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3194,6 +3194,8 @@ self: super: with self; { dirigera = callPackage ../development/python-modules/dirigera { }; + dirsearch = callPackage ../development/python-modules/dirsearch { }; + dirty-equals = callPackage ../development/python-modules/dirty-equals { }; dirtyjson = callPackage ../development/python-modules/dirtyjson { }; From 87df940a6a1eb2348a6909bd332314b35b32fcdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 09:02:49 +0000 Subject: [PATCH 0036/1054] raspberrypifw: 1.20240926 -> 1.20241008 --- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index ab60a10447ef..497bc3c326b2 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -3,13 +3,13 @@ stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - version = "1.20240926"; + version = "1.20241008"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - hash = "sha256-MCutxzdSFoZ4hn2Fxk2AHHgWCt/Jgc+reqJZHUuSKOc="; + hash = "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0="; }; installPhase = '' From 4f2b5f3788566bc92b8e4daaaebee43c766dccc6 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 31 Jul 2024 09:50:31 +0200 Subject: [PATCH 0037/1054] auto-editor: init at 25.3.0 --- pkgs/by-name/au/auto-editor/package.nix | 65 +++++++++++++++++++ .../au/auto-editor/set-exe-paths.patch | 32 +++++++++ 2 files changed, 97 insertions(+) create mode 100644 pkgs/by-name/au/auto-editor/package.nix create mode 100644 pkgs/by-name/au/auto-editor/set-exe-paths.patch diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix new file mode 100644 index 000000000000..4bfc9ccaabe0 --- /dev/null +++ b/pkgs/by-name/au/auto-editor/package.nix @@ -0,0 +1,65 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + replaceVars, + ffmpeg, + yt-dlp, +}: + +python3Packages.buildPythonApplication rec { + pname = "auto-editor"; + version = "24w29a"; + pyproject = true; + + src = fetchFromGitHub { + owner = "WyattBlue"; + repo = "auto-editor"; + rev = "refs/tags/${version}"; + hash = "sha256-2/6IqwMlaWobOlDr/h2WV2OqkxqVmUI65XsyBphTbpA="; + }; + + patches = [ + (replaceVars ./set-exe-paths.patch { + ffmpeg = lib.getExe ffmpeg; + yt_dlp = lib.getExe yt-dlp; + }) + ]; + + postPatch = '' + # pyav is a fork of av, but has since mostly been un-forked + substituteInPlace pyproject.toml \ + --replace-fail '"pyav==12.2.*"' '"av"' + ''; + + # our patch file also removes the dependency on ae-ffmpeg + pythonRemoveDeps = [ "ae-ffmpeg" ]; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + av + numpy + ]; + + checkPhase = '' + runHook preCheck + + $out/bin/auto-editor test all + + runHook postCheck + ''; + + pythonImportsCheck = [ "auto_editor" ]; + + meta = { + changelog = "https://github.com/WyattBlue/auto-editor/releases/tag/${version}"; + description = "Command line application for automatically editing video and audio by analyzing a variety of methods, most notably audio loudness"; + homepage = "https://auto-editor.com/"; + license = lib.licenses.unlicense; + mainProgram = "auto-editor"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/by-name/au/auto-editor/set-exe-paths.patch b/pkgs/by-name/au/auto-editor/set-exe-paths.patch new file mode 100644 index 000000000000..8eaa7bc58bf6 --- /dev/null +++ b/pkgs/by-name/au/auto-editor/set-exe-paths.patch @@ -0,0 +1,32 @@ +diff --git a/auto_editor/ffwrapper.py b/auto_editor/ffwrapper.py +index b6df2d4..8409032 100644 +--- a/auto_editor/ffwrapper.py ++++ b/auto_editor/ffwrapper.py +@@ -30,13 +30,7 @@ class FFmpeg: + return ff_location + if my_ffmpeg: + return "ffmpeg" +- +- try: +- import ae_ffmpeg +- +- return ae_ffmpeg.get_path() +- except ImportError: +- return "ffmpeg" ++ return "@ffmpeg@" + + self.debug = debug + self.show_cmd = show_cmd +diff --git a/auto_editor/utils/types.py b/auto_editor/utils/types.py +index ccd6581..a66e5e3 100644 +--- a/auto_editor/utils/types.py ++++ b/auto_editor/utils/types.py +@@ -218,7 +218,7 @@ def resolution(val: str | None) -> tuple[int, int] | None: + + @dataclass + class Args: +- yt_dlp_location: str = "yt-dlp" ++ yt_dlp_location: str = "@yt_dlp@" + download_format: str | None = None + output_format: str | None = None + yt_dlp_extras: str | None = None From 88b18841422dcc4d56e63d592eafc2b5b4149b89 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Mon, 17 Jun 2024 13:04:33 +0200 Subject: [PATCH 0038/1054] nixos/akkoma: Make imports explicit --- nixos/modules/services/web-apps/akkoma.nix | 72 +++++++++++++++++----- 1 file changed, 58 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 17c221778d89..a42e96884e96 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -1,12 +1,57 @@ { config, lib, pkgs, ... }: -with lib; let + inherit (lib) + any + attrsets + attrByPath + catAttrs + collect + concatMapStrings + concatStringsSep + escape + escapeShellArg + escapeShellArgs + hasInfix + isAttrs + isList + isStorePath + isString + mapAttrs + mapAttrsToList + optionalString + optionals + replaceStrings + splitString + substring + versionOlder + + fileContents + readFile + + literalExpression + literalMD + mkBefore + mkEnableOption + mkIf + mkMerge + mkOption + mkOptionType + mkPackageOption + types; + cfg = config.services.akkoma; ex = cfg.config; db = ex.":pleroma"."Pleroma.Repo"; web = ex.":pleroma"."Pleroma.Web.Endpoint"; + format = pkgs.formats.elixirConf { elixir = cfg.package.elixirPackage; }; + inherit (format.lib) + mkAtom + mkMap + mkRaw + mkTuple; + isConfined = config.systemd.services.akkoma.confinement.enable; hasSmtp = (attrByPath [ ":pleroma" "Pleroma.Emails.Mailer" "adapter" "value" ] null ex) == "Swoosh.Adapters.SMTP"; @@ -96,16 +141,15 @@ let passAsFile = [ "code" ]; } ''elixir "$codePath" >"$out"''); - format = pkgs.formats.elixirConf { elixir = cfg.package.elixirPackage; }; configFile = format.generate "config.exs" (replaceSec (attrsets.updateManyAttrsByPath [{ path = [ ":pleroma" "Pleroma.Web.Endpoint" "http" "ip" ]; update = addr: if isAbsolutePath addr - then format.lib.mkTuple - [ (format.lib.mkAtom ":local") addr ] - else format.lib.mkRaw (erlAddr addr); + then mkTuple + [ (mkAtom ":local") addr ] + else mkRaw (erlAddr addr); }] cfg.config)); writeShell = { name, text, runtimeInputs ? [ ] }: @@ -282,7 +326,7 @@ let AKKOMA_CONFIG_PATH="''${RUNTIME_DIRECTORY%%:*}/config.exs" \ ERL_EPMD_ADDRESS="${cfg.dist.address}" \ ERL_EPMD_PORT="${toString cfg.dist.epmdPort}" \ - ERL_FLAGS=${lib.escapeShellArg (lib.escapeShellArgs ([ + ERL_FLAGS=${escapeShellArg (escapeShellArgs ([ "-kernel" "inet_dist_use_interface" (erlAddr cfg.dist.address) "-kernel" "inet_dist_listen_min" (toString cfg.dist.portMin) "-kernel" "inet_dist_listen_max" (toString cfg.dist.portMax) @@ -639,7 +683,7 @@ in { "Pleroma.Repo" = mkOption { type = elixirValue; default = { - adapter = format.lib.mkRaw "Ecto.Adapters.Postgres"; + adapter = mkRaw "Ecto.Adapters.Postgres"; socket_dir = "/run/postgresql"; username = cfg.user; database = "akkoma"; @@ -769,7 +813,7 @@ in { in { base_url = mkOption { type = types.nonEmptyStr; - default = if lib.versionOlder config.system.stateVersion "24.05" + default = if versionOlder config.system.stateVersion "24.05" then "${httpConf.scheme}://${httpConf.host}:${builtins.toString httpConf.port}/media/" else null; defaultText = literalExpression '' @@ -787,7 +831,7 @@ in { ":frontends" = mkOption { type = elixirValue; default = mapAttrs - (key: val: format.lib.mkMap { name = val.name; ref = val.ref; }) + (key: val: mkMap { name = val.name; ref = val.ref; }) cfg.frontends; defaultText = literalExpression '' lib.mapAttrs (key: val: @@ -816,7 +860,7 @@ in { }; base_url = mkOption { type = types.nullOr types.nonEmptyStr; - default = if lib.versionOlder config.system.stateVersion "24.05" + default = if versionOlder config.system.stateVersion "24.05" then "${httpConf.scheme}://${httpConf.host}:${builtins.toString httpConf.port}" else null; defaultText = literalExpression '' @@ -899,7 +943,7 @@ in { ":backends" = mkOption { type = types.listOf elixirValue; visible = false; - default = with format.lib; [ + default = [ (mkTuple [ (mkRaw "ExSyslogger") (mkAtom ":ex_syslogger") ]) ]; }; @@ -913,7 +957,7 @@ in { level = mkOption { type = types.nonEmptyStr; - apply = format.lib.mkAtom; + apply = mkAtom; default = ":info"; example = ":warning"; description = '' @@ -931,7 +975,7 @@ in { ":data_dir" = mkOption { type = elixirValue; internal = true; - default = format.lib.mkRaw '' + default = mkRaw '' Path.join(System.fetch_env!("CACHE_DIRECTORY"), "tzdata") ''; }; @@ -1136,6 +1180,6 @@ in { }; }; - meta.maintainers = with maintainers; [ mvs ]; + meta.maintainers = with lib.maintainers; [ mvs ]; meta.doc = ./akkoma.md; } From cebeec1b8d67db1c02c38fbcf876bff6462fb413 Mon Sep 17 00:00:00 2001 From: diniamo Date: Fri, 25 Oct 2024 13:10:01 +0200 Subject: [PATCH 0039/1054] nixos/transmission: improve permission handling and description --- .../modules/services/torrent/transmission.nix | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index ceef0db78b09..cd6e4bbc228e 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -191,6 +191,17 @@ in and [](#opt-services.transmission.settings.watch-dir). Note that you may also want to change [](#opt-services.transmission.settings.umask). + + Keep in mind, that if the default user is used, the `home` directory + is locked behind a `750` permission, which affects all subdirectories + as well. There are 3 ways to get around this: + + 1. (Recommended) add the users that should have access to the group + set by [](#opt-services.transmission.group) + 2. Change [](#opt-services.transmission.settings.download-dir) to be + under a directory that has the right permissions + 3. Change `systemd.services.transmission.serviceConfig.StateDirectoryMode` + to the same value as this option ''; }; @@ -279,17 +290,20 @@ in # when /home/foo is not owned by cfg.user. # Note also that using an ExecStartPre= wouldn't work either # because BindPaths= needs these directories before. - system.activationScripts = mkIf (cfg.downloadDirPermissions != null) - { transmission-daemon = '' - install -d -m 700 '${cfg.home}/${settingsDir}' - chown -R '${cfg.user}:${cfg.group}' ${cfg.home}/${settingsDir} + system.activationScripts.transmission-daemon = + '' + install -d -m 700 -o '${cfg.user}' -g '${cfg.group}' '${cfg.home}/${settingsDir}' + '' + + optionalString (cfg.downloadDirPermissions != null) '' install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.download-dir}' - '' + optionalString cfg.settings.incomplete-dir-enabled '' - install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.incomplete-dir}' - '' + optionalString cfg.settings.watch-dir-enabled '' - install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.watch-dir}' - ''; - }; + + ${optionalString cfg.settings.incomplete-dir-enabled '' + install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.incomplete-dir}' + ''} + ${optionalString cfg.settings.watch-dir-enabled '' + install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.watch-dir}' + ''} + ''; systemd.services.transmission = { description = "Transmission BitTorrent Service"; @@ -409,20 +423,20 @@ in # It's useful to have transmission in path, e.g. for remote control environment.systemPackages = [ cfg.package ]; - users.users = optionalAttrs (cfg.user == "transmission") ({ + users.users = optionalAttrs (cfg.user == "transmission") { transmission = { group = cfg.group; uid = config.ids.uids.transmission; description = "Transmission BitTorrent user"; home = cfg.home; }; - }); + }; - users.groups = optionalAttrs (cfg.group == "transmission") ({ + users.groups = optionalAttrs (cfg.group == "transmission") { transmission = { gid = config.ids.gids.transmission; }; - }); + }; networking.firewall = mkMerge [ (mkIf cfg.openPeerPorts ( From 89320d7377d739c26d8a97a68fd26915eb9e4e85 Mon Sep 17 00:00:00 2001 From: diniamo Date: Sun, 20 Oct 2024 20:32:16 +0200 Subject: [PATCH 0040/1054] nixos/transmission: improve code nixos/transmission: improve code - Remove `with lib;` - Use `{ name = { ... }; }` instead of `{ name.foo = ...; name.bar = ...; }` --- .../modules/services/torrent/transmission.nix | 256 +++++++++--------- 1 file changed, 131 insertions(+), 125 deletions(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index cd6e4bbc228e..e2daf3e0179d 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -1,8 +1,11 @@ { config, lib, pkgs, options, ... }: -with lib; - let + inherit (lib) mkRenamedOptionModule mkAliasOptionModuleMD mkEnableOption + mkOption types literalExpression mkPackageOption mkIf + optionalString optional mkDefault escapeShellArgs optionalAttrs + mkMerge; + cfg = config.services.transmission; opt = options.services.transmission; inherit (config.environment) etc; @@ -49,127 +52,127 @@ in default = {}; type = types.submodule { freeformType = settingsFormat.type; - options.download-dir = mkOption { - type = types.path; - default = "${cfg.home}/${downloadsDir}"; - defaultText = literalExpression ''"''${config.${opt.home}}/${downloadsDir}"''; - description = "Directory where to download torrents."; - }; - options.incomplete-dir = mkOption { - type = types.path; - default = "${cfg.home}/${incompleteDir}"; - defaultText = literalExpression ''"''${config.${opt.home}}/${incompleteDir}"''; - description = '' - When enabled with - services.transmission.home - [](#opt-services.transmission.settings.incomplete-dir-enabled), - new torrents will download the files to this directory. - When complete, the files will be moved to download-dir - [](#opt-services.transmission.settings.download-dir). - ''; - }; - options.incomplete-dir-enabled = mkOption { - type = types.bool; - default = true; - description = ""; - }; - options.message-level = mkOption { - type = types.ints.between 0 6; - default = 2; - description = "Set verbosity of transmission messages."; - }; - options.peer-port = mkOption { - type = types.port; - default = 51413; - description = "The peer port to listen for incoming connections."; - }; - options.peer-port-random-high = mkOption { - type = types.port; - default = 65535; - description = '' - The maximum peer port to listen to for incoming connections - when [](#opt-services.transmission.settings.peer-port-random-on-start) is enabled. - ''; - }; - options.peer-port-random-low = mkOption { - type = types.port; - default = 65535; - description = '' - The minimal peer port to listen to for incoming connections - when [](#opt-services.transmission.settings.peer-port-random-on-start) is enabled. - ''; - }; - options.peer-port-random-on-start = mkOption { - type = types.bool; - default = false; - description = "Randomize the peer port."; - }; - options.rpc-bind-address = mkOption { - type = types.str; - default = "127.0.0.1"; - example = "0.0.0.0"; - description = '' - Where to listen for RPC connections. - Use `0.0.0.0` to listen on all interfaces. - ''; - }; - options.rpc-port = mkOption { - type = types.port; - default = 9091; - description = "The RPC port to listen to."; - }; - options.script-torrent-done-enabled = mkOption { - type = types.bool; - default = false; - description = '' - Whether to run - [](#opt-services.transmission.settings.script-torrent-done-filename) - at torrent completion. - ''; - }; - options.script-torrent-done-filename = mkOption { - type = types.nullOr types.path; - default = null; - description = "Executable to be run at torrent completion."; - }; - options.umask = mkOption { - type = types.int; - default = 2; - description = '' - Sets transmission's file mode creation mask. - See the umask(2) manpage for more information. - Users who want their saved torrents to be world-writable - may want to set this value to 0. - Bear in mind that the json markup language only accepts numbers in base 10, - so the standard umask(2) octal notation "022" is written in settings.json as 18. - ''; - }; - options.utp-enabled = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable [Micro Transport Protocol (µTP)](https://en.wikipedia.org/wiki/Micro_Transport_Protocol). - ''; - }; - options.watch-dir = mkOption { - type = types.path; - default = "${cfg.home}/${watchDir}"; - defaultText = literalExpression ''"''${config.${opt.home}}/${watchDir}"''; - description = "Watch a directory for torrent files and add them to transmission."; - }; - options.watch-dir-enabled = mkOption { - type = types.bool; - default = false; - description = ''Whether to enable the - [](#opt-services.transmission.settings.watch-dir). - ''; - }; - options.trash-original-torrent-files = mkOption { - type = types.bool; - default = false; - description = ''Whether to delete torrents added from the - [](#opt-services.transmission.settings.watch-dir). - ''; + options = { + download-dir = mkOption { + type = types.path; + default = "${cfg.home}/${downloadsDir}"; + defaultText = literalExpression ''"''${config.${opt.home}}/${downloadsDir}"''; + description = "Directory where to download torrents."; + }; + incomplete-dir = mkOption { + type = types.path; + default = "${cfg.home}/${incompleteDir}"; + defaultText = literalExpression ''"''${config.${opt.home}}/${incompleteDir}"''; + description = '' + When enabled with + services.transmission.home + [](#opt-services.transmission.settings.incomplete-dir-enabled), + new torrents will download the files to this directory. + When complete, the files will be moved to download-dir + [](#opt-services.transmission.settings.download-dir). + ''; + }; + incomplete-dir-enabled = mkOption { + type = types.bool; + default = true; + description = ""; + }; + message-level = mkOption { + type = types.ints.between 0 6; + default = 2; + description = "Set verbosity of transmission messages."; + }; + peer-port = mkOption { + type = types.port; + default = 51413; + description = "The peer port to listen for incoming connections."; + }; + peer-port-random-high = mkOption { + type = types.port; + default = 65535; + description = '' + The maximum peer port to listen to for incoming connections + when [](#opt-services.transmission.settings.peer-port-random-on-start) is enabled. + ''; + }; + peer-port-random-low = mkOption { + type = types.port; + default = 65535; + description = '' + The minimal peer port to listen to for incoming connections + when [](#opt-services.transmission.settings.peer-port-random-on-start) is enabled. + ''; + }; + peer-port-random-on-start = mkOption { + type = types.bool; + default = false; + description = "Randomize the peer port."; + }; + rpc-bind-address = mkOption { + type = types.str; + default = "127.0.0.1"; + example = "0.0.0.0"; + description = '' + Where to listen for RPC connections. + Use `0.0.0.0` to listen on all interfaces. + ''; + }; + rpc-port = mkOption { + type = types.port; + default = 9091; + description = "The RPC port to listen to."; + }; + script-torrent-done-enabled = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run + [](#opt-services.transmission.settings.script-torrent-done-filename) + at torrent completion. + ''; + }; + script-torrent-done-filename = mkOption { + type = types.nullOr types.path; + default = null; + description = "Executable to be run at torrent completion."; + }; + umask = mkOption { + type = types.str; + default = "022"; + description = '' + Sets transmission's file mode creation mask. + See the umask(2) manpage for more information. + Users who want their saved torrents to be world-writable + may want to set this value to `000`. + ''; + }; + utp-enabled = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable [Micro Transport Protocol (µTP)](https://en.wikipedia.org/wiki/Micro_Transport_Protocol). + ''; + }; + watch-dir = mkOption { + type = types.path; + default = "${cfg.home}/${watchDir}"; + defaultText = literalExpression ''"''${config.${opt.home}}/${watchDir}"''; + description = "Watch a directory for torrent files and add them to transmission."; + }; + watch-dir-enabled = mkOption { + type = types.bool; + default = false; + description = ''Whether to enable the + [](#opt-services.transmission.settings.watch-dir). + ''; + }; + trash-original-torrent-files = mkOption { + type = types.bool; + default = false; + description = ''Whether to delete torrents added from the + [](#opt-services.transmission.settings.watch-dir). + ''; + }; }; }; }; @@ -310,8 +313,11 @@ in after = [ "network.target" ] ++ optional apparmor.enable "apparmor.service"; requires = optional apparmor.enable "apparmor.service"; wantedBy = [ "multi-user.target" ]; - environment.CURL_CA_BUNDLE = etc."ssl/certs/ca-certificates.crt".source; - environment.TRANSMISSION_WEB_HOME = lib.mkIf (cfg.webHome != null) cfg.webHome; + + environment = { + CURL_CA_BUNDLE = etc."ssl/certs/ca-certificates.crt".source; + TRANSMISSION_WEB_HOME = lib.mkIf (cfg.webHome != null) cfg.webHome; + }; serviceConfig = { # Use "+" because credentialsFile may not be accessible to User= or Group=. From 76fb46fd8ada509ca81fb8d11bfc744d683a2a45 Mon Sep 17 00:00:00 2001 From: diniamo Date: Sat, 26 Oct 2024 15:46:37 +0200 Subject: [PATCH 0041/1054] nixos/transmission: format with nixfmt-rfc-style --- .../modules/services/torrent/transmission.nix | 192 ++++++++++++------ 1 file changed, 128 insertions(+), 64 deletions(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index e2daf3e0179d..23f94d92042f 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -1,10 +1,28 @@ -{ config, lib, pkgs, options, ... }: +{ + config, + lib, + pkgs, + options, + ... +}: let - inherit (lib) mkRenamedOptionModule mkAliasOptionModuleMD mkEnableOption - mkOption types literalExpression mkPackageOption mkIf - optionalString optional mkDefault escapeShellArgs optionalAttrs - mkMerge; + inherit (lib) + mkRenamedOptionModule + mkAliasOptionModuleMD + mkEnableOption + mkOption + types + literalExpression + mkPackageOption + mkIf + optionalString + optional + mkDefault + escapeShellArgs + optionalAttrs + mkMerge + ; cfg = config.services.transmission; opt = options.services.transmission; @@ -15,15 +33,36 @@ let downloadsDir = "Downloads"; incompleteDir = ".incomplete"; watchDir = "watchdir"; - settingsFormat = pkgs.formats.json {}; + settingsFormat = pkgs.formats.json { }; settingsFile = settingsFormat.generate "settings.json" cfg.settings; in { imports = [ - (mkRenamedOptionModule ["services" "transmission" "port"] - ["services" "transmission" "settings" "rpc-port"]) - (mkAliasOptionModuleMD ["services" "transmission" "openFirewall"] - ["services" "transmission" "openPeerPorts"]) + (mkRenamedOptionModule + [ + "services" + "transmission" + "port" + ] + [ + "services" + "transmission" + "settings" + "rpc-port" + ] + ) + (mkAliasOptionModuleMD + [ + "services" + "transmission" + "openFirewall" + ] + [ + "services" + "transmission" + "openPeerPorts" + ] + ) ]; options = { services.transmission = { @@ -49,7 +88,7 @@ in See [Transmission's Wiki](https://github.com/transmission/transmission/wiki/Editing-Configuration-Files) for documentation of settings not explicitly covered by this module. ''; - default = {}; + default = { }; type = types.submodule { freeformType = settingsFormat.type; options = { @@ -162,15 +201,17 @@ in watch-dir-enabled = mkOption { type = types.bool; default = false; - description = ''Whether to enable the - [](#opt-services.transmission.settings.watch-dir). + description = '' + Whether to enable the + [](#opt-services.transmission.settings.watch-dir). ''; }; trash-original-torrent-files = mkOption { type = types.bool; default = false; - description = ''Whether to delete torrents added from the - [](#opt-services.transmission.settings.watch-dir). + description = '' + Whether to delete torrents added from the + [](#opt-services.transmission.settings.watch-dir). ''; }; }; @@ -245,7 +286,7 @@ in extraFlags = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; example = [ "--log-debug" ]; description = '' Extra flags passed to the transmission command in the service definition. @@ -321,18 +362,23 @@ in serviceConfig = { # Use "+" because credentialsFile may not be accessible to User= or Group=. - ExecStartPre = [("+" + pkgs.writeShellScript "transmission-prestart" '' - set -eu${lib.optionalString (cfg.settings.message-level >= 3) "x"} - ${pkgs.jq}/bin/jq --slurp add ${settingsFile} '${cfg.credentialsFile}' | - install -D -m 600 -o '${cfg.user}' -g '${cfg.group}' /dev/stdin \ - '${cfg.home}/${settingsDir}/settings.json' - '')]; - ExecStart="${cfg.package}/bin/transmission-daemon -f -g ${cfg.home}/${settingsDir} ${escapeShellArgs cfg.extraFlags}"; + ExecStartPre = [ + ( + "+" + + pkgs.writeShellScript "transmission-prestart" '' + set -eu${lib.optionalString (cfg.settings.message-level >= 3) "x"} + ${pkgs.jq}/bin/jq --slurp add ${settingsFile} '${cfg.credentialsFile}' | + install -D -m 600 -o '${cfg.user}' -g '${cfg.group}' /dev/stdin \ + '${cfg.home}/${settingsDir}/settings.json' + '' + ) + ]; + ExecStart = "${cfg.package}/bin/transmission-daemon -f -g ${cfg.home}/${settingsDir} ${escapeShellArgs cfg.extraFlags}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = cfg.user; Group = cfg.group; # Create rootDir in the host's mount namespace. - RuntimeDirectory = [(baseNameOf rootDir)]; + RuntimeDirectory = [ (baseNameOf rootDir) ]; RuntimeDirectoryMode = "755"; # This is for BindPaths= and BindReadOnlyPaths= # to allow traversal of directories they create in RootDirectory=. @@ -350,27 +396,30 @@ in RootDirectoryStartOnly = true; MountAPIVFS = true; BindPaths = - [ "${cfg.home}/${settingsDir}" + [ + "${cfg.home}/${settingsDir}" cfg.settings.download-dir # Transmission may need to read in the host's /run (eg. /run/systemd/resolve) # or write in its private /run (eg. /run/host). "/run" - ] ++ - optional cfg.settings.incomplete-dir-enabled - cfg.settings.incomplete-dir ++ - optional (cfg.settings.watch-dir-enabled && cfg.settings.trash-original-torrent-files) - cfg.settings.watch-dir; - BindReadOnlyPaths = [ - # No confinement done of /nix/store here like in systemd-confinement.nix, - # an AppArmor profile is provided to get a confinement based upon paths and rights. - builtins.storeDir - "/etc" - ] ++ - optional (cfg.settings.script-torrent-done-enabled && - cfg.settings.script-torrent-done-filename != null) - cfg.settings.script-torrent-done-filename ++ - optional (cfg.settings.watch-dir-enabled && !cfg.settings.trash-original-torrent-files) - cfg.settings.watch-dir; + ] + ++ optional cfg.settings.incomplete-dir-enabled cfg.settings.incomplete-dir + ++ optional ( + cfg.settings.watch-dir-enabled && cfg.settings.trash-original-torrent-files + ) cfg.settings.watch-dir; + BindReadOnlyPaths = + [ + # No confinement done of /nix/store here like in systemd-confinement.nix, + # an AppArmor profile is provided to get a confinement based upon paths and rights. + builtins.storeDir + "/etc" + ] + ++ optional ( + cfg.settings.script-torrent-done-enabled && cfg.settings.script-torrent-done-filename != null + ) cfg.settings.script-torrent-done-filename + ++ optional ( + cfg.settings.watch-dir-enabled && !cfg.settings.trash-original-torrent-files + ) cfg.settings.watch-dir; StateDirectory = [ "transmission" "transmission/${settingsDir}" @@ -409,7 +458,11 @@ in RemoveIPC = true; # AF_UNIX may become usable one day: # https://github.com/transmission/transmission/issues/441 - RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; @@ -418,7 +471,13 @@ in # Groups in @system-service which do not contain a syscall # listed by perf stat -e 'syscalls:sys_enter_*' transmission-daemon -f # in tests, and seem likely not necessary for transmission-daemon. - "~@aio" "~@chown" "~@keyring" "~@memlock" "~@resources" "~@setuid" "~@timer" + "~@aio" + "~@chown" + "~@keyring" + "~@memlock" + "~@resources" + "~@setuid" + "~@timer" # In the @privileged group, but reached when querying infos through RPC (eg. with stig). "quotactl" ]; @@ -446,21 +505,24 @@ in networking.firewall = mkMerge [ (mkIf cfg.openPeerPorts ( - if cfg.settings.peer-port-random-on-start - then - { allowedTCPPortRanges = - [ { from = cfg.settings.peer-port-random-low; - to = cfg.settings.peer-port-random-high; - } - ]; - allowedUDPPortRanges = - [ { from = cfg.settings.peer-port-random-low; - to = cfg.settings.peer-port-random-high; - } - ]; + if cfg.settings.peer-port-random-on-start then + { + allowedTCPPortRanges = [ + { + from = cfg.settings.peer-port-random-low; + to = cfg.settings.peer-port-random-high; + } + ]; + allowedUDPPortRanges = [ + { + from = cfg.settings.peer-port-random-low; + to = cfg.settings.peer-port-random-high; + } + ]; } else - { allowedTCPPorts = [ cfg.settings.peer-port ]; + { + allowedTCPPorts = [ cfg.settings.peer-port ]; allowedUDPPorts = [ cfg.settings.peer-port ]; } )) @@ -522,14 +584,16 @@ in ''} } - ${optionalString (cfg.settings.script-torrent-done-enabled && - cfg.settings.script-torrent-done-filename != null) '' - # Stack transmission_directories profile on top of - # any existing profile for script-torrent-done-filename - # FIXME: to be tested as I'm not sure it works well with NoNewPrivileges= - # https://gitlab.com/apparmor/apparmor/-/wikis/AppArmorStacking#seccomp-and-no_new_privs - px ${cfg.settings.script-torrent-done-filename} -> &@{dirs}, - ''} + ${optionalString + (cfg.settings.script-torrent-done-enabled && cfg.settings.script-torrent-done-filename != null) + '' + # Stack transmission_directories profile on top of + # any existing profile for script-torrent-done-filename + # FIXME: to be tested as I'm not sure it works well with NoNewPrivileges= + # https://gitlab.com/apparmor/apparmor/-/wikis/AppArmorStacking#seccomp-and-no_new_privs + px ${cfg.settings.script-torrent-done-filename} -> &@{dirs}, + '' + } ${optionalString (cfg.webHome != null) '' r ${cfg.webHome}/**, From 38bc6ac8f9d1b49b35ca54ec0f4d727b513db363 Mon Sep 17 00:00:00 2001 From: diniamo Date: Tue, 29 Oct 2024 15:39:47 +0100 Subject: [PATCH 0042/1054] nixos/transmission: fix the type of `settings.umask` --- nixos/modules/services/torrent/transmission.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 23f94d92042f..4d44ee56becd 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -176,13 +176,18 @@ in description = "Executable to be run at torrent completion."; }; umask = mkOption { - type = types.str; - default = "022"; + type = types.either types.int types.str; + default = if cfg.package == pkgs.transmission_3 then 18 else "022"; + defaultText = literalExpression "if cfg.package == pkgs.transmission_3 then 18 else \"022\""; description = '' Sets transmission's file mode creation mask. See the umask(2) manpage for more information. Users who want their saved torrents to be world-writable - may want to set this value to `000`. + may want to set this value to 0/`"000"`. + + Keep in mind, that if you are using Transmission 3, this has to + be passed as a base 10 integer, whereas Transmission 4 takes + an octal number in a string instead. ''; }; utp-enabled = mkOption { From 2610a20422b56ef4aaadad4d0d121cefb0d13d49 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 16 Oct 2024 16:36:45 +0200 Subject: [PATCH 0043/1054] joypixels: 8.0.0 -> 9.0.0 Resolves #348645 --- pkgs/data/fonts/joypixels/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index 5e999f88dbea..4cbf704bb86f 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -63,15 +63,15 @@ in stdenv.mkDerivation rec { pname = "joypixels"; - version = "8.0.0"; + version = "9.0.0"; src = assert !acceptLicense -> throwLicense; with systemSpecific; fetchurl { name = fontFile; url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}"; sha256 = { - darwin = "0kj4nck6k91avhan9iy3n8hhk47xr44rd1lzljjx3w2yzw1w9zvv"; - }.${kernel.name} or "1bkyclgmvl6ppbdvidc5xr1g6f215slf0glnh5p6fsfbxc5h95bw"; + darwin = "sha256-muUxXzz8BePyPsiZocYvM0ebM1H+u84ysN5YUvsMLiU="; + }.${kernel.name} or "sha256-pmGsVgYSK/c5OlhOXhNlRBs/XppMXmsHcZeSmIkuED4="; }; dontUnpack = true; @@ -87,8 +87,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Finest emoji you can use legally (formerly EmojiOne)"; longDescription = '' - Updated for 2023! JoyPixels 8.0 includes 3,702 originally crafted icon - designs and is 100% Unicode 15.0 compatible. We offer the largest + Updated for 2024! JoyPixels 9.0 includes 3,820 originally crafted icon + designs and is 100% Unicode 15.1 compatible. We offer the largest selection of files ranging from png, svg, iconjar, and fonts (sprites available upon request). ''; From 75c3ed6d05d16d6fb705d12dbfa3737436ac32b2 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 25 Jul 2024 12:20:55 -0400 Subject: [PATCH 0044/1054] python311Packages.fslpy: init at 3.21.1 --- .../python-modules/fslpy/default.nix | 98 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 100 insertions(+) create mode 100644 pkgs/development/python-modules/fslpy/default.nix diff --git a/pkgs/development/python-modules/fslpy/default.nix b/pkgs/development/python-modules/fslpy/default.nix new file mode 100644 index 000000000000..0633b9b5133c --- /dev/null +++ b/pkgs/development/python-modules/fslpy/default.nix @@ -0,0 +1,98 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitLab, + setuptools, + dill, + h5py, + nibabel, + numpy, + scipy, + indexed-gzip, + pillow, + rtree, + trimesh, + wxpython, + pytestCheckHook, + pytest-cov-stub, + tomli, +}: + +buildPythonPackage rec { + pname = "fslpy"; + version = "3.21.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitLab { + domain = "git.fmrib.ox.ac.uk"; + owner = "fsl"; + repo = "fslpy"; + rev = "refs/tags/${version}"; + hash = "sha256-O0bhzu6zZeuGJqXAwlgM8qHkgtaGCmg7xSkOqbZH2eA="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + dill + h5py + nibabel + numpy + scipy + ]; + + optional-dependencies = { + extra = [ + indexed-gzip + pillow + rtree + trimesh + wxpython + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + tomli + ] ++ optional-dependencies.extra; + + disabledTestPaths = [ + # tries to download data: + "fsl/tests/test_dicom.py" + # tests exit with "SystemExit: Unable to access the X Display, is $DISPLAY set properly?" + "fsl/tests/test_idle.py" + "fsl/tests/test_platform.py" + # require FSL's atlas library (via $FSLDIR), which has an unfree license: + "fsl/tests/test_atlases.py" + "fsl/tests/test_atlases_query.py" + "fsl/tests/test_parse_data.py" + "fsl/tests/test_scripts/test_atlasq_list_summary.py" + "fsl/tests/test_scripts/test_atlasq_ohi.py" + "fsl/tests/test_scripts/test_atlasq_query.py" + # requires FSL (unfree and not in Nixpkgs): + "fsl/tests/test_fslsub.py" + "fsl/tests/test_run.py" + "fsl/tests/test_wrappers" + ]; + + pythonImportsCheck = [ + "fsl" + "fsl.data" + "fsl.scripts" + "fsl.transform" + "fsl.utils" + "fsl.wrappers" + ]; + + meta = { + description = "FSL Python library"; + homepage = "https://git.fmrib.ox.ac.uk/fsl/fslpy"; + changelog = "https://git.fmrib.ox.ac.uk/fsl/fslpy/-/blob/main/CHANGELOG.rst"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b033b1a3ad23..fe906ad5911f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4782,6 +4782,8 @@ self: super: with self; { fschat = callPackage ../development/python-modules/fschat { }; + fslpy = callPackage ../development/python-modules/fslpy { }; + fsspec-xrootd = callPackage ../development/python-modules/fsspec-xrootd { }; fsspec = callPackage ../development/python-modules/fsspec { }; From dbfb1a7338c1a12459cb0bc2775451eab12625a8 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 3 Nov 2024 12:00:00 +0000 Subject: [PATCH 0045/1054] python3Packages.django: fix build on 32 bit platforms --- pkgs/development/python-modules/django/4.nix | 5 ++++- pkgs/development/python-modules/django/5.nix | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 3e79caf80134..edc12e795973 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -118,7 +118,10 @@ buildPythonPackage rec { tzdata ] ++ lib.flatten (lib.attrValues optional-dependencies); - doCheck = !stdenv.hostPlatform.isDarwin; + doCheck = + !stdenv.hostPlatform.isDarwin + # pywatchman depends on folly which does not support 32bits + && !stdenv.hostPlatform.is32bit; preCheck = '' # make sure the installed library gets imported diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 39be46703e68..185550ae4e19 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -114,7 +114,10 @@ buildPythonPackage rec { tzdata ] ++ lib.flatten (lib.attrValues optional-dependencies); - doCheck = !stdenv.hostPlatform.isDarwin; + doCheck = + !stdenv.hostPlatform.isDarwin + # pywatchman depends on folly which does not support 32bits + && !stdenv.hostPlatform.is32bit; preCheck = '' # make sure the installed library gets imported From 3b48a63ac5d4b3c6fbd630d9b5c5958765a5d64d Mon Sep 17 00:00:00 2001 From: deinferno <14363193+deinferno@users.noreply.github.com> Date: Sun, 3 Nov 2024 20:31:46 +0500 Subject: [PATCH 0046/1054] polybar: remove references to cc before makeWrapper --- pkgs/by-name/po/polybar/package.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix index 520b7753d3f0..ab3bf1e8e691 100644 --- a/pkgs/by-name/po/polybar/package.nix +++ b/pkgs/by-name/po/polybar/package.nix @@ -90,15 +90,12 @@ stdenv.mkDerivation (finalAttrs: { substituteAllInPlace src/utils/file.cpp ''; - postInstall = - lib.optionalString i3Support '' - wrapProgram $out/bin/polybar \ - --prefix PATH : "${i3}/bin" - ''; - - postFixup = '' + postInstall = '' remove-references-to -t ${stdenv.cc} $out/bin/polybar - ''; + '' + (lib.optionalString i3Support '' + wrapProgram $out/bin/polybar \ + --prefix PATH : "${i3}/bin" + ''); meta = with lib; { homepage = "https://polybar.github.io/"; From 1ed59a4eb8a0d5694bc7f67b3770e664433730e7 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Sun, 3 Nov 2024 20:14:31 -0800 Subject: [PATCH 0047/1054] lix: only use LTO with GCC Enabling LTO causes test failures when compiling for x86_64-darwin (at least under Rosetta 2). The Nix package only enables LTO when using GCC, so we'll copy that for now. I don't feel safe leaving it on for aarch64-darwin unless we can understand why it's failing on x86_64-darwin in case this is an indication of UB. Fixes #337036. --- pkgs/tools/package-management/lix/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix index 521c27b7e7bc..73853738d882 100644 --- a/pkgs/tools/package-management/lix/common.nix +++ b/pkgs/tools/package-management/lix/common.nix @@ -190,7 +190,7 @@ stdenv.mkDerivation { [ # Enable LTO, since it improves eval performance a fair amount # LTO is disabled on static due to strange linking errors - (lib.mesonBool "b_lto" (!stdenv.hostPlatform.isStatic)) + (lib.mesonBool "b_lto" (!stdenv.hostPlatform.isStatic && stdenv.cc.isGNU)) (lib.mesonEnable "gc" true) (lib.mesonBool "enable-tests" true) (lib.mesonBool "enable-docs" enableDocumentation) From 7d7994a7cbd127c4808e694495bb79cac12e8964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=A9rence=20Chateign=C3=A9?= Date: Wed, 9 Oct 2024 20:36:15 +0200 Subject: [PATCH 0048/1054] google-chat-linux: init at 5.29.23-1 --- pkgs/by-name/go/google-chat-linux/package.nix | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 pkgs/by-name/go/google-chat-linux/package.nix diff --git a/pkgs/by-name/go/google-chat-linux/package.nix b/pkgs/by-name/go/google-chat-linux/package.nix new file mode 100644 index 000000000000..3df1deb2dca3 --- /dev/null +++ b/pkgs/by-name/go/google-chat-linux/package.nix @@ -0,0 +1,71 @@ +{ + buildNpmPackage, + copyDesktopItems, + electron, + fetchFromGitHub, + lib, + makeDesktopItem, +}: + +buildNpmPackage rec { + pname = "google-chat-linux"; + version = "5.29.23-1"; + + src = fetchFromGitHub { + owner = "squalou"; + repo = "google-chat-linux"; + rev = "refs/tags/${version}"; + hash = "sha256-JBjxZUs0HUgAkJJBYhNv2SHjpBtAcP09Ah4ATPwpZsQ="; + }; + + npmDepsHash = "sha256-7lKWbXyDpYh1sP9LAV/oA7rfpckSbIucwKT21vBrJ3Y="; + dontNpmBuild = true; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + # npm install will error when electron tries to download its binary + # we don't need it anyways since we wrap the program with our nixpkgs electron + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + postPatch = '' + # https://github.com/electron/electron/issues/31121 + substituteInPlace src/paths.js \ + --replace-fail "process.resourcesPath" "'$out/lib/node_modules/${pname}/assets'" + ''; + + postInstall = '' + mkdir -p $out/share/icons + ln -s $out/lib/node_modules/${pname}/build/icons/icon.png $out/share/icons/${pname}.png + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/lib/node_modules/${pname}/ + ''; + + desktopItems = [ + (makeDesktopItem { + name = "google-chat-linux"; + exec = "google-chat-linux"; + icon = "google-chat-linux"; + desktopName = "Google Chat"; + comment = meta.description; + categories = [ + "Network" + "InstantMessaging" + ]; + }) + ]; + + meta = { + description = "Electron-base client for Google Hangouts Chat"; + homepage = "https://github.com/squalou/google-chat-linux"; + downloadPage = "https://github.com/squalou/google-chat-linux/releases"; + changelog = "https://github.com/squalou/google-chat-linux/releases/tag/${version}"; + license = lib.licenses.wtfpl; + mainProgram = "google-chat-linux"; + maintainers = with lib.maintainers; [ + cterence + ]; + platforms = lib.platforms.linux; + }; +} From ad24e1ca55b34851f7e8cb312163e23e2367dc37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=A9rence=20Chateign=C3=A9?= Date: Wed, 9 Oct 2024 20:36:47 +0200 Subject: [PATCH 0049/1054] maintainers: add cterence --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8c1b474b231b..1b7675025e51 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4606,6 +4606,12 @@ githubId = 490965; name = "Craig Swank"; }; + cterence = { + email = "terence.chateigne@posteo.net"; + github = "cterence"; + githubId = 25285508; + name = "Térence Chateigné"; + }; ctron = { email = "ctron@dentrassi.de"; github = "ctron"; From b51666b2cc4e3cdc51c9bed4a0f07cf3b3d3e096 Mon Sep 17 00:00:00 2001 From: Honnip Date: Sat, 2 Nov 2024 00:22:22 +0900 Subject: [PATCH 0050/1054] gnomeExtensions.pano: 22 -> v23-alpha3 --- .../gnome/extensions/extensionOverrides.nix | 20 +++++++++----- .../pano_at_elhan.io.patch | 27 ------------------- 2 files changed, 13 insertions(+), 34 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index e45aa28bd526..0ddd47c12e47 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -1,4 +1,5 @@ { lib +, fetchzip , ddcutil , easyeffects , gjs @@ -112,13 +113,18 @@ super: lib.trivial.pipe super [ ]; })) - (patchExtension "pano@elhan.io" (old: { - patches = [ - (substituteAll { - src = ./extensionOverridesPatches/pano_at_elhan.io.patch; - inherit gsound libgda; - }) - ]; + (patchExtension "pano@elhan.io" (final: prev: { + version = "v23-alpha3"; + src = fetchzip { + url = "https://github.com/oae/gnome-shell-pano/releases/download/${final.version}/pano@elhan.io.zip"; + hash = "sha256-LYpxsl/PC8hwz0ZdH5cDdSZPRmkniBPUCqHQxB4KNhc="; + stripRoot = false; + }; + preInstall = '' + substituteInPlace extension.js \ + --replace-fail "import Gda from 'gi://Gda?version>=5.0'" "imports.gi.GIRepository.Repository.prepend_search_path('${libgda}/lib/girepository-1.0'); const Gda = (await import('gi://Gda')).default" \ + --replace-fail "import GSound from 'gi://GSound'" "imports.gi.GIRepository.Repository.prepend_search_path('${gsound}/lib/girepository-1.0'); const GSound = (await import('gi://GSound')).default" + ''; })) (patchExtension "system-monitor@gnome-shell-extensions.gcampax.github.com" (old: { diff --git a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch deleted file mode 100644 index d5b61dba99aa..000000000000 --- a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/__nix-prepend-search-paths.js b/__nix-prepend-search-paths.js -new file mode 100644 -index 0000000..bf3071b ---- /dev/null -+++ b/__nix-prepend-search-paths.js -@@ -0,0 +1,3 @@ -+import GIRepository from 'gi://GIRepository'; -+GIRepository.Repository.prepend_search_path('@gsound@/lib/girepository-1.0'); -+GIRepository.Repository.prepend_search_path('@libgda@/lib/girepository-1.0'); -diff --git a/extension.js b/extension.js -index a3d6741..6a38850 100644 ---- a/extension.js -+++ b/extension.js -@@ -1,3 +1,4 @@ -+import './__nix-prepend-search-paths.js'; - import Gio from 'gi://Gio'; - import GLib from 'gi://GLib'; - import Shell from 'gi://Shell'; -diff --git a/prefs.js b/prefs.js -index 5dd94eb..634b2ef 100644 ---- a/prefs.js -+++ b/prefs.js -@@ -1,3 +1,4 @@ -+import './__nix-prepend-search-paths.js'; - import Gdk from 'gi://Gdk'; - import Gtk from 'gi://Gtk'; - import { ExtensionPreferences } from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js'; From 3688e311b4ce4692a8fbb9f2afc64996f0f03b28 Mon Sep 17 00:00:00 2001 From: Joshua Leivenzon Date: Thu, 7 Nov 2024 19:50:37 +1100 Subject: [PATCH 0051/1054] flutter: Pass flutter_tools package_config.json to Dart runtime --- pkgs/development/compilers/flutter/flutter.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 0db577decce3..69872053952d 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -92,6 +92,8 @@ let # Some of flutter_tools's dependencies contain static assets. The # application attempts to read its own package_config.json to find these # assets at runtime. + # TODO: Remove this once Flutter 3.24 is the lowest version in Nixpkgs. + # https://github.com/flutter/flutter/pull/150340 makes it redundant. mkdir -p packages/flutter_tools/.dart_tool ln -s '${flutterTools.pubcache}/package_config.json' packages/flutter_tools/.dart_tool/package_config.json @@ -131,7 +133,7 @@ let makeShellWrapper "$out/bin/dart" "$out/bin/flutter" \ --set-default FLUTTER_ROOT "$out" \ --set FLUTTER_ALREADY_LOCKED true \ - --add-flags "--disable-dart-dev \$NIX_FLUTTER_TOOLS_VM_OPTIONS $out/bin/cache/flutter_tools.snapshot" + --add-flags "--disable-dart-dev --packages='${flutterTools.pubcache}/package_config.json' \$NIX_FLUTTER_TOOLS_VM_OPTIONS $out/bin/cache/flutter_tools.snapshot" runHook postInstall ''; From a5eaeab894dd2934675dbd951214ac671f5159d5 Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Thu, 7 Nov 2024 15:33:22 +0400 Subject: [PATCH 0052/1054] maintainers: add sako --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5c51a0805dfd..208d539834f1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18635,6 +18635,14 @@ github = "Sail0rd"; githubId = 55802415; }; + sako = { + name = "Sako"; + email = "sako@cock.email"; + matrix = "@sako:imagisphe.re"; + github = "Sakooooo"; + githubId = 78461130; + keys = [ { fingerprint = "CA52 EE7B E681 720E 32B6 6792 FE52 FD65 B76E 4751"; } ]; + }; samalws = { email = "sam@samalws.com"; name = "Sam Alws"; From f3b448bfe5b3d488d3f2efae6696811af6e29735 Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Thu, 7 Nov 2024 15:40:29 +0400 Subject: [PATCH 0053/1054] unnamed-sdvx-clone: init at 0.6.0 --- .../by-name/un/unnamed-sdvx-clone/package.nix | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 pkgs/by-name/un/unnamed-sdvx-clone/package.nix diff --git a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix new file mode 100644 index 000000000000..b91ab1ea5298 --- /dev/null +++ b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix @@ -0,0 +1,108 @@ +{ + stdenv, + cmake, + fetchFromGitHub, + freetype, + pkg-config, + SDL2, + libpng, + libjpeg, + zlib, + libogg, + libvorbis, + libarchive, + iconv, + openssl, + curl, + libcpr, + rapidjson, + writeShellScriptBin, + makeDesktopItem, + lib, + copyDesktopItems, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "unnamed-sdvx-clone"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "Drewol"; + repo = "unnamed-sdvx-clone"; + rev = "refs/tags/v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-wuf7xZztoxzNQJzlJOfH/Dc25/717NevBx7E0RDybho="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + copyDesktopItems + ]; + + buildInputs = [ + freetype + SDL2 + libpng + libjpeg + zlib + libogg + libvorbis + libarchive + iconv + openssl + curl + libcpr + rapidjson + ]; + + cmakeFlags = [ + "-DUSE_SYSTEM_CPR=ON" + "-DCMAKE_BUILD_TYPE=Release" + ]; + + # Wrapper script because the things are hardcoded so we just + # change the game directory via the built in option uhhhhh + wrapperScript = writeShellScriptBin "usc-game-wrapped" '' + DATA_PATH="''${XDG_CONFIG_HOME:-$HOME/.local/share}/usc" + mkdir -p $DATA_PATH + + cp -r @out@/bin/audio $DATA_PATH + cp -r @out@/bin/fonts $DATA_PATH + cp -r @out@/bin/skins $DATA_PATH + cp -r @out@/bin/LightPlugins $DATA_PATH + + find $DATA_PATH -type d -exec chmod 755 {} + + find $DATA_PATH -type f -exec chmod 644 {} + + + @out@/bin/usc-game -gamedir="$DATA_PATH" + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Unnamed SDVX Clone"; + exec = "usc-game-wrapped"; + comment = "Unnamed SDVX Clone"; + desktopName = "Unnamed SDVX Clone"; + categories = [ "Game" ]; + }) + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + substituteAll $wrapperScript/bin/usc-game-wrapped $out/bin/usc-game-wrapped + chmod +x $out/bin/usc-game-wrapped + mkdir $out/share + cp -r /build/source/bin $out + runHook postInstall + ''; + + meta = { + description = "A game based on K-Shoot MANIA and Sound Voltex"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sako ]; + platforms = lib.platforms.linux; + mainProgram = "usc-game-wrapped"; + }; +}) From 7c99a7de644babeffaded90d6931ea43f8192974 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Thu, 7 Nov 2024 19:13:53 -0800 Subject: [PATCH 0054/1054] python310Packages.onlykey-solo-python: fix compatibility with fido2 1.1.3 --- .../python-modules/onlykey-solo-python/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/onlykey-solo-python/default.nix b/pkgs/development/python-modules/onlykey-solo-python/default.nix index 53831b63c40c..bff5a0dca626 100644 --- a/pkgs/development/python-modules/onlykey-solo-python/default.nix +++ b/pkgs/development/python-modules/onlykey-solo-python/default.nix @@ -28,10 +28,10 @@ buildPythonPackage rec { ''; patches = [ - # https://github.com/trustcrypto/onlykey-solo-python/pull/2 + # https://github.com/trustcrypto/onlykey-solo-python/pull/3 (fetchpatch { - url = "https://github.com/trustcrypto/onlykey-solo-python/commit/c5a86506f940d4e8fbb670ed665ddca48779cbe9.patch"; - hash = "sha256-LhCUR5QH9Je/Nr185HgQxfkCtat8W2Huv62zr5Mlrn4="; + url = "https://github.com/trustcrypto/onlykey-solo-python/commit/dfebd6b36087f5f918da8c1af5a3236581cccf2d.patch"; + hash = "sha256-O0XQoWwhwvLc0CchUTXSuWgHMNG2ZPDy7FsU3RQrdp8="; }) ]; From 6bb49a52f3d68917c28652263ae23348f9b92c2d Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Wed, 7 Aug 2024 12:36:26 -0700 Subject: [PATCH 0055/1054] python3Packages.pywikibot: init at 9.5.0 --- .../python-modules/pywikibot/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/pywikibot/default.nix diff --git a/pkgs/development/python-modules/pywikibot/default.nix b/pkgs/development/python-modules/pywikibot/default.nix new file mode 100644 index 000000000000..ab10a6e71eeb --- /dev/null +++ b/pkgs/development/python-modules/pywikibot/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + mwparserfromhell, + requests, + packaging, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "pywikibot"; + version = "9.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ZUOsiadQ2zekQDc+wc9MvNgLBXQkguvrDufpC8+1kLo="; + }; + + propagatedBuildInputs = [ + mwparserfromhell + requests + packaging + ]; + + # Tests attempt to install a tool using pip, which fails due to the sandbox + doCheck = false; + + pythonImportsCheck = [ "pywikibot" ]; + + meta = { + description = "Python MediaWiki bot framework"; + mainProgram = "pwb"; + homepage = "https://www.mediawiki.org/wiki/Manual:Pywikibot"; + changelog = "https://doc.wikimedia.org/pywikibot/master/changelog.html"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomodachi94 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 251571df44b8..b494e5744d45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13132,6 +13132,8 @@ self: super: with self; { pywfa = callPackage ../development/python-modules/pywfa { }; + pywikibot = callPackage ../development/python-modules/pywikibot { }; + pywilight = callPackage ../development/python-modules/pywilight { }; pywinrm = callPackage ../development/python-modules/pywinrm { }; From bbbd6b711cda065023eb7caa0bf4462e8fdb2cdf Mon Sep 17 00:00:00 2001 From: Talha Can Havadar Date: Tue, 5 Nov 2024 15:45:16 +0100 Subject: [PATCH 0056/1054] maintainers: add talhaHavadar --- maintainers/maintainer-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f53e59971f2a..8bf842d77677 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21325,6 +21325,17 @@ githubId = 6064962; name = "TakWolf"; }; + talhaHavadar = { + email = "havadartalha@gmail.com"; + github = "talhaHavadar"; + githubId = 6908462; + name = "Talha Can Havadar"; + keys = [ + { + fingerprint = "1E13 12DF 4B71 58B6 EBF9 DE78 2574 3879 62FE B0D1"; + } + ]; + }; talkara = { email = "taito.horiuchi@relexsolutions.com"; github = "talkara"; From 563987104e9ce0088f140360edd02458b2266688 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 9 Nov 2024 12:00:00 +0000 Subject: [PATCH 0057/1054] linux config: enable cp15 barrier emulation on aarch64 this fixes the native armv7l build of nodejs on aarch64 remote builders --- pkgs/os-specific/linux/kernel/common-config.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 54a9753b5fa1..34eeb745ff36 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1297,6 +1297,13 @@ let # differently when run under aarch64 kernels compared to when # it is run under an aarch32 kernel. COMPAT_ALIGNMENT_FIXUPS = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "6.1" yes); + + # requirement for CP15_BARRIER_EMULATION + ARMV8_DEPRECATED = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") yes; + # emulate a specific armv7 instruction that was removed from armv8 + # this instruction is required to build a native armv7 nodejs on an + # aarch64-linux builder, for example + CP15_BARRIER_EMULATION = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") yes; } // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Required for various hardware features on Chrome OS devices CHROME_PLATFORMS = yes; From 49fec30e867199515dd5942e403797483ee49c4b Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 5 Aug 2024 18:24:45 +0200 Subject: [PATCH 0058/1054] sbctl: 0.14 -> 0.16 Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/sb/sbctl/fix-go-module.patch | 108 ---------------------- pkgs/by-name/sb/sbctl/package.nix | 23 ++--- 2 files changed, 12 insertions(+), 119 deletions(-) delete mode 100644 pkgs/by-name/sb/sbctl/fix-go-module.patch diff --git a/pkgs/by-name/sb/sbctl/fix-go-module.patch b/pkgs/by-name/sb/sbctl/fix-go-module.patch deleted file mode 100644 index 7e160aa34157..000000000000 --- a/pkgs/by-name/sb/sbctl/fix-go-module.patch +++ /dev/null @@ -1,108 +0,0 @@ -From cf12e591c6007c6e32bd86167816e316f5b70c26 Mon Sep 17 00:00:00 2001 -From: Sefa Eyeoglu -Date: Sat, 25 May 2024 15:38:41 +0200 -Subject: [PATCH] Fix go module - -Signed-off-by: Sefa Eyeoglu ---- - go.mod | 4 +++- - go.sum | 10 ++++++++++ - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/go.mod b/go.mod -index 2e23dd6..7668f57 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,8 @@ - module github.com/foxboron/sbctl - --go 1.20 -+go 1.21 -+ -+toolchain go1.22.3 - - require ( - github.com/fatih/color v1.13.0 -diff --git a/go.sum b/go.sum -index 9f29d75..d3f4af4 100644 ---- a/go.sum -+++ b/go.sum -@@ -314,6 +314,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ - github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= - github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= - github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= - github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM= - github.com/google/go-licenses v0.0.0-20210329231322-ce1d9163b77d/go.mod h1:+TYOmkVoJOpwnS0wfdsJCV9CoD5nJYsHoFk/0CrTK4M= - github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -@@ -322,9 +323,11 @@ github.com/google/go-replayers/httpreplay v0.1.0/go.mod h1:YKZViNhiGgqdBlUbI2MwG - github.com/google/go-tpm v0.9.0 h1:sQF6YqWMi+SCXpsmS3fd21oPy/vSddwZry4JnmltHVk= - github.com/google/go-tpm v0.9.0/go.mod h1:FkNVkc6C+IsvDI9Jw1OveJmxGZUUaKxtrpOS47QWKfU= - github.com/google/go-tpm-tools v0.4.2 h1:iyaCPKt2N5Rd0yz0G8ANa022SgCNZkMpp+db6QELtvI= -+github.com/google/go-tpm-tools v0.4.2/go.mod h1:fGUDZu4tw3V4hUVuFHmiYgRd0c58/IXivn9v3Ea/ck4= - github.com/google/go-tspi v0.3.0 h1:ADtq8RKfP+jrTyIWIZDIYcKOMecRqNJFOew2IT0Inus= - github.com/google/go-tspi v0.3.0/go.mod h1:xfMGI3G0PhxCdNVcYr1C4C+EizojDg/TXuX5by8CiHI= - github.com/google/goexpect v0.0.0-20210430020637-ab937bf7fd6f h1:7MmqygqdeJtziBUpm4Z9ThROFZUaVGaePMfcDnluf1E= -+github.com/google/goexpect v0.0.0-20210430020637-ab937bf7fd6f/go.mod h1:n1ej5+FqyEytMt/mugVDZLIiqTMO+vsrgY+kM6ohzN0= - github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= - github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2 h1:CVuJwN34x4xM2aT4sIKhmeib40NeBPhRihNjQmpJsA4= - github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2/go.mod h1:nOFQdrUlIlx6M6ODdSpBj1NVA+VgLC6kmw60mkw34H4= -@@ -422,6 +425,7 @@ github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbc - github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= - github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= - github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8= -+github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis= - github.com/hugelgupf/vmtest v0.0.0-20240110072021-f6f07acb7aa1 h1:aa9+0fjwoGotyC8A3QjdITMAX89g/+qvDAhKPrK1NKE= - github.com/hugelgupf/vmtest v0.0.0-20240110072021-f6f07acb7aa1/go.mod h1:a4SVM0HTMEt2IqrtCMOF44++nnzhrkHmQpkpw6Yrpso= - github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -@@ -554,6 +558,7 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi - github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= - github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= - github.com/ncruces/go-fs v0.2.2 h1:ak7h7jdihotXtXqjrBb2YZViJ+n41tLIqMG9ZY7bJMQ= -+github.com/ncruces/go-fs v0.2.2/go.mod h1:07xkoGj//ID8iICNv3rcD2PtMjia3mABv1yZzdq7qZ8= - github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= - github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= - github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -@@ -641,6 +646,7 @@ github.com/pseudomuto/protoc-gen-doc v1.5.0/go.mod h1:exDTOVwqpp30eV/EDPFLZy3Pwr - github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= - github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= - github.com/rekby/gpt v0.0.0-20200219180433-a930afbc6edc h1:goZGTwEEn8mWLcY012VouWZWkJ8GrXm9tS3VORMxT90= -+github.com/rekby/gpt v0.0.0-20200219180433-a930afbc6edc/go.mod h1:scrOqOnnHVKCHENvFw8k9ajCb88uqLQDA4BvuJNJ2ew= - github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= - github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= - github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -@@ -705,6 +711,7 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 - github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= -+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= - github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= - github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0= -@@ -774,6 +781,7 @@ go.etcd.io/etcd/tests/v3 v3.5.0/go.mod h1:f+mtZ1bE1YPvgKdOJV2BKy4JQW0nAFnQehgOE7 - go.etcd.io/etcd/v3 v3.5.0-alpha.0/go.mod h1:JZ79d3LV6NUfPjUxXrpiFAYcjhT+06qqw+i28snx8To= - go.etcd.io/etcd/v3 v3.5.0/go.mod h1:FldM0/VzcxYWLvWx1sdA7ghKw7C3L2DvUTzGrcEtsC4= - go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 h1:A/5uWzF44DlIgdm/PQFwfMkW0JX+cIcQi/SwLAmZP5M= -+go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= - go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= - go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= - go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -@@ -1277,6 +1285,7 @@ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD - google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= - google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= - google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= -+google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= - google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= - google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= - google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -@@ -1328,6 +1337,7 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= -+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= - honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= - honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= --- -2.44.1 - diff --git a/pkgs/by-name/sb/sbctl/package.nix b/pkgs/by-name/sb/sbctl/package.nix index 75c752cc8849..6fecd4b14631 100644 --- a/pkgs/by-name/sb/sbctl/package.nix +++ b/pkgs/by-name/sb/sbctl/package.nix @@ -9,31 +9,32 @@ buildGoModule rec { pname = "sbctl"; - version = "0.14"; + version = "0.16"; src = fetchFromGitHub { owner = "Foxboron"; repo = pname; rev = version; - hash = "sha256-1TprUr+bLPOlMpe4ReV1S/QbVsA8Q7QIOcLczEaSyAQ="; + hash = "sha256-BLSvjo6GCqpECJPJtQ6C2zEz1p03uyvxTYa+DoxZ78s="; }; - patches = [ - ./fix-go-module.patch - ]; + vendorHash = "sha256-srfZ+TD93szabegwtzLTjB+uo8aj8mB4ecQ9m8er00A="; - vendorHash = "sha256-LuSewWK/sxaHibJ6a05PM9CPen8J+MJD6lwk4SNOWSA="; - - ldflags = [ "-s" "-w" "-X github.com/foxboron/sbctl.DatabasePath=${databasePath}" ]; + ldflags = [ "-s" "-w" "-X github.com/foxboron/sbctl.DatabasePath=${databasePath}" "-X github.com/foxboron/sbctl.Version=${version}" ]; nativeBuildInputs = [ installShellFiles asciidoc ]; postBuild = '' - make docs/sbctl.8 + make docs/sbctl.conf.5 docs/sbctl.8 ''; + checkFlags = [ + # https://github.com/Foxboron/sbctl/issues/343 + "-skip" "github.com/google/go-tpm-tools/.*" + ]; + postInstall = '' - installManPage docs/sbctl.8 + installManPage docs/sbctl.conf.5 docs/sbctl.8 installShellCompletion --cmd sbctl \ --bash <($out/bin/sbctl completion bash) \ @@ -48,7 +49,7 @@ buildGoModule rec { mainProgram = "sbctl"; homepage = "https://github.com/Foxboron/sbctl"; license = licenses.mit; - maintainers = with maintainers; [ raitobezarius ]; + maintainers = with maintainers; [ raitobezarius Scrumplex ]; # go-uefi do not support darwin at the moment: # see upstream on https://github.com/Foxboron/go-uefi/issues/13 platforms = platforms.linux; From 9cc2c5f0fd022739a76f2bca0fb1156811bbc792 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 9 Nov 2024 13:13:28 +0100 Subject: [PATCH 0059/1054] sbctl: don't generate completions when cross compiling Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/sb/sbctl/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sb/sbctl/package.nix b/pkgs/by-name/sb/sbctl/package.nix index 6fecd4b14631..70f461686772 100644 --- a/pkgs/by-name/sb/sbctl/package.nix +++ b/pkgs/by-name/sb/sbctl/package.nix @@ -1,5 +1,6 @@ { lib , buildGoModule +, stdenv , fetchFromGitHub , installShellFiles , asciidoc @@ -35,11 +36,11 @@ buildGoModule rec { postInstall = '' installManPage docs/sbctl.conf.5 docs/sbctl.8 - + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sbctl \ - --bash <($out/bin/sbctl completion bash) \ - --fish <($out/bin/sbctl completion fish) \ - --zsh <($out/bin/sbctl completion zsh) + --bash <($out/bin/sbctl completion bash) \ + --fish <($out/bin/sbctl completion fish) \ + --zsh <($out/bin/sbctl completion zsh) ''; passthru.updateScript = nix-update-script { }; From fc30e169ac2363c0d7886dfed44c5333114fa06a Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 9 Nov 2024 13:13:41 +0100 Subject: [PATCH 0060/1054] sbctl: nixfmt Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/sb/sbctl/package.nix | 55 ++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/sb/sbctl/package.nix b/pkgs/by-name/sb/sbctl/package.nix index 70f461686772..657afb7ea86a 100644 --- a/pkgs/by-name/sb/sbctl/package.nix +++ b/pkgs/by-name/sb/sbctl/package.nix @@ -1,11 +1,12 @@ -{ lib -, buildGoModule -, stdenv -, fetchFromGitHub -, installShellFiles -, asciidoc -, databasePath ? "/etc/secureboot" -, nix-update-script +{ + lib, + buildGoModule, + stdenv, + fetchFromGitHub, + installShellFiles, + asciidoc, + databasePath ? "/etc/secureboot", + nix-update-script, }: buildGoModule rec { @@ -21,9 +22,17 @@ buildGoModule rec { vendorHash = "sha256-srfZ+TD93szabegwtzLTjB+uo8aj8mB4ecQ9m8er00A="; - ldflags = [ "-s" "-w" "-X github.com/foxboron/sbctl.DatabasePath=${databasePath}" "-X github.com/foxboron/sbctl.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/foxboron/sbctl.DatabasePath=${databasePath}" + "-X github.com/foxboron/sbctl.Version=${version}" + ]; - nativeBuildInputs = [ installShellFiles asciidoc ]; + nativeBuildInputs = [ + installShellFiles + asciidoc + ]; postBuild = '' make docs/sbctl.conf.5 docs/sbctl.8 @@ -31,17 +40,20 @@ buildGoModule rec { checkFlags = [ # https://github.com/Foxboron/sbctl/issues/343 - "-skip" "github.com/google/go-tpm-tools/.*" + "-skip" + "github.com/google/go-tpm-tools/.*" ]; - postInstall = '' - installManPage docs/sbctl.conf.5 docs/sbctl.8 - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd sbctl \ - --bash <($out/bin/sbctl completion bash) \ - --fish <($out/bin/sbctl completion fish) \ - --zsh <($out/bin/sbctl completion zsh) - ''; + postInstall = + '' + installManPage docs/sbctl.conf.5 docs/sbctl.8 + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd sbctl \ + --bash <($out/bin/sbctl completion bash) \ + --fish <($out/bin/sbctl completion fish) \ + --zsh <($out/bin/sbctl completion zsh) + ''; passthru.updateScript = nix-update-script { }; @@ -50,7 +62,10 @@ buildGoModule rec { mainProgram = "sbctl"; homepage = "https://github.com/Foxboron/sbctl"; license = licenses.mit; - maintainers = with maintainers; [ raitobezarius Scrumplex ]; + maintainers = with maintainers; [ + raitobezarius + Scrumplex + ]; # go-uefi do not support darwin at the moment: # see upstream on https://github.com/Foxboron/go-uefi/issues/13 platforms = platforms.linux; From 3a7bef85cad99c5987e9412b8d38c31bde5a10c3 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 9 Nov 2024 13:30:33 +0100 Subject: [PATCH 0061/1054] sbctl: don't use pname in src Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/sb/sbctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sb/sbctl/package.nix b/pkgs/by-name/sb/sbctl/package.nix index 657afb7ea86a..79b858eb49ed 100644 --- a/pkgs/by-name/sb/sbctl/package.nix +++ b/pkgs/by-name/sb/sbctl/package.nix @@ -15,8 +15,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "Foxboron"; - repo = pname; - rev = version; + repo = "sbctl"; + rev = "refs/tags/${version}"; hash = "sha256-BLSvjo6GCqpECJPJtQ6C2zEz1p03uyvxTYa+DoxZ78s="; }; From 0c38fa2802129a0b4dbded8b9812cafa8023e61d Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Tue, 1 Oct 2024 23:18:09 +0200 Subject: [PATCH 0062/1054] libratbag: 0.17 -> 0.18 --- pkgs/by-name/li/libratbag/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libratbag/package.nix b/pkgs/by-name/li/libratbag/package.nix index 3a13c53cf586..df740b338dc7 100644 --- a/pkgs/by-name/li/libratbag/package.nix +++ b/pkgs/by-name/li/libratbag/package.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libratbag"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "libratbag"; repo = "libratbag"; rev = "v${version}"; - sha256 = "sha256-TQ8DVj4yqq3IA0oGnLDz+QNTyNRmGqspEjkPeBmXNew="; + sha256 = "sha256-dAWKDF5hegvKhUZ4JW2J/P9uSs4xNrZLNinhAff6NSc="; }; nativeBuildInputs = [ From 71b8c39ca813ceb9a566c2bcc46d93a2e1e4b265 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 02:25:05 +0100 Subject: [PATCH 0063/1054] libratbag: format with nixfmt --- pkgs/by-name/li/libratbag/package.nix | 60 +++++++++++++++++++++------ 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/li/libratbag/package.nix b/pkgs/by-name/li/libratbag/package.nix index df740b338dc7..0d7bc5cb4084 100644 --- a/pkgs/by-name/li/libratbag/package.nix +++ b/pkgs/by-name/li/libratbag/package.nix @@ -1,25 +1,61 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsNoGuiHook, gobject-introspection -, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 -, json-glib, libunistring }: +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + wrapGAppsNoGuiHook, + gobject-introspection, + glib, + systemd, + udev, + libevdev, + gitMinimal, + check, + valgrind, + swig, + python3, + json-glib, + libunistring, +}: stdenv.mkDerivation rec { pname = "libratbag"; version = "0.18"; src = fetchFromGitHub { - owner = "libratbag"; - repo = "libratbag"; - rev = "v${version}"; + owner = "libratbag"; + repo = "libratbag"; + rev = "v${version}"; sha256 = "sha256-dAWKDF5hegvKhUZ4JW2J/P9uSs4xNrZLNinhAff6NSc="; }; nativeBuildInputs = [ - meson ninja pkg-config gitMinimal swig check valgrind wrapGAppsNoGuiHook gobject-introspection + meson + ninja + pkg-config + gitMinimal + swig + check + valgrind + wrapGAppsNoGuiHook + gobject-introspection ]; buildInputs = [ - glib systemd udev libevdev json-glib libunistring - (python3.withPackages (ps: with ps; [ evdev pygobject3 ])) + glib + systemd + udev + libevdev + json-glib + libunistring + (python3.withPackages ( + ps: with ps; [ + evdev + pygobject3 + ] + )) ]; mesonFlags = [ @@ -28,9 +64,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Configuration library for gaming mice"; - homepage = "https://github.com/libratbag/libratbag"; - license = licenses.mit; + homepage = "https://github.com/libratbag/libratbag"; + license = licenses.mit; maintainers = with maintainers; [ mvnetbiz ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } From 3442068f54253ab3624ad3b5b3cd4a04042c4da2 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 02:26:10 +0100 Subject: [PATCH 0064/1054] libratbag: refactor --- pkgs/by-name/li/libratbag/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libratbag/package.nix b/pkgs/by-name/li/libratbag/package.nix index 0d7bc5cb4084..8cd47c2fa0e1 100644 --- a/pkgs/by-name/li/libratbag/package.nix +++ b/pkgs/by-name/li/libratbag/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "libratbag"; repo = "libratbag"; rev = "v${version}"; - sha256 = "sha256-dAWKDF5hegvKhUZ4JW2J/P9uSs4xNrZLNinhAff6NSc="; + hash = "sha256-dAWKDF5hegvKhUZ4JW2J/P9uSs4xNrZLNinhAff6NSc="; }; nativeBuildInputs = [ @@ -62,11 +62,11 @@ stdenv.mkDerivation rec { "-Dsystemd-unit-dir=./lib/systemd/system/" ]; - meta = with lib; { + meta = { description = "Configuration library for gaming mice"; homepage = "https://github.com/libratbag/libratbag"; - license = licenses.mit; - maintainers = with maintainers; [ mvnetbiz ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mvnetbiz ]; + platforms = lib.platforms.linux; }; } From a6229420a3d0382cbef7b7e90e0fd19658267b40 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 02:28:23 +0100 Subject: [PATCH 0065/1054] piper: 0.7 -> 0.8 Co-authored-by: myclevorname --- pkgs/by-name/pi/piper/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/piper/package.nix b/pkgs/by-name/pi/piper/package.nix index bba3843f4f4c..b859510173d2 100644 --- a/pkgs/by-name/pi/piper/package.nix +++ b/pkgs/by-name/pi/piper/package.nix @@ -4,7 +4,7 @@ python3.pkgs.buildPythonApplication rec { pname = "piper"; - version = "0.7"; + version = "0.8"; format = "other"; @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { owner = "libratbag"; repo = "piper"; rev = version; - sha256 = "0jsvfy0ihdcgnqljfgs41lys1nlz18qvsa0a8ndx3pyr41f8w8wf"; + sha256 = "sha256-j58fL6jJAzeagy5/1FmygUhdBm+PAlIkw22Rl/fLff4="; }; nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook3 desktop-file-utils appstream-glib gobject-introspection ]; @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { mesonFlags = [ "-Druntime-dependency-checks=false" - "-Dtests=false" ]; postPatch = '' From 77ee7fc30af0f1534554b8e226bf588fbc2d79e3 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 02:28:55 +0100 Subject: [PATCH 0066/1054] piper: format with nixfmt --- pkgs/by-name/pi/piper/package.nix | 55 ++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/pi/piper/package.nix b/pkgs/by-name/pi/piper/package.nix index b859510173d2..8dad1176b36a 100644 --- a/pkgs/by-name/pi/piper/package.nix +++ b/pkgs/by-name/pi/piper/package.nix @@ -1,6 +1,20 @@ -{ lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 -, wrapGAppsHook3, gtk3, glib, desktop-file-utils, appstream-glib, adwaita-icon-theme -, gobject-introspection, librsvg }: +{ + lib, + meson, + ninja, + pkg-config, + gettext, + fetchFromGitHub, + python3, + wrapGAppsHook3, + gtk3, + glib, + desktop-file-utils, + appstream-glib, + adwaita-icon-theme, + gobject-introspection, + librsvg, +}: python3.pkgs.buildPythonApplication rec { pname = "piper"; @@ -9,17 +23,34 @@ python3.pkgs.buildPythonApplication rec { format = "other"; src = fetchFromGitHub { - owner = "libratbag"; - repo = "piper"; - rev = version; + owner = "libratbag"; + repo = "piper"; + rev = version; sha256 = "sha256-j58fL6jJAzeagy5/1FmygUhdBm+PAlIkw22Rl/fLff4="; }; - nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook3 desktop-file-utils appstream-glib gobject-introspection ]; + nativeBuildInputs = [ + meson + ninja + gettext + pkg-config + wrapGAppsHook3 + desktop-file-utils + appstream-glib + gobject-introspection + ]; buildInputs = [ - gtk3 glib adwaita-icon-theme python3 librsvg + gtk3 + glib + adwaita-icon-theme + python3 + librsvg + ]; + propagatedBuildInputs = with python3.pkgs; [ + lxml + evdev + pygobject3 ]; - propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; mesonFlags = [ "-Druntime-dependency-checks=false" @@ -33,9 +64,9 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "GTK frontend for ratbagd mouse config daemon"; mainProgram = "piper"; - homepage = "https://github.com/libratbag/piper"; - license = licenses.gpl2Only; + homepage = "https://github.com/libratbag/piper"; + license = licenses.gpl2Only; maintainers = with maintainers; [ mvnetbiz ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } From 016e5f240f44e926c882c90fb8f5e96efb7830c1 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 02:29:56 +0100 Subject: [PATCH 0067/1054] piper: refactor --- pkgs/by-name/pi/piper/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pi/piper/package.nix b/pkgs/by-name/pi/piper/package.nix index 8dad1176b36a..083ebff2d2a3 100644 --- a/pkgs/by-name/pi/piper/package.nix +++ b/pkgs/by-name/pi/piper/package.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "libratbag"; repo = "piper"; rev = version; - sha256 = "sha256-j58fL6jJAzeagy5/1FmygUhdBm+PAlIkw22Rl/fLff4="; + hash = "sha256-j58fL6jJAzeagy5/1FmygUhdBm+PAlIkw22Rl/fLff4="; }; nativeBuildInputs = [ @@ -61,12 +61,12 @@ python3.pkgs.buildPythonApplication rec { patchShebangs meson_install.sh data/generate-piper-gresource.xml.py ''; - meta = with lib; { + meta = { description = "GTK frontend for ratbagd mouse config daemon"; mainProgram = "piper"; homepage = "https://github.com/libratbag/piper"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ mvnetbiz ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ mvnetbiz ]; + platforms = lib.platforms.linux; }; } From 9cf5d33f09f0972c62dac03cb32a94b2c55ce8fa Mon Sep 17 00:00:00 2001 From: Jan Christoph Ebersbach Date: Sun, 3 Nov 2024 10:15:33 +0100 Subject: [PATCH 0068/1054] sope: add jceb to maintainers --- pkgs/by-name/so/sope/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix index 89372fca3f63..aad8948b398e 100644 --- a/pkgs/by-name/so/sope/package.nix +++ b/pkgs/by-name/so/sope/package.nix @@ -59,6 +59,6 @@ gnustep.stdenv.mkDerivation rec { license = licenses.publicDomain; homepage = "https://github.com/inverse-inc/sope"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ jceb ]; }; } From 81b0e3f7fa14dac6ac28c00966a171f5f2573055 Mon Sep 17 00:00:00 2001 From: Jan Christoph Ebersbach Date: Sun, 3 Nov 2024 10:15:59 +0100 Subject: [PATCH 0069/1054] sogo: 5.11.0 -> 5.11.2 --- pkgs/by-name/so/sogo/package.nix | 4 ++-- pkgs/by-name/so/sope/package.nix | 24 ++++++++---------------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/so/sogo/package.nix b/pkgs/by-name/so/sogo/package.nix index b24910f4bb05..4cd51f1307a0 100644 --- a/pkgs/by-name/so/sogo/package.nix +++ b/pkgs/by-name/so/sogo/package.nix @@ -5,14 +5,14 @@ , libwbxml }: gnustep.stdenv.mkDerivation rec { pname = "sogo"; - version = "5.11.0"; + version = "5.11.2"; # always update the sope package as well, when updating sogo src = fetchFromGitHub { owner = "Alinto"; repo = pname; rev = "SOGo-${version}"; - hash = "sha256-2/0OaCAQkdnDPGOVERZs2Oz+bCpQN3MTLzp2pz0WB08="; + hash = "sha256-c+547x7ugYoLMgGVLcMmmb9rzquRJOv8n+Js2CuE7I0="; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ]; diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix index aad8948b398e..67fcb756e9bc 100644 --- a/pkgs/by-name/so/sope/package.nix +++ b/pkgs/by-name/so/sope/package.nix @@ -3,23 +3,15 @@ gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.9.0"; + version = "5.11.2"; src = fetchFromGitHub { - owner = "inverse-inc"; + owner = "Alinto"; repo = pname; rev = "SOPE-${version}"; - hash = "sha256-JZh8sC/w2MRy3UyWYGMvU47XtWKGnLuUlCsVyyxd7zg="; + hash = "sha256-6vec2ZgpK5jcKr3c2SLn6fLAun56MDjupWtR6dMdjag="; }; - patches = [ - (fetchpatch { # https://github.com/Alinto/sope/pull/66 - name = "sope-fix-gnustep-1.29.0+.patch"; - url = "https://github.com/Alinto/sope/pull/66/commits/9ec2744cc851b11886c3ebb723138e4d672bd5c7.patch"; - hash = "sha256-JgYRwjmjlitgzYz9Jfei5XJRThP1TunPjI0g5M2wZPA="; - }) - ]; - nativeBuildInputs = [ gnustep.make ]; buildInputs = [ gnustep.base libxml2 openssl ] ++ lib.optional (openldap != null) openldap @@ -45,7 +37,7 @@ gnustep.stdenv.mkDerivation rec { env = { GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf"; - NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=int-conversion"; }; # Move over the makefiles (see comment over preConfigure) @@ -54,11 +46,11 @@ gnustep.stdenv.mkDerivation rec { find /build/Makefiles -mindepth 1 -maxdepth 1 -not -type l -exec cp -r '{}' $out/share/GNUstep/Makefiles \; ''; - meta = with lib; { + meta = { description = "Extensive set of frameworks which form a complete Web application server environment"; - license = licenses.publicDomain; + license = lib.licenses.publicDomain; homepage = "https://github.com/inverse-inc/sope"; - platforms = platforms.linux; - maintainers = with maintainers; [ jceb ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jceb ]; }; } From 7578f3833bf6f4bfac41449444885ccd952345c0 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 17 Aug 2024 19:45:42 +0000 Subject: [PATCH 0070/1054] plasma-panel-spacer-extended: init at 1.9.0 --- .../plasma-panel-spacer-extended/package.nix | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix diff --git a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix new file mode 100644 index 000000000000..b6877859a793 --- /dev/null +++ b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + kdePackages, + glib, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "plasma-panel-spacer-extended"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "luisbocanegra"; + repo = "plasma-panel-spacer-extended"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-3ediynClboG6/dBQTih6jJPGjsTBZhZKOPQAjGLRNmk="; + }; + + nativeBuildInputs = [ + cmake + kdePackages.extra-cmake-modules + ]; + + buildInputs = [ + kdePackages.kdeplasma-addons + kdePackages.plasma-desktop + ]; + + strictDeps = true; + + cmakeFlags = [ (lib.cmakeFeature "Qt6_DIR" "${kdePackages.qtbase}/lib/cmake/Qt6") ]; + + propagatedUserEnvPkgs = [ glib ]; + + dontWrapQtApps = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Spacer with mouse gestures for the KDE Plasma Panel"; + homepage = "https://github.com/luisbocanegra/plasma-panel-spacer-extended"; + changelog = "https://github.com/luisbocanegra/plasma-panel-spacer-extended/blob/main/CHANGELOG.md"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + inherit (kdePackages.kwindowsystem.meta) platforms; + }; +}) From 872d4bf33ed0c7998c7726b295ba8c445cf25b3d Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Sun, 10 Nov 2024 00:13:57 -0800 Subject: [PATCH 0071/1054] vkquake: 1.31.2 -> 1.31.3 --- pkgs/games/quakespasm/vulkan.nix | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 10c647fb17aa..4c84267c1d4c 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -1,33 +1,33 @@ { - lib, - stdenv, - fetchFromGitHub, - meson, - ninja, - glslang, - pkg-config, - flac, - libopus, - opusfile, - makeWrapper, SDL2, + fetchFromGitHub, + flac, + glslang, gzip, + lib, + libmpg123, + libopus, libvorbis, - libmad, + makeWrapper, + meson, + moltenvk, + ninja, + opusfile, + pkg-config, + stdenv, vulkan-headers, vulkan-loader, - moltenvk, }: stdenv.mkDerivation rec { pname = "vkquake"; - version = "1.31.2"; + version = "1.31.3"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; - sha256 = "sha256-7JE1KBavZt8u55KpWMmQOJJuxlW99ICnaQI4MbTgGdw="; + sha256 = "sha256-VqTfcwt6/VTotD2Y7x7WiVwISRGOLfmMWh6EO5DSMX4="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { SDL2 flac gzip - libmad + libmpg123 libopus libvorbis opusfile From 41960fcdacbafa81ed5daf40d378b490fc5e81ca Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 17 Oct 2024 19:08:19 +0300 Subject: [PATCH 0072/1054] splice.nix: make `pkgs` `splicedPackages` when required MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will make `pkgs` used in `callPackage`, and `pkgsCross.X.pkgs` have packages with `__spliced`. https://www.github.com/NixOS/nixpkgs/blob/3029741718f4c765fbc5ebf76bea3d6c8ff15fe5/pkgs/development/interpreters/python/passthrufun.nix#L37 https://www.github.com/NixOS/nixpkgs/blob/d2bd9a39dec88eddd5c192abee69939e67f43d12/pkgs/top-level/python-packages.nix#L10720 ``` nix-repl> pkgsCross.aarch64-multiplatform.python3Packages.protobuf4.protobuf.__spliced error: … while evaluating the attribute 'aarch64-multiplatform.python3Packages.protobuf4.protobuf.__spliced' at /home/artturin/nixgits/my-nixpkgs/.worktree/1/pkgs/development/python-modules/protobuf/4.nix:119:13: 118| passthru = { 119| inherit protobuf; | ^ 120| }; error: attribute '__spliced' missing at «string»:1:1: 1| pkgsCross.aarch64-multiplatform.python3Packages.protobuf4.protobuf.__spliced | ^ ``` to ``` nix-repl> pkgsCross.aarch64-multiplatform.python3Packages.protobuf4.protobuf.__spliced { buildBuild = «derivation /nix/store/s7da5mfvx4h1n86j78knaj9cprglxqz6-protobuf-25.4.drv»; buildHost = «derivation /nix/store/s7da5mfvx4h1n86j78knaj9cprglxqz6-protobuf-25.4.drv»; buildTarget = «repeated»; hostHost = «derivation /nix/store/mszvybzs4zxh43awyrjnybsfcb265n9r-protobuf-aarch64-unknown-linux-gnu-25.4.drv»; hostTarget = «repeated»; } ``` --- pkgs/top-level/splice.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 3b600c22f60e..e9e1ba02bf81 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -151,6 +151,8 @@ in newScope = extra: lib.callPackageWith (pkgsForCall // extra); + pkgs = if actuallySplice then splicedPackages // { recurseForDerivations = false; } else pkgs; + # prefill 2 fields of the function for convenience makeScopeWithSplicing = lib.makeScopeWithSplicing splicePackages pkgs.newScope; makeScopeWithSplicing' = lib.makeScopeWithSplicing' { inherit splicePackages; inherit (pkgs) newScope; }; From a27e48e1b24504bc134ba05640c5663c7af0fd80 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 1 Nov 2024 20:21:38 +0200 Subject: [PATCH 0073/1054] treewide: remove `= __splicedPackages` Now that `pkgs` is `__splicedPackages` on cross we can remove these variables I set. Assignments like `patchutils = pkgs.patchutils_0_3_3;` in `all-packages.nix` cannot be removed because the `pkgs` in `patchutils = pkgs.patchutils_0_3_3;` in `all-packages.nix` is coming from this `pkgs:` https://www.github.com/NixOS/nixpkgs/blob/b6e486730fc875ec79a3dea0f1f46eaf9f6ffa9d/pkgs/top-level/all-packages.nix#L9 instead of the `pkgs` in `with pkgs;` --- pkgs/development/beam-modules/default.nix | 3 +-- pkgs/development/beam-modules/lib.nix | 5 +---- pkgs/development/interpreters/perl/default.nix | 6 +----- pkgs/top-level/all-packages.nix | 10 +++------- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 23649ca76f26..b5a4188a0b2a 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,7 +1,6 @@ -{ lib, __splicedPackages, erlang }: +{ lib, pkgs, erlang }: let - pkgs = __splicedPackages; inherit (lib) makeExtensible; lib' = pkgs.callPackage ./lib.nix { }; diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index 2d93b28cda6b..1b021cf93472 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -1,8 +1,5 @@ -{ __splicedPackages, lib }: +{ pkgs, lib }: -let - pkgs = __splicedPackages; -in rec { /* Similar to callPackageWith/callPackage, but without makeOverridable diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 8fd99172be10..1080f02f6e4d 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -19,11 +19,7 @@ let # - adds spliced package sets to the package set ({ stdenv, pkgs, perl, callPackage, makeScopeWithSplicing' }: let perlPackagesFun = callPackage ../../../top-level/perl-packages.nix { - # allow 'perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig; }; }' like in python3Packages - # most perl packages aren't called with callPackage so it's not possible to override their arguments individually - # the conditional is because the // above won't be applied to __splicedPackages and hopefully no one is doing that when cross-compiling - pkgs = if stdenv.buildPlatform != stdenv.hostPlatform then pkgs.__splicedPackages else pkgs; - inherit stdenv; + inherit stdenv pkgs; perl = self; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13d3da983e2f..41da7a024b2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5577,9 +5577,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { - pkgs = pkgs.__splicedPackages; - }); + tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); tokei = callPackage ../development/tools/misc/tokei { inherit (darwin.apple_sdk.frameworks) Security; @@ -5944,7 +5942,7 @@ with pkgs; yarn-berry = callPackage ../development/tools/yarn-berry { }; - yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; }; + yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { }; inherit (yarn2nix-moretea) yarn2nix @@ -6653,7 +6651,6 @@ with pkgs; idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules { idris-no-deps = haskellPackages.idris; - pkgs = pkgs.__splicedPackages; }); idris = idrisPackages.with-packages [ idrisPackages.base ] ; @@ -17353,8 +17350,7 @@ with pkgs; openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; openraPackages_2019 = import ../games/openra_2019 { - inherit lib; - pkgs = pkgs.__splicedPackages; + inherit lib pkgs; }; openra_2019 = openraPackages_2019.engines.release; From 1c327386b4934dd76d0deae5d7d350050553b23a Mon Sep 17 00:00:00 2001 From: Dict Xiong Date: Fri, 18 Oct 2024 15:15:16 +0800 Subject: [PATCH 0074/1054] maintainers: add DictXiong --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c069e9b2494c..e6aefc68fa59 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5495,6 +5495,12 @@ githubId = 15774340; name = "Thomas Depierre"; }; + DictXiong = { + email = "me@beardic.cn"; + github = "DictXiong"; + githubId = 41772157; + name = "Dict Xiong"; + }; diegolelis = { email = "diego.o.lelis@gmail.com"; github = "DiegoLelis"; From ff0d3ad153794f6244360b15da7b6ad0a3a9da3c Mon Sep 17 00:00:00 2001 From: Flameopathic Date: Mon, 11 Nov 2024 09:44:15 -0500 Subject: [PATCH 0075/1054] wl-clicker: init at v0.3.1 --- pkgs/by-name/wl/wl-clicker/package.nix | 50 ++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/wl/wl-clicker/package.nix diff --git a/pkgs/by-name/wl/wl-clicker/package.nix b/pkgs/by-name/wl/wl-clicker/package.nix new file mode 100644 index 000000000000..aa54cf4d6db7 --- /dev/null +++ b/pkgs/by-name/wl/wl-clicker/package.nix @@ -0,0 +1,50 @@ +{ + lib, + fetchFromGitHub, + stdenv, + wayland-scanner, + wlr-protocols, + wayland, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wl-clicker"; + version = "0.3.1"; + + nativeBuildInputs = [ wayland-scanner ]; + buildInputs = [ + wlr-protocols + wayland + ]; + + src = fetchFromGitHub { + owner = "phonetic112"; + repo = "wl-clicker"; + rev = "v${finalAttrs.version}"; + hash = "sha256-HuUK1kkqIdB5SdcewJ1J8elzqrFaFWC3BRV3GgcasTU="; + }; + + postPatch = '' + sed -i 's|/usr|${wlr-protocols}|g' Makefile + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install build/wl-clicker $out/bin/wl-clicker + + runHook postInstall + ''; + + meta = { + description = "Wayland autoclicker"; + longDescription = "Script for auto clicking at incredibly high speeds - user must be a part of `input` group to run."; + homepage = "https://github.com/phonetic112/wl-clicker"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.Flameopathic ]; + mainProgram = "wl-clicker"; + platforms = lib.platforms.linux; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; + }; +}) From 899a7b2472bc386979824f6e6633f6d723c802a7 Mon Sep 17 00:00:00 2001 From: d4rk Date: Sun, 3 Nov 2024 15:36:05 -0800 Subject: [PATCH 0076/1054] maintainers: add d4rk --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6ced83f98095..ffb5eb991945 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4719,6 +4719,12 @@ github = "d4ilyrun"; githubId = 34611103; }; + d4rk = { + name = "Anoop Menon"; + email = "d4rk@blackvoltage.org"; + github = "d4rk"; + githubId = 22163; + }; d4rkstar = { name = "Bruno Salzano"; email = "d4rkstar@gmail.com"; From f28124f58a6db5068d5e85af5a340e396126384e Mon Sep 17 00:00:00 2001 From: d4rk Date: Tue, 1 Oct 2024 12:35:01 -0700 Subject: [PATCH 0077/1054] vulkan-hdr-layer-kwin6: init at 0-unstable-2024-10-19 https://github.com/Zamundaaa/VK_hdr_layer Enables HDR support for Vulkan clients (such as mpv) on kwin6. This is likely to be a temporary solution until Wayland upstream adopts the necessary protocols, however that has been in the works for many years: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/14 For the time being, this provides a path for users to experiment with HDR, share feedback and hopefully make progress. Arch provides a similar package: https://aur.archlinux.org/packages/vk-hdr-layer-kwin6-git --- .../vu/vulkan-hdr-layer-kwin6/package.nix | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix diff --git a/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix new file mode 100644 index 000000000000..d698760dbf22 --- /dev/null +++ b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + libX11, + meson, + ninja, + pkg-config, + vulkan-headers, + vulkan-loader, + wayland-scanner, + wayland, +}: + +stdenv.mkDerivation rec { + pname = "vulkan-hdr-layer-kwin6"; + version = "0-unstable-2024-10-19"; + + depsBuildBuild = [ pkg-config ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + cmake + wayland-scanner + ]; + + buildInputs = [ + vulkan-headers + vulkan-loader + libX11 + wayland + ]; + + strictDeps = true; + + src = fetchFromGitHub { + owner = "Zamundaaa"; + repo = "VK_hdr_layer"; + rev = "e173f2617262664901039e3c821929afce05d2c1"; + hash = "sha256-hBxRwbn29zFeHcRpfMF6I4piSASpN2AvZY0ci5Utj4U="; + fetchSubmodules = true; + }; + + meta = { + description = "Vulkan Wayland HDR WSI Layer (Xaver Hugl's fork for KWin 6)"; + homepage = "https://github.com/Zamundaaa/VK_hdr_layer"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ d4rk ]; + }; +} From c6668dffc80c0acb0797f24886d8a2eb3d5b37e6 Mon Sep 17 00:00:00 2001 From: "Daniel S. Smetana" Date: Tue, 20 Aug 2024 20:56:49 +0900 Subject: [PATCH 0078/1054] canon-cups-ufr2: 5.90 -> 6.00 --- pkgs/by-name/ca/canon-cups-ufr2/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/canon-cups-ufr2/package.nix b/pkgs/by-name/ca/canon-cups-ufr2/package.nix index e39bcf05e427..fa8bbafa5ac2 100644 --- a/pkgs/by-name/ca/canon-cups-ufr2/package.nix +++ b/pkgs/by-name/ca/canon-cups-ufr2/package.nix @@ -30,15 +30,15 @@ let ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; libs = pkgs: lib.makeLibraryPath buildInputs; - version = "5.90"; - dl = "8/0100007658/40"; + version = "6.00"; + dl = "0/0100009240/34"; suffix1 = "m17n"; - suffix2 = "03"; + suffix2 = "00"; versionNoDots = builtins.replaceStrings [ "." ] [ "" ] version; src_canon = fetchurl { url = "http://gdlp01.c-wss.com/gds/${dl}/linux-UFRII-drv-v${versionNoDots}-${suffix1}-${suffix2}.tar.gz"; - hash = "sha256-HvuRQYqkHRCwfajSJPridDcADq7VkYwBEo4qr9W5mqA="; + hash = "sha256-JQAe/avYG+9TAsH26UGai6u8/upRXwZrGBc/hd4jZe8="; }; buildInputs = [ cups zlib jbigkit glib gtk3 libxml2 gdk-pixbuf pango cairo atk ]; From 3ce3d5b24093459af9ed1e9257e550fef224b6b9 Mon Sep 17 00:00:00 2001 From: "Daniel S. Smetana" Date: Tue, 20 Aug 2024 20:57:50 +0900 Subject: [PATCH 0079/1054] canon-cups-ufr2: fix color printing issues This commit resolves https://github.com/NixOS/nixpkgs/issues/310013 by adding the required `libjpeg` and `libgcrypt` libraries. It sets `dontPatchELF = true` to prevent `patchelf --shrink-rpath` from removing these libraries from the `RPATH`. This is necessary because the driver binaries use `dlopen` to load the libraries at runtime instead of specifying them in `DT_NEEDED`, which causes `dlopen` to be unable to find them when `patchelf --shrink-rpath` is called. --- pkgs/by-name/ca/canon-cups-ufr2/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/canon-cups-ufr2/package.nix b/pkgs/by-name/ca/canon-cups-ufr2/package.nix index fa8bbafa5ac2..9f34deeeff94 100644 --- a/pkgs/by-name/ca/canon-cups-ufr2/package.nix +++ b/pkgs/by-name/ca/canon-cups-ufr2/package.nix @@ -8,6 +8,8 @@ , makeWrapper , cups , jbigkit +, libjpeg +, libgcrypt , glib , gtk3 , gdk-pixbuf @@ -41,13 +43,16 @@ let hash = "sha256-JQAe/avYG+9TAsH26UGai6u8/upRXwZrGBc/hd4jZe8="; }; - buildInputs = [ cups zlib jbigkit glib gtk3 libxml2 gdk-pixbuf pango cairo atk ]; + buildInputs = [ cups zlib jbigkit libjpeg libgcrypt glib gtk3 libxml2 gdk-pixbuf pango cairo atk ]; in stdenv.mkDerivation rec { pname = "canon-cups-ufr2"; inherit version; src = src_canon; + # we can't let patchelf remove unnecessary RPATHs because the driver uses dlopen to load libjpeg and libgcrypt + dontPatchELF = true; + postUnpack = '' ( cd $sourceRoot From f0cc69f4ab14b1caddd6bc55e912b61e221d60db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Cl=C3=A9roux?= <73357644+gcleroux@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:58:29 -0500 Subject: [PATCH 0080/1054] kind: 0.2.4 -> 0.2.5 --- pkgs/by-name/ki/kind/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ki/kind/package.nix b/pkgs/by-name/ki/kind/package.nix index 239ecdcf1d6b..c4c5c0bfbff2 100644 --- a/pkgs/by-name/ki/kind/package.nix +++ b/pkgs/by-name/ki/kind/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kind"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - hash = "sha256-vndN3ssiaaJdpPZQ0vBdqr4xPuY2bAHAd+SJamNrX6Q="; + hash = "sha256-6WlkZ2dLMSSSlJAEshMpD5Ai0WVo1NzXAvpjEQd3JPA="; }; patches = [ From e351a0b8409dab9b6b7c6276347bf3a9b766d00e Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:18:06 -0700 Subject: [PATCH 0081/1054] maintainers: add pancaek --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 289dc3e6f775..d37a42f5fab1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15539,6 +15539,11 @@ githubId = 686076; name = "Vitalii Voloshyn"; }; + pancaek = { + github = "pancaek"; + githubId = 20342389; + name = "paneku"; + }; panda2134 = { email = "me+nixpkgs@panda2134.site"; github = "panda2134"; From 4ec848d3650e21a1efddfb4d4822d6dea6c0461c Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:33:32 -0700 Subject: [PATCH 0082/1054] komika-fonts: init at 0-unstable-2024-08-12 --- pkgs/by-name/ko/komika-fonts/package.nix | 120 +++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 pkgs/by-name/ko/komika-fonts/package.nix diff --git a/pkgs/by-name/ko/komika-fonts/package.nix b/pkgs/by-name/ko/komika-fonts/package.nix new file mode 100644 index 000000000000..c6473d2c8445 --- /dev/null +++ b/pkgs/by-name/ko/komika-fonts/package.nix @@ -0,0 +1,120 @@ +{ + stdenvNoCC, + lib, + fetchzip, + variants ? [ + "display" + "hand" + "poster" + "text" + "title" + "komikahuna" + "komikandy" + "komikazba" + "komikaze" + "komikazoom" + ], +}: + +let + fetchFont = + { + url, + hash, + curlOptsList ? [ ], + }: + fetchzip { + inherit url hash curlOptsList; + name = lib.nameFromURL url "."; + stripRoot = false; + }; + fontMap = { + "display" = { + url = "https://www.1001fonts.com/download/komika-display.zip"; + hash = "sha256-6oNKuaoV+a/cFCKFXRV8gtWqvFtPGtrqg+vt8hQREMI="; + }; + "hand" = { + url = "https://www.1001fonts.com/download/komika.zip"; + hash = "sha256-yb5SWQj7BRCLYHL31m25bhCOuo8qAvkRzGH6UIo3Bbs="; + }; + "poster" = { + url = "https://www.1001freefonts.com/d/5010/komika-poster.zip"; + hash = "sha256-k1uUfHSh9kymCJrfuPtKHejFeZGl2PxL4C/3hpoPIc4="; + curlOptsList = [ + "-H" + "Referer: https://www.1001freefonts.com/komika-poster.font" + ]; + }; + "text" = { + url = "https://www.1001fonts.com/download/komika-text.zip"; + hash = "sha256-FdeFGw6MlYVTiYdvbfjSlQYq+UlKZTJ79HAdEEjMPQs="; + }; + "title" = { + url = "https://www.1001freefonts.com/d/5011/komika-title.zip"; + hash = "sha256-M/1NgsHjLR/w/ZxWEb5cebqEI1VKgPvtk75bhAPaw20="; + curlOptsList = [ + "-H" + "Referer: https://www.1001freefonts.com/komika-title.font" + ]; + }; + "komikahuna" = { + url = "https://www.1001fonts.com/download/komikahuna.zip"; + hash = "sha256-TjGxQA3ZyIOyJUNP+MVkYiSDk9WDIDPy3d2ttWC1aoc="; + }; + "komikandy" = { + url = "https://www.1001fonts.com/download/komikandy.zip"; + hash = "sha256-NqpR+gM2giTHGUBYoJlO8vkzOD0ep7LzAry3nIagjLY="; + }; + "komikazba" = { + url = "https://www.1001fonts.com/download/komikazba.zip"; + hash = "sha256-SGJMP0OdZ/AEImN5S3QshCbWSLXO4qTjHnSQYqoy3Pc="; + }; + "komikaze" = { + url = "https://www.1001fonts.com/download/komikaze.zip"; + hash = "sha256-daJRwgkzL5v224KwkaGMK2FqVnfin8+8WvMTvXTkCGE="; + }; + "komikazoom" = { + url = "https://www.1001fonts.com/download/komikazoom.zip"; + hash = "sha256-/o2QPPPiQBkNU0XRxJyI0+5CKFEv4FKU3A5ku1zyVX4="; + }; + + }; + knownFonts = lib.attrNames fontMap; + selectedFonts = + if (variants == [ ]) then + lib.warn "No variants selected, installing all instead" knownFonts + else + let + unknown = lib.subtractLists knownFonts variants; + in + if (unknown != [ ]) then + throw "Unknown variant(s): ${lib.concatStringsSep " " unknown}" + else + variants; + +in +stdenvNoCC.mkDerivation { + pname = "komika-fonts"; + version = "0-unstable-2024-08-12"; + sourceRoot = "."; + + srcs = map (variant: fetchFont fontMap.${variant}) selectedFonts; + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/ttf + mv **/*.ttf $out/share/fonts/ttf + runHook postInstall + ''; + + meta = { + homepage = "https://moorstation.org/typoasis/designers/lab/index.htm"; + # description from archive here: http://web.archive.org/web/20030422173903fw_/http://www.hardcovermedia.com/lab/Pages/Fontpages/komikahands.html + description = "First ever comic lettering super family"; + longDescription = '' + 50 fonts, covering everything the comic artist needs when it comes to lettering. 10 text faces, 10 display faces, 10 tiling faces, 10 hand variations, 9 poster faces, and 20 balloons in a font. + ''; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ pancaek ]; + platforms = lib.platforms.all; + }; +} From e4e84b2b36b33b185b4693161200add7e4b9c483 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 10 Nov 2024 19:48:01 +0900 Subject: [PATCH 0083/1054] dprint: format with nixfmt-rfc-style --- pkgs/development/tools/dprint/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index d6b1266ab393..f57edba6aa79 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchCrate, rustPlatform, CoreFoundation, Security }: +{ + lib, + stdenv, + fetchCrate, + rustPlatform, + CoreFoundation, + Security, +}: rustPlatform.buildRustPackage rec { pname = "dprint"; @@ -11,7 +18,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-86ecnwDDVvgXgBBodP2rSZOn+R52Jap8RCKILttGOn8="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + CoreFoundation + Security + ]; # Tests fail because they expect a test WASM plugin. Tests already run for # every commit upstream on GitHub Actions From d76335d6343069e3455beb747055ac392c5bca0f Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 10 Nov 2024 19:56:33 +0900 Subject: [PATCH 0084/1054] dprint: add passthru.tests.version --- pkgs/development/tools/dprint/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index f57edba6aa79..6e66d51dbe79 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -5,6 +5,8 @@ rustPlatform, CoreFoundation, Security, + testers, + dprint, }: rustPlatform.buildRustPackage rec { @@ -27,6 +29,17 @@ rustPlatform.buildRustPackage rec { # every commit upstream on GitHub Actions doCheck = false; + passthru = { + tests.version = testers.testVersion { + inherit version; + + package = dprint; + command = '' + DPRINT_CACHE_DIR="$(mktemp --directory)" dprint --version + ''; + }; + }; + meta = with lib; { description = "Code formatting platform written in Rust"; longDescription = '' From ef9f08ed35e96b5354435f9535f463d8d5d1409e Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 10 Nov 2024 20:40:38 +0900 Subject: [PATCH 0085/1054] dprint: add updateScript --- pkgs/development/tools/dprint/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index 6e66d51dbe79..e39f4251843b 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -6,6 +6,7 @@ CoreFoundation, Security, testers, + nix-update-script, dprint, }: @@ -38,6 +39,8 @@ rustPlatform.buildRustPackage rec { DPRINT_CACHE_DIR="$(mktemp --directory)" dprint --version ''; }; + + updateScript = nix-update-script { }; }; meta = with lib; { From 4155ccc122bb63eddb310b279ad577b87046f081 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 10 Nov 2024 20:49:43 +0900 Subject: [PATCH 0086/1054] dprint: 0.47.2 -> 0.47.5 --- pkgs/development/tools/dprint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index e39f4251843b..910d19d89c4a 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.47.2"; + version = "0.47.5"; src = fetchCrate { inherit pname version; - hash = "sha256-zafRwiXfRACT6G408pXLCk7t6akabOs1VFLRF9SeNWI="; + hash = "sha256-1TfROcng9hF8j2PR+LEXNWnIKLapTPU1QunoCi5NxhI="; }; - cargoHash = "sha256-86ecnwDDVvgXgBBodP2rSZOn+R52Jap8RCKILttGOn8="; + cargoHash = "sha256-EliiKKRt+7IMPR8+0OWn+YKizPT9SZjVALAdbwi301w="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation From fe3ce419eb0b647233f0ba3f86e59bddac18711a Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 10 Nov 2024 20:51:06 +0900 Subject: [PATCH 0087/1054] dprint: switch to the new darwin sdk pattern --- pkgs/development/tools/dprint/default.nix | 7 ------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index 910d19d89c4a..38cb068c4d59 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -3,8 +3,6 @@ stdenv, fetchCrate, rustPlatform, - CoreFoundation, - Security, testers, nix-update-script, dprint, @@ -21,11 +19,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EliiKKRt+7IMPR8+0OWn+YKizPT9SZjVALAdbwi301w="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - ]; - # Tests fail because they expect a test WASM plugin. Tests already run for # every commit upstream on GitHub Actions doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ebffaa70335..f6323a2b13be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8231,9 +8231,7 @@ with pkgs; dbt = with python3Packages; toPythonApplication dbt-core; - dprint = callPackage ../development/tools/dprint { - inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security; - }; + dprint = callPackage ../development/tools/dprint { }; devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo123Module; }; From ccfbd723b367889f71eb4569d631ee90349dd650 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Nov 2024 23:19:25 +0000 Subject: [PATCH 0088/1054] passt: 2024_09_06.6b38f07 -> 2024_10_30.ee7d0b6 --- pkgs/by-name/pa/passt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix index 6f9c04ae0fb9..ad04ac2b30ed 100644 --- a/pkgs/by-name/pa/passt/package.nix +++ b/pkgs/by-name/pa/passt/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "passt"; - version = "2024_09_06.6b38f07"; + version = "2024_10_30.ee7d0b6"; src = fetchurl { url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz"; - hash = "sha256-Qf1neJOkYXR5p9Owk60qtc22A+au4EY45Qt9PfJ+Lrs="; + hash = "sha256-x5WIqtWBfVt7+u47bfT2g92ghhaIjYt2GW279+sbKdE="; }; postPatch = '' From 33586ab6d6875a83333f8a165878d144475d537b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Nov 2024 01:19:38 +0000 Subject: [PATCH 0089/1054] boogie: 3.2.5 -> 3.4.2 --- pkgs/by-name/bo/boogie/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index c018581cecf7..83809abfe4c7 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "Boogie"; - version = "3.2.5"; + version = "3.4.2"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; rev = "v${version}"; - hash = "sha256-36aGVJEzaAwQgR11NI+v8c4cXm24iiXtiwjW6qd3qsE="; + hash = "sha256-IWtYbb1IFB6DLIYYTP+q7q+h/0aqonxr/mWwf+83aRo="; }; projectFile = [ "Source/Boogie.sln" ]; From 4e84219665352871e1335902977438d2984b865e Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 1 Nov 2024 16:44:19 -0400 Subject: [PATCH 0090/1054] gcalcli: 4.4.0 -> 4.5.1 --- pkgs/by-name/gc/gcalcli/package.nix | 40 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/gc/gcalcli/package.nix b/pkgs/by-name/gc/gcalcli/package.nix index c9c29cd8e007..e1f51abd82f7 100644 --- a/pkgs/by-name/gc/gcalcli/package.nix +++ b/pkgs/by-name/gc/gcalcli/package.nix @@ -2,49 +2,47 @@ stdenv, lib, fetchFromGitHub, + nix-update-script, python3Packages, libnotify, }: python3Packages.buildPythonApplication rec { pname = "gcalcli"; - version = "4.4.0"; + version = "4.5.1"; pyproject = true; src = fetchFromGitHub { owner = "insanum"; repo = "gcalcli"; rev = "refs/tags/v${version}"; - hash = "sha256-X9sgnujHMbmrt7cpcBOvTycIKFz3G2QzNDt3me5GUrQ="; + hash = "sha256-FU1EHLQ+/2sOGeeGwONsrV786kHTFfMel7ocBcCe+rI="; }; - postPatch = - '' - # dev dependencies - substituteInPlace pyproject.toml \ - --replace-fail "\"google-api-python-client-stubs\"," "" \ - --replace-fail "\"types-python-dateutil\"," "" \ - --replace-fail "\"types-requests\"," "" \ - --replace-fail "\"types-vobject\"," "" - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace gcalcli/argparsers.py \ - --replace-fail "'notify-send" "'${lib.getExe libnotify}" - ''; + updateScript = nix-update-script { }; - build-system = with python3Packages; [ setuptools ]; + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace gcalcli/argparsers.py \ + --replace-fail "'notify-send" "'${lib.getExe libnotify}" + ''; + + build-system = with python3Packages; [ setuptools-scm ]; dependencies = with python3Packages; [ argcomplete - python-dateutil + babel gflags - httplib2 - parsedatetime - vobject google-api-python-client google-auth-oauthlib - uritemplate + httplib2 libnotify + parsedatetime + platformdirs + pydantic + python-dateutil + truststore + uritemplate + vobject ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; From 934cf4cdea4c8790f93278232027d9ebcfc5b0c7 Mon Sep 17 00:00:00 2001 From: Dict Xiong Date: Fri, 18 Oct 2024 15:24:08 +0800 Subject: [PATCH 0091/1054] rpPPPoE: 3.12 -> 4.0 and build kernel mode plugin The old rpPPPoE package from Roaring Penguin is no longer maintained and the download link is also inaccessible. So I switch the upstream to https://github.com/dfskoll/rp-pppoe. Also, according to the discussions in https://github.com/dfskoll/rp-pppoe/issues/32, it is strongly recommended to use rpPPPoE in the kernel mode, as it is more stable and performant than in the user mode. So I enable the compilation of the kernel mode plugin `rp-pppoe.so`. It will be available at `/run/current-system/sw/lib/rp-pppoe.so`. --- pkgs/by-name/rp/rpPPPoE/package.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/rp/rpPPPoE/package.nix b/pkgs/by-name/rp/rpPPPoE/package.nix index e58c25766810..6fd6c40ce308 100644 --- a/pkgs/by-name/rp/rpPPPoE/package.nix +++ b/pkgs/by-name/rp/rpPPPoE/package.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchurl, ppp } : +{ lib, stdenv, fetchFromGitHub, ppp } : let in stdenv.mkDerivation rec { pname = "rp-pppoe"; - version = "3.12"; + version = "4.0"; - src = fetchurl { - url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; - sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80"; + src = fetchFromGitHub { + owner = "dfskoll"; + repo = "rp-pppoe"; + rev = version; + hash = "sha256-2y26FVxVn8sU9/E2yJeJmbhAeOB0Go7EUPMU9H58H6U="; }; buildInputs = [ ppp ]; @@ -17,11 +19,13 @@ stdenv.mkDerivation rec { export PPPD=${ppp}/sbin/pppd ''; - configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "rpppoe_cv_pack_bitfields=rev" ]; + configureFlags = [ "--enable-plugin=${ppp}/include" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "rpppoe_cv_pack_bitfields=rev" ]; postConfigure = '' sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/etc/ppp@' + sed -i Makefile -e 's@/etc/ppp/plugins@$(out)/lib@' sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)@' + sed -i Makefile -e '/# Directory created by rp-pppoe for kernel-mode plugin/d' ''; makeFlags = [ "AR:=$(AR)" ]; @@ -29,7 +33,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Roaring Penguin Point-to-Point over Ethernet tool"; platforms = platforms.linux; - homepage = "https://www.roaringpenguin.com/products/pppoe"; + homepage = "https://github.com/dfskoll/rp-pppoe"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ DictXiong ]; }; } From 82803318055e6dbf94e1d01db373cde0b7292f17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Nov 2024 03:34:03 +0000 Subject: [PATCH 0092/1054] renode-unstable: 1.15.3+20241004git4b8a8f170 -> 1.15.3+20241112git6e850cb52 --- pkgs/by-name/re/renode-unstable/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 8426e804c075..95a18ec25f26 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -5,11 +5,11 @@ renode.overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.3+20241004git4b8a8f170"; + version = "1.15.3+20241112git6e850cb52"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-/+fH5DHL/kg4IlJyOlCuOMsUocaBsA8GYvq5iP7Ip+4="; + hash = "sha256-GkmzPc0pPRglkuGzPU+rLUcwlhw8v4VgQnxnkzT/+cI="; }; passthru.updateScript = From 41f5151102c622d8112ed8b803b4f9a614decb3a Mon Sep 17 00:00:00 2001 From: Bastian Asmussen Date: Fri, 15 Nov 2024 15:29:54 +0100 Subject: [PATCH 0093/1054] maintainers: add BastianAsmussen --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5e2792825044..6ad35e2bcbac 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2474,6 +2474,13 @@ githubId = 6987136; keys = [ { fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940"; } ]; }; + BastianAsmussen = { + name = "Bastian Asmussen"; + email = "bastian@asmussen.tech"; + github = "BastianAsmussen"; + githubId = 76102128; + keys = [ { fingerprint = "3B11 7469 0893 85E7 16C2 7CD9 0FE5 A355 DBC9 2568"; } ]; + }; basvandijk = { email = "v.dijk.bas@gmail.com"; github = "basvandijk"; From aef4e7d0bdad3e1ac2b02b8a68598572f7bb651a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Nov 2024 00:47:57 +0000 Subject: [PATCH 0094/1054] glooctl: 1.17.14 -> 1.17.16 --- pkgs/by-name/gl/glooctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index 8121f7005f3c..c66ebfa74be6 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "glooctl"; - version = "1.17.14"; + version = "1.17.16"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-7KkaQYTsamUapWKPB0JIoEnOs/SvrCbBgQqvQg9VQ9o="; + hash = "sha256-GU6Vdnb4eQnpv9DwpLJvwUONwmEG9mOORojBsJZNATw="; }; - vendorHash = "sha256-rAObw4J0ATle1gq5Z1MsrGy/iqQDHjnMPAEIPBgtY3g="; + vendorHash = "sha256-NXQTDiUBQEr/QzpDV8b13nGUJ3YmkZNYBrlT4tiRalk="; subPackages = [ "projects/gloo/cli/cmd" ]; From ed0c00f8abc1482640398e26a59d3abea81c47da Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 13 Nov 2024 23:35:55 +0100 Subject: [PATCH 0095/1054] wsysmon: remove procps dep and dynamically link spdlog --- pkgs/by-name/ws/wsysmon/dependencies.patch | 14 -------- ...l.patch => fix-deps-and-add-install.patch} | 35 +++++++++++++++++-- pkgs/by-name/ws/wsysmon/package.nix | 34 ++++++++---------- 3 files changed, 47 insertions(+), 36 deletions(-) delete mode 100644 pkgs/by-name/ws/wsysmon/dependencies.patch rename pkgs/by-name/ws/wsysmon/{install.patch => fix-deps-and-add-install.patch} (53%) diff --git a/pkgs/by-name/ws/wsysmon/dependencies.patch b/pkgs/by-name/ws/wsysmon/dependencies.patch deleted file mode 100644 index cc0a2fc709eb..000000000000 --- a/pkgs/by-name/ws/wsysmon/dependencies.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 31e8048..1eec936 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,8 +7,7 @@ include(FetchContent) - - FetchContent_Declare( - spdlog -- GIT_REPOSITORY https://github.com/gabime/spdlog.git -- GIT_TAG v1.10.0 -+ SOURCE_DIR @spdlog_src@ - ) - FetchContent_MakeAvailable(spdlog) - diff --git a/pkgs/by-name/ws/wsysmon/install.patch b/pkgs/by-name/ws/wsysmon/fix-deps-and-add-install.patch similarity index 53% rename from pkgs/by-name/ws/wsysmon/install.patch rename to pkgs/by-name/ws/wsysmon/fix-deps-and-add-install.patch index 4b5946a7ab74..bf295b8483ff 100644 --- a/pkgs/by-name/ws/wsysmon/install.patch +++ b/pkgs/by-name/ws/wsysmon/fix-deps-and-add-install.patch @@ -1,14 +1,43 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 31e8048..a125b3f 100644 +index 31e8048..b21f6f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -20,3 +20,9 @@ include_directories(${GTKMM_INCLUDE_DIRS} ${X11_INCLUDE_DIR}) +@@ -5,12 +5,7 @@ set(CMAKE_CXX_STANDARD 17) + find_package(PkgConfig) + include(FetchContent) + +-FetchContent_Declare( +- spdlog +- GIT_REPOSITORY https://github.com/gabime/spdlog.git +- GIT_TAG v1.10.0 +-) +-FetchContent_MakeAvailable(spdlog) ++find_package(spdlog REQUIRED) + + pkg_check_modules(GTKMM REQUIRED gtkmm-3.0) + find_package(X11 REQUIRED) +@@ -19,4 +14,10 @@ link_directories(${GTKMM_LIBRARY_DIRS}) + include_directories(${GTKMM_INCLUDE_DIRS} ${X11_INCLUDE_DIR}) add_executable(WSysMon src/main.cpp src/ui/MainWindow.cpp src/ui/widgets/GraphWidget.cpp src/ui/widgets/PerformanceButton.cpp src/ui/views/ProcessesView.cpp src/ui/views/PerformanceView.cpp src/ui/views/performance/PerformanceCPUView.cpp src/ui/views/performance/PerformanceGPUView.cpp src/ui/views/performance/PerformanceNetworkView.cpp src/ui/views/performance/PerformanceRAMView.cpp src/utils/DispatcherThread.cpp src/utils/UnitConverter.cpp src/utils/X11Utils.cpp src/api/process/ProcessManager.cpp src/api/process/ProcessNode.cpp src/api/linux/ProcessesApi.cpp src/api/linux/GPUApi.cpp src/api/linux/NetworkApi.cpp src/api/linux/SystemInfoApi.cpp src/api/DiskApi.h src/api/linux/DiskApi.cpp src/ui/views/performance/PerformanceDiskView.cpp src/ui/views/performance/PerformanceDiskView.h src/api/linux/gpu/nvml.h src/api/linux/gpu/nvml_hook_funcs.inl src/api/linux/gpu/NvGpuApi.cpp src/api/linux/gpu/NvGpuApi.h src/api/HwMonApi.h src/api/linux/HwMonApi.cpp) - target_link_libraries(WSysMon PRIVATE spdlog::spdlog pthread procps ${CMAKE_DL_LIBS} ${GTKMM_LIBRARIES} ${X11_LIBRARIES}) +-target_link_libraries(WSysMon PRIVATE spdlog::spdlog pthread procps ${CMAKE_DL_LIBS} ${GTKMM_LIBRARIES} ${X11_LIBRARIES}) ++target_link_libraries(WSysMon PRIVATE spdlog::spdlog pthread ${CMAKE_DL_LIBS} ${GTKMM_LIBRARIES} ${X11_LIBRARIES}) + +install( + TARGETS + WSysMon + RUNTIME DESTINATION bin +) +diff --git a/src/api/process/ProcessManager.h b/src/api/process/ProcessManager.h +index 44989f4..2e98963 100644 +--- a/src/api/process/ProcessManager.h ++++ b/src/api/process/ProcessManager.h +@@ -5,8 +5,6 @@ + #include + #include + +-#include +- + #include "ProcessNode.h" + #include "../ProcessesApi.h" + diff --git a/pkgs/by-name/ws/wsysmon/package.nix b/pkgs/by-name/ws/wsysmon/package.nix index 0e6635b0292f..76ffb4ab5964 100644 --- a/pkgs/by-name/ws/wsysmon/package.nix +++ b/pkgs/by-name/ws/wsysmon/package.nix @@ -1,13 +1,12 @@ -{ lib -, stdenv -, fetchFromGitHub -, substituteAll -, cmake -, pkg-config -, gtkmm3 -, gtk3 -, procps -, spdlog +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + gtkmm3, + gtk3, + spdlog, }: stdenv.mkDerivation rec { @@ -18,17 +17,15 @@ stdenv.mkDerivation rec { owner = "slyfabi"; repo = "wsysmon"; rev = version; - sha256 = "sha256-5kfZT+hm064qXoAzi0RdmUqXi8VaXamlbm+FJOrGh3A="; + hash = "sha256-5kfZT+hm064qXoAzi0RdmUqXi8VaXamlbm+FJOrGh3A="; }; patches = [ - # Prevent CMake from trying to fetch libraries from GitHub - (substituteAll { - src = ./dependencies.patch; - spdlog_src = spdlog.src; - }) - # Add an installPhase - ./install.patch + # - Dynamically link spdlog + # - Remove dependency on procps (had a newer version than this package expected) + # - See https://github.com/SlyFabi/WSysMon/issues/4 for the issue about procps and why it could be removed + # - Add an installPhase + ./fix-deps-and-add-install.patch ]; nativeBuildInputs = [ @@ -39,7 +36,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtkmm3 gtk3 - procps spdlog ]; From 9f1665e1f823d7a49182a4eb85beb873ee0e838f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Nov 2024 16:21:04 +0000 Subject: [PATCH 0096/1054] jbang: 0.119.0 -> 0.120.4 --- pkgs/by-name/jb/jbang/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jb/jbang/package.nix b/pkgs/by-name/jb/jbang/package.nix index 085612b67a34..7015dc0b66db 100644 --- a/pkgs/by-name/jb/jbang/package.nix +++ b/pkgs/by-name/jb/jbang/package.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.119.0"; + version = "0.120.4"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-ebwBRzgpYEomboY+hMok8KmOaNR4hRaPy7SxjHbLeYU="; + sha256 = "sha256-JjAHvXf4BKGgWGstDJmC8c8BoveZIha/g9b/d8LdXHU="; }; nativeBuildInputs = [ makeWrapper ]; From f9ede03bf8dc759f0e7da65da0968d4285612e2f Mon Sep 17 00:00:00 2001 From: Nicola Squartini Date: Sun, 12 Nov 2023 12:37:49 +0100 Subject: [PATCH 0097/1054] maintainers: add tensor5 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0b6cde9d55e1..3fbd7b6e179a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21654,6 +21654,12 @@ githubId = 2084639; name = "Manu"; }; + tensor5 = { + github = "tensor5"; + githubId = 1545895; + matrix = "@tensor5:matrix.org"; + name = "Nicola Squartini"; + }; teozkr = { email = "teo@nullable.se"; github = "nightkr"; From 5fbc2731f4107f75bcd5bc5842dc16280d7ee5b3 Mon Sep 17 00:00:00 2001 From: NovaViper Date: Sat, 16 Nov 2024 16:41:07 -0600 Subject: [PATCH 0098/1054] digikam: add conditional cmake flag for cudaSupport --- pkgs/by-name/di/digikam/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index 39a61d7e0eb5..39f2443a2734 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -37,6 +37,8 @@ x265, libGLX, libGLU, + cudaPackages, + enableCuda ? config.cudaSupport, kdePackages, @@ -178,6 +180,7 @@ stdenv.mkDerivation (finalAttrs: { #(lib.cmakeBool "ENABLE_AKONADICONTACTSUPPORT" true) (lib.cmakeBool "ENABLE_MEDIAPLAYER" true) (lib.cmakeBool "ENABLE_APPSTYLES" true) + (lib.optionals enableCuda "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}") ]; # Tests segfault for some reason… From 06d460dbb27eb48dd24912e09867f16a92c8f492 Mon Sep 17 00:00:00 2001 From: Gurjaka Date: Sun, 17 Nov 2024 16:18:50 +0400 Subject: [PATCH 0099/1054] maintainers: add gurjaka --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 30b6e40d3c19..b5d2bad0661e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8451,6 +8451,12 @@ githubId = 6578603; name = "Jonas Rembser"; }; + gurjaka = { + name = "Gurami Esartia"; + email = "esartia.gurika@gmail.com"; + github = "Gurjaka"; + githubId = 143032436; + }; guserav = { github = "guserav"; githubId = 28863828; From cb9f9a1e5a51a87d59b373db7016cee1608debd5 Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 14 Nov 2024 20:07:25 +0100 Subject: [PATCH 0100/1054] fetchgit{,hub}: add tag argument It's become a common pattern to use `rev = "refs/tags/${version}"` rather than just `rev = version` to ensure that the tag gets fetched rather than a branch that has the same name. This has so far been done using boilerplate though, so let's add a simple abstraction to fetch a tag instead. --- doc/build-helpers/fetchers.chapter.md | 5 ++++- pkgs/build-support/fetchgit/default.nix | 5 ++++- pkgs/build-support/fetchgithub/default.nix | 11 ++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index d37a2fecaccd..567d47a1499b 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -755,6 +755,9 @@ Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `hash` Used with Git. Expects `url` to a Git repo, `rev`, and `hash`. `rev` in this case can be full the git commit id (SHA1 hash) or a tag name like `refs/tags/v1.0`. +If you want to fetch a tag you should pass the `tag` parameter instead of `rev` which has the same effect as setting `rev = "refs/tags"/${version}"`. +This is safer than just setting `rev = version` w.r.t. possible branch and tag name conflicts. + Additionally, the following optional arguments can be given: *`fetchSubmodules`* (Boolean) @@ -833,7 +836,7 @@ A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are m ## `fetchFromGitHub` {#fetchfromgithub} -`fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `hash` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available, but `hash` is currently preferred. +`fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. If you need to fetch a tag however, you should prefer to use the `tag` parameter which achieves this in a safer way with less boilerplate. Finally, `hash` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available, but `hash` is currently preferred. To use a different GitHub instance, use `githubBase` (defaults to `"github.com"`). diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 4c40cbcef7e1..6f4cbba982a0 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -13,7 +13,10 @@ in lib.makeOverridable (lib.fetchers.withNormalizedHash { } ( # NOTE Please document parameter additions or changes in # doc/build-helpers/fetchers.chapter.md -{ url, rev ? "HEAD", leaveDotGit ? deepClone +{ url +, tag ? null +, rev ? if tag != null then "refs/tags/${tag}" else "HEAD" # FIXME fetching HEAD by default is problematic at best +, leaveDotGit ? deepClone , outputHash ? lib.fakeHash, outputHashAlgo ? null , fetchSubmodules ? true, deepClone ? false , branchName ? null diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index d27a3df7d3df..de9912465a93 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -1,7 +1,10 @@ { lib, fetchgit, fetchzip }: lib.makeOverridable ( -{ owner, repo, rev, name ? "source" +{ owner, repo +, tag ? null +, rev ? if tag != null then "refs/tags/${tag}" else null +, name ? "source" , fetchSubmodules ? false, leaveDotGit ? null , deepClone ? false, private ? false, forceFetchGit ? false , fetchLFS ? false @@ -11,6 +14,8 @@ lib.makeOverridable ( , ... # For hash agility }@args: +assert (lib.assertMsg (rev != null) "You must provide `fetchFromGitHub with a `rev` or `tag`."); + let position = (if args.meta.description or null != null @@ -24,7 +29,7 @@ let # to indicate where derivation originates, similar to make-derivation.nix's mkDerivation position = "${position.file}:${toString position.line}"; }; - passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "forceFetchGit" "private" "githubBase" "varPrefix" ]; + passthruAttrs = removeAttrs args [ "owner" "repo" "tag" "rev" "fetchSubmodules" "forceFetchGit" "private" "githubBase" "varPrefix" ]; varBase = "NIX${lib.optionalString (varPrefix != null) "_${varPrefix}"}_GITHUB_PRIVATE_"; useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || fetchLFS || (sparseCheckout != []); # We prefer fetchzip in cases we don't need submodules as the hash @@ -53,7 +58,7 @@ let fetcherArgs = (if useFetchGit then { - inherit rev deepClone fetchSubmodules sparseCheckout fetchLFS; url = gitRepoUrl; + inherit tag rev deepClone fetchSubmodules sparseCheckout fetchLFS; url = gitRepoUrl; } // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; } else { url = "${baseUrl}/archive/${rev}.tar.gz"; From ae1d8fc4da794246a3fec72346cbdea15f578566 Mon Sep 17 00:00:00 2001 From: Krzysztof Nazarewski Date: Sat, 25 May 2024 16:46:45 +0200 Subject: [PATCH 0101/1054] msgraph-cli: init a 1.9.0 --- pkgs/by-name/ms/msgraph-cli/deps.nix | 220 ++++++++++++++++++++++++ pkgs/by-name/ms/msgraph-cli/package.nix | 41 +++++ pkgs/by-name/ms/msgraph-cli/update.sh | 23 +++ 3 files changed, 284 insertions(+) create mode 100644 pkgs/by-name/ms/msgraph-cli/deps.nix create mode 100644 pkgs/by-name/ms/msgraph-cli/package.nix create mode 100755 pkgs/by-name/ms/msgraph-cli/update.sh diff --git a/pkgs/by-name/ms/msgraph-cli/deps.nix b/pkgs/by-name/ms/msgraph-cli/deps.nix new file mode 100644 index 000000000000..e2ad995943b4 --- /dev/null +++ b/pkgs/by-name/ms/msgraph-cli/deps.nix @@ -0,0 +1,220 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Azure.Core"; version = "1.36.0"; hash = "sha256-lokfjW2wvgFu6bALLzNmDhXIz3HXoPuGX0WfGb9hmpI="; }) + (fetchNuGet { pname = "Azure.Core"; version = "1.37.0"; hash = "sha256-ETDRf0+cNgVa1udMkhjYkOLP5Hd0NtiSQqAZHCjevds="; }) + (fetchNuGet { pname = "Azure.Identity"; version = "1.10.4"; hash = "sha256-wjopxd/bq0IjdZd5C69XLITrKz8+TFxc0YsPcj8sZHA="; }) + (fetchNuGet { pname = "JmesPath.Net"; version = "1.0.330"; hash = "sha256-FfSgpXmgaFg1uNzJjyJKjU1GZQAo64Og449EByhmKsc="; }) + (fetchNuGet { pname = "JmesPath.Net.Parser"; version = "1.0.330"; hash = "sha256-xJxWkfve/tpeFmX4YRW9SK8z1cT8dMCwwqEhOudi9og="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; hash = "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; hash = "sha256-7NZcKkiXWSuhhVcA/fXHPY/62aGUyMsRdiHm91cWC5Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; hash = "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "6.0.0"; hash = "sha256-jFACPqLvGo14eg4G3hV/UYY/d9i3hNKvgL+3nnDGZME="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "8.0.0"; hash = "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; hash = "sha256-tG3DEWURVkQHm4MlmxjE/YouTp9wQKbWs6qHH2nfgqc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "8.0.0"; hash = "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; hash = "sha256-PLnSa0JMfDC62OTv8sL0QFJbANE7QSnJ997ySFBS1go="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; hash = "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; hash = "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "6.0.0"; hash = "sha256-b+y3HRjUm+CfZhChVdMoN0HTXmWxrs4yiC7yM6psGmc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "8.0.0"; hash = "sha256-/yj5QaEzeRStvOFoBpPRPXlEehGtr2E6/rJb+OEPIK8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; hash = "sha256-gZuMaunMJVyvvepuzNodGPRc6eqKH//bks3957dYkPI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; hash = "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.0"; hash = "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; hash = "sha256-uBjWjHKEXjZ9fDfFxMjOou3lhfTNhs1yO+e3fpWreLk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; hash = "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; hash = "sha256-5BAQOqnaEXM2YjdrmrCinXBeZ5FKxCWtebEXMdwcbMY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; hash = "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; hash = "sha256-RAWHjkkfvGpjc49Q0kJbZyXgU6UEq/EJ0j557sj2/iU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; hash = "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "6.0.0"; hash = "sha256-ux2aROPMS7aCyfDgRn7DmIrg5M2UlK00vPjfUWGC/kA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "8.0.0"; hash = "sha256-sKHa+w4/pMeQb5RRFqLtMTUJy5H6hSIGWchbH2pxSrg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "6.0.0"; hash = "sha256-ksIPO6RhfbYx/i3su4J3sDhoL+TDnITKsgIpEqnpktc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "8.0.0"; hash = "sha256-UgljypOLld1lL7k7h1noazNzvyEHIJw+r+6uGzucFSY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; hash = "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; hash = "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; hash = "sha256-IeMOza71UDzsEIVIlYuI0RYKk+d+VOC6zCqYCQs6nV4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; hash = "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; hash = "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "6.0.0"; hash = "sha256-kweko71W7/hIAUO3ZYYbNXksVLgj8wrDN028QthMFCs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "8.0.0"; hash = "sha256-AJunzYBZM2wCg86hnPnMrBuWIIyW/4PnIVoDSU969cA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "6.0.0"; hash = "sha256-1BXQjw/ySWmddAZ79bv3OhmC4SPTG8PHyTOlrNEUb0g="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "8.0.0"; hash = "sha256-vXBm4yhWGP4uow0CqstuqOkxO8yeZEM15JTTenjPbhc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "6.0.0"; hash = "sha256-j2Begn1+Xoa+9yPoQC6b6aPmUIpBrjkTGQhRhYfJaDI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "8.0.0"; hash = "sha256-kaR7YOlq5s8W9nZDtH/lKtnfGbrgOuQY4DUPcA2lcj0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; hash = "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; hash = "sha256-au0Y13cGk/dQFKuvSA5NnP/++bErTk0oOTlgmHdI2Mw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; hash = "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) + (fetchNuGet { pname = "Microsoft.Graph.Cli.Core"; version = "1.2.1"; hash = "sha256-aS8p5p6v2BLMwYq4MsPqzPNuyvli+cck0If8zew1Tg8="; }) + (fetchNuGet { pname = "Microsoft.Graph.Core"; version = "3.1.7"; hash = "sha256-OVAc7SpKYtY9IP83TGpy7F2lLR7rTJ6XBR+2JAVPWAU="; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.56.0"; hash = "sha256-vXd9uZ1AoThcVIBmOZbMrP2xIjpoInWM9iP1pzCSnmc="; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.56.0"; hash = "sha256-FQF6kIDzNLxtaVnVDBMFryfTuj6T5pCx92GN6aYhmN0="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.22.0"; hash = "sha256-P+7razdzKHXujmkfYfw7ZCK/MvhqNqCJ9kuxFEUsiRg="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.3.1"; hash = "sha256-lbZKfnulWcM4Mxbz6Hkrp/lM41hsOfCnsHLEb+u2czc="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.3.1"; hash = "sha256-C7uySnKBB0e5Wf6z8YNtjbtBbhalJMdqx0EWVcYy7Q4="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.3.1"; hash = "sha256-6OHGsItAXicCSlW0ghCy5szNi6HwhlCmbykbN1O5yAw="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "7.3.1"; hash = "sha256-bBEbYXtPGNqsJiSZ7Kx3kcP1ZbosqPrGyu1PIfFPIeA="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "7.3.1"; hash = "sha256-NWw7q26IZAKiQQILU1qLeNVkMxE9rX0NwUubWAcoBiE="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.3.1"; hash = "sha256-qfTNU0g9QA8kV42VTAez1pSTmfFRJBbeTbGn/nfGFUU="; }) + (fetchNuGet { pname = "Microsoft.Kiota.Abstractions"; version = "1.7.5"; hash = "sha256-g2ShFodiwkMofAMAbuYiUTXn21yLWyaYeDzAAikTY60="; }) + (fetchNuGet { pname = "Microsoft.Kiota.Abstractions"; version = "1.7.8"; hash = "sha256-209eh7BsL2Y0SZZbj3ABZXZQeq5bFiGRA2k4Dia9nLs="; }) + (fetchNuGet { pname = "Microsoft.Kiota.Abstractions"; version = "1.7.9"; hash = "sha256-zRAtEMarPRwJY985Morh+enZXrqO+gDpLH2K9HVCIQI="; }) + (fetchNuGet { pname = "Microsoft.Kiota.Authentication.Azure"; version = "1.1.3"; hash = "sha256-eNfXJ4Ab+55c15w5QEHzUy0nkxXK5fhPSw+waiSxJ8k="; }) + (fetchNuGet { pname = "Microsoft.Kiota.Cli.Commons"; version = "1.1.0"; hash = "sha256-+ieR78qQpeCLGo7TSEzSYE52zaBC6oASvPusOf2eHaY="; }) + (fetchNuGet { pname = "Microsoft.Kiota.Http.HttpClientLibrary"; version = "1.3.6"; hash = "sha256-w79hmlcGlkky8HK8Cy24iWXhn1UdmQCpgIJ9n3Z3kHA="; }) + (fetchNuGet { pname = "Microsoft.Kiota.Serialization.Form"; version = "1.1.3"; hash = "sha256-bY9XhBO618WaP8N3WWS7lKNkzsb0UG+0vyo85/ROk2s="; }) + (fetchNuGet { pname = "Microsoft.Kiota.Serialization.Json"; version = "1.1.5"; hash = "sha256-BSWIlNwGkceO4WHFGmD0PSQhlDf0J4EAq+66LXOZkuI="; }) + (fetchNuGet { pname = "Microsoft.Kiota.Serialization.Multipart"; version = "1.1.2"; hash = "sha256-co1iP+5YB9xdsfj73pzRh9PYWP/lVDzMv64klJeVvAs="; }) + (fetchNuGet { pname = "Microsoft.Kiota.Serialization.Text"; version = "1.1.2"; hash = "sha256-TXTNr/15sJnGQ0qJuFGvu2apZHXRWtVcVjpAO2dLaEE="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "Spectre.Console"; version = "0.48.0"; hash = "sha256-hr7BkVJ5v+NOPytlINjo+yoJetRUKmBhZbTMVKOMf2w="; }) + (fetchNuGet { pname = "Springcomp.GPLEX.Runtime"; version = "1.2.4"; hash = "sha256-WrdQVnuoJMWD4q+j7qW5nKL1jjj/YKb2lafHMsKNS/Y="; }) + (fetchNuGet { pname = "Springcomp.GPPG.Runtime"; version = "1.2.4"; hash = "sha256-M6JRE/uW8WwV8UsQi8ROKII+zFW+ROpvE9b1ig+kcic="; }) + (fetchNuGet { pname = "Std.UriTemplate"; version = "0.0.50"; hash = "sha256-Wkxk3YQ3datFXVrPSuzBqtrWEmLkIQUeiBwuQb+E+aM="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; }) + (fetchNuGet { pname = "System.CommandLine.Hosting"; version = "0.4.0-alpha.22272.1"; hash = "sha256-tmzZU+FBdao8Jp2v+K+HHfc9QXpGBr5EY4X8+dNPceY="; }) + (fetchNuGet { pname = "System.CommandLine.NamingConventionBinder"; version = "2.0.0-beta4.22272.1"; hash = "sha256-Ffzs51XiFraSX1efQRO1IyiNraIgi8aOdkRRzCT6DB4="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; hash = "sha256-RY9uWSPdK2fgSwlj1OHBGBVo3ZvGQgBJNzAsS5OGMWc="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; hash = "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; hash = "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; hash = "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.3.1"; hash = "sha256-Si60aDtJSjvXvY5ZkVQKF3JzxAkmkAKOw5D/q8CwuyQ="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; hash = "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; hash = "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.7.0"; hash = "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.7.0"; hash = "sha256-dZfs5q3Ij1W1eJCfYjxI2o+41aSiFpaAugpoECaCOug="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; hash = "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; hash = "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; hash = "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; hash = "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.1"; hash = "sha256-Y0ba+eTXdrJZgET0xaurt1nkKbQRNBhod+KMcg9IdR4="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) +] diff --git a/pkgs/by-name/ms/msgraph-cli/package.nix b/pkgs/by-name/ms/msgraph-cli/package.nix new file mode 100644 index 000000000000..c6cd1fa71d78 --- /dev/null +++ b/pkgs/by-name/ms/msgraph-cli/package.nix @@ -0,0 +1,41 @@ +{ + lib, + buildDotnetModule, + dotnetCorePackages, + fetchFromGitHub, + libsecret, +}: +buildDotnetModule rec { + pname = "msgraph-cli"; + version = "v1.9.0"; + + src = fetchFromGitHub { + owner = "microsoftgraph"; + repo = "msgraph-cli"; + rev = version; + hash = "sha256-bpdxzVlQWQLNYTZHN25S6qa3NKHhDc+xV6NvzSNMVnQ="; + }; + + projectFile = "src/msgraph-cli.csproj"; + + nugetDeps = ./deps.nix; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + + runtimeDeps = [ libsecret ]; + + passthru.updateScript = ./update.sh; + meta = with lib; { + mainProgram = "mgc"; + description = "Microsoft Graph CLI"; + homepage = "https://github.com/microsoftgraph/msgraph-cli"; + license = licenses.mit; + maintainers = with maintainers; [ nazarewk ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + ]; + }; +} diff --git a/pkgs/by-name/ms/msgraph-cli/update.sh b/pkgs/by-name/ms/msgraph-cli/update.sh new file mode 100755 index 000000000000..d1bc45f25dac --- /dev/null +++ b/pkgs/by-name/ms/msgraph-cli/update.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nixfmt-rfc-style common-updater-scripts +set -eEuo pipefail +[ -z "${DEBUG:-}" ] || set -x +cd "${BASH_SOURCE[0]%/*}" +# run: nix-shell maintainers/scripts/update.nix --argstr package msgraph-cli + +package_file="./package.nix" + +pname="$(sed -nE 's/\s*pname = "(.*)".*/\1/p' "${package_file}")" +owner="$(sed -nE 's/\s*owner = "(.*)".*/\1/p' "${package_file}")" +repo="$(sed -nE 's/\s*repo = "(.*)".*/\1/p' "${package_file}")" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' "${package_file}")" + +new_version="$(curl -s "https://api.github.com/repos/${owner}/${repo}/releases?per_page=1" | jq -r '.[0].name' | sed 's|^GCM ||')" +if [[ $new_version == "$old_version" ]]; then + echo "Up to date" + exit 0 +fi + +cd ../../../.. +update-source-version "${repo}" "$new_version" +"$(nix-build -A "${pname}.fetch-deps" --no-out-link)" From 60065ac2e06cdfdb709ee53e5377c9894bf8670f Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Mon, 18 Nov 2024 15:03:50 +0100 Subject: [PATCH 0102/1054] gifski: use `useFetchCargoVendor` --- pkgs/tools/graphics/gifski/Cargo.lock | 828 ------------------------- pkgs/tools/graphics/gifski/default.nix | 8 +- 2 files changed, 2 insertions(+), 834 deletions(-) delete mode 100644 pkgs/tools/graphics/gifski/Cargo.lock diff --git a/pkgs/tools/graphics/gifski/Cargo.lock b/pkgs/tools/graphics/gifski/Cargo.lock deleted file mode 100644 index 5bc148787ee4..000000000000 --- a/pkgs/tools/graphics/gifski/Cargo.lock +++ /dev/null @@ -1,828 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "autocfg" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" - -[[package]] -name = "bindgen" -version = "0.64.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 1.0.109", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bytemuck" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" - -[[package]] -name = "cc" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clang-sys" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "either" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" - -[[package]] -name = "fallible_collections" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "ffmpeg-next" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e72c72e8dcf638fb0fb03f033a954691662b5dabeaa3f85a6607d101569fccd" -dependencies = [ - "bitflags", - "ffmpeg-sys-next", - "libc", -] - -[[package]] -name = "ffmpeg-sys-next" -version = "6.1.0" -source = "git+https://github.com/kornelski/rust-ffmpeg-sys-1?rev=fd5784d645df2ebe022a204ac36582074da1edf7#fd5784d645df2ebe022a204ac36582074da1edf7" -dependencies = [ - "bindgen", - "cc", - "libc", - "num_cpus", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "gif" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" -dependencies = [ - "weezl", -] - -[[package]] -name = "gif-dispose" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781005a5985b4c723fd3e6586df79d823151846ebcbcf2fcc7e3d3fba18c2d51" -dependencies = [ - "gif", - "imgref", - "rgb", -] - -[[package]] -name = "gifski" -version = "1.32.0" -dependencies = [ - "clap", - "crossbeam-channel", - "crossbeam-utils", - "dunce", - "ffmpeg-next", - "gif", - "gif-dispose", - "imagequant", - "imgref", - "lodepng", - "loop9", - "natord", - "num-traits", - "ordered-channel", - "pbr", - "quick-error", - "resize", - "rgb", - "wild", - "y4m", - "yuv", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "imagequant" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a7f142d232ccbdc00cbef49d17f45639aeb07d9bfe28e17c21dea3efac64e5" -dependencies = [ - "arrayvec", - "once_cell", - "rayon", - "rgb", - "thread_local", -] - -[[package]] -name = "imgref" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets", -] - -[[package]] -name = "lodepng" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a42d298694b14401847de29abd44adf278b42e989e516deac7b72018400002d8" -dependencies = [ - "crc32fast", - "fallible_collections", - "flate2", - "libc", - "rgb", -] - -[[package]] -name = "loop9" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" -dependencies = [ - "imgref", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "natord" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" - -[[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 = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "ordered-channel" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f0bc569ca0974cb90125f52cf76f7b6ad3a072301beba78eb0aa4174c4964ed" -dependencies = [ - "crossbeam-channel", -] - -[[package]] -name = "pbr" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5827dfa0d69b6c92493d6c38e633bbaa5937c153d0d7c28bf12313f8c6d514" -dependencies = [ - "crossbeam-channel", - "libc", - "winapi", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "resize" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e29f584c07a8396c5e2eee0bd8d7aec5c8d9e0a3c2333806fd2ec1d2a5b080" -dependencies = [ - "rayon", - "rgb", -] - -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[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.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "wild" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" -dependencies = [ - "glob", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" - -[[package]] -name = "y4m" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448" - -[[package]] -name = "yuv" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157c9233496247738a5417ce7e8ecf953c3d4e1931374d16b0c6a95636572be4" -dependencies = [ - "num-traits", - "rgb", -] - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 843916e74310..ee3597f7cd71 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -16,12 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Sl8HRc5tfRcYxXsXmvZ3M+f7PU7+1jz+IKWPhWWQ/us="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "ffmpeg-sys-next-6.1.0" = "sha256-RB9sDQoP68Dzqk8tIuYlOX3dZcS64hKI5KpTGq/7xbM="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-iWH0lXHolLpNVE/pgy1cOwiTMNRVy2JrruhQ/S4tp8M="; nativeBuildInputs = [ pkg-config From baf8c5d3daaa240208326d49d27e3e0830577db8 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Mon, 18 Nov 2024 15:04:23 +0100 Subject: [PATCH 0103/1054] gifski: format using nixfmt --- pkgs/tools/graphics/gifski/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index ee3597f7cd71..a51bce5453a3 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -1,8 +1,9 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, ffmpeg +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + ffmpeg, }: rustPlatform.buildRustPackage rec { From 0cf736ebdd17471a0ae354fa4e8d67ec7992b775 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Mon, 18 Nov 2024 15:07:20 +0100 Subject: [PATCH 0104/1054] gifski: move to by-name --- .../gifski/default.nix => by-name/gi/gifski/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{tools/graphics/gifski/default.nix => by-name/gi/gifski/package.nix} (97%) diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/by-name/gi/gifski/package.nix similarity index 97% rename from pkgs/tools/graphics/gifski/default.nix rename to pkgs/by-name/gi/gifski/package.nix index a51bce5453a3..80c78c5992bb 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/by-name/gi/gifski/package.nix @@ -3,7 +3,7 @@ rustPlatform, fetchFromGitHub, pkg-config, - ffmpeg, + ffmpeg_6, }: rustPlatform.buildRustPackage rec { @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - ffmpeg + ffmpeg_6 ]; buildFeatures = [ "video" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6a847b642dd..f84d9334c65d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3564,10 +3564,6 @@ with pkgs; gibberish-detector = with python3Packages; toPythonApplication gibberish-detector; - gifski = callPackage ../tools/graphics/gifski { - ffmpeg = ffmpeg_6; - }; - gitlab = callPackage ../applications/version-management/gitlab { }; gitlab-ee = callPackage ../applications/version-management/gitlab { gitlabEnterprise = true; From 38b076534b831e216097a83d749537db6d9e1226 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Mon, 18 Nov 2024 15:07:51 +0100 Subject: [PATCH 0105/1054] gifski: remove meta `with lib` use --- pkgs/by-name/gi/gifski/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gifski/package.nix b/pkgs/by-name/gi/gifski/package.nix index 80c78c5992bb..fc3ffaab1886 100644 --- a/pkgs/by-name/gi/gifski/package.nix +++ b/pkgs/by-name/gi/gifski/package.nix @@ -41,12 +41,12 @@ rustPlatform.buildRustPackage rec { # checkType = "debug"; - meta = with lib; { + meta = { description = "GIF encoder based on libimagequant (pngquant)"; homepage = "https://gif.ski/"; changelog = "https://github.com/ImageOptim/gifski/releases/tag/${src.rev}"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "gifski"; }; } From 415b0ea85b2cb2dbd5f6ffaf769fa66dfe9b5630 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Nov 2024 04:23:48 +0000 Subject: [PATCH 0106/1054] python312Packages.datalad: 1.1.3 -> 1.1.4 --- pkgs/development/python-modules/datalad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix index c61c0566c163..5021b2e1c302 100644 --- a/pkgs/development/python-modules/datalad/default.nix +++ b/pkgs/development/python-modules/datalad/default.nix @@ -52,13 +52,13 @@ buildPythonPackage rec { pname = "datalad"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "datalad"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Y7P9vRfFUJ5ZhVRTAYeImI9cv1LtWVAeBoBl6wANnrc="; + hash = "sha256-l3II9xebSq09He5e4GGGiGtfe6ERtIQD00eHKGx46WA="; }; postPatch = '' From eea7e3a90dc96201c7329731617133ec77e9ae59 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Thu, 14 Nov 2024 10:46:03 -0600 Subject: [PATCH 0107/1054] rygel: make gtk support optional --- pkgs/by-name/ry/rygel/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index ef80b1b35a39..2f90692003fc 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -12,7 +12,9 @@ libxslt, gobject-introspection, wrapGAppsHook3, + wrapGAppsNoGuiHook, python3, + gdk-pixbuf, glib, gssdp_1_6, gupnp_1_6, @@ -21,6 +23,8 @@ gst_all_1, libgee, libsoup_3, + libX11, + withGtk ? true, gtk3, libmediaart, pipewire, @@ -60,12 +64,13 @@ stdenv.mkDerivation (finalAttrs: { libxml2 libxslt # for xsltproc gobject-introspection - wrapGAppsHook3 + (if withGtk then wrapGAppsHook3 else wrapGAppsNoGuiHook) python3 ]; buildInputs = [ + gdk-pixbuf glib gssdp_1_6 gupnp_1_6 @@ -76,11 +81,13 @@ stdenv.mkDerivation (finalAttrs: { gtk3 libmediaart pipewire + libX11 sqlite systemd tinysparql shared-mime-info ] + ++ lib.optionals withGtk [ gtk3 ] ++ (with gst_all_1; [ gstreamer gst-editing-services @@ -95,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dapi-docs=false" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" + (lib.mesonEnable "gtk" withGtk) ]; doCheck = true; From 386bc09b61ccecbe90d085c9ea5bc604217ee25d Mon Sep 17 00:00:00 2001 From: Jean-Luc Jox Date: Wed, 20 Nov 2024 09:13:02 +1000 Subject: [PATCH 0108/1054] maintainers: add jljox --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ba5167d7d307..2b6fdd851895 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10445,6 +10445,12 @@ githubId = 1058504; name = "José Luis Lafuente"; }; + jljox = { + email = "jeanluc.jox@gmail.com"; + github = "jljox"; + githubId = 3665886; + name = "Jean-Luc Jox"; + }; jloyet = { email = "ml@fatbsd.com"; github = "fatpat"; From 892b1f3a1c74dfa80217510f653525ead76c02a1 Mon Sep 17 00:00:00 2001 From: Jean-Luc Jox Date: Wed, 13 Nov 2024 23:04:21 +1000 Subject: [PATCH 0109/1054] kittycad-kcl-lsp: init at 0.1.61 --- pkgs/by-name/ki/kittycad-kcl-lsp/package.nix | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/ki/kittycad-kcl-lsp/package.nix diff --git a/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix new file mode 100644 index 000000000000..d78ca6390929 --- /dev/null +++ b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix @@ -0,0 +1,31 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, +}: + +rustPlatform.buildRustPackage rec { + pname = "kittycad-kcl-lsp"; + version = "0.1.61"; + + src = fetchFromGitHub { + owner = "KittyCAD"; + repo = "kcl-lsp"; + rev = "refs/tags/v${version}"; + hash = "sha256-VtrR4v0BJWYdoYFDJpWnmVqDhZMlPGm+g9yjxYfcFxQ="; + }; + + cargoHash = "sha256-51eFOJnc/GqgXtfVx/omR+KuC7x/oKGGR+s0z6nKXBg="; + + nativeBuildInputs = [ pkg-config ]; + + meta = { + description = "KittyCAD KCL language server"; + changelog = "https://github.com/KittyCAD/kcl-lsp/releases/tag/v${version}"; + homepage = "https://github.com/KittyCAD/kcl-lsp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jljox ]; + mainProgram = "kittycad-kcl-lsp"; + }; +} From ca01f3f15662121ce977cd695ae63f885fd81121 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 20 Nov 2024 11:44:53 -0500 Subject: [PATCH 0110/1054] python312Packages.billiard: disable time sensitive tests --- pkgs/development/python-modules/billiard/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 4604eb15f43d..f8f93caa17f7 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -31,6 +31,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "billiard" ]; + disabledTests = [ + # time sensitive + "test_on_ready_counter_is_synchronized" + ]; + meta = { description = "Python multiprocessing fork with improvements and bugfixes"; homepage = "https://github.com/celery/billiard"; From 18ed1c4e972073f105aaff675cc5f96558e3e5ac Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Thu, 21 Nov 2024 09:54:45 +0100 Subject: [PATCH 0111/1054] kopia: 0.17.0 -> 0.18.2 --- pkgs/by-name/ko/kopia/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/kopia/package.nix b/pkgs/by-name/ko/kopia/package.nix index 35dfc707474f..6268aaf00cb6 100644 --- a/pkgs/by-name/ko/kopia/package.nix +++ b/pkgs/by-name/ko/kopia/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.17.0"; + version = "0.18.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Bqy9eFUvUgSdyChzh52qqPVvMi+3ad01koxVgnibbLk="; + hash = "sha256-7gQlBLmHvqsXXmSYllfsDJRx9VjW0AH7bXf6cG6lGOI="; }; - vendorHash = "sha256-/NMp64JeCQjCcEYkE6lYzu/E+irTcwkmDCJhB04ALFY="; + vendorHash = "sha256-lCUEL7rtnv8/86ZTHM4HsYplDnWj1xsFh83JKW6qRrk="; doCheck = false; From b1dc24918a06d0b555cbbd87ce25bc372adee482 Mon Sep 17 00:00:00 2001 From: ShawnToubeau Date: Thu, 21 Nov 2024 13:41:36 -0500 Subject: [PATCH 0112/1054] maintainers: add ShawnToubeau --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ba5167d7d307..9f993d95e21b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20095,6 +20095,12 @@ githubId = 293035; name = "Shawn Dellysse"; }; + ShawnToubeau = { + name = "Shawn Toubeau"; + email = "shawntoubeau@gmail.com"; + github = "ShawnToubeau"; + githubId = 22332636; + }; shayne = { email = "shaynesweeney@gmail.com"; github = "shayne"; From 53b61e7a0ea65e009f2135d6d3474dcadf8209db Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 22 Nov 2024 09:24:45 +0900 Subject: [PATCH 0113/1054] python312Packages.datalad: refactor --- .../python-modules/datalad/default.nix | 70 +++++++++---------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix index 5021b2e1c302..1df8ee11bf65 100644 --- a/pkgs/development/python-modules/datalad/default.nix +++ b/pkgs/development/python-modules/datalad/default.nix @@ -34,16 +34,15 @@ python-dateutil, # duecredit duecredit, - # python>=3.8 distro, # win colorama, # python-version-dependent pythonOlder, - importlib-resources, importlib-metadata, typing-extensions, # tests + pytest-xdist, pytestCheckHook, p7zip, curl, @@ -53,10 +52,11 @@ buildPythonPackage rec { pname = "datalad"; version = "1.1.4"; + pyproject = true; src = fetchFromGitHub { owner = "datalad"; - repo = pname; + repo = "datalad"; rev = "refs/tags/${version}"; hash = "sha256-l3II9xebSq09He5e4GGGiGtfe6ERtIQD00eHKGx46WA="; }; @@ -79,49 +79,44 @@ buildPythonPackage rec { ]; dependencies = - [ - # core - platformdirs - chardet - iso8601 - humanize - fasteners - packaging - patool - tqdm - annexremote - looseversion - setuptools - git-annex + optional-dependencies.core ++ optional-dependencies.downloaders ++ optional-dependencies.publish; - # downloaders-extra - # requests-ftp # not in nixpkgs yet - - # downloaders + optional-dependencies = { + core = + [ + platformdirs + chardet + distro + iso8601 + humanize + fasteners + packaging + patool + tqdm + annexremote + looseversion + ] + ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ] + ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] + ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + downloaders = [ boto3 keyrings-alt keyring msgpack requests - - # publish - python-gitlab - - # misc + ]; + downloaders-extra = [ + # requests-ftp # not in nixpkgs yet + ]; + publish = [ python-gitlab ]; + misc = [ argcomplete pyperclip python-dateutil - - # duecredit - duecredit - - # python>=3.8 - distro - ] - ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ] - ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ] - ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] - ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + ]; + duecredit = [ duecredit ]; + }; postInstall = '' installShellCompletion --cmd datalad \ @@ -228,6 +223,7 @@ buildPythonPackage rec { nativeCheckInputs = [ p7zip + pytest-xdist pytestCheckHook git-annex curl From c7fe0ba1a142dcbb67d19c6d066b212662ec5741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sat, 23 Nov 2024 17:30:53 +0100 Subject: [PATCH 0114/1054] qemu: fix strictDeps Ref: https://github.com/NixOS/nixpkgs/issues/178468 --- pkgs/applications/virtualization/qemu/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 396b10250ed7..5ba70129b1bc 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, overrideSDK, buildPackages , pixman, vde2, alsa-lib, flex, pcre2 -, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson +, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson, perl , sigtool , makeWrapper, removeReferencesTo , attr, libcap, libcap_ng, socat, libslirp @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper removeReferencesTo - pkg-config flex bison meson ninja + pkg-config flex bison meson ninja perl # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation python3Packages.python @@ -95,14 +95,14 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals gtkSupport [ wrapGAppsHook3 ] ++ lib.optionals enableDocs [ python3Packages.sphinx python3Packages.sphinx-rtd-theme ] ++ lib.optionals hexagonSupport [ glib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool rez setfile ] ++ lib.optionals (!userOnly) [ dtc ]; buildInputs = [ glib zlib ] ++ lib.optionals (!minimal) [ dtc pixman vde2 lzo snappy libtasn1 gnutls nettle libslirp ] ++ lib.optionals (!userOnly) [ curl ] ++ lib.optionals ncursesSupport [ ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Cocoa Hypervisor Kernel rez setfile vmnet ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Cocoa Hypervisor Kernel vmnet ] ++ lib.optionals seccompSupport [ libseccomp ] ++ lib.optionals numaSupport [ numactl ] ++ lib.optionals alsaSupport [ alsa-lib ] From 6b6bbe1aae8c423ff7ab2faedd24a9532b8d15f2 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:36:34 +0000 Subject: [PATCH 0115/1054] nano: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/applications/editors/nano/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 432d297aea5e..76fd7cea6238 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { homepage = "https://www.nano-editor.org/"; description = "Small, user-friendly console text editor"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ joachifm nequissimus ]; + maintainers = with maintainers; [ joachifm nequissimus sigmasquadron ]; platforms = platforms.all; mainProgram = "nano"; }; From d890c3f858939fb2c696d3cea0110e7f9830e5fc Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:36:57 +0000 Subject: [PATCH 0116/1054] keepassxc: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/applications/misc/keepassxc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index e548e2ee6b7e..941c658fea71 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; mainProgram = "keepassxc"; - maintainers = with maintainers; [ blankparticle ]; + maintainers = with maintainers; [ blankparticle sigmasquadron ]; platforms = platforms.linux ++ platforms.darwin; }; } From 4a972e31157759d33a4651575d6c307e2117b6a8 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:37:15 +0000 Subject: [PATCH 0117/1054] OVMF: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/applications/virtualization/OVMF/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 35336ad8ad3f..ac2f2f2302f5 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -205,7 +205,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; license = lib.licenses.bsd2; platforms = metaPlatforms; - maintainers = with lib.maintainers; [ adamcstephens raitobezarius mjoerg ]; + maintainers = with lib.maintainers; [ adamcstephens raitobezarius mjoerg sigmasquadron ]; broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) From aac54d9b210f1e9b59911d9b10457ac4debfb890 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:37:21 +0000 Subject: [PATCH 0118/1054] asciiquarium: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/by-name/as/asciiquarium/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/as/asciiquarium/package.nix b/pkgs/by-name/as/asciiquarium/package.nix index 0ab79bb2134a..7ebf58e34978 100644 --- a/pkgs/by-name/as/asciiquarium/package.nix +++ b/pkgs/by-name/as/asciiquarium/package.nix @@ -26,6 +26,6 @@ in stdenv.mkDerivation { homepage = "https://robobunny.com/projects/asciiquarium/html/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.utdemir ]; + maintainers = with maintainers; [ sigmasquadron utdemir ]; }; } From f611da92a7badc165c06938a106cb898ffd06a37 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:37:25 +0000 Subject: [PATCH 0119/1054] bat: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/by-name/ba/bat/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix index 747566e8c19c..978ca06a47f3 100644 --- a/pkgs/by-name/ba/bat/package.nix +++ b/pkgs/by-name/ba/bat/package.nix @@ -75,6 +75,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/sharkdp/bat/raw/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; mainProgram = "bat"; - maintainers = with maintainers; [ dywedir zowoq SuperSandro2000 ]; + maintainers = with maintainers; [ dywedir zowoq SuperSandro2000 sigmasquadron ]; }; } From 03b4c534849dd48914b93d2ba66b409915d8cc42 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:37:29 +0000 Subject: [PATCH 0120/1054] cntr: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/by-name/cn/cntr/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cn/cntr/package.nix b/pkgs/by-name/cn/cntr/package.nix index 188032d2b966..0a4f9b999d94 100644 --- a/pkgs/by-name/cn/cntr/package.nix +++ b/pkgs/by-name/cn/cntr/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Mic92/cntr"; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 sigmasquadron ]; mainProgram = "cntr"; }; } From 8050a6bbc3939540a2cdc36be983c87cade3bdec Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:37:33 +0000 Subject: [PATCH 0121/1054] cryfs: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/by-name/cr/cryfs/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cr/cryfs/package.nix b/pkgs/by-name/cr/cryfs/package.nix index 52444e56cb05..6d64973e8ceb 100644 --- a/pkgs/by-name/cr/cryfs/package.nix +++ b/pkgs/by-name/cr/cryfs/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { homepage = "https://www.cryfs.org/"; changelog = "https://github.com/cryfs/cryfs/raw/${version}/ChangeLog.txt"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ peterhoeg c0bw3b ]; + maintainers = with maintainers; [ peterhoeg c0bw3b sigmasquadron ]; platforms = platforms.unix; }; } From 9374b8b083b2599191c4c993e9a1338f92f151ac Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:37:39 +0000 Subject: [PATCH 0122/1054] dev86: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/by-name/de/dev86/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/de/dev86/package.nix b/pkgs/by-name/de/dev86/package.nix index c42c4ce88c15..e3da58d11f74 100644 --- a/pkgs/by-name/de/dev86/package.nix +++ b/pkgs/by-name/de/dev86/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C compiler, assembler and linker environment for the production of 8086 executables"; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres sigmasquadron ]; platforms = lib.platforms.linux; }; }) From 817bda8d0556c94edebed004939cc0a0854d0ff4 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:37:43 +0000 Subject: [PATCH 0123/1054] duf: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/by-name/du/duf/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/du/duf/package.nix b/pkgs/by-name/du/duf/package.nix index 5c2ccb5717fc..0fb2846297d7 100644 --- a/pkgs/by-name/du/duf/package.nix +++ b/pkgs/by-name/du/duf/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { homepage = "https://github.com/muesli/duf/"; description = "Disk Usage/Free Utility"; license = licenses.mit; - maintainers = with maintainers; [ figsoda penguwin ]; + maintainers = with maintainers; [ figsoda penguwin sigmasquadron ]; mainProgram = "duf"; }; } From ec3d4c6c836a9dc8d85dd97a6a7cb5ac9bccb41d Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:37:50 +0000 Subject: [PATCH 0124/1054] er-patcher: adopt Signed-off-by: Fernando Rodrigues --- pkgs/by-name/er/er-patcher/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/er/er-patcher/package.nix b/pkgs/by-name/er/er-patcher/package.nix index 79ba027d4c96..d3a02fac46b1 100644 --- a/pkgs/by-name/er/er-patcher/package.nix +++ b/pkgs/by-name/er/er-patcher/package.nix @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec { that ensures the patched executable is never run with EAC enabled (unless explicity told to do so). Use at your own risk! ''; license = licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.sigmasquadron ]; mainProgram = "er-patcher"; }; } From 33cbff8371b8cdfc818762fd4457245e63afbe41 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:37:55 +0000 Subject: [PATCH 0125/1054] eza: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/by-name/ez/eza/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 9452224d8390..00bb0522873e 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -65,7 +65,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/eza-community/eza/releases/tag/v${version}"; license = licenses.eupl12; mainProgram = "eza"; - maintainers = with maintainers; [ cafkafk _9glenda ]; + maintainers = with maintainers; [ cafkafk _9glenda sigmasquadron ]; platforms = platforms.unix ++ platforms.windows; }; } From 7fccd0fad5f654d338ed3be34b3a0ba06a1f20ce Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:38:00 +0000 Subject: [PATCH 0126/1054] freetube: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/by-name/fr/freetube/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index 77959f42af41..07e1b71c3d2f 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { ryneeverett alyaeanyx ryand56 + sigmasquadron ]; inherit (electron.meta) platforms; mainProgram = "freetube"; From dca118b096a82bccd59bf4f1ea119d6ada3d6bd2 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:38:04 +0000 Subject: [PATCH 0127/1054] lazygit: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/by-name/la/lazygit/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index d1fcbdcc7b0e..09826db219ec 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -37,6 +37,7 @@ buildGoModule rec { khaneliman paveloom starsep + sigmasquadron ]; mainProgram = "lazygit"; }; From 5b97724312802db9609f281b83fc5daa38b6064e Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:38:10 +0000 Subject: [PATCH 0128/1054] mullvad-browser: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/by-name/mu/mullvad-browser/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index 9f46d11f6a43..3a9363112d65 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -278,7 +278,7 @@ stdenv.mkDerivation rec { mainProgram = "mullvad-browser"; homepage = "https://mullvad.net/en/browser"; platforms = attrNames sources; - maintainers = with maintainers; [ felschr panicgh ]; + maintainers = with maintainers; [ felschr panicgh sigmasquadron ]; # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain # restrictions on redistribution), it's free enough for our purposes. From ab413c8047b155342d8f5c9d99dbeae942d4bf69 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:38:17 +0000 Subject: [PATCH 0129/1054] music-player: adopt Signed-off-by: Fernando Rodrigues --- pkgs/by-name/mu/music-player/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/music-player/package.nix b/pkgs/by-name/mu/music-player/package.nix index 1aaf189dc2c1..3ff1da09e451 100644 --- a/pkgs/by-name/mu/music-player/package.nix +++ b/pkgs/by-name/mu/music-player/package.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/tsirysndr/music-player"; changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.sigmasquadron ]; mainProgram = "music-player"; }; } From 4f41851f812e94128eec495f4cfd8f74dadf206d Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:38:39 +0000 Subject: [PATCH 0130/1054] steamguard-cli: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/by-name/st/steamguard-cli/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index c5e8ac3f29e5..5293f90e7ebd 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dyc3/steamguard-cli"; license = with licenses; [ gpl3Only ]; mainProgram = "steamguard"; - maintainers = with maintainers; [ surfaceflinger ]; + maintainers = with maintainers; [ surfaceflinger sigmasquadron ]; platforms = platforms.linux; }; } From d4f3fe7de3c08389160b9ed1c3b057b959d20fe3 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:38:42 +0000 Subject: [PATCH 0131/1054] fish: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- nixos/modules/programs/fish.nix | 2 +- pkgs/shells/fish/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index ef31a404bcb8..4d1eb6c36d99 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -313,5 +313,5 @@ in ''; }; - + meta.maintainers = with lib.maintainers; [ sigmasquadron ]; } diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 75353691a663..16462ba09f6e 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -315,7 +315,7 @@ let changelog = "https://github.com/fish-shell/fish-shell/releases/tag/${version}"; license = licenses.gpl2Only; platforms = platforms.unix; - maintainers = with maintainers; [ adamcstephens cole-h winter ]; + maintainers = with maintainers; [ adamcstephens cole-h winter sigmasquadron ]; mainProgram = "fish"; }; From ade41e6fd7832b4696be7cae737a59d076cbae16 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Wed, 13 Nov 2024 16:38:48 +0000 Subject: [PATCH 0132/1054] scarab: add sigmasquadron as co-maintainer Signed-off-by: Fernando Rodrigues --- pkgs/tools/games/scarab/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/games/scarab/default.nix b/pkgs/tools/games/scarab/default.nix index 62cd0f2b4c4a..4bf15142a618 100644 --- a/pkgs/tools/games/scarab/default.nix +++ b/pkgs/tools/games/scarab/default.nix @@ -76,7 +76,10 @@ buildDotnetModule rec { downloadPage = "https://github.com/fifty-six/Scarab/releases"; changelog = "https://github.com/fifty-six/Scarab/releases/tag/v${version}"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ huantian ]; + maintainers = with lib.maintainers; [ + huantian + sigmasquadron + ]; mainProgram = "Scarab"; platforms = lib.platforms.linux; }; From 2ed86e28551d21963ce6f27b85ead00a133446be Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 23 Nov 2024 20:15:11 -0300 Subject: [PATCH 0133/1054] seabios: adopt Also removes an unused parenthesis. Signed-off-by: Fernando Rodrigues --- pkgs/by-name/se/seabios/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix index a6070810332b..619db76a88d8 100644 --- a/pkgs/by-name/se/seabios/package.nix +++ b/pkgs/by-name/se/seabios/package.nix @@ -9,7 +9,7 @@ ___build-type ? "csm", }: -assert lib.elem (___build-type) [ +assert lib.elem ___build-type [ "coreboot" # SeaBIOS with CSM (Compatible Support Module) support; learn more at # https://www.electronicshub.org/what-is-csm-bios/ @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { use of coreboot. ''; license = with lib.licenses; [ lgpl3Plus ]; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ sigmasquadron ]; platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isUnix lib.systems.inspect.patterns.isx86; badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; }; From dc5f9d7ea9a8b6b114f89294de32432c869b8738 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 24 Nov 2024 15:31:08 +0400 Subject: [PATCH 0134/1054] gpxlab: add symlink to binary on darwin --- pkgs/applications/misc/gpxlab/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/applications/misc/gpxlab/default.nix index c3002104256c..4f1e3abde2f9 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/applications/misc/gpxlab/default.nix @@ -22,6 +22,9 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv GPXLab/GPXLab.app $out/Applications + + mkdir -p $out/bin + ln -s $out/Applications/GPXLab.app/Contents/MacOS/GPXLab $out/bin/gpxlab ''; meta = with lib; { From bd4e8d2878d69676cecfc7b04fb9b651d5abde5d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 24 Nov 2024 15:37:51 +0400 Subject: [PATCH 0135/1054] gpxlab: migrate to by-name --- .../default.nix => by-name/gp/gpxlab/package.nix} | 15 +++++++++++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 11 insertions(+), 6 deletions(-) rename pkgs/{applications/misc/gpxlab/default.nix => by-name/gp/gpxlab/package.nix} (86%) diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/by-name/gp/gpxlab/package.nix similarity index 86% rename from pkgs/applications/misc/gpxlab/default.nix rename to pkgs/by-name/gp/gpxlab/package.nix index 4f1e3abde2f9..07d09dd0edad 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/by-name/gp/gpxlab/package.nix @@ -1,8 +1,11 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub -, qmake, qttools +{ + stdenv, + lib, + fetchFromGitHub, + qt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "gpxlab"; version = "0.7.0"; @@ -13,7 +16,11 @@ mkDerivation rec { sha256 = "080vnwcciqblfrbfyz9gjhl2lqw1hkdpbgr5qfrlyglkd4ynjd84"; }; - nativeBuildInputs = [ qmake qttools ]; + nativeBuildInputs = [ + qt5.qmake + qt5.qttools + qt5.wrapQtAppsHook + ]; preConfigure = '' lrelease GPXLab/locale/*.ts diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98a076259d50..4e3d28d5916d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14294,8 +14294,6 @@ with pkgs; gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { }; - gpxlab = libsForQt5.callPackage ../applications/misc/gpxlab { }; - gpxsee-qt5 = libsForQt5.callPackage ../applications/misc/gpxsee { }; gpxsee-qt6 = qt6Packages.callPackage ../applications/misc/gpxsee { }; From cfcccc73e6b56d298c44968426f4aefe9750dd81 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 21 Nov 2024 02:25:11 +0400 Subject: [PATCH 0136/1054] s2geometry: enable on unix --- pkgs/by-name/s2/s2geometry/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/s2/s2geometry/package.nix b/pkgs/by-name/s2/s2geometry/package.nix index 6fe6f47eb065..a037c7b68a61 100644 --- a/pkgs/by-name/s2/s2geometry/package.nix +++ b/pkgs/by-name/s2/s2geometry/package.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://s2geometry.io/"; license = licenses.asl20; maintainers = [ maintainers.Thra11 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }) From fc3871aa8ad6d9dbfff9bc3be5c131576e0fe8e5 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 10 Oct 2024 21:08:20 +0200 Subject: [PATCH 0137/1054] linux/common-config: enable support for crashkernel dumps Signed-off-by: Sefa Eyeoglu --- pkgs/os-specific/linux/kernel/common-config.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0676294533a8..5cc96ec5fdc4 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -45,8 +45,8 @@ let options = { debug = { - # Necessary for BTF - DEBUG_INFO = whenOlder "5.18" yes; + # Necessary for BTF and crashkernel + DEBUG_INFO = yes; DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes; # Reduced debug info conflict with BTF and have been enabled in # aarch64 defconfig since 5.13 @@ -64,7 +64,7 @@ let RCU_TORTURE_TEST = no; SCHEDSTATS = yes; DETECT_HUNG_TASK = yes; - CRASH_DUMP = option no; + CRASH_DUMP = yes; # Easier debugging of NFS issues. SUNRPC_DEBUG = yes; # Provide access to tunables like sched_migration_cost_ns @@ -85,6 +85,9 @@ let # Export known printks in debugfs PRINTK_INDEX = whenAtLeast "5.15" yes; + + # Enable crashkernel support + PROC_VMCORE = yes; }; power-management = { From d8b5f031dc448652ae800a7aa10bfd1313ffa0cc Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 10 Oct 2024 21:08:36 +0200 Subject: [PATCH 0138/1054] nixos/crashdump: remove redundant kernel patch Signed-off-by: Sefa Eyeoglu --- nixos/modules/misc/crashdump.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix index b0f75d9caaa3..b2464e57d3a0 100644 --- a/nixos/modules/misc/crashdump.nix +++ b/nixos/modules/misc/crashdump.nix @@ -60,17 +60,6 @@ in "nmi_watchdog=panic" "softlockup_panic=1" ]; - kernelPatches = [ { - name = "crashdump-config"; - patch = null; - extraConfig = '' - CRASH_DUMP y - DEBUG_INFO y - PROC_VMCORE y - LOCKUP_DETECTOR y - HARDLOCKUP_DETECTOR y - ''; - } ]; }; }; } From 65dc95e52f4919423834efbbbbc8a94d9aefd2c4 Mon Sep 17 00:00:00 2001 From: Flo Date: Sun, 24 Nov 2024 15:12:14 +0100 Subject: [PATCH 0139/1054] feat: Allow setting a password on cmdline for pxe boot --- nixos/modules/installer/netboot/netboot.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index adcc10316fea..fa477a11a4f7 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -141,6 +141,17 @@ with lib; # /etc/NIXOS tag. touch /etc/NIXOS ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system + + # Set password for user nixos if specified on cmdline + # Allows using nixos-anywhere in headless environments + for o in $( Date: Sun, 24 Nov 2024 22:39:56 +0100 Subject: [PATCH 0140/1054] Add passwordHash option --- nixos/modules/installer/netboot/netboot.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index fa477a11a4f7..1706dbf455d6 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -146,9 +146,13 @@ with lib; # Allows using nixos-anywhere in headless environments for o in $( Date: Sun, 24 Nov 2024 23:46:59 +0100 Subject: [PATCH 0141/1054] zfs-replicate: 3.2.13 -> 4.0.0 --- pkgs/tools/backup/zfs-replicate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index 72a41a53cdfe..210355b700a6 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "zfs_replicate"; - version = "3.2.13"; + version = "4.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Xmg33bqs3gQJWqkCNiWYUem3o6XsxpfbHIVvLs/2D94="; + hash = "sha256-9WD2IW7GRxMF7hOa8HTI/+cuOjVaYMT4OnrYU/xFgME="; }; nativeBuildInputs = [ From b5442735ff0f715f1d4ab1ca60905a721f23d98b Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 25 Nov 2024 07:58:06 +0000 Subject: [PATCH 0142/1054] buffybox: init at 3.2.0-unstable-2024-11-10 [buffybox](https://gitlab.postmarketos.org/postmarketOS/buffybox/) is a suite of graphical applications for the terminal. notably for nixpkgs, this includes `buffyboard`: an on-screen framebuffer keyboard especially useful for touch-only devices like mobile phones. `buffyboard` can be built and launched (as root) with no arguments: then tab to an unused TTY (e.g. Ctrl+Alt+F2) where an on-screen keyboard should now be visible (if not, try clicking in the bottom of the terminal to force a redraw). further configuration of buffyboard is possible by editing `/etc/buffyboard.conf` or passing CLI flags. --- pkgs/by-name/bu/buffybox/package.nix | 60 ++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/bu/buffybox/package.nix diff --git a/pkgs/by-name/bu/buffybox/package.nix b/pkgs/by-name/bu/buffybox/package.nix new file mode 100644 index 000000000000..8dcef1f1f0f4 --- /dev/null +++ b/pkgs/by-name/bu/buffybox/package.nix @@ -0,0 +1,60 @@ +{ + fetchFromGitLab, + inih, + lib, + libdrm, + libinput, + libxkbcommon, + meson, + ninja, + pkg-config, + scdoc, + stdenv, + unstableGitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "buffybox"; + version = "3.2.0-unstable-2024-11-10"; + + src = fetchFromGitLab { + domain = "gitlab.postmarketos.org"; + owner = "postmarketOS"; + repo = "buffybox"; + fetchSubmodules = true; # to use its vendored lvgl + rev = "07e324c17564cb9aab573259a8e0824a6806a751"; + hash = "sha256-JY9WqtRjDsQf1UVFnM6oTwyAuhlJvrhcSNJdEZ0zIus="; + }; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + ]; + + buildInputs = [ + inih + libdrm + libinput + libxkbcommon + ]; + + env.PKG_CONFIG_SYSTEMD_SYSTEMD_SYSTEM_UNIT_DIR = "${placeholder "out"}/lib/systemd/system"; + + strictDeps = true; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A suite of graphical applications for the terminal"; + homepage = "https://gitlab.postmarketos.org/postmarketOS/buffybox"; + license = licenses.gpl3Plus; + maintainers = with lib.maintainers; [ colinsane ]; + platforms = platforms.linux; + }; +}) From 51759e8046caa67396f3d4d70b966ba697cd8b70 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Mon, 25 Nov 2024 11:08:07 +0100 Subject: [PATCH 0143/1054] proxmox-auto-install-assistant: 8.2.6 -> 8.3.3 Changelog: https://git.proxmox.com/?p=pve-installer.git;a=blob;f=debian/changelog Signed-off-by: Christoph Heiss --- .../proxmox-auto-install-assistant/Cargo.lock | 862 +++++++++++------- .../package.nix | 16 +- 2 files changed, 532 insertions(+), 346 deletions(-) diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock b/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock index ae850ced93c7..df8651a1334d 100644 --- a/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock @@ -32,9 +32,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -47,43 +47,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "autocfg" @@ -97,12 +97,6 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - [[package]] name = "bitflags" version = "1.3.2" @@ -125,16 +119,19 @@ dependencies = [ ] [[package]] -name = "bumpalo" -version = "3.16.0" +name = "castaway" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" +dependencies = [ + "rustversion", +] [[package]] name = "cc" -version = "1.1.28" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "shlex", ] @@ -147,9 +144,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.19" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -157,9 +154,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -181,15 +178,29 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + +[[package]] +name = "compact_str" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "rustversion", + "ryu", + "static_assertions", +] [[package]] name = "core-foundation" @@ -209,9 +220,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -240,6 +251,31 @@ version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +[[package]] +name = "crossterm" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags 2.6.0", + "crossterm_winapi", + "mio", + "parking_lot", + "rustix", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -252,37 +288,49 @@ dependencies = [ [[package]] name = "cursive" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839" +checksum = "386d5a36020bb856e9a34ecb8a4e6c9bd6b0262d1857bae4db7bc7e2fdaa532e" dependencies = [ "ahash", "cfg-if", "crossbeam-channel", + "crossterm", "cursive_core", "lazy_static", "libc", "log", "signal-hook", - "termion", "unicode-segmentation", "unicode-width", ] [[package]] -name = "cursive_core" -version = "0.3.7" +name = "cursive-macros" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d" +checksum = "ac7ac0eb0cede3dfdfebf4d5f22354e05a730b79c25fd03481fc69fcfba0a73e" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "cursive_core" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321ec774d27fafc66e812034d0025f8858bd7d9095304ff8fc200e0b9f9cc257" dependencies = [ "ahash", + "compact_str", "crossbeam-channel", + "cursive-macros", "enum-map", "enumset", "lazy_static", "log", "num", - "owning_ref", + "parking_lot", + "serde_json", "time", "unicode-segmentation", "unicode-width", @@ -342,6 +390,17 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "enum-map" version = "2.7.3" @@ -401,15 +460,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -474,9 +533,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heck" @@ -484,12 +543,136 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -498,12 +681,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -524,18 +718,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "js-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" -dependencies = [ - "wasm-bindgen", -] +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "lazy_static" @@ -545,9 +730,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "linux-raw-sys" @@ -555,6 +740,22 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.22" @@ -585,6 +786,19 @@ dependencies = [ "adler2", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "log", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "native-tls" version = "0.2.12" @@ -691,12 +905,6 @@ dependencies = [ "libc", ] -[[package]] -name = "numtoa" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" - [[package]] name = "once_cell" version = "1.20.2" @@ -705,9 +913,9 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -737,9 +945,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -748,12 +956,26 @@ dependencies = [ ] [[package]] -name = "owning_ref" -version = "0.4.1" +name = "parking_lot" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ - "stable_deref_trait", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", ] [[package]] @@ -782,22 +1004,23 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "proxmox-auto-install-assistant" -version = "8.2.6" +version = "8.3.3" dependencies = [ "anyhow", "clap", "glob", "log", "proxmox-auto-installer", + "proxmox-installer-common", "regex", "serde", "serde_json", @@ -813,7 +1036,6 @@ dependencies = [ "glob", "log", "proxmox-installer-common", - "regex", "serde", "serde_json", "serde_plain", @@ -837,22 +1059,38 @@ name = "proxmox-fetch-answer" version = "0.1.0" dependencies = [ "anyhow", - "hex", "log", - "native-tls", "proxmox-auto-installer", - "rustls 0.20.9", - "rustls-native-certs 0.6.3", - "sha2", + "proxmox-installer-common", + "serde", + "serde_json", "toml", - "ureq", ] [[package]] name = "proxmox-installer-common" version = "0.1.0" dependencies = [ + "anyhow", + "hex", + "native-tls", "regex", + "rustls", + "rustls-native-certs", + "serde", + "serde_json", + "serde_plain", + "sha2", + "ureq", +] + +[[package]] +name = "proxmox-post-hook" +version = "0.1.0" +dependencies = [ + "anyhow", + "proxmox-auto-installer", + "proxmox-installer-common", "serde", "serde_json", ] @@ -879,24 +1117,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] -[[package]] -name = "redox_termios" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" - [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -906,9 +1138,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -921,21 +1153,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.8" @@ -946,16 +1163,16 @@ dependencies = [ "cfg-if", "getrandom", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys 0.52.0", ] [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -966,29 +1183,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.9" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.16.20", - "sct", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" -dependencies = [ - "log", - "once_cell", - "ring 0.17.8", - "rustls-pki-types", + "ring", "rustls-webpki", - "subtle", - "zeroize", + "sct", ] [[package]] @@ -998,20 +1200,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.4", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.2.0", - "rustls-pki-types", + "rustls-pemfile", "schannel", "security-framework", ] @@ -1022,35 +1211,25 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.7", + "base64", ] -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" - [[package]] name = "rustls-webpki" -version = "0.102.8" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.8", - "rustls-pki-types", - "untrusted 0.9.0", + "ring", + "untrusted", ] +[[package]] +name = "rustversion" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" + [[package]] name = "ryu" version = "1.0.18" @@ -1059,21 +1238,27 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + [[package]] name = "sct" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -1091,9 +1276,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -1101,18 +1286,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -1121,9 +1306,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -1176,6 +1361,17 @@ dependencies = [ "signal-hook-registry", ] +[[package]] +name = "signal-hook-mio" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -1186,10 +1382,10 @@ dependencies = [ ] [[package]] -name = "spin" -version = "0.5.2" +name = "smallvec" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "spin" @@ -1203,23 +1399,23 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[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.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - [[package]] name = "syn" -version = "2.0.79" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -1227,10 +1423,21 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.13.0" +name = "synstructure" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tempfile" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", @@ -1239,18 +1446,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "termion" -version = "1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" -dependencies = [ - "libc", - "numtoa", - "redox_syscall", - "redox_termios", -] - [[package]] name = "time" version = "0.3.36" @@ -1285,25 +1480,20 @@ dependencies = [ ] [[package]] -name = "tinyvec" -version = "1.8.0" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "tinyvec_macros", + "displaydoc", + "zerovec", ] -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "toml" -version = "0.7.8" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -1322,9 +1512,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", @@ -1339,26 +1529,11 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "unicode-bidi" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" - [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - -[[package]] -name = "unicode-normalization" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" -dependencies = [ - "tinyvec", -] +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-segmentation" @@ -1372,12 +1547,6 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -1386,33 +1555,45 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.10.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" +checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" dependencies = [ - "base64 0.22.1", + "base64", "flate2", "log", "native-tls", "once_cell", - "rustls 0.23.14", - "rustls-native-certs 0.7.3", - "rustls-pki-types", + "rustls", + "rustls-native-certs", + "rustls-webpki", "url", "webpki-roots", ] [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -1437,89 +1618,11 @@ 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.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" - -[[package]] -name = "web-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - [[package]] name = "webpki-roots" -version = "0.26.6" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" -dependencies = [ - "rustls-pki-types", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "winapi" @@ -1627,19 +1730,55 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "xi-unicode" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -1661,7 +1800,44 @@ dependencies = [ ] [[package]] -name = "zeroize" -version = "1.8.1" +name = "zerofrom" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix index d161ab4ab0f3..7b8cbd76b794 100644 --- a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix @@ -4,16 +4,18 @@ rustPlatform, testers, proxmox-auto-install-assistant, + pkg-config, + openssl, }: rustPlatform.buildRustPackage rec { pname = "proxmox-auto-install-assistant"; - version = "8.2.6"; + version = "8.3.3"; src = fetchgit { url = "git://git.proxmox.com/git/pve-installer.git"; - rev = "c339618cbdcbce378bf192e01393a60903fe2b04"; - hash = "sha256-nF2FpzXeoPIB+dW92HAI+EJZuMJxlnD012Yu3hL9OvU="; + rev = "cf6df4a23491071d207dcc8b00af8ddf310ae0b0"; + hash = "sha256-n4mn8VF84QyJiUNubgoxkbMEbuyj8n5KeIdVB3Xz5iY="; }; postPatch = '' @@ -28,6 +30,14 @@ rustPlatform.buildRustPackage rec { cargoLock.lockFile = ./Cargo.lock; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl.dev ]; + + postFixup = '' + # openssl is not actually necessary, only pulled in through a feature (unfortunately) + patchelf --remove-needed libssl.so.3 $out/bin/proxmox-auto-install-assistant + ''; + passthru.tests.version = testers.testVersion { package = proxmox-auto-install-assistant; }; meta = { From 97dd1a61b7794e62260c46214a2ac2d5a870ab4d Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Mon, 25 Nov 2024 11:08:27 +0100 Subject: [PATCH 0144/1054] proxmox-auto-install-assistant: switch to versionCheckHook Signed-off-by: Christoph Heiss --- pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix index 7b8cbd76b794..acc15ff2c81f 100644 --- a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix @@ -3,9 +3,9 @@ fetchgit, rustPlatform, testers, - proxmox-auto-install-assistant, pkg-config, openssl, + versionCheckHook, }: rustPlatform.buildRustPackage rec { @@ -38,7 +38,9 @@ rustPlatform.buildRustPackage rec { patchelf --remove-needed libssl.so.3 $out/bin/proxmox-auto-install-assistant ''; - passthru.tests.version = testers.testVersion { package = proxmox-auto-install-assistant; }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; meta = { description = "Tool to prepare a Proxmox installation ISO for automated installations"; From 1ff7a913595a024a37cb437bb63cf692a4bed26c Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Mon, 25 Nov 2024 17:59:42 +0100 Subject: [PATCH 0145/1054] amdvlk: 2024.Q3.3 -> 2024.Q4.1 2024.Q4.1 was released: https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-2024.Q4.1 Remove previous workaround for glslang, not needed anymore with the latest version. --- pkgs/by-name/am/amdvlk/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix index f0d60c42a33a..7d5884c03d80 100644 --- a/pkgs/by-name/am/amdvlk/package.nix +++ b/pkgs/by-name/am/amdvlk/package.nix @@ -23,19 +23,17 @@ let suffix = if stdenv.system == "x86_64-linux" then "64" else "32"; - # Fix https://github.com/NixOS/nixpkgs/issues/348903 until the glslang update to 15.0.0 is merged into master - glslang_fixed = glslang.overrideAttrs (finalAttrs: oldAttrs: { cmakeFlags = [ ]; }); in stdenv.mkDerivation (finalAttrs: { pname = "amdvlk"; - version = "2024.Q3.3"; + version = "2024.Q4.1"; src = fetchRepoProject { name = "amdvlk-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${finalAttrs.version}"; - hash = "sha256-wIPubMsSaNGTykD/K0gxdba128TqW5nu4CjXoLkprc0="; + hash = "sha256-x1g4VKXbkYM2S0tfXWFESyHwalNwH813mtwWjCQK2ew="; }; buildInputs = @@ -61,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { [ cmake directx-shader-compiler - glslang_fixed + glslang ninja patchelf perl From d75d17e1e84f63e58a49c8db075cf28200eb2c37 Mon Sep 17 00:00:00 2001 From: Daniel Baker Date: Mon, 25 Nov 2024 09:09:00 -0800 Subject: [PATCH 0146/1054] nixos/cage: add package option Adds a package option so users can inject their own package. Previously the only way to change the package was to use an overlay and change the cage package everywhere. --- nixos/modules/services/wayland/cage.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix index 870ae58f8646..c96bc5adf1cf 100644 --- a/nixos/modules/services/wayland/cage.nix +++ b/nixos/modules/services/wayland/cage.nix @@ -41,6 +41,8 @@ in { ''; }; + options.services.cage.package = mkPackageOption pkgs "cage" { }; + config = mkIf cfg.enable { # The service is partially based off of the one provided in the @@ -64,7 +66,7 @@ in { unitConfig.ConditionPathExists = "/dev/tty1"; serviceConfig = { ExecStart = '' - ${pkgs.cage}/bin/cage \ + ${cfg.package}/bin/cage \ ${escapeShellArgs cfg.extraArguments} \ -- ${cfg.program} ''; From 900bd0d8e6203f51c25456e493a3b61cca59ac8b Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 25 Nov 2024 09:21:20 +0000 Subject: [PATCH 0147/1054] nixos/buffyboard: init [buffyboard](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/tree/master/buffyboard) is the on-screen framebuffer keyboard provided by postmarketOS's buffybox project. enable this with `services.buffybox.enable = true;`: any additional settings are strictly optional. once enabled, tab to an unused TTY (e.g. Ctrl+Alt+F2) and use the mouse/touchpad/touchscreen to use the virtual keyboard. may require a manual `systemctl start buffybox` if enabled on an already-booted device. Co-authored-by: Luflosi --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/hardware/buffyboard.nix | 138 ++++++++++++++++++ 3 files changed, 141 insertions(+) create mode 100644 nixos/modules/services/hardware/buffyboard.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index d55b5bfd42a7..b811b03f06de 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -16,6 +16,8 @@ - [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](#opt-services.amazon-cloudwatch-agent.enable). +- [Buffyboard](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/tree/master/buffyboard), a framebuffer on-screen keyboard. Available as [services.buffyboard](option.html#opt-services.buffyboard). + ## Backward Incompatibilities {#sec-release-25.05-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 91ecee0ef265..767531f9e8ef 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -588,6 +588,7 @@ ./services/hardware/bluetooth.nix ./services/hardware/bolt.nix ./services/hardware/brltty.nix + ./services/hardware/buffyboard.nix ./services/hardware/ddccontrol.nix ./services/hardware/display.nix ./services/hardware/fancontrol.nix diff --git a/nixos/modules/services/hardware/buffyboard.nix b/nixos/modules/services/hardware/buffyboard.nix new file mode 100644 index 000000000000..f6cab16138c0 --- /dev/null +++ b/nixos/modules/services/hardware/buffyboard.nix @@ -0,0 +1,138 @@ +# INTEGRATION NOTES: +# Buffyboard integrates as a virtual device in /dev/input +# which reads touch or pointer events from other input devices +# and generates events based on where those map to the keys it renders to the framebuffer. +# +# Buffyboard generates these events whether or not its onscreen keyboard is actually visible. +# Hence special care is needed if running anything which claims ownership of the display (such as a desktop environment), +# to avoid unwanted input events being triggered during normal desktop operation. +# +# Desktop users are recommended to either: +# 1. Stop buffyboard once your DE is started. +# e.g. `services.buffyboard.unitConfig.Conflicts = [ "my-de.service" ];` +# 2. Configure your DE to ignore input events from buffyboard (product-id=25209; vendor-id=26214; name=rd) +# e.g. `echo 'input "26214:25209:rd" events disabled' > ~/.config/sway/config` + +{ + config, + lib, + pkgs, + utils, + ... +}: +let + cfg = config.services.buffyboard; + ini = pkgs.formats.ini { }; +in +{ + meta.maintainers = with lib.maintainers; [ colinsane ]; + + options = { + services.buffyboard = with lib; { + enable = mkEnableOption "buffyboard framebuffer keyboard (on-screen keyboard)"; + package = mkPackageOption pkgs "buffybox" { }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + Extra CLI arguments to pass to buffyboard. + ''; + example = [ + "--geometry=1920x1080@640,0" + "--dpi=192" + "--rotate=2" + "--verbose" + ]; + }; + + configFile = mkOption { + type = lib.types.path; + default = ini.generate "buffyboard.conf" (lib.filterAttrsRecursive (_: v: v != null) cfg.settings); + defaultText = lib.literalExpression ''ini.generate "buffyboard.conf" cfg.settings''; + description = '' + Path to an INI format configuration file to provide Buffyboard. + By default, this is generated from whatever you've set in `settings`. + If specified manually, then `settings` is ignored. + + For an example config file see [here](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/blob/master/buffyboard/buffyboard.conf) + ''; + }; + + settings = mkOption { + description = '' + Settings to include in /etc/buffyboard.conf. + Every option here is strictly optional: + Buffyboard will use its own baked-in defaults for those options left unset. + ''; + type = types.submodule { + freeformType = ini.type; + + options.input.pointer = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + Enable or disable the use of a hardware mouse or other pointing device. + ''; + }; + options.input.touchscreen = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + Enable or disable the use of the touchscreen. + ''; + }; + + options.theme.default = mkOption { + type = types.either types.str ( + types.enum [ + null + "adwaita-dark" + "breezy-dark" + "breezy-light" + "nord-dark" + "nord-light" + "pmos-dark" + "pmos-light" + ] + ); + default = null; + description = '' + Selects the default theme on boot. Can be changed at runtime to the alternative theme. + ''; + }; + options.quirks.fbdev_force_refresh = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + If true and using the framebuffer backend, this triggers a display refresh after every draw operation. + This has a negative performance impact. + ''; + }; + }; + default = { }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.packages = [ cfg.package ]; + systemd.services.buffyboard = { + # upstream provides the service (including systemd hardening): we just configure it to start by default + # and override ExecStart so as to optionally pass extra arguments + serviceConfig.ExecStart = [ + "" # clear default ExecStart + (utils.escapeSystemdExecArgs ( + [ + (lib.getExe' cfg.package "buffyboard") + "--config-override" + cfg.configFile + ] + ++ cfg.extraFlags + )) + ]; + wantedBy = [ "getty.target" ]; + before = [ "getty.target" ]; + }; + }; +} From f2a0dc5399da4388068d615244ca9ac0e07c5516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 26 Nov 2024 07:44:37 -0300 Subject: [PATCH 0148/1054] lxqt.lxqt-wayland-session: 0.1.0 -> 0.1.1 Diff: https://github.com/lxqt/lxqt-wayland-session/compare/0.1.0...0.1.1 --- .../lxqt/lxqt-wayland-session/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix index 21f4ef2548d9..430cde7762c5 100644 --- a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix @@ -4,12 +4,15 @@ fetchFromGitHub, cmake, kwindowsystem, + layer-shell-qt, liblxqt, libqtxdg, lxqt-build-tools, + lxqt-session, pkg-config, qtsvg, qttools, + qtxdg-tools, xdg-user-dirs, xkeyboard_config, gitUpdater, @@ -17,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lxqt-wayland-session"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-wayland-session"; rev = version; - hash = "sha256-5WdfwJ89HWlXL6y9Lpgs7H3mbN/wbf+9VbP9ERPasBM="; + hash = "sha256-UMlV8LqUXM2+3ZSLj30FFgC+ZVPmt2W8uE2RrZKqCJE="; }; nativeBuildInputs = [ @@ -35,15 +38,19 @@ stdenv.mkDerivation rec { buildInputs = [ kwindowsystem + layer-shell-qt # for applications that need layer-shell-qt (ex: lxqt-panel) liblxqt libqtxdg + lxqt-session qtsvg - xdg-user-dirs + qtxdg-tools # allow to use xdg-utils under LXQt, similar to https://github.com/lxqt/lxqt-session/blob/2.0.0/CHANGELOG#L27 + xdg-user-dirs # startlxqtwayland sets XDG_CURRENT_DESKTOP ]; postPatch = '' substituteInPlace startlxqtwayland.in \ - --replace-fail /usr/share/X11/xkb/rules ${xkeyboard_config}/share/X11/xkb/rules + --replace-fail /usr/share/X11/xkb/rules ${xkeyboard_config}/share/X11/xkb/rules \ + --replace-fail "cp -av " "cp -av --no-preserve=mode " substituteInPlace configurations/{labwc/autostart,lxqt-hyprland.conf,lxqt-wayfire.ini} \ --replace-fail /usr/share/lxqt/wallpapers $out/share/lxqt/wallpapers From c826dbd65f1955ff5e757d931159449824a3d782 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Nov 2024 21:30:08 +0000 Subject: [PATCH 0149/1054] python312Packages.tinydb: 4.8.0 -> 4.8.2 --- .../python-modules/tinydb/default.nix | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix index 5ad3e1fb4cda..f62cefdbbd9f 100644 --- a/pkgs/development/python-modules/tinydb/default.nix +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -5,43 +5,41 @@ fetchFromGitHub, poetry-core, pytestCheckHook, - pycodestyle, + pytest-cov-stub, pyyaml, }: buildPythonPackage rec { pname = "tinydb"; - version = "4.8.0"; - disabled = pythonOlder "3.5"; - format = "pyproject"; + version = "4.8.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "msiemens"; - repo = pname; + repo = "tinydb"; rev = "refs/tags/v${version}"; - hash = "sha256-sdWcpkjC8LtOI1k0Wyk4vLXBcwYe1vuQON9J7P8JPxA="; + hash = "sha256-N/45XB7ZuZiq25v6DQx4K9NRVnBbUHPeiKKbxQ9YB3E="; }; - nativeBuildInputs = [ poetry-core ]; - - postPatch = '' - substituteInPlace pytest.ini \ - --replace "--cov-append --cov-report term --cov tinydb" "" - ''; + build-system = [ + poetry-core + ]; nativeCheckInputs = [ pytestCheckHook - pycodestyle + pytest-cov-stub pyyaml ]; pythonImportsCheck = [ "tinydb" ]; - meta = with lib; { + meta = { description = "Lightweight document oriented database written in Python"; homepage = "https://tinydb.readthedocs.org/"; changelog = "https://tinydb.readthedocs.io/en/latest/changelog.html"; - license = licenses.mit; - maintainers = with maintainers; [ marcus7070 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marcus7070 ]; }; } From 5c182f857e5f877234f632414dd643f0846676a7 Mon Sep 17 00:00:00 2001 From: Vladimir Timofeenko Date: Sun, 24 Nov 2024 19:17:10 -0800 Subject: [PATCH 0150/1054] nickel: 1.8.1 -> 1.9.0 --- pkgs/by-name/ni/nickel/package.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index 70a2167bc56e..8c488d1ec9fe 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "nickel"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "tweag"; repo = "nickel"; rev = "refs/tags/${version}"; - hash = "sha256-hlcF04m3SI66d1C9U1onog2QoEMfqtHb7V++47ZmeW4="; + hash = "sha256-chIpZqs1tyXk4YQBlF4K/Ofrn1CrijbYant9+SSppGU="; }; - cargoHash = "sha256-VFjZb7lsqOSt5Rc94dhS4Br/5i/HXPHZMqC1c0/LzHU="; + cargoHash = "sha256-MaMzwvvWP+vmdBVCefXI6dehuTyPcPW2b6KdarxjBjA="; cargoBuildFlags = [ "-p nickel-lang-cli" "-p nickel-lang-lsp" ]; @@ -26,6 +26,16 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "nls" ]; + # This fixes the way comrak is defined as a dependency, without the sed the build fails: + # + # cargo metadata failure: error: Package `nickel-lang-core v0.10.0 + # (/build/source/core)` does not have feature `comrak`. It has an optional + # dependency with that name, but that dependency uses the "dep:" syntax in + # the features table, so it does not have an implicit feature with that name. + preBuild = '' + sed -i 's/dep:comrak/comrak/' core/Cargo.toml + ''; + postInstall = '' mkdir -p $nls/bin mv $out/bin/nls $nls/bin/nls From 666a4348c2ec4ca2f62515a1d8bcac11a332610a Mon Sep 17 00:00:00 2001 From: Dionysis Grigoropoulos Date: Fri, 15 Nov 2024 18:16:03 +0200 Subject: [PATCH 0151/1054] matrix-alertmanager: 0.7.2 -> 0.8.0 --- pkgs/by-name/ma/matrix-alertmanager/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/matrix-alertmanager/package.nix b/pkgs/by-name/ma/matrix-alertmanager/package.nix index 13ddfc651c95..9e387d03285b 100644 --- a/pkgs/by-name/ma/matrix-alertmanager/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager/package.nix @@ -6,13 +6,13 @@ buildNpmPackage rec { pname = "matrix-alertmanager"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "jaywink"; repo = pname; rev = "v${version}"; - hash = "sha256-7rsY/nUiuSVkM8fbPPa9DB3c+Uhs+Si/j1Jzls6d2qc="; + hash = "sha256-GwASazYgZTYrMn696VL+JKEjECoCKxr2VWj2zae8U/E="; }; postPatch = '' @@ -20,7 +20,7 @@ buildNpmPackage rec { mv package.json.tmp package.json ''; - npmDepsHash = "sha256-OI/zlz03YQwUnpOiHAVQfk8PWKsurldpp0PbF1K9zbM="; + npmDepsHash = "sha256-LCbImn0EGbTtB30IjLU+tjP38BQdk5Wozsl3EgOrcs8="; dontNpmBuild = true; @@ -30,6 +30,6 @@ buildNpmPackage rec { mainProgram = "matrix-alertmanager"; homepage = "https://github.com/jaywink/matrix-alertmanager"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ erethon ]; }; } From 4b53e94e9cf1d0e61641d7fad59b210563916d1f Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Tue, 26 Nov 2024 21:36:24 +0100 Subject: [PATCH 0152/1054] wikiman: init at 2.13.2 --- pkgs/by-name/wi/wikiman/fix-paths.patch | 44 ++++++++++++++++ pkgs/by-name/wi/wikiman/package.nix | 68 +++++++++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 pkgs/by-name/wi/wikiman/fix-paths.patch create mode 100644 pkgs/by-name/wi/wikiman/package.nix diff --git a/pkgs/by-name/wi/wikiman/fix-paths.patch b/pkgs/by-name/wi/wikiman/fix-paths.patch new file mode 100644 index 000000000000..d5923accce7d --- /dev/null +++ b/pkgs/by-name/wi/wikiman/fix-paths.patch @@ -0,0 +1,44 @@ +diff --git a/wikiman.sh b/wikiman.sh +index 89a436e..adc6510 100755 +--- a/wikiman.sh ++++ b/wikiman.sh +@@ -46,38 +46,7 @@ if printenv WIKIMAN_TUI_PREVIEW >/dev/null; then + fi + + init() { +- +- # BSD compatibility: Installation prefix +- +- case "$(dirname "$0")" in +- "$HOME/bin"|"$HOME/.local/bin") +- conf_sys_usr="$HOME/.local/share"; +- conf_sys_etc="${XDG_CONFIG_HOME:-"$HOME/.config"}/wikiman";; +- '/bin'|'/sbin'|'/usr/bin'|'/usr/sbin') +- conf_sys_usr='/usr'; +- conf_sys_etc='/etc';; +- '/usr/local/bin'|'/usr/local/sbin') +- conf_sys_usr='/usr/local'; +- conf_sys_etc='/usr/local/etc';; +- *) +- case "$(dirname "$(command -v wikiman)")" in +- "$HOME/bin"|"$HOME/.local/bin") +- echo 'warning: unsupported installation path, using fallback for user install' 1>&2; +- conf_sys_usr="$HOME/.local/share"; +- conf_sys_etc="${XDG_CONFIG_HOME:-"$HOME/.config"}/wikiman";; +- '/bin'|'/sbin'|'/usr/bin'|'/usr/sbin') +- echo 'warning: unsupported installation path, using fallback for Linux' 1>&2; +- conf_sys_usr='/usr'; +- conf_sys_etc='/etc';; +- '/usr/local/bin'|'/usr/local/sbin') +- echo 'warning: unsupported installation path, using fallback for BSD' 1>&2; +- conf_sys_usr='/usr/local'; +- conf_sys_etc='/usr/local/etc';; +- *) +- echo 'error: unsupported installation path - failed to establish fallback' 1>&2; +- exit 5;; +- esac;; +- esac ++ conf_sys_etc="/etc/xdg/wikiman/wikiman.conf" + + export conf_sys_usr + export conf_sys_etc diff --git a/pkgs/by-name/wi/wikiman/package.nix b/pkgs/by-name/wi/wikiman/package.nix new file mode 100644 index 000000000000..4af6d99f5ca4 --- /dev/null +++ b/pkgs/by-name/wi/wikiman/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + + fzf, + ripgrep, + gawk, + w3m, + coreutils, + parallel, + + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "wikiman"; + version = "2.13.2"; + + src = fetchFromGitHub { + owner = "filiparag"; + repo = "wikiman"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-gk/9PVIRw9OQrdCSS+LcniXDYNcHUQUxZ2XGQCwpHaI="; + }; + + patches = [ ./fix-paths.patch ]; + + nativeBuildInputs = [ makeWrapper ]; + + makeFlags = [ "prefix=${placeholder "out"}" ]; + + postInstall = '' + mv $out/usr/* $out + rmdir $out/usr + ''; + + postFixup = + let + runtimeDependencies = [ + fzf + ripgrep + gawk + w3m + coreutils + parallel + ]; + in + '' + wrapProgram $out/bin/wikiman \ + --prefix PATH : "${lib.makeBinPath runtimeDependencies}":$out/bin \ + --set "conf_sys_usr" "$out" + ''; + + # Couldn't do a versionCheckHook since the script fails when no sources are found. + # Even when just printing the version. Yeah. + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Offline search engine for manual pages, Arch Wiki, Gentoo Wiki and other documentation"; + homepage = "https://github.com/filiparag/wikiman"; + license = with lib.licenses; [ mit ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ pluiedev ]; + mainProgram = "wikiman"; + }; +}) From 81bfbe3d828a3e0a71a10562c4ec6516cdd5607d Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Mon, 18 Nov 2024 00:04:31 +0100 Subject: [PATCH 0153/1054] ropebwt2: init at 0-unstable-2021-02-01 Tiddit dependency. GCC use is hardcoded in Makefile so CC is overridden to use clang on other platforms. --- pkgs/by-name/ro/ropebwt2/package.nix | 31 ++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/ro/ropebwt2/package.nix diff --git a/pkgs/by-name/ro/ropebwt2/package.nix b/pkgs/by-name/ro/ropebwt2/package.nix new file mode 100644 index 000000000000..c83512b71912 --- /dev/null +++ b/pkgs/by-name/ro/ropebwt2/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchFromGitHub, + zlib, +}: +stdenv.mkDerivation { + name = "ropebwt2"; + version = "0-unstable-2021-02-01"; + src = fetchFromGitHub { + owner = "lh3"; + repo = "ropebwt2"; + rev = "bd8dbd3db2e9e3cff74acc2907c0742c9ebbf033"; + hash = "sha256-R/VvbprwcfXF2TBZOYmc1MU3AzCcXFfWCHoYYumXtI8="; + }; + buildInputs = [ zlib ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installPhase = '' + runHook preInstall + install -Dm755 ropebwt2 -t $out/bin + runHook postInstall + ''; + meta = { + homepage = "https://github.com/lh3/ropebwt2"; + description = "Incremental construction of FM-index for DNA sequences"; + mainProgram = "ropebwwith lib; t2"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ apraga ]; + platforms = lib.platforms.unix; + }; +} From 602605237b42660be3b3deab3fef3a0576140a7a Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Mon, 18 Nov 2024 00:07:28 +0100 Subject: [PATCH 0154/1054] fermi2: init at unstable-2021-05-21 Tiddit dependency. --- pkgs/by-name/fe/fermi2/package.nix | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/fe/fermi2/package.nix diff --git a/pkgs/by-name/fe/fermi2/package.nix b/pkgs/by-name/fe/fermi2/package.nix new file mode 100644 index 000000000000..9d391b476edc --- /dev/null +++ b/pkgs/by-name/fe/fermi2/package.nix @@ -0,0 +1,34 @@ +{ + config, + lib, + fetchFromGitHub, + zlib, + stdenv, +}: +stdenv.mkDerivation { + pname = "fermi2"; + version = "0.1-unstable-2021-05-21"; + src = fetchFromGitHub { + owner = "lh3"; + repo = "fermi2"; + rev = "cb1410972b2bd330883823116931ae67ead8b30f"; + hash = "sha256-jDn1OBuGWDMEHI5A3R9meOykEGM6yjItSnUpx36DxgA="; + }; + buildInputs = [ zlib ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installPhase = '' + runHook preInstall + + install -Dm755 fermi2 -t $out/bin + + runHook postInstall + ''; + meta = { + homepage = "https://github.com/lh3/fermi2"; + description = "Successor of fermi, a whole genome de novo assembler based on the FMD-index for large genomes"; + mainProgram = "fermi2"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ apraga ]; + platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.unix; + }; +} From 196f141973be2bed412b7e8cc016afb65c2d7254 Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Sun, 17 Nov 2024 23:02:20 +0100 Subject: [PATCH 0155/1054] tiddit: init at 3.6.1 Genomic tool to call structural variations. This packages requires 2 executables,packaging fermi2, bwt2, that are packaged in the same derivation and added to the path later on. --- pkgs/by-name/ro/ropebwt2/package.nix | 4 ++- pkgs/by-name/ti/tiddit/package.nix | 51 ++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/ti/tiddit/package.nix diff --git a/pkgs/by-name/ro/ropebwt2/package.nix b/pkgs/by-name/ro/ropebwt2/package.nix index c83512b71912..3ef831907e7d 100644 --- a/pkgs/by-name/ro/ropebwt2/package.nix +++ b/pkgs/by-name/ro/ropebwt2/package.nix @@ -17,13 +17,15 @@ stdenv.mkDerivation { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' runHook preInstall + install -Dm755 ropebwt2 -t $out/bin + runHook postInstall ''; meta = { homepage = "https://github.com/lh3/ropebwt2"; description = "Incremental construction of FM-index for DNA sequences"; - mainProgram = "ropebwwith lib; t2"; + mainProgram = "ropebwt2"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ apraga ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ti/tiddit/package.nix b/pkgs/by-name/ti/tiddit/package.nix new file mode 100644 index 000000000000..4ec1b496360e --- /dev/null +++ b/pkgs/by-name/ti/tiddit/package.nix @@ -0,0 +1,51 @@ +{ + bwa, + lib, + fermi2, + ropebwt2, + fetchFromGitHub, + python3Packages, +}: +python3Packages.buildPythonApplication rec { + name = "tiddit"; + version = "3.6.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "SciLifeLab"; + repo = "TIDDIT"; + rev = "refs/tags/TIDDIT-${version}"; + hash = "sha256-OeqVQJDw0fmSDWIGab2qtTJCzZxqLY2XzRqaTRuPIdI="; + }; + + build-system = with python3Packages; [ + setuptools + wheel + ]; + + dependencies = with python3Packages; [ + cython + joblib + numpy + pysam + ]; + + makeWrapperArgs = [ + "--prefix PATH : ${ + lib.makeBinPath [ + bwa + fermi2 + ropebwt2 + ] + }" + ]; + + meta = { + homepage = "https://github.com/SciLifeLab/TIDDIT"; + description = "Identify chromosomal rearrangements using Mate Pair or Paired End sequencing data"; + mainProgram = "tiddit"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ apraga ]; + platforms = lib.platforms.unix; + }; +} From f9b403d5d350327e2003c1935aca442bbfc58a2d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 19 Oct 2024 07:53:23 +0000 Subject: [PATCH 0156/1054] mirrord: init at 3.125.0 --- pkgs/by-name/mi/mirrord/manifest.json | 13 ++++++ pkgs/by-name/mi/mirrord/package.nix | 51 +++++++++++++++++++++ pkgs/by-name/mi/mirrord/update.py | 64 +++++++++++++++++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 pkgs/by-name/mi/mirrord/manifest.json create mode 100644 pkgs/by-name/mi/mirrord/package.nix create mode 100755 pkgs/by-name/mi/mirrord/update.py diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json new file mode 100644 index 000000000000..682cfc8db1b7 --- /dev/null +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -0,0 +1,13 @@ +{ + "version": "3.125.0", + "assets": { + "x86_64-linux": { + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.125.0/mirrord_linux_x86_64", + "hash": "sha256-xh5M/YG2W61wiNd4iB6LVUfidkHkB5OmbCzRh7yUpeU=" + }, + "aarch64-linux": { + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.125.0/mirrord_linux_aarch64", + "hash": "sha256-MWGdYeJXseSAKlndUT07NNWCpywJfGJ0hGRklEMQQmw=" + } + } +} diff --git a/pkgs/by-name/mi/mirrord/package.nix b/pkgs/by-name/mi/mirrord/package.nix new file mode 100644 index 000000000000..ce8e406c3b51 --- /dev/null +++ b/pkgs/by-name/mi/mirrord/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + testers, + mirrord, + autoPatchelfHook, +}: + +let + manifest = lib.importJSON ./manifest.json; +in +stdenv.mkDerivation (finalAttrs: { + pname = "mirrord"; + version = manifest.version; + + src = fetchurl (manifest.assets.${stdenv.hostPlatform.system}); + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isElf [ + autoPatchelfHook + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isElf [ + stdenv.cc.cc.lib + ]; + + installPhase = '' + install -D $src $out/bin/mirrord + ''; + + passthru = { + tests.version = testers.testVersion { + package = mirrord; + }; + updateScript = ./update.py; + }; + + meta = { + description = "Run local processes in the context of Kubernetes environment"; + homepage = "https://mirrord.dev/"; + license = lib.licenses.mit; + platforms = builtins.attrNames manifest.assets; + maintainers = with lib.maintainers; [ aaronjheng ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "mirrord"; + }; +}) diff --git a/pkgs/by-name/mi/mirrord/update.py b/pkgs/by-name/mi/mirrord/update.py new file mode 100755 index 000000000000..6096b991b81a --- /dev/null +++ b/pkgs/by-name/mi/mirrord/update.py @@ -0,0 +1,64 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i python -p "python3.withPackages (ps: with ps; [ ps.httpx ps.socksio ])" + +import json +import os +import pathlib +import subprocess + +import httpx + +platforms = { + "x86_64-linux": "linux_x86_64", + "aarch64-linux": "linux_aarch64", +} + +if __name__ == "__main__": + headers = {} + token = os.getenv("GITHUB_TOKEN") + if token is not None: + headers["Authorization"] = "Bearer {}".format(token) + + resp = httpx.get( + "https://api.github.com/repos/metalbear-co/mirrord/releases/latest", + headers=headers, + ) + + latest_release = resp.json().get("tag_name") + version = latest_release.removeprefix("v") + + assets = { + "version": version, + "assets": {}, + } + + for k, v in platforms.items(): + url = "https://github.com/metalbear-co/mirrord/releases/download/{}/mirrord_{}".format( + version, v + ) + + process = subprocess.run( + ["nix-prefetch-url", "--type", "sha256", url], + capture_output=True, + text=True, + ) + + process.check_returncode() + + process = subprocess.run( + ["nix-hash", "--type", "sha256", "--to-sri", process.stdout.rstrip()], + capture_output=True, + text=True, + ) + + process.check_returncode() + + hash = process.stdout.rstrip() + assets["assets"][k] = { + "url": url, + "hash": hash, + } + + (pathlib.Path(__file__).parent / "manifest.json").write_text( + json.dumps(assets, indent=2) + "\n" + ) From c4a7f5477b2baf2b37a944481e81c3888e0340a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Nov 2024 07:05:54 +0000 Subject: [PATCH 0157/1054] python312Packages.art: 6.3 -> 6.4 --- pkgs/development/python-modules/art/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/art/default.nix b/pkgs/development/python-modules/art/default.nix index b0d50295a8aa..3a9874f037c6 100644 --- a/pkgs/development/python-modules/art/default.nix +++ b/pkgs/development/python-modules/art/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "art"; - version = "6.3"; + version = "6.4"; pyproject = true; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = "art"; rev = "refs/tags/v${version}"; - hash = "sha256-9kz6uyLdcrQqgWzT9g2qI9a+IituY/OFmbot+HlQsCE="; + hash = "sha256-qA1fhqNJbhSOvsPSgbnuRTs40OJsn7tYHWzujN2RVK8="; }; build-system = [ setuptools ]; From f1f9a54031dbc95b6e924772fddd125debb697bb Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 24 Nov 2024 15:23:26 +0100 Subject: [PATCH 0158/1054] cups-filters: 1.28.17 -> 2.0.1 --- nixos/modules/services/printing/cupsd.nix | 8 ++- pkgs/by-name/cu/cups-browsed/package.nix | 47 ++++++++++++++ pkgs/by-name/li/libcupsfilters/package.nix | 64 +++++++++++++++++++ pkgs/by-name/li/libppd/package.nix | 48 ++++++++++++++ pkgs/misc/cups/filters.nix | 63 +++++------------- .../misc/system-config-printer/default.nix | 4 +- pkgs/top-level/perl-packages.nix | 8 ++- 7 files changed, 190 insertions(+), 52 deletions(-) create mode 100644 pkgs/by-name/cu/cups-browsed/package.nix create mode 100644 pkgs/by-name/li/libcupsfilters/package.nix create mode 100644 pkgs/by-name/li/libppd/package.nix diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index a1fb0b3951e4..45bb841c317b 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -4,7 +4,7 @@ with lib; let - inherit (pkgs) cups-pk-helper cups-filters xdg-utils; + inherit (pkgs) cups-pk-helper libcupsfilters cups-filters xdg-utils; cfg = config.services.printing; cups = cfg.package; @@ -35,7 +35,7 @@ let bindir = pkgs.buildEnv { name = "cups-progs"; paths = - [ cups.out additionalBackends cups-filters pkgs.ghostscript ] + [ cups.out additionalBackends libcupsfilters cups-filters pkgs.ghostscript ] ++ cfg.drivers; pathsToLink = [ "/lib" "/share/cups" "/bin" ]; postBuild = cfg.bindirCmds; @@ -278,6 +278,8 @@ in ''; }; + browsed.package = lib.mkPackageOption pkgs "cups-browsed" {}; + browsedConf = mkOption { type = types.lines; default = ""; @@ -438,7 +440,7 @@ in path = [ cups ]; - serviceConfig.ExecStart = "${cups-filters}/bin/cups-browsed"; + serviceConfig.ExecStart = "${cfg.browsed.package}/bin/cups-browsed"; restartTriggers = [ browsedFile ]; }; diff --git a/pkgs/by-name/cu/cups-browsed/package.nix b/pkgs/by-name/cu/cups-browsed/package.nix new file mode 100644 index 000000000000..66564ac60053 --- /dev/null +++ b/pkgs/by-name/cu/cups-browsed/package.nix @@ -0,0 +1,47 @@ +{ + autoreconfHook, + avahi, + cups, + fetchFromGitHub, + glib, + lib, + libcupsfilters, + libppd, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "cups-browsed"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "OpenPrinting"; + repo = "cups-browsed"; + rev = version; + hash = "sha256-UkPJqVWG6obIW0jGXsnnYB2lmIm/uiMuPYSGY3+M4Gw="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + cups + ]; + + buildInputs = [ + avahi + libcupsfilters + libppd + glib + ]; + + configureFlags = [ + "--with-rcdir=no" + ]; + + makeFlags = [ + "CUPS_SERVERBIN=$(out)/lib/cups" + "CUPS_DATADIR=$(out)/share/cups" + "CUPS_SERVERROOT=$(out)/etc/cups" + ]; +} diff --git a/pkgs/by-name/li/libcupsfilters/package.nix b/pkgs/by-name/li/libcupsfilters/package.nix new file mode 100644 index 000000000000..dfd17f890c47 --- /dev/null +++ b/pkgs/by-name/li/libcupsfilters/package.nix @@ -0,0 +1,64 @@ +{ + autoreconfHook, + cups, + dbus, + dejavu_fonts, + fetchFromGitHub, + fontconfig, + ghostscript, + lcms2, + libexif, + libjpeg, + libpng, + libtiff, + mupdf, + pkg-config, + poppler, + poppler_utils, + qpdf, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "libcupsfilters"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "OpenPrinting"; + repo = "libcupsfilters"; + rev = "2.1.0"; + hash = "sha256-tnQqM4stUJseDO9BG+PRUSFafjgpQQklTDsDsB9zQ4Y="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + cups + ]; + buildInputs = [ + dbus + fontconfig + ghostscript + lcms2 + libexif + libjpeg + libpng + libtiff + mupdf + poppler + poppler_utils + qpdf + ]; + configureFlags = [ + "--with-mutool-path=${mupdf}/bin/mutool" + "--with-gs-path=${ghostscript}/bin/gs" + "--with-ippfind-path=${cups}/bin/ippfind" + "--enable-imagefilters" + "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf" + ]; + makeFlags = [ + "CUPS_SERVERBIN=$(out)/lib/cups" + "CUPS_DATADIR=$(out)/share/cups" + "CUPS_SERVERROOT=$(out)/etc/cups" + ]; +} diff --git a/pkgs/by-name/li/libppd/package.nix b/pkgs/by-name/li/libppd/package.nix new file mode 100644 index 000000000000..39383430208c --- /dev/null +++ b/pkgs/by-name/li/libppd/package.nix @@ -0,0 +1,48 @@ +{ + autoreconfHook, + cups, + fetchFromGitHub, + ghostscript, + libcupsfilters, + libz, + mupdf, + pkg-config, + poppler_utils, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "libppd"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "OpenPrinting"; + repo = "libppd"; + rev = version; + hash = "sha256-vT4h3dnMu4yHNk0ExGZjuChdu0kAcxsla7vJupZpLaY="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + cups + ]; + buildInputs = [ + ghostscript + libcupsfilters + mupdf + libz + ]; + configureFlags = [ + "--with-mutool-path=${mupdf}/bin/mutool" + "--with-pdftops=pdftops" + "--with-pdftops-path=${poppler_utils}/bin/pdftops" + "--with-gs-path=${ghostscript}/bin/gs" + "--with-pdftocairo-path=${poppler_utils}/bin/pdftocairo" + ]; + makeFlags = [ + "CUPS_SERVERBIN=$(out)/lib/cups" + "CUPS_DATADIR=$(out)/share/cups" + "CUPS_SERVERROOT=$(out)/etc/cups" + ]; +} diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index d5688d3bc351..e4f44dbf2947 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,18 +1,18 @@ { lib -, avahi , bc , coreutils , cups , dbus , dejavu_fonts -, fetchurl -, fetchpatch +, fetchFromGitHub , fontconfig , gawk , ghostscript , gnugrep , gnused , ijs +, libcupsfilters +, libppd , libexif , libjpeg , liblouis @@ -30,70 +30,41 @@ , withAvahi ? true }: -let +(if !withAvahi then lib.warn "the 'withAvahi' parameter to 'cups-filters' is deprecated, as the cups-browsed component (which does not make sense without avahi) has been split out of the cups-filters package (which no longer needs avahi)" else lib.id) + +(let binPath = lib.makeBinPath [ bc coreutils gawk gnused gnugrep which ]; in stdenv.mkDerivation rec { pname = "cups-filters"; - version = "1.28.17"; + version = "2.0.1"; - src = fetchurl { - url = "https://github.com/OpenPrinting/cups-filters/releases/download/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-Jwo3UqlgNoqpnUMftdNPQDmyrJQ8V22EBhLR2Bhcm7k="; + src = fetchFromGitHub { + owner = "OpenPrinting"; + repo = "cups-filters"; + rev = version; + hash = "sha256-bLOl64bdeZ10JLcQ7GbU+VffJu3Lzo0ves7O7GQIOWY="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-24805.patch"; - url = "https://github.com/OpenPrinting/cups-filters/commit/93e60d3df358c0ae6f3dba79e1c9684657683d89.patch"; - hash = "sha256-KgWTYFr2uShL040azzE+KaNyBPy7Gs/hCnEgQmmPCys="; - }) - (fetchpatch { - name = "CVE-2024-47076.patch"; - url = "https://github.com/OpenPrinting/libcupsfilters/commit/95576ec3d20c109332d14672a807353cdc551018.patch"; - hash = "sha256-MXWllrdWt8n7zqvumQNg34dBgWMwMTwf9lrD+ZZP8Wk="; - }) - (fetchpatch { - name = "remove-cups-ldap-browse-protocols_CVE-2024-47176_CVE-2024-47850.patch"; - url = "https://github.com/OpenPrinting/cups-filters/commit/6fd2bdfbdce76149af531ce9fca9062304238451.patch"; - hash = "sha256-XS1ODy7i7ilgEjsKuEvOUiRN9pqsj+bOktKoshKcg8Q="; - }) - ]; - nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; buildInputs = [ cups - dbus - fontconfig ghostscript - ijs - libexif - libjpeg - liblouis # braille embosser support - libpng + libcupsfilters + libppd mupdf - perl - poppler - poppler_utils - qpdf - ] ++ lib.optionals withAvahi [ avahi ]; + ]; configureFlags = [ "--with-mutool-path=${mupdf}/bin/mutool" - "--with-pdftops=pdftops" - "--with-pdftops-path=${poppler_utils}/bin/pdftops" "--with-gs-path=${ghostscript}/bin/gs" - "--with-pdftocairo-path=${poppler_utils}/bin/pdftocairo" "--with-ippfind-path=${cups}/bin/ippfind" - "--enable-imagefilters" - "--with-rcdir=no" "--with-shell=${stdenv.shell}" - "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf" "--localstatedir=/var" "--sysconfdir=/etc" - ] ++ lib.optionals (!withAvahi) [ "--disable-avahi" ]; + ]; makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ]; @@ -130,4 +101,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index c94f94f55f2e..595882b9b500 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -2,7 +2,7 @@ , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , gobject-introspection, libsecret, packagekit -, cups-filters, gettext, libtool, autoconf-archive +, libcupsfilters, gettext, libtool, autoconf-archive , python3Packages, autoreconfHook, bash, fetchpatch }: @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { buildPythonPath "$out $pythonPath" gappsWrapperArgs+=( --prefix PATH : "$program_PATH" - --set CUPS_DATADIR "${cups-filters}/share/cups" + --set CUPS_DATADIR "${libcupsfilters}/share/cups" ) find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fa15b777e3a5..957cbfbd28cb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18677,7 +18677,13 @@ with self; { url = "mirror://cpan/authors/id/N/NI/NINE/Net-CUPS-0.64.tar.gz"; hash = "sha256-17x3/w9iv4dMhDxZDrEqgLvUR0mi+3Tb7URcNdDoWoU="; }; - buildInputs = [ pkgs.cups pkgs.cups-filters ]; + patches = [ + (fetchpatch { + url = "https://git.launchpad.net/ubuntu/+source/libnet-cups-perl/plain/debian/patches/cupsfilters-2.0.patch?id=a47b8df8551853c12a7f965ae60bb52333883c88"; + hash = "sha256-ouOrUsRHD1qxu8B6rZiqs9LXYIymX5kSuu99KnmP8Bo="; + }) + ]; + buildInputs = [ pkgs.cups pkgs.libcupsfilters ]; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.cups}/lib -lcups"; meta = { description = "Common Unix Printing System Interface"; From dd90a1d99b28804a7590e2589fc8977c1651861b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Nov 2024 10:17:53 +0000 Subject: [PATCH 0159/1054] mlflow-server: 2.17.2 -> 2.18.0 --- pkgs/development/python-modules/mlflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 6e0b46f058eb..c52166ac7b72 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -70,14 +70,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.17.2"; + version = "2.18.0"; pyproject = true; src = fetchFromGitHub { owner = "mlflow"; repo = "mlflow"; rev = "refs/tags/v${version}"; - hash = "sha256-s3t6RAJh129d5XJKtMNxS0wgGO4mKbAfMCXDBXEKBxM="; + hash = "sha256-etfgdSf3pbcKtCOk9MOgcR+Tzg4cmLbdadAOtQqN4PM="; }; # Remove currently broken dependency `shap`, a model explainability package. From 34ae6ed370f62c76126bf79fbf6a3f3bd43781ec Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 27 Nov 2024 11:58:26 +0100 Subject: [PATCH 0160/1054] simulide: don't use libsForQt5.callPackage --- .../science/electronics/simulide/default.nix | 31 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/science/electronics/simulide/default.nix b/pkgs/applications/science/electronics/simulide/default.nix index 717f7b57de74..441b6e4e27b5 100644 --- a/pkgs/applications/science/electronics/simulide/default.nix +++ b/pkgs/applications/science/electronics/simulide/default.nix @@ -1,12 +1,8 @@ { lib, + stdenv, fetchbzr, - mkDerivation, - qmake, - qtserialport, - qtmultimedia, - qttools, - qtscript, + libsForQt5, }: let @@ -24,7 +20,7 @@ let cp simulide $out/bin/simulide '', }: - mkDerivation { + stdenv.mkDerivation { pname = "simulide"; version = "${version}-${release}"; inherit src; @@ -48,13 +44,18 @@ let cd build_XX ''; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = with libsForQt5; [ + qmake + wrapQtAppsHook + ]; - buildInputs = [ - qtserialport - qtmultimedia - qttools - ] ++ extraBuildInputs; + buildInputs = + (with libsForQt5; [ + qtserialport + qtmultimedia + qttools + ]) + ++ extraBuildInputs; installPhase = '' runHook preInstall @@ -104,7 +105,7 @@ in sed -i src/gpsim/value.h -e '1i #include ' sed -i src/gpsim/modules/watchdog.h -e '1i #include ' ''; - extraBuildInputs = [ qtscript ]; + extraBuildInputs = [ libsForQt5.qtscript ]; iconPath = "resources/icons/hicolor/256x256/simulide.png"; # upstream had a messed up icon path in this release installFiles = '' cp -r share/simulide/* $out/share/simulide @@ -121,7 +122,7 @@ in sha256 = "sha256-rJWZvnjVzaKXU2ktbde1w8LSNvu0jWkDIk4dq2l7t5g="; inherit rev; }; - extraBuildInputs = [ qtscript ]; + extraBuildInputs = [ libsForQt5.qtscript ]; }; simulide_1_1_0 = generic rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b6419813241..df7c22c26302 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17878,7 +17878,7 @@ with pkgs; appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { }; - inherit (libsForQt5.callPackage ../applications/science/electronics/simulide { }) + inherit (callPackage ../applications/science/electronics/simulide { }) simulide_0_4_15 simulide_1_0_0 simulide_1_1_0; simulide = simulide_1_0_0; From 17f173dd44bc2c2b03c7a304519ff38db3067790 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 27 Nov 2024 12:25:31 +0100 Subject: [PATCH 0161/1054] simulide: migrate to pkgs/by-name --- .../science/electronics/simulide/default.nix | 138 ----------------- pkgs/by-name/si/simulide/package.nix | 142 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 +- 3 files changed, 145 insertions(+), 142 deletions(-) delete mode 100644 pkgs/applications/science/electronics/simulide/default.nix create mode 100644 pkgs/by-name/si/simulide/package.nix diff --git a/pkgs/applications/science/electronics/simulide/default.nix b/pkgs/applications/science/electronics/simulide/default.nix deleted file mode 100644 index 441b6e4e27b5..000000000000 --- a/pkgs/applications/science/electronics/simulide/default.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ - lib, - stdenv, - fetchbzr, - libsForQt5, -}: - -let - generic = - { - version, - release, - rev, - src, - extraPostPatch ? "", - extraBuildInputs ? [ ], - iconPath ? "resources/icons/simulide.png", - installFiles ? '' - cp -r data examples $out/share/simulide - cp simulide $out/bin/simulide - '', - }: - stdenv.mkDerivation { - pname = "simulide"; - version = "${version}-${release}"; - inherit src; - - postPatch = '' - sed -i resources/simulide.desktop \ - -e "s|^Exec=.*$|Exec=simulide|" \ - -e "s|^Icon=.*$|Icon=simulide|" - - # Note: older versions don't have REV_NO - sed -i SimulIDE.pro \ - -e "s|^VERSION = .*$|VERSION = ${version}|" \ - -e "s|^RELEASE = .*$|RELEASE = -${release}|" \ - -e "s|^REV_NO = .*$|REV_NO = ${rev}|" \ - -e "s|^BUILD_DATE = .*$|BUILD_DATE = ??-??-??|" - - ${extraPostPatch} - ''; - - preConfigure = '' - cd build_XX - ''; - - nativeBuildInputs = with libsForQt5; [ - qmake - wrapQtAppsHook - ]; - - buildInputs = - (with libsForQt5; [ - qtserialport - qtmultimedia - qttools - ]) - ++ extraBuildInputs; - - installPhase = '' - runHook preInstall - - install -Dm644 ../resources/simulide.desktop $out/share/applications/simulide.desktop - install -Dm644 ../${iconPath} $out/share/icons/hicolor/256x256/apps/simulide.png - - mkdir -p $out/share/simulide $out/bin - pushd executables/SimulIDE_* - ${installFiles} - popd - - runHook postInstall - ''; - - meta = { - description = "Simple real time electronic circuit simulator"; - longDescription = '' - SimulIDE is a simple real time electronic circuit simulator, intended for hobbyist or students - to learn and experiment with analog and digital electronic circuits and microcontrollers. - It supports PIC, AVR, Arduino and other MCUs and MPUs. - ''; - homepage = "https://simulide.com/"; - license = lib.licenses.gpl3Only; - mainProgram = "simulide"; - maintainers = with lib.maintainers; [ - carloscraveiro - tomasajt - ]; - platforms = [ "x86_64-linux" ]; - }; - }; -in -{ - simulide_0_4_15 = generic rec { - version = "0.4.15"; - release = "SR10"; - rev = "291"; - src = fetchbzr { - # the branch name does not mach the version for some reason - url = "https://code.launchpad.net/~arcachofo/simulide/simulide_0.4.14"; - sha256 = "sha256-BBoZr/S2pif0Jft5wrem8y00dXl08jq3kFiIUtOr3LM="; - inherit rev; - }; - extraPostPatch = '' - # GCC 13 needs the header explicitly included - sed -i src/gpsim/value.h -e '1i #include ' - sed -i src/gpsim/modules/watchdog.h -e '1i #include ' - ''; - extraBuildInputs = [ libsForQt5.qtscript ]; - iconPath = "resources/icons/hicolor/256x256/simulide.png"; # upstream had a messed up icon path in this release - installFiles = '' - cp -r share/simulide/* $out/share/simulide - cp bin/simulide $out/bin/simulide - ''; - }; - - simulide_1_0_0 = generic rec { - version = "1.0.0"; - release = "SR2"; - rev = "1449"; - src = fetchbzr { - url = "https://code.launchpad.net/~arcachofo/simulide/1.0.0"; - sha256 = "sha256-rJWZvnjVzaKXU2ktbde1w8LSNvu0jWkDIk4dq2l7t5g="; - inherit rev; - }; - extraBuildInputs = [ libsForQt5.qtscript ]; - }; - - simulide_1_1_0 = generic rec { - version = "1.1.0"; - release = "SR0"; - rev = "1917"; - src = fetchbzr { - url = "https://code.launchpad.net/~arcachofo/simulide/1.1.0"; - sha256 = "sha256-qNBaGWl89Le9uC1VFK+xYhrLzIvOIWjkQbutnrAmZ2M="; - inherit rev; - }; - }; -} diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix new file mode 100644 index 000000000000..1f82243942f9 --- /dev/null +++ b/pkgs/by-name/si/simulide/package.nix @@ -0,0 +1,142 @@ +{ + lib, + stdenv, + fetchbzr, + libsForQt5, + versionNum ? "1.0.0", +}: + +let + versionInfo = { + "0.4.15" = rec { + release = "SR10"; + rev = "291"; + src = fetchbzr { + # the branch name does not mach the version for some reason + url = "https://code.launchpad.net/~arcachofo/simulide/simulide_0.4.14"; + sha256 = "sha256-BBoZr/S2pif0Jft5wrem8y00dXl08jq3kFiIUtOr3LM="; + inherit rev; + }; + }; + "1.0.0" = rec { + release = "SR2"; + rev = "1449"; + src = fetchbzr { + url = "https://code.launchpad.net/~arcachofo/simulide/1.0.0"; + sha256 = "sha256-rJWZvnjVzaKXU2ktbde1w8LSNvu0jWkDIk4dq2l7t5g="; + inherit rev; + }; + }; + "1.1.0" = rec { + release = "SR0"; + rev = "1917"; + src = fetchbzr { + url = "https://code.launchpad.net/~arcachofo/simulide/1.1.0"; + sha256 = "sha256-qNBaGWl89Le9uC1VFK+xYhrLzIvOIWjkQbutnrAmZ2M="; + inherit rev; + }; + }; + }; +in + +let + inherit (versionInfo.${versionNum} or (throw "Unsupported versionNum")) release rev src; + + extraPostPatch = lib.optionalString (lib.versionOlder versionNum "1.0.0") '' + # GCC 13 needs the header explicitly included + sed -i src/gpsim/value.h -e '1i #include ' + sed -i src/gpsim/modules/watchdog.h -e '1i #include ' + ''; + + extraBuildInputs = lib.optionals (lib.versionOlder versionNum "1.1.0") [ + libsForQt5.qtscript + ]; + + iconPath = + if lib.versionOlder versionNum "1.0.0" then + "resources/icons/hicolor/256x256/simulide.png" # upstream had a messed up icon path in this release + else + "resources/icons/simulide.png"; + + installFiles = + if lib.versionOlder versionNum "1.0.0" then + '' + cp -r share/simulide/* $out/share/simulide + cp bin/simulide $out/bin/simulide + '' + else + '' + cp -r data examples $out/share/simulide + cp simulide $out/bin/simulide + ''; + +in + +stdenv.mkDerivation { + pname = "simulide"; + version = "${versionNum}-${release}"; + inherit src; + + postPatch = '' + sed -i resources/simulide.desktop \ + -e "s|^Exec=.*$|Exec=simulide|" \ + -e "s|^Icon=.*$|Icon=simulide|" + + # Note: older versions don't have REV_NO + sed -i SimulIDE.pro \ + -e "s|^VERSION = .*$|VERSION = ${versionNum}|" \ + -e "s|^RELEASE = .*$|RELEASE = -${release}|" \ + -e "s|^REV_NO = .*$|REV_NO = ${rev}|" \ + -e "s|^BUILD_DATE = .*$|BUILD_DATE = ??-??-??|" + + ${extraPostPatch} + ''; + + preConfigure = '' + cd build_XX + ''; + + nativeBuildInputs = with libsForQt5; [ + qmake + wrapQtAppsHook + ]; + + buildInputs = + (with libsForQt5; [ + qtserialport + qtmultimedia + qttools + ]) + ++ extraBuildInputs; + + installPhase = '' + runHook preInstall + + install -Dm644 ../resources/simulide.desktop $out/share/applications/simulide.desktop + install -Dm644 ../${iconPath} $out/share/icons/hicolor/256x256/apps/simulide.png + + mkdir -p $out/share/simulide $out/bin + pushd executables/SimulIDE_* + ${installFiles} + popd + + runHook postInstall + ''; + + meta = { + description = "Simple real time electronic circuit simulator"; + longDescription = '' + SimulIDE is a simple real time electronic circuit simulator, intended for hobbyist or students + to learn and experiment with analog and digital electronic circuits and microcontrollers. + It supports PIC, AVR, Arduino and other MCUs and MPUs. + ''; + homepage = "https://simulide.com/"; + license = lib.licenses.gpl3Only; + mainProgram = "simulide"; + maintainers = with lib.maintainers; [ + carloscraveiro + tomasajt + ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df7c22c26302..238fdac34a6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17878,10 +17878,9 @@ with pkgs; appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { }; - inherit (callPackage ../applications/science/electronics/simulide { }) - simulide_0_4_15 simulide_1_0_0 simulide_1_1_0; - - simulide = simulide_1_0_0; + simulide_0_4_15 = simulide.override { versionNum = "0.4.15"; }; + simulide_1_0_0 = simulide.override { versionNum = "1.0.0"; }; + simulide_1_1_0 = simulide.override { versionNum = "1.1.0"; }; eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; From 8cf70f5ff0ab5c1e8c2134f996d1b2e8a67857d4 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Wed, 27 Nov 2024 17:04:50 +0100 Subject: [PATCH 0162/1054] minio-warp: init at 1.0.6 Signed-off-by: Christoph Heiss --- pkgs/by-name/mi/minio-warp/package.nix | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/mi/minio-warp/package.nix diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix new file mode 100644 index 000000000000..67a77b6e00b3 --- /dev/null +++ b/pkgs/by-name/mi/minio-warp/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + versionCheckHook, +}: + +buildGoModule rec { + pname = "minio-warp"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "minio"; + repo = "warp"; + rev = "v${version}"; + hash = "sha256-Zfjj/cYxucjuJRzER6MczQFqu8kdfUUXqC0mcQFbk0Q="; + }; + + vendorHash = "sha256-GD9Om5jymrRbeCVGNXtaam5Dmfg99CtEeiAFENhwyyY="; + + # See .goreleaser.yml + ldflags = [ + "-s" + "-w" + "-X github.com/minio/warp/pkg.ReleaseTag=v${version}" + "-X github.com/minio/warp/pkg.CommitID=${src.rev}" + "-X github.com/minio/warp/pkg.Version=${version}" + "-X github.com/minio/warp/pkg.ShortCommitID=${src.rev}" + "-X github.com/minio/warp/pkg.ReleaseTime=1970-01-01T00:00:00Z" + ]; + + postInstall = '' + mv $out/bin/warp $out/bin/minio-warp + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + + meta = { + description = "S3 benchmarking tool"; + homepage = "https://github.com/minio/warp"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ christoph-heiss ]; + mainProgram = "minio-warp"; + }; +} From 4f6eafbb37cb0434f9cf310d96509f04ba4f634b Mon Sep 17 00:00:00 2001 From: Alex James Date: Wed, 27 Nov 2024 11:54:29 -0600 Subject: [PATCH 0163/1054] tiny-cuda-nn: fix a couple of build issues The CUDA architecture detection code in tiny-cuda-nn's Torch bindings convert CUDA capabilities to `int`s, which breaks with 9.0a. Filter 9.0a from the CUDA capabilities passed to TCNN_CUDA_ARCHITECTURES. Also patch the Torch bindings to replace the hardcoded `-std=c++14` argument to nvcc with `-std=c++17` for CUDA 11+ to fix the build. --- pkgs/by-name/ti/tiny-cuda-nn/package.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tiny-cuda-nn/package.nix b/pkgs/by-name/ti/tiny-cuda-nn/package.nix index ada84ef50767..74a76d2b9c90 100644 --- a/pkgs/by-name/ti/tiny-cuda-nn/package.nix +++ b/pkgs/by-name/ti/tiny-cuda-nn/package.nix @@ -11,7 +11,7 @@ which, }: let inherit (lib) lists strings; - inherit (cudaPackages) backendStdenv flags; + inherit (cudaPackages) backendStdenv cudaVersion flags; cuda-common-redist = with cudaPackages; [ (lib.getDev cuda_cudart) # cuda_runtime.h @@ -36,6 +36,14 @@ name = "cuda-redist"; paths = cuda-common-redist; }; + + unsupportedCudaCapabilities = [ + "9.0a" + ]; + + cudaCapabilities = lists.subtractLists unsupportedCudaCapabilities flags.cudaCapabilities; + + cudaArchitecturesString = strings.concatMapStringsSep ";" flags.dropDot cudaCapabilities; in stdenv.mkDerivation (finalAttrs: { pname = "tiny-cuda-nn"; @@ -52,6 +60,13 @@ in hash = "sha256-qW6Fk2GB71fvZSsfu+mykabSxEKvaikZ/pQQZUycOy0="; }; + # Remove this once a release is made with + # https://github.com/NVlabs/tiny-cuda-nn/commit/78a14fe8c292a69f54e6d0d47a09f52b777127e1 + postPatch = lib.optionals (strings.versionAtLeast cudaVersion "11.0") '' + substituteInPlace bindings/torch/setup.py --replace-fail \ + "-std=c++14" "-std=c++17" + ''; + nativeBuildInputs = [ cmake @@ -89,7 +104,7 @@ in doCheck = false; preConfigure = '' - export TCNN_CUDA_ARCHITECTURES="${flags.cmakeCudaArchitecturesString}" + export TCNN_CUDA_ARCHITECTURES="${cudaArchitecturesString}" export CUDA_HOME="${cuda-native-redist}" export LIBRARY_PATH="${cuda-native-redist}/lib/stubs:$LIBRARY_PATH" export CC="${backendStdenv.cc}/bin/cc" From 7f6e867bfe13ecc73a78ff53301e8300d1a73de8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Nov 2024 18:49:44 +0000 Subject: [PATCH 0164/1054] commitizen: 3.30.0 -> 4.0.0 --- pkgs/development/python-modules/commitizen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index 039880f363dd..06a42d63887c 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "commitizen"; - version = "3.30.0"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "commitizen-tools"; repo = "commitizen"; rev = "refs/tags/v${version}"; - hash = "sha256-8ULIoFKrDAGHwz0EZzYJtl/4h6UVUECLUDbvTJbdD60="; + hash = "sha256-M6JoBVst2aJwxr/SyMpXXOnMKIl9gX0ltg3H0SpU7uQ="; }; pythonRelaxDeps = [ From 79fdb67f884dfbeeb2538b667be23e35b27e92d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Nov 2024 23:00:40 +0000 Subject: [PATCH 0165/1054] python312Packages.marimo: 0.9.14 -> 0.9.27 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 3d135bd357f0..02755b8ed342 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -30,13 +30,13 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.9.14"; + version = "0.9.27"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-Q3dnRuAS8B4cWvF04GGg5OOZtmAJPKa2fHwnoO2DXDs="; + hash = "sha256-vs1miLjM/xRrnFYpHte65CfDt4ZRoCKjFMClWukIWZY="; }; build-system = [ hatchling ]; From 18a80ee43c6b16754ce49ef18b82db8777553181 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Tue, 26 Nov 2024 19:24:07 -0800 Subject: [PATCH 0166/1054] linuxPackages_latest.broadcom_sta: add patch to compile on Kernel 6.12 Commit 5f60d5f6bbc1, part of Kernel 6.12, moves asm/unaligned.h to linux/unaligned.h. As a result we use a trivial patch which simply switches the include path if compiling for 6.12. --- pkgs/os-specific/linux/broadcom-sta/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 7bf505f7fa94..9d310b02e179 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, fetchFromGitHub, + fetchpatch2, kernel, }: @@ -66,7 +67,13 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - patches = map (patch: "${rpmFusionPatches}/${patch}") patchset; + patches = map (patch: "${rpmFusionPatches}/${patch}") patchset ++ [ + # Fix for Kernel 6.12 and later (5f60d5f6bbc1) + (fetchpatch2 { + url = "https://gist.githubusercontent.com/joanbm/20db669eed4d8367a457780747be8cb9/raw/5536ba1354b6b97013530e7345d3bf29e92225b1/broadcom-wl-fix-linux-6.12.patch"; + hash = "sha256-Y5VgWp0m5tNp8lxDhIg7IodbqyUsJVHHiVIFgP9ioHE="; + }) + ]; makeFlags = [ "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}" ]; From f5080d12b384b58f70047a35fdc67ff90ba8490a Mon Sep 17 00:00:00 2001 From: Flo Date: Thu, 28 Nov 2024 13:47:45 +0100 Subject: [PATCH 0167/1054] Rebuild password update functionality, add tests --- nixos/modules/installer/netboot/netboot.nix | 49 ++++++++++----------- nixos/tests/boot.nix | 18 +++++--- 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 1706dbf455d6..ae8655f407e6 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -131,33 +131,30 @@ with lib; boot.loader.timeout = 10; - boot.postBootCommands = - '' - # After booting, register the contents of the Nix store - # in the Nix database in the tmpfs. - ${config.nix.package}/bin/nix-store --load-db < /nix/store/nix-path-registration + boot.postBootCommands = '' + # After booting, register the contents of the Nix store + # in the Nix database in the tmpfs. + ${config.nix.package}/bin/nix-store --load-db < /nix/store/nix-path-registration - # nixos-rebuild also requires a "system" profile and an - # /etc/NIXOS tag. - touch /etc/NIXOS - ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system - - # Set password for user nixos if specified on cmdline - # Allows using nixos-anywhere in headless environments - for o in $( Date: Thu, 28 Nov 2024 13:50:44 +0100 Subject: [PATCH 0168/1054] Add tests --- nixos/tests/boot.nix | 55 ++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index b73f9593e491..3ec8d3e5a3cf 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -111,34 +111,39 @@ let pxe = ipxeBootDir; } // extraConfig); in - makeTest { - name = "boot-netboot-" + name; - nodes = { }; - testScript = '' - machine = create_machine("${startCommand}") - machine.start() - machine.wait_for_unit("multi-user.target") - machine.shutdown() - ''; - }; -in { - uefiCdrom = makeBootTest "uefi-cdrom" { - uefi = true; - cdrom = "${iso}/iso/${iso.isoName}"; + makeTest { + name = "boot-netboot-" + name; + nodes = { }; + testScript = '' + machine = create_machine("${startCommand}") + machine.start() + machine.wait_for_unit("multi-user.target") + machine.succeed("grep 'serial' /proc/cmdline") + machine.succeed("grep 'live.nixos.passwordHash' /proc/cmdline") + machine.succeed("grep '$6$jnwR50SkbLYEq/Vp$wmggwioAkfmwuYqd5hIfatZWS/bO6hewzNIwIrWcgdh7k/fhUzZT29Vil3ioMo94sdji/nipbzwEpxecLZw0d0' /etc/shadow") + machine.shutdown() + ''; }; +in +{ + uefiCdrom = makeBootTest "uefi-cdrom" { + uefi = true; + cdrom = "${iso}/iso/${iso.isoName}"; + }; - uefiUsb = makeBootTest "uefi-usb" { - uefi = true; - usb = "${iso}/iso/${iso.isoName}"; - }; + uefiUsb = makeBootTest "uefi-usb" { + uefi = true; + usb = "${iso}/iso/${iso.isoName}"; + }; - uefiNetboot = makeNetbootTest "uefi" { - uefi = true; - }; -} // lib.optionalAttrs (pkgs.stdenv.hostPlatform.system == "x86_64-linux") { - biosCdrom = makeBootTest "bios-cdrom" { - cdrom = "${iso}/iso/${iso.isoName}"; - }; + uefiNetboot = makeNetbootTest "uefi" { + uefi = true; + }; +} +// lib.optionalAttrs (pkgs.stdenv.hostPlatform.system == "x86_64-linux") { + biosCdrom = makeBootTest "bios-cdrom" { + cdrom = "${iso}/iso/${iso.isoName}"; + }; biosUsb = makeBootTest "bios-usb" { usb = "${iso}/iso/${iso.isoName}"; From b65739e061fbf58aed6ef6145685b154c65ddc97 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Thu, 28 Nov 2024 14:39:53 +0100 Subject: [PATCH 0169/1054] =?UTF-8?q?zotero:=207.0.8=20=E2=86=92=207.0.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Diff: https://github.com/zotero/zotero/compare/7.0.8...7.0.10 --- pkgs/by-name/zo/zotero/darwin.nix | 2 +- pkgs/by-name/zo/zotero/linux.nix | 2 +- pkgs/by-name/zo/zotero/package.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zo/zotero/darwin.nix b/pkgs/by-name/zo/zotero/darwin.nix index ad60ee9d409e..12697c31a085 100644 --- a/pkgs/by-name/zo/zotero/darwin.nix +++ b/pkgs/by-name/zo/zotero/darwin.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}.dmg"; - hash = "sha256-z1HAkHz4JGRfQJna2cINZTmYPzyj9ofp7mJHN/mNyOo="; + hash = "sha256-JP9zRPsEDICw6Q7VHRd7IB0J9+v0qU7QuLf7eTPafBo="; }; sourceRoot = "."; diff --git a/pkgs/by-name/zo/zotero/linux.nix b/pkgs/by-name/zo/zotero/linux.nix index 1b7d58f86883..5a3d3570fc3f 100644 --- a/pkgs/by-name/zo/zotero/linux.nix +++ b/pkgs/by-name/zo/zotero/linux.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - hash = "sha256-utiqS4/PvlkQesqTOyEvj8uwW1sDxlqjnhv6GFfY5uk="; + hash = "sha256-t0LApaU13tT/14nvRpnWZwFyWiJq+WfZNgVyhNayMcs="; }; dontPatchELF = true; diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix index f6117050c97f..a56aef7d3ae7 100644 --- a/pkgs/by-name/zo/zotero/package.nix +++ b/pkgs/by-name/zo/zotero/package.nix @@ -6,7 +6,7 @@ let pname = "zotero"; - version = "7.0.8"; + version = "7.0.10"; meta = { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; From b6447bb4a802779f1ed774e580c88047723c6da2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Thu, 28 Nov 2024 17:24:17 +0200 Subject: [PATCH 0170/1054] python3Packages.proton-core: 0.3.3 -> 0.4.0 Update the package to the latest version. --- pkgs/development/python-modules/proton-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proton-core/default.nix b/pkgs/development/python-modules/proton-core/default.nix index 91bffd81e2ce..c4cfc5fcf15c 100644 --- a/pkgs/development/python-modules/proton-core/default.nix +++ b/pkgs/development/python-modules/proton-core/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "proton-core"; - version = "0.3.3"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-core"; rev = "refs/tags/v${version}"; - hash = "sha256-2Drlai/PYzi1z1CtDYfNhol2wamb/HNrvUhj0XsiyHg="; + hash = "sha256-EZsPw2kPgY42MQxrXt7yAtCNSmSNN5AYxx7SllwsbvA="; }; build-system = [ setuptools ]; From e50228f6d981184e913b39b537734e9f1efb0ef5 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Thu, 28 Nov 2024 16:34:35 +0100 Subject: [PATCH 0171/1054] perlPackages.DBDMariaDB: fix strictDeps = true --- pkgs/top-level/perl-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f339c7c80c24..3bea9ca56b33 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7182,8 +7182,10 @@ with self; { url = "mirror://cpan/authors/id/P/PA/PALI/DBD-MariaDB-1.23.tar.gz"; hash = "sha256-DQx2xmDd1VVw5I8+L96o9iGmmsDtSBkOjPyvy16bhZ0="; }; + nativeBuildInputs = [ pkgs.mariadb-connector-c ]; buildInputs = [ pkgs.mariadb-connector-c DevelChecklib TestDeep TestDistManifest TestPod ]; propagatedBuildInputs = [ DBI ]; + strictDeps = true; meta = { description = "MariaDB and MySQL driver for the Perl5 Database Interface (DBI)"; homepage = "https://github.com/gooddata/DBD-MariaDB"; From beb6fe987b2428126c435cefe41262dcf22aa1ca Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 25 Nov 2024 20:09:46 +0900 Subject: [PATCH 0172/1054] cloudflare-warp: format with nixfmt-rfc-style --- pkgs/by-name/cl/cloudflare-warp/package.nix | 60 ++++++++++++--------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index dd8a48bddd26..cc629fb850a0 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -1,34 +1,39 @@ -{ stdenv -, lib -, autoPatchelfHook -, copyDesktopItems -, dbus -, dpkg -, fetchurl -, gtk3 -, libpcap -, makeDesktopItem -, makeWrapper -, nftables -, nss -, openssl +{ + stdenv, + lib, + autoPatchelfHook, + copyDesktopItems, + dbus, + dpkg, + fetchurl, + gtk3, + libpcap, + makeDesktopItem, + makeWrapper, + nftables, + nss, + openssl, }: stdenv.mkDerivation rec { pname = "cloudflare-warp"; version = "2024.11.309"; - suffix = { - aarch64-linux = "arm64"; - x86_64-linux = "amd64"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + suffix = + { + aarch64-linux = "arm64"; + x86_64-linux = "amd64"; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_${suffix}.deb"; - hash = { - aarch64-linux = "sha256-pdCPN4NxaQqWNRPZY1CN03KnTdzl62vJ3JNfxGozI4k="; - x86_64-linux = "sha256-THxXETyy08rBmvghrc8HIQ2cBSLeNVl8SkD43CVY/tE="; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + hash = + { + aarch64-linux = "sha256-pdCPN4NxaQqWNRPZY1CN03KnTdzl62vJ3JNfxGozI4k="; + x86_64-linux = "sha256-THxXETyy08rBmvghrc8HIQ2cBSLeNVl8SkD43CVY/tE="; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; nativeBuildInputs = [ @@ -51,7 +56,11 @@ stdenv.mkDerivation rec { (makeDesktopItem { name = "com.cloudflare.WarpCli"; desktopName = "Cloudflare Zero Trust Team Enrollment"; - categories = [ "Utility" "Security" "ConsoleOnly" ]; + categories = [ + "Utility" + "Security" + "ConsoleOnly" + ]; noDisplay = true; mimeTypes = [ "x-scheme-handler/com.cloudflare.warp" ]; exec = "warp-cli --accept-tos registration token %u"; @@ -100,6 +109,9 @@ stdenv.mkDerivation rec { devpikachu marcusramberg ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; } From 13b953c8644e7457bf2b429ca14d7367f6eebf85 Mon Sep 17 00:00:00 2001 From: nicoo Date: Thu, 28 Nov 2024 16:27:36 +0000 Subject: [PATCH 0173/1054] lib.packagesFromDirectoryRecursive: More precise type signature Pulled above the inputs section to avoid duplicating information. --- lib/filesystem.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/filesystem.nix b/lib/filesystem.nix index 5a78bcca4ebd..2f43792017f9 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -306,6 +306,16 @@ in As a result, directories with no `.nix` files (including empty directories) will be transformed into empty attribute sets. + # Type + + ``` + packagesFromDirectoryRecursive :: { + callPackage :: Path -> {} -> a, + directory :: Path, + ... + } -> AttrSet + ``` + # Inputs Structured function argument @@ -317,20 +327,10 @@ in : `pkgs.callPackage` - Type: `Path -> AttrSet -> a` - `directory` : The directory to read package files from - Type: `Path` - - - # Type - - ``` - packagesFromDirectoryRecursive :: AttrSet -> AttrSet - ``` # Examples :::{.example} From 8872fb10ac344b4f880e3a6ed7d59ee95c681aa8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Nov 2024 19:45:58 +0000 Subject: [PATCH 0174/1054] davinci-resolve: 19.0.2 -> 19.1 --- pkgs/applications/video/davinci-resolve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 686821482e6d..d66202afcc71 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -34,7 +34,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "19.0.2"; + version = "19.1"; nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } ) @@ -55,8 +55,8 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant - then "sha256-q11stWFWRDUebAUzGH23R3Spd3EdDG85+6yB/srYCJY=" - else "sha256-dYTrO0wpIN68WhBovmYLK5uWOQ1nubpSyKqPCDMPMiM="; + then "sha256-uEUZt0TQ4XrAag6NoCPUtYSnkwpwh3BNlol1z/EmP9E=" + else "sha256-3VVyfXT/mZFuf2GGkNS47ErSdAGpdUUwwwKY19zBBZo="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; From 7a294f6ffb7b95a0109cc2611e5703139e899427 Mon Sep 17 00:00:00 2001 From: RodEsp <1084688+RodEsp@users.noreply.github.com> Date: Thu, 28 Nov 2024 15:04:13 -0500 Subject: [PATCH 0175/1054] warp-terminal: 0.2024.11.19.08.02.stable_01 -> 0.2024.11.19.08.02.stable_03 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 7edef151703d..48a4a92c919f 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-zvM7CcWYFXMN9dLoJqXnQlENmWDGYRKXQACtUQnXmmE=", - "version": "0.2024.11.19.08.02.stable_01" + "hash": "sha256-N1CvHYWhwi75+eelp3UPrqnigRTg1LWKhmVDNXv96LA=", + "version": "0.2024.11.19.08.02.stable_03" }, "linux_x86_64": { - "hash": "sha256-4uYVA+6NI11X/rYwEzHeTiPnDyntpZcBBBCiZkc9ik8=", - "version": "0.2024.11.19.08.02.stable_01" + "hash": "sha256-vxK9GFYYFZK3NIIejh6dAK3sKkpAR4cyOSC/t2Aodg8=", + "version": "0.2024.11.19.08.02.stable_03" }, "linux_aarch64": { - "hash": "sha256-3Tx/NcWV0zyTRp5FVqWTfnhXoxrW3ph/Ytc2tjfNhcs=", - "version": "0.2024.11.19.08.02.stable_01" + "hash": "sha256-eADShsB0/kKNMzBP1/JZ0Kofh2iTQtsxFz2N1H+hxY0=", + "version": "0.2024.11.19.08.02.stable_03" } } From 4bdf760ad3adda23210c11c45d160f844b48e715 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Nov 2024 21:52:36 +0000 Subject: [PATCH 0176/1054] python312Packages.langsmith: 0.1.137 -> 0.1.147 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 83c78c9bbc07..12a731af5f30 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.137"; + version = "0.1.147"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-nR3fb3MHBxFvI4qrsTpElLWTDUESZ8J78GsVoCGTIyQ="; + hash = "sha256-d0PJaC1MhVS3i4AtXUjSkkq/Yj2Pi42H/cW/XML/94o="; }; sourceRoot = "${src.name}/python"; From a2e747664b7005a36a367c8acde256a3a4dfee65 Mon Sep 17 00:00:00 2001 From: Yaroslav Chvanov Date: Fri, 29 Nov 2024 00:35:00 +0300 Subject: [PATCH 0177/1054] strawberry: format with nixfmt --- .../applications/audio/strawberry/default.nix | 172 +++++++++--------- 1 file changed, 91 insertions(+), 81 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 58ac8f60ff1c..3e30c90b755c 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -1,41 +1,42 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, alsa-lib -, boost -, chromaprint -, fftw -, gnutls -, libcdio -, libebur128 -, libmtp -, libpthreadstubs -, libtasn1 -, libXdmcp -, ninja -, pcre -, protobuf -, sqlite -, taglib -, libgpod -, libidn2 -, libpulseaudio -, libselinux -, libsepol -, p11-kit -, util-linux -, qtbase -, qtx11extras ? null # doesn't exist in qt6 -, qttools -, withGstreamer ? true -, glib-networking -, gst_all_1 -, withVlc ? true -, libvlc -, nix-update-script +{ + alsa-lib, + boost, + chromaprint, + cmake, + fetchFromGitHub, + fftw, + glib-networking, + gnutls, + gst_all_1, + lib, + libXdmcp, + libcdio, + libebur128, + libgpod, + libidn2, + libmtp, + libpthreadstubs, + libpulseaudio, + libselinux, + libsepol, + libtasn1, + libvlc, + ninja, + nix-update-script, + p11-kit, + pcre, + pkg-config, + protobuf, + qtbase, + qttools, + qtx11extras ? null, # doesn't exist in qt6 + sqlite, + stdenv, + taglib, + util-linux, + withGstreamer ? true, + withVlc ? true, + wrapQtAppsHook, }: let @@ -60,50 +61,59 @@ stdenv.mkDerivation rec { --replace pictures/strawberry.png pictures/strawberry-grey.png ''; - buildInputs = [ - alsa-lib - boost - chromaprint - fftw - gnutls - libcdio - libebur128 - libidn2 - libmtp - libpthreadstubs - libtasn1 - libXdmcp - pcre - protobuf - sqlite - taglib - qtbase - qtx11extras - ] ++ optionals stdenv.hostPlatform.isLinux [ - libgpod - libpulseaudio - libselinux - libsepol - p11-kit - ] ++ optionals withGstreamer (with gst_all_1; [ - glib-networking - gstreamer - gst-libav - gst-plugins-base - gst-plugins-good - gst-plugins-bad - gst-plugins-ugly - ]) ++ optionals withVlc [ libvlc ]; + buildInputs = + [ + alsa-lib + boost + chromaprint + fftw + gnutls + libXdmcp + libcdio + libebur128 + libidn2 + libmtp + libpthreadstubs + libtasn1 + pcre + protobuf + qtbase + qtx11extras + sqlite + taglib + ] + ++ optionals stdenv.hostPlatform.isLinux [ + libgpod + libpulseaudio + libselinux + libsepol + p11-kit + ] + ++ optionals withGstreamer ( + with gst_all_1; + [ + glib-networking + gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + ] + ) + ++ optionals withVlc [ libvlc ]; - nativeBuildInputs = [ - cmake - ninja - pkg-config - qttools - wrapQtAppsHook - ] ++ optionals stdenv.hostPlatform.isLinux [ - util-linux - ]; + nativeBuildInputs = + [ + cmake + ninja + pkg-config + qttools + wrapQtAppsHook + ] + ++ optionals stdenv.hostPlatform.isLinux [ + util-linux + ]; postInstall = optionalString withGstreamer '' qtWrapperArgs+=( From ff6e974816517c6fef59c5d32ac47bb71b2243f0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 27 Nov 2024 01:27:32 +0100 Subject: [PATCH 0178/1054] lomiri.lomiri-mediaplayer-app: init at 1.1.0 --- .../lomiri-mediaplayer-app/default.nix | 164 ++++++++++++++++++ pkgs/desktops/lomiri/default.nix | 1 + 2 files changed, 165 insertions(+) create mode 100644 pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix diff --git a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix new file mode 100644 index 000000000000..15ad1337194d --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix @@ -0,0 +1,164 @@ +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + gitUpdater, + cmake, + gettext, + gst_all_1, + lomiri-action-api, + lomiri-content-hub, + lomiri-ui-toolkit, + pkg-config, + qtbase, + qtdeclarative, + qtmultimedia, + qtxmlpatterns, + wrapGAppsHook3, + wrapQtAppsHook, + xvfb-run, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-mediaplayer-app"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-mediaplayer-app"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-Pq1TA7eoHDRRzr6zT2cmIye91uz/0YsmQ8Qp79244wg="; + }; + + patches = [ + # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/35 merged & in release + (fetchpatch { + name = "0001-lomiri-mediaplayer-app-Fix-GNUInstallDirs-usage.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/baaa0ea7cba2a9f8bc7f223246857eba1cd5d8e4.patch"; + hash = "sha256-RChPRi4zrAWJEl4Urznh5FRYuTnxCFzG+gZurrF7Ym0="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/36 merged & in release + (fetchpatch { + name = "0002-lomiri-mediaplayer-app-Drop-NO_DEFAULT_PATH-for-qmltestrunner.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/3bf4ebae7eb59176af984d07ad72b67ee0bd1b8f.patch"; + hash = "sha256-dJCW0dKe7Tq1Mg9CSdVQHamObVrPS7COXsdv41SWnHg="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/37 merged & in release + (fetchpatch { + name = "0003-lomiri-mediaplayer-app-BUILD_TESTING.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/df1aadb82d73177133bc096307ec1ef1e2b0c2ed.patch"; + hash = "sha256-dvkGjG0ptCmLDIAWzDjOzu+Q/5bgVdb/+RmE6v8fV0Q="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/38 merged & in release + (fetchpatch { + name = "0004-lomiri-mediaplayer-app-bindtextdomain.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/bd927e823205214f9ea01dfb1f93171a8952ecf9.patch"; + hash = "sha256-/lg0elv9weNnRGq1oD94/sE511EZ0TmXZsURcauQobI="; + }) + (fetchpatch { + name = "0005-lomiri-mediaplayer-app-Fix-title-localisation.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/c4cba819dd55e7e85c4ea496626bed9aa78470a5.patch"; + hash = "sha256-EiUxaCa5ANnRSciB8IodQOGnmG4rE/g/M+K4XcyqTI8="; + }) + ]; + + postPatch = '' + # We don't want absolute paths in desktop files + substituteInPlace data/lomiri-mediaplayer-app.desktop.in.in \ + --replace-fail 'Icon=@MEDIAPLAYER_DIR@/@LOMIRI_MEDIAPLAYER_APP_ICON@' 'Icon=lomiri-mediaplayer-app' \ + --replace-fail 'X-Lomiri-SymbolicIcon=@MEDIAPLAYER_DIR@/@LOMIRI_MEDIAPLAYER_APP_SYMBOLIC_ICON@' 'X-Lomiri-SymbolicIcon=lomiri-app-launch/symbolic/lomiri-mediaplayer-app.svg' \ + --replace-fail 'X-Lomiri-Splash-Image=@MEDIAPLAYER_DIR@/@LOMIRI_MEDIAPLAYER_APP_SPLASH@' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/lomiri-mediaplayer-app.svg' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + pkg-config + wrapGAppsHook3 + wrapQtAppsHook + ]; + + buildInputs = + [ + qtbase + qtmultimedia + + # QML + lomiri-action-api + lomiri-content-hub + lomiri-ui-toolkit + qtxmlpatterns + ] + # QtMultimedia playback support + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + ]); + + nativeCheckInputs = [ + qtdeclarative # qmltestrunner + xvfb-run + ]; + + checkInputs = [ lomiri-ui-toolkit ]; + + dontWrapGApps = true; + + cmakeFlags = [ (lib.cmakeBool "ENABLE_AUTOPILOT" false) ]; + + # Only test segfaults in Nix sandbox, see LSS for details + doCheck = false; + + preCheck = + let + listToQtVar = + list: suffix: lib.strings.concatMapStringsSep ":" (drv: "${lib.getBin drv}/${suffix}") list; + in + '' + export QT_PLUGIN_PATH=${listToQtVar [ qtbase ] qtbase.qtPluginPrefix} + export QML2_IMPORT_PATH=${ + listToQtVar [ + lomiri-ui-toolkit + qtmultimedia + qtxmlpatterns + ] qtbase.qtQmlPrefix + } + ''; + + postInstall = '' + mkdir -p $out/share/{icons/hicolor/256x256/apps,lomiri-app-launch/{symbolic,splash}} + + ln -s $out/share/{lomiri-mediaplayer-app,icons/hicolor/256x256/apps}/lomiri-mediaplayer-app.png + ln -s $out/share/{lomiri-mediaplayer-app/lomiri-mediaplayer-app-splash.svg,lomiri-app-launch/splash/lomiri-mediaplayer-app.svg} + ln -s $out/share/{lomiri-mediaplayer-app/lomiri-mediaplayer-app-symbolic.svg,lomiri-app-launch/symbolic/lomiri-mediaplayer-app.svg} + ''; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + passthru = { + updateScript = gitUpdater { }; + }; + + meta = { + description = "Media Player application for Ubuntu Touch devices"; + homepage = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app"; + changelog = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app/-/blob/${finalAttrs.version}/ChangeLog"; + license = with lib.licenses; [ + gpl3Only + cc-by-sa-30 + ]; + mainProgram = "lomiri-mediaplayer-app"; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index a8577bbf4123..f0ae070a7860 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -20,6 +20,7 @@ let lomiri-docviewer-app = callPackage ./applications/lomiri-docviewer-app { }; lomiri-filemanager-app = callPackage ./applications/lomiri-filemanager-app { }; lomiri-gallery-app = callPackage ./applications/lomiri-gallery-app { }; + lomiri-mediaplayer-app = callPackage ./applications/lomiri-mediaplayer-app { }; lomiri-system-settings-unwrapped = callPackage ./applications/lomiri-system-settings { }; lomiri-system-settings = callPackage ./applications/lomiri-system-settings/wrapper.nix { }; lomiri-terminal-app = callPackage ./applications/lomiri-terminal-app { }; From 928dea90c68f371bd8a81f003844c508114adc8f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 27 Nov 2024 18:07:50 +0100 Subject: [PATCH 0179/1054] nixos/lomiri: Add mediaplayer app --- nixos/modules/services/desktop-managers/lomiri.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 8d245ce0050c..f48cce7ab210 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -90,6 +90,7 @@ in lomiri-filemanager-app lomiri-gallery-app lomiri-history-service + lomiri-mediaplayer-app lomiri-polkit-agent lomiri-schemas # exposes some required dbus interfaces lomiri-session # wrappers to properly launch the session From 00ee3ec75f498e8a7f6979241fa491b1c02abf14 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 27 Nov 2024 19:31:56 +0100 Subject: [PATCH 0180/1054] tests/lomiri-mediaplayer-app: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/lomiri-mediaplayer-app.nix | 77 +++++++++++++++++++ .../lomiri-mediaplayer-app/default.nix | 2 + 3 files changed, 80 insertions(+) create mode 100644 nixos/tests/lomiri-mediaplayer-app.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 6f941cc254ad..ba889d403472 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -562,6 +562,7 @@ in { lomiri-clock-app = runTest ./lomiri-clock-app.nix; lomiri-docviewer-app = runTest ./lomiri-docviewer-app.nix; lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix; + lomiri-mediaplayer-app = runTest ./lomiri-mediaplayer-app.nix; lomiri-gallery-app = runTest ./lomiri-gallery-app.nix; lomiri-system-settings = handleTest ./lomiri-system-settings.nix {}; lorri = handleTest ./lorri/default.nix {}; diff --git a/nixos/tests/lomiri-mediaplayer-app.nix b/nixos/tests/lomiri-mediaplayer-app.nix new file mode 100644 index 000000000000..b4ac5dd4ad2a --- /dev/null +++ b/nixos/tests/lomiri-mediaplayer-app.nix @@ -0,0 +1,77 @@ +{ lib, ... }: +let + ocrContent = "Video Test"; + videoFile = "test.webm"; +in +{ + name = "lomiri-mediaplayer-app-standalone"; + meta.maintainers = lib.teams.lomiri.members; + + nodes.machine = + { config, pkgs, ... }: + { + imports = [ ./common/x11.nix ]; + + services.xserver.enable = true; + + environment = { + # Setup video + etc."${videoFile}".source = + pkgs.runCommand videoFile + { + nativeBuildInputs = with pkgs; [ + ffmpeg # produce video for OCR + (imagemagick.override { ghostscriptSupport = true; }) # produce OCR-able image + ]; + } + '' + magick -size 400x400 canvas:white -pointsize 40 -fill black -annotate +100+100 '${ocrContent}' output.png + ffmpeg -re -loop 1 -i output.png -c:v libvpx -b:v 100K -t 120 $out -loglevel fatal + ''; + systemPackages = with pkgs.lomiri; [ + suru-icon-theme + lomiri-mediaplayer-app + ]; + variables = { + UITK_ICON_THEME = "suru"; + }; + }; + + i18n.supportedLocales = [ "all" ]; + + fonts = { + packages = with pkgs; [ + # Intended font & helps with OCR + ubuntu-classic + ]; + }; + }; + + enableOCR = true; + + testScript = '' + machine.wait_for_x() + + with subtest("lomiri mediaplayer launches"): + machine.succeed("lomiri-mediaplayer-app >&2 &") + machine.wait_for_text("Choose from") + machine.screenshot("lomiri-mediaplayer_open") + + machine.succeed("pkill -f lomiri-mediaplayer-app") + + with subtest("lomiri mediaplayer plays video"): + machine.succeed("lomiri-mediaplayer-app /etc/${videoFile} >&2 &") + machine.wait_for_text("${ocrContent}") + machine.screenshot("lomiri-mediaplayer_playback") + + machine.succeed("pkill -f lomiri-mediaplayer-app") + + with subtest("lomiri mediaplayer localisation works"): + # OCR struggles with finding identifying the translated window title, and lomiri-content-hub QML isn't translated + # Cause an error, and look for the error popup + machine.succeed("touch invalid.mp4") + machine.succeed("env LANG=de_DE.UTF-8 lomiri-mediaplayer-app invalid.mp4 >&2 &") + machine.wait_for_text("Fehler") + machine.screenshot("lomiri-mediaplayer_localised") + ''; +} diff --git a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix index 15ad1337194d..cb63a2cb8ac3 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix @@ -4,6 +4,7 @@ fetchFromGitLab, fetchpatch, gitUpdater, + nixosTests, cmake, gettext, gst_all_1, @@ -146,6 +147,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { + tests.vm = nixosTests.lomiri-mediaplayer-app; updateScript = gitUpdater { }; }; From 801174a20057d252f7820298ba07543738b99f02 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 28 Nov 2024 21:26:25 -0700 Subject: [PATCH 0181/1054] bash-completion: hack around a release bug impacting BSDs See https://github.com/scop/bash-completion/issues/1282 --- pkgs/by-name/ba/bash-completion/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ba/bash-completion/package.nix b/pkgs/by-name/ba/bash-completion/package.nix index 6408f0610ff6..40d4c564ff9e 100644 --- a/pkgs/by-name/ba/bash-completion/package.nix +++ b/pkgs/by-name/ba/bash-completion/package.nix @@ -61,6 +61,9 @@ stdenv.mkDerivation rec { prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i -e 's/readlink -f/readlink/g' bash_completion completions/* + '' + lib.optionalString stdenv.hostPlatform.isFreeBSD '' + # please remove this next release! + touch completions/{pkg_delete,freebsd-update,kldload,kldunload,portinstall,portsnap,portupgrade} ''; meta = with lib; { From ae165c04aeebb4a332d292c98a36fdcb8b2f2239 Mon Sep 17 00:00:00 2001 From: Nicola Squartini Date: Sun, 12 Nov 2023 16:21:47 +0100 Subject: [PATCH 0182/1054] bitbox: init at 4.46.3 --- pkgs/by-name/bi/bitbox/genassets.patch | 13 +++ pkgs/by-name/bi/bitbox/package.nix | 89 +++++++++++++++++++ .../bitbox/rules.d/51-hid-digitalbitbox.rules | 1 + .../bitbox/rules.d/52-hid-digitalbitbox.rules | 1 + .../bi/bitbox/rules.d/53-hid-bitbox02.rules | 1 + .../bi/bitbox/rules.d/54-hid-bitbox02.rules | 1 + 6 files changed, 106 insertions(+) create mode 100644 pkgs/by-name/bi/bitbox/genassets.patch create mode 100644 pkgs/by-name/bi/bitbox/package.nix create mode 100644 pkgs/by-name/bi/bitbox/rules.d/51-hid-digitalbitbox.rules create mode 100644 pkgs/by-name/bi/bitbox/rules.d/52-hid-digitalbitbox.rules create mode 100644 pkgs/by-name/bi/bitbox/rules.d/53-hid-bitbox02.rules create mode 100644 pkgs/by-name/bi/bitbox/rules.d/54-hid-bitbox02.rules diff --git a/pkgs/by-name/bi/bitbox/genassets.patch b/pkgs/by-name/bi/bitbox/genassets.patch new file mode 100644 index 000000000000..0c09f22ec6ea --- /dev/null +++ b/pkgs/by-name/bi/bitbox/genassets.patch @@ -0,0 +1,13 @@ +diff --git a/frontends/qt/genassets.sh b/frontends/qt/genassets.sh +index 4b1ba87be..b5a9ad279 100755 +--- a/frontends/qt/genassets.sh ++++ b/frontends/qt/genassets.sh +@@ -20,7 +20,7 @@ if [ ! -d ../web/build ]; then + fi + + echo '' > assets.qrc +-/usr/bin/find ../web/build/ -maxdepth 3 -type f | sed -e "s|../web/build/||" | awk '{ print "../web/build/" $1 "" '} >> assets.qrc ++find ../web/build/ -maxdepth 3 -type f | sort | sed -e "s|../web/build/||" | awk '{ print "../web/build/" $1 "" '} >> assets.qrc + + echo 'resources/trayicon.png' >> assets.qrc + echo '' >> assets.qrc diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix new file mode 100644 index 000000000000..b59bad835f55 --- /dev/null +++ b/pkgs/by-name/bi/bitbox/package.nix @@ -0,0 +1,89 @@ +{ + lib, + stdenv, + fetchFromGitHub, + buildNpmPackage, + clang, + go, + libsForQt5, +}: + +stdenv.mkDerivation rec { + pname = "bitbox"; + version = "4.46.3"; + + src = fetchFromGitHub { + owner = "BitBoxSwiss"; + repo = "bitbox-wallet-app"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-2oGVQ022NGOHLo7TBdeXG3ng1nYW8fyLwSV0hJdAl9I="; + }; + + patches = [ + ./genassets.patch + ]; + + postPatch = '' + substituteInPlace frontends/qt/resources/linux/usr/share/applications/bitbox.desktop \ + --replace-fail 'Exec=BitBox %u' 'Exec=bitbox %u' + ''; + + dontConfigure = true; + + passthru.web = buildNpmPackage { + pname = "bitbox-web"; + inherit version; + inherit src; + sourceRoot = "source/frontends/web"; + npmDepsHash = "sha256-w98wwKHiZtor5ivKd+sh5K8HnAepu6cw9RyVJ+eTq3k="; + installPhase = "cp -r build $out"; + }; + + buildPhase = '' + runHook preBuild + + ln -s ${passthru.web} frontends/web/build + export GOCACHE=$TMPDIR/go-cache + cd frontends/qt + make -C server linux + ./genassets.sh + qmake -o build/Makefile + cd build + make + cd ../../.. + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -r frontends/qt/resources/linux/usr/share $out + mkdir $out/{bin,lib} + cp frontends/qt/build/BitBox $out/bin/bitbox + cp frontends/qt/build/assets.rcc $out/bin + cp frontends/qt/server/libserver.so $out/lib + install -Dt $out/lib/udev/rules.d ${./rules.d}/* + + runHook postInstall + ''; + + buildInputs = [ libsForQt5.qtwebengine ]; + + nativeBuildInputs = [ + clang + go + libsForQt5.wrapQtAppsHook + ]; + + meta = { + description = "Companion app for the BitBox02 hardware wallet"; + homepage = "https://bitbox.swiss/app/"; + license = lib.licenses.asl20; + mainProgram = "bitbox"; + maintainers = [ lib.maintainers.tensor5 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/bi/bitbox/rules.d/51-hid-digitalbitbox.rules b/pkgs/by-name/bi/bitbox/rules.d/51-hid-digitalbitbox.rules new file mode 100644 index 000000000000..94c86203afaf --- /dev/null +++ b/pkgs/by-name/bi/bitbox/rules.d/51-hid-digitalbitbox.rules @@ -0,0 +1 @@ +SUBSYSTEM=="usb", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbb%n", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402" diff --git a/pkgs/by-name/bi/bitbox/rules.d/52-hid-digitalbitbox.rules b/pkgs/by-name/bi/bitbox/rules.d/52-hid-digitalbitbox.rules new file mode 100644 index 000000000000..84fe717211d5 --- /dev/null +++ b/pkgs/by-name/bi/bitbox/rules.d/52-hid-digitalbitbox.rules @@ -0,0 +1 @@ +KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbbf%n" diff --git a/pkgs/by-name/bi/bitbox/rules.d/53-hid-bitbox02.rules b/pkgs/by-name/bi/bitbox/rules.d/53-hid-bitbox02.rules new file mode 100644 index 000000000000..2daffc03bad2 --- /dev/null +++ b/pkgs/by-name/bi/bitbox/rules.d/53-hid-bitbox02.rules @@ -0,0 +1 @@ +SUBSYSTEM=="usb", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="bitbox02_%n", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403" diff --git a/pkgs/by-name/bi/bitbox/rules.d/54-hid-bitbox02.rules b/pkgs/by-name/bi/bitbox/rules.d/54-hid-bitbox02.rules new file mode 100644 index 000000000000..1b74e4774304 --- /dev/null +++ b/pkgs/by-name/bi/bitbox/rules.d/54-hid-bitbox02.rules @@ -0,0 +1 @@ +KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="bitbox02-%n" From 79662325cb64c7effec13993aa0c322baa80bde3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 13:47:03 +0000 Subject: [PATCH 0183/1054] python312Packages.optimum: 1.23.0 -> 1.23.3 --- pkgs/development/python-modules/optimum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 02485462a8b1..2bdef53e1ff6 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.23.0"; + version = "1.23.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-1A430tvuUsMiVmDbISdj2g5l05D6FswGKsjdUBpZrP0="; + hash = "sha256-GJp1ukrYxEEwmkge31b02ROWZW5V23TtoEUjhycHpSg="; }; build-system = [ setuptools ]; From 17dd96c4deead1bc2334e62e8889283ccc521412 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 16:50:55 +0000 Subject: [PATCH 0184/1054] python312Packages.binance-connector: 3.9.0 -> 3.10.0 --- pkgs/development/python-modules/binance-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/binance-connector/default.nix b/pkgs/development/python-modules/binance-connector/default.nix index cec5c8b4a4ad..f993d586cc5e 100644 --- a/pkgs/development/python-modules/binance-connector/default.nix +++ b/pkgs/development/python-modules/binance-connector/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "binance-connector"; - version = "3.9.0"; + version = "3.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "binance"; repo = "${pname}-python"; rev = "refs/tags/v${version}"; - hash = "sha256-i0dJ7UO7HZ9bWhWtWBZ5OwloRBUiZgUKRXab4sm2w/o="; + hash = "sha256-WZUDGUAFy4t5uLtv/p5UkBMX+posilbgEHazIDYFc+Q="; }; propagatedBuildInputs = [ From cc90b03c71a9988c0f87bc90479fa2dbfaa259d2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 29 Nov 2024 17:54:22 +0100 Subject: [PATCH 0185/1054] python312Packages.jupyterlab-server: remove jupyterlab_server.pytest_plugin from import checks Allows to override the package with `doCheck = false` --- .../development/python-modules/jupyterlab-server/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix index 2461e5ea0de3..357b2b292595 100644 --- a/pkgs/development/python-modules/jupyterlab-server/default.nix +++ b/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -79,16 +79,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyterlab_server" - "jupyterlab_server.pytest_plugin" ]; __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Set of server components for JupyterLab and JupyterLab like applications"; homepage = "https://github.com/jupyterlab/jupyterlab_server"; changelog = "https://github.com/jupyterlab/jupyterlab_server/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = lib.teams.jupyter.members; }; } From efa60da789205e265acf47aca8892df4534273c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Thu, 28 Nov 2024 17:28:49 +0200 Subject: [PATCH 0186/1054] python3Packages.proton-vpn-api-core: 0.36.6 -> 0.38.2 Update the package to the latest version and restrict the platforms only to Linux. Officially there isn't any indication that this should be supported by anything else other than Linux and our current builds are failing for Darwin. --- .../python-modules/proton-vpn-api-core/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index a15bf540f4cc..5b5eee10365f 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "0.36.6"; + version = "0.38.2"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; rev = "v${version}"; - hash = "sha256-LzABTSIa7guoAYv9scSm2edxeiSS7yMfJdZnAqXHtF0="; + hash = "sha256-ldIslr2qiwClQW6rWNbEAAkUbdJfCzvUIkCuoajP2M4="; }; build-system = [ @@ -80,6 +80,7 @@ buildPythonPackage rec { description = "Acts as a facade to the other Proton VPN components, exposing a uniform API to the available Proton VPN services"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-api-core"; license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ sebtm ]; }; } From 0e5cc7f03299149843c410dec8b18d1076eb2baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Thu, 28 Nov 2024 17:34:01 +0200 Subject: [PATCH 0187/1054] python3Packages.proton-keyring-linux: 0.1.0 -> 0.2.0 Update the package to the latest version. --- .../python-modules/proton-keyring-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proton-keyring-linux/default.nix b/pkgs/development/python-modules/proton-keyring-linux/default.nix index 56bd41fea4a6..40a354ec31f4 100644 --- a/pkgs/development/python-modules/proton-keyring-linux/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "proton-keyring-linux"; - version = "0.1.0"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-keyring-linux"; rev = "refs/tags/v${version}"; - hash = "sha256-feIgRC0U7d96gFcmHqRF3/8k/bsxlPJs1/K+ki7uXys="; + hash = "sha256-wT+0S3dGanLwqRrpCooAwy/RDyZDn1aEdJ7eWvwVfiY="; }; build-system = [ setuptools ]; From dddeb779ac9895708bade50507a13c4a1d10e3a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Thu, 28 Nov 2024 17:43:45 +0200 Subject: [PATCH 0188/1054] proton-vpn-local-agent: 1.0.0 -> 1.2.0 Update the package to the latest version. --- pkgs/by-name/pr/proton-vpn-local-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix index 665d032b1ac8..28447625151c 100644 --- a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix +++ b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "proton-vpn-local-agent"; - version = "1.0.0"; - cargoHash = "sha256-TE2iqxTC6UH7pCM1wKEwaujMenNIp4LE+oy545tGmL0="; + version = "1.2.0"; + cargoHash = "sha256-qxNbHM6KmBmLbruOhbFIp3klz6RuKWBLioVsBPDQiLI="; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-local-agent"; rev = version; - hash = "sha256-I+tbVQzD4xJUsoRF8TU/2EMldVqtfxY3E7PQN3ks0mA="; + hash = "sha256-1iUeAWojIcXbvO6YoPEh//dbVdl90cUocyO3nfDtUEM"; }; sourceRoot = "${src.name}/python-proton-vpn-local-agent"; From c44e35947944993fa5c2d69c4e1948794f9a6b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Thu, 28 Nov 2024 17:48:41 +0200 Subject: [PATCH 0189/1054] python3Packages.proton-vpn-network-manager: 0.9.7 -> 0.10.1 Update the package to the latest version. iproute2 dependency is a Linux only package so this will not be available for anything else either. Also, based on the official documentation, there isn't any indication that other platforms other than Linux is supported. --- .../python-modules/proton-vpn-network-manager/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index fc6e1c28151b..70a773c0a265 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "proton-vpn-network-manager"; - version = "0.9.7"; + version = "0.10.1"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-d5OJ5p+f1YLcJNlQ8AHSBkuDWVJnFkdzW5/iWcXkMYQ="; + hash = "sha256-zS/H7efEJlvDlcoxil6pd6lFLdLRAV7Bmr/ngtZ8Nuc"; }; nativeBuildInputs = [ @@ -76,6 +76,7 @@ buildPythonPackage rec { description = "Provides the necessary functionality for other ProtonVPN components to interact with NetworkManager"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager"; license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ sebtm ]; }; } From f11e9d4e1c648994503ac7d4829acce0a3fa333c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Thu, 28 Nov 2024 17:53:41 +0200 Subject: [PATCH 0190/1054] protonvpn-gui: 4.7.4 -> 4.8.0 Update the package to the latest version. --- pkgs/applications/networking/protonvpn-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index a2d98b63ee52..f9bae1023066 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -21,14 +21,14 @@ buildPythonApplication rec { pname = "protonvpn-gui"; - version = "4.7.4"; + version = "4.8.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; rev = "refs/tags/v${version}"; - hash = "sha256-qF6rLCF4Lfzdr2I2jmhLJzhYYstncnQVdyHOn2ajCyg="; + hash = "sha256-KNMlDjL4SosHZ6ol2jpC1K7F6VuCa1O2EkQtl8uwnig="; }; nativeBuildInputs = [ From f88894d14a76b7a3c9e488ad70d76bf67e78dcb2 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 30 Nov 2024 03:53:51 +0800 Subject: [PATCH 0191/1054] pdfstudio: format --- pkgs/applications/misc/pdfstudio/common.nix | 53 +++++++------- pkgs/applications/misc/pdfstudio/default.nix | 72 ++++++++++++++------ 2 files changed, 78 insertions(+), 47 deletions(-) diff --git a/pkgs/applications/misc/pdfstudio/common.nix b/pkgs/applications/misc/pdfstudio/common.nix index 8edb816977c6..c9834e9ec4ed 100644 --- a/pkgs/applications/misc/pdfstudio/common.nix +++ b/pkgs/applications/misc/pdfstudio/common.nix @@ -1,22 +1,23 @@ -{ pname -, program -, src -, year -, version -, desktopName -, longDescription -, broken ? false -, buildFHSEnv -, extraBuildInputs ? [ ] -, jdk -, stdenv -, lib -, dpkg -, makeDesktopItem -, copyDesktopItems -, autoPatchelfHook -, sane-backends -, cups +{ + pname, + program, + src, + year, + version, + desktopName, + longDescription, + broken ? false, + buildFHSEnv, + extraBuildInputs ? [ ], + jdk, + stdenv, + lib, + dpkg, + makeDesktopItem, + copyDesktopItems, + autoPatchelfHook, + sane-backends, + cups, }: let thisPackage = stdenv.mkDerivation rec { @@ -24,7 +25,7 @@ let strictDeps = true; buildInputs = [ - sane-backends #for libsane.so.1 + sane-backends # for libsane.so.1 ] ++ extraBuildInputs; nativeBuildInputs = [ @@ -70,10 +71,12 @@ in # Package with cups in FHS sandbox, because JAVA bin expects "/usr/bin/lpr" for printing. buildFHSEnv { inherit pname version; + targetPkgs = pkgs: [ cups thisPackage ]; + runScript = "${program}${year}"; # link desktop item and icon into FHS user environment @@ -84,18 +87,18 @@ buildFHSEnv { ln -s ${thisPackage}/share/pixmaps/*.png "$out/share/pixmaps/" ''; - meta = with lib; { + meta = { inherit broken; homepage = "https://www.qoppa.com/${pname}/"; description = "Easy to use, full-featured PDF editing software"; longDescription = longDescription; - sourceProvenance = with sourceTypes; [ + sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ]; - license = licenses.unfree; - platforms = platforms.linux; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; mainProgram = pname; - maintainers = [ maintainers.pwoelfel ]; + maintainers = with lib.maintainers; [ pwoelfel ]; }; } diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index 43b179977301..967a946060d9 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -8,29 +8,32 @@ # - year identifies the year portion of the version, defaults to most recent year. # - pname is either "pdfstudio${year}" or "pdfstudioviewer". -{ lib -, stdenv -, program ? "pdfstudio" -, year ? "2023" -, fetchurl -, callPackage -, jdk11 -, jdk17 +{ + lib, + stdenv, + program ? "pdfstudio", + year ? "2023", + fetchurl, + callPackage, + jdk11, + jdk17, }: let longDescription = '' PDF Studio is an easy to use, full-featured PDF editing software. This is the standard/pro edition, which requires a license. For the free PDF Studio Viewer see the package pdfstudioviewer. ''; pname = if (program == "pdfstudio") then "${program}${year}" else program; - desktopName = - if (program == "pdfstudio") - then "PDF Studio ${year}" - else "PDF Studio Viewer"; + desktopName = if (program == "pdfstudio") then "PDF Studio ${year}" else "PDF Studio Viewer"; dot2dash = str: builtins.replaceStrings [ "." ] [ "_" ] str; in { pdfstudioviewer = callPackage ./common.nix rec { - inherit desktopName pname program year; + inherit + desktopName + pname + program + year + ; version = "${year}.0.3"; longDescription = '' PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio. @@ -43,55 +46,80 @@ in }; pdfstudio2021 = callPackage ./common.nix rec { - inherit desktopName longDescription pname program year; + inherit + desktopName + longDescription + pname + program + year + ; version = "${year}.2.2"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; sha256 = "sha256-HdkwRMqwquAaW6l3AukGReFtw2f5n36tZ8vXo6QiPvU="; }; extraBuildInputs = [ - (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 + (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk11; }; pdfstudio2022 = callPackage ./common.nix rec { - inherit desktopName longDescription pname program year; + inherit + desktopName + longDescription + pname + program + year + ; version = "${year}.2.5"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; sha256 = "sha256-3faZyWUnFe//S+gOskWhsZ6jzHw67FRsv/xP77R1jj4="; }; extraBuildInputs = [ - (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 + (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk17; }; pdfstudio2023 = callPackage ./common.nix rec { - inherit desktopName longDescription pname program year; + inherit + desktopName + longDescription + pname + program + year + ; version = "${year}.0.3"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; sha256 = "sha256-Po7BMmEWoC46rP7tUwZT9Ji/Wi8lKc6WN8x47fx2DXg="; }; extraBuildInputs = [ - (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 + (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk17; }; pdfstudio2024 = callPackage ./common.nix rec { - inherit desktopName longDescription pname program year; + inherit + desktopName + longDescription + pname + program + year + ; version = "${year}.0.0"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; sha256 = "sha256-9TMSKtBE0+T7wRnBgtUjRr/JUmCaYdyD/7y0ML37wCM="; }; extraBuildInputs = [ - (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 + (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk17; }; -}.${pname} +} +.${pname} From 8f28ab10cfe39674cffe01a939d1f21b0c34349d Mon Sep 17 00:00:00 2001 From: Cosmic Horror Date: Fri, 29 Nov 2024 02:19:43 -0700 Subject: [PATCH 0192/1054] to-html: 0.1.4 -> 0.1.6 --- pkgs/by-name/to/to-html/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/to-html/package.nix b/pkgs/by-name/to/to-html/package.nix index 5ddba61276d4..493ceb60a054 100644 --- a/pkgs/by-name/to/to-html/package.nix +++ b/pkgs/by-name/to/to-html/package.nix @@ -4,17 +4,17 @@ }: rustPlatform.buildRustPackage rec { - version = "0.1.4"; + version = "0.1.6"; pname = "to-html"; src = fetchFromGitHub { owner = "Aloso"; repo = "to-html"; rev = "v${version}"; - hash = "sha256-zkTBjsMFhRz7lVRh8i+XkaJ/qWmTAMPnkH5aDhbHf8U="; + hash = "sha256-eNFt9/yK4oHOspNM8PMTewhx8APaHzmgNdrWqrUuQSU="; }; - cargoHash = "sha256-hXc+lB3DKnRZkp1U5wW/vPKSZ0c1UknQCAxDfE7Eubg="; + cargoHash = "sha256-UxDyk7m6eWvuWPHWUY2OJI59p43/bag8pcZyeGJr/QA="; # Requires external resources doCheck = false; From 88f32cf694a7f6fc16c2e5b80d615b8b317fa9c4 Mon Sep 17 00:00:00 2001 From: Cosmic Horror Date: Fri, 29 Nov 2024 03:10:07 -0700 Subject: [PATCH 0193/1054] to-html: Add shell completions --- pkgs/by-name/to/to-html/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/to/to-html/package.nix b/pkgs/by-name/to/to-html/package.nix index 493ceb60a054..cfa80570f50c 100644 --- a/pkgs/by-name/to/to-html/package.nix +++ b/pkgs/by-name/to/to-html/package.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, installShellFiles , rustPlatform }: @@ -19,6 +20,14 @@ rustPlatform.buildRustPackage rec { # Requires external resources doCheck = false; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion \ + $releaseDir/build/to-html-*/out/to-html.{bash,fish} \ + --zsh $releaseDir/build/to-html-*/out/_to-html + ''; + meta = { description = "Terminal wrapper for rendering a terminal on a website by converting ANSI escape sequences to HTML"; mainProgram = "to-html"; From 4ebdf1edaafe4367a10b081b72c83a870276b73b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 22:37:16 +0000 Subject: [PATCH 0194/1054] python312Packages.replicate: 1.0.1 -> 1.0.4 --- pkgs/development/python-modules/replicate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/replicate/default.nix b/pkgs/development/python-modules/replicate/default.nix index f2b6f3d00b4c..4a5614afe4b8 100644 --- a/pkgs/development/python-modules/replicate/default.nix +++ b/pkgs/development/python-modules/replicate/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "replicate"; - version = "1.0.1"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "replicate"; repo = "replicate-python"; rev = "refs/tags/${version}"; - hash = "sha256-q//RV4Y9k2KXXgZGfBF/XObxsBfAHE50oG+r/Vvu9BY="; + hash = "sha256-VXJBArFzVPls0ZWL8o6hkOiTtjYRxkdNDiWCPN/hW48="; }; build-system = [ setuptools ]; From cdd6102925f3c802a5b5b2cc39e6e730af843f03 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 30 Nov 2024 15:16:18 +0800 Subject: [PATCH 0195/1054] jprofiler: remove catap as maintainer --- pkgs/development/tools/java/jprofiler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/java/jprofiler/default.nix b/pkgs/development/tools/java/jprofiler/default.nix index 3e86ea7b702a..25a93b099626 100644 --- a/pkgs/development/tools/java/jprofiler/default.nix +++ b/pkgs/development/tools/java/jprofiler/default.nix @@ -23,7 +23,7 @@ let ''; homepage = "https://www.ej-technologies.com/products/jprofiler/overview.html"; license = licenses.unfree; - maintainers = with maintainers; [ catap ]; + maintainers = with maintainers; [ ]; }; src = if stdenv.hostPlatform.isLinux then fetchurl { From 5b9283c4ef773e451aec6706fbb756a1b9dd2531 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 30 Nov 2024 15:17:53 +0800 Subject: [PATCH 0196/1054] jprofiler: format --- .../tools/java/jprofiler/default.nix | 77 +++++++++++++------ 1 file changed, 53 insertions(+), 24 deletions(-) diff --git a/pkgs/development/tools/java/jprofiler/default.nix b/pkgs/development/tools/java/jprofiler/default.nix index 25a93b099626..e49a6f5927fa 100644 --- a/pkgs/development/tools/java/jprofiler/default.nix +++ b/pkgs/development/tools/java/jprofiler/default.nix @@ -1,38 +1,46 @@ -{ stdenv -, lib -, fetchurl -, makeWrapper -, makeDesktopItem -, copyDesktopItems -, _7zz -, jdk +{ + stdenv, + lib, + fetchurl, + makeWrapper, + makeDesktopItem, + copyDesktopItems, + _7zz, + jdk, }: let - inherit (stdenv.hostPlatform) system; pname = "jprofiler"; version = "13.0.6"; nameApp = "JProfiler"; - meta = with lib; { + meta = { description = "JProfiler's intuitive UI helps you resolve performance bottlenecks"; longDescription = '' JProfiler's intuitive UI helps you resolve performance bottlenecks, pin down memory leaks and understand threading issues. ''; homepage = "https://www.ej-technologies.com/products/jprofiler/overview.html"; - license = licenses.unfree; - maintainers = with maintainers; [ ]; + license = lib.licenses.unfree; + maintainers = [ ]; }; - src = if stdenv.hostPlatform.isLinux then fetchurl { - url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_linux_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; - hash = "sha256-orjBSaC7NvKcak+RSEa9V05oL3EZIBnp7TyaX/8XFyg="; - } else fetchurl { - url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_macos_${lib.replaceStrings ["."] ["_"] version}.dmg"; - hash = "sha256-OI6NSPqYws5Rv25U5jIPzkyJtB8LF04qHB3NPR9XBWg="; - }; + src = + if stdenv.hostPlatform.isLinux then + fetchurl { + url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_linux_${ + lib.replaceStrings [ "." ] [ "_" ] version + }.tar.gz"; + hash = "sha256-orjBSaC7NvKcak+RSEa9V05oL3EZIBnp7TyaX/8XFyg="; + } + else + fetchurl { + url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_macos_${ + lib.replaceStrings [ "." ] [ "_" ] version + }.dmg"; + hash = "sha256-OI6NSPqYws5Rv25U5jIPzkyJtB8LF04qHB3NPR9XBWg="; + }; srcIcon = fetchurl { url = "https://www.ej-technologies.com/assets/content/header-product-jprofiler@2x-24bc4d84bd2a4eb641a5c8531758ff7c.png"; @@ -52,12 +60,21 @@ let ]; linux = stdenv.mkDerivation { - inherit pname version src desktopItems; + inherit + pname + version + src + desktopItems + ; - nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; installPhase = '' runHook preInstall + cp -r . $out rm -f $out/bin/updater @@ -71,20 +88,28 @@ let install -Dm644 "${srcIcon}" \ "$out/share/icons/hicolor/scalable/apps/jprofiler.png" + runHook postInstall ''; - meta = meta // { platforms = lib.platforms.linux; }; + meta = meta // { + platforms = lib.platforms.linux; + }; }; darwin = stdenv.mkDerivation { inherit pname version src; - nativeBuildInputs = [ makeWrapper _7zz ]; + nativeBuildInputs = [ + makeWrapper + _7zz + ]; unpackPhase = '' runHook preUnpack + 7zz x $src -x!JProfiler/\[\] + runHook postUnpack ''; @@ -92,13 +117,17 @@ let installPhase = '' runHook preInstall + mkdir -p $out/{Applications,bin} cp -R ${nameApp}.app $out/Applications/ makeWrapper $out/Applications/${nameApp}.app/Contents/MacOS/JavaApplicationStub $out/bin/${pname} + runHook postInstall ''; - meta = meta // { platforms = lib.platforms.darwin; }; + meta = meta // { + platforms = lib.platforms.darwin; + }; }; in if stdenv.hostPlatform.isDarwin then darwin else linux From be9066a7f3c12597302c9795732b447e109965f1 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 30 Nov 2024 15:18:26 +0800 Subject: [PATCH 0197/1054] jprofiler: 13.0.6 -> 14.0.5 --- .../development/tools/java/jprofiler/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/java/jprofiler/default.nix b/pkgs/development/tools/java/jprofiler/default.nix index e49a6f5927fa..4c2dd406e4ec 100644 --- a/pkgs/development/tools/java/jprofiler/default.nix +++ b/pkgs/development/tools/java/jprofiler/default.nix @@ -11,8 +11,7 @@ let pname = "jprofiler"; - - version = "13.0.6"; + version = "14.0.5"; nameApp = "JProfiler"; meta = { @@ -29,24 +28,19 @@ let src = if stdenv.hostPlatform.isLinux then fetchurl { - url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_linux_${ + url = "https://download.ej-technologies.com/jprofiler/jprofiler_linux_${ lib.replaceStrings [ "." ] [ "_" ] version }.tar.gz"; - hash = "sha256-orjBSaC7NvKcak+RSEa9V05oL3EZIBnp7TyaX/8XFyg="; + hash = "sha256-S7e2WurDJ0ePzpMg0YK94Mn0eHfb8/jNmf0kYts2Y0M="; } else fetchurl { url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_macos_${ lib.replaceStrings [ "." ] [ "_" ] version }.dmg"; - hash = "sha256-OI6NSPqYws5Rv25U5jIPzkyJtB8LF04qHB3NPR9XBWg="; + hash = "sha256-HPGh+dRfLuQprpgnu8oFboHUB1xvFqPblJcowqgZ5KA="; }; - srcIcon = fetchurl { - url = "https://www.ej-technologies.com/assets/content/header-product-jprofiler@2x-24bc4d84bd2a4eb641a5c8531758ff7c.png"; - hash = "sha256-4T0j2ctHmgWOSCmFG2PZCLJS57nIa5MxmJBpMYzy9FI="; - }; - desktopItems = [ (makeDesktopItem { name = pname; @@ -86,7 +80,7 @@ let wrapProgram $f --set JAVA_HOME "${jdk.home}" done - install -Dm644 "${srcIcon}" \ + install -Dm644 "./.install4j/i4j_extf_7_1u09tly_16qtnph.png" \ "$out/share/icons/hicolor/scalable/apps/jprofiler.png" runHook postInstall From e3a9c19e86661ce0d5799b20c91a5156eaf34db8 Mon Sep 17 00:00:00 2001 From: Yaroslav Chvanov Date: Fri, 29 Nov 2024 00:36:03 +0300 Subject: [PATCH 0198/1054] strawberry: drop strawberry-qt5 in favor of strawberry-qt6 --- nixos/doc/manual/release-notes/rl-2505.section.md | 3 +++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index be4351684fdb..f51130a227bd 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -27,6 +27,9 @@ - `buildGoPackage` has been removed. Use `buildGoModule` instead. See the [Go section in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-language-go) for details. +- `strawberry` has been updated to 1.2, which drops support for the VLC backend and Qt 5. The `strawberry-qt5` package + and `withGstreamer`/`withVlc` override options have been removed due to this. + - `timescaledb` requires manual upgrade steps. After you run ALTER EXTENSION, you must run [this SQL script](https://github.com/timescale/timescaledb-extras/blob/master/utils/2.15.X-fix_hypertable_foreign_keys.sql). For more details, see the following pull requests [#6797](https://github.com/timescale/timescaledb/pull/6797). PostgreSQL 13 is no longer supported in TimescaleDB v2.16. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e4ff2d475eeb..1189328802e1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1193,6 +1193,7 @@ mapAliases { steam-small = steam; # Added 2024-09-12 steam-run-native = steam-run; # added 2022-02-21 StormLib = stormlib; # Added 2024-01-21 + strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry-qt6"; # Added 2024-11-22 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 sumokoin = throw "sumokoin has been removed as it was abandoned upstream"; # Added 2024-11-23 swiProlog = lib.warn "swiProlog has been renamed to swi-prolog" swi-prolog; # Added 2024-09-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e806f98b32b..ffa8c6f275b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3228,11 +3228,9 @@ with pkgs; sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; - strawberry-qt5 = libsForQt5.callPackage ../applications/audio/strawberry { }; - strawberry-qt6 = qt6Packages.callPackage ../applications/audio/strawberry { }; - strawberry = strawberry-qt5; + strawberry = strawberry-qt6; schleuder = callPackage ../tools/security/schleuder { }; From 10ce0b2de85389ae66966eb2f947b94c23feb683 Mon Sep 17 00:00:00 2001 From: Yaroslav Chvanov Date: Fri, 29 Nov 2024 00:45:39 +0300 Subject: [PATCH 0199/1054] strawberry: 1.1.3 -> 1.2.2 VLC backend and Qt 5 build are no longer supported. protobuf is no longer required. Use packaged kdsingleapplication instead of building it from submodule. --- .../applications/audio/strawberry/default.nix | 40 +++++++------------ 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 3e30c90b755c..94072c6ae69a 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -8,6 +8,7 @@ glib-networking, gnutls, gst_all_1, + kdsingleapplication, lib, libXdmcp, libcdio, @@ -20,39 +21,33 @@ libselinux, libsepol, libtasn1, - libvlc, ninja, nix-update-script, p11-kit, pcre, pkg-config, - protobuf, qtbase, qttools, - qtx11extras ? null, # doesn't exist in qt6 sqlite, stdenv, taglib, util-linux, - withGstreamer ? true, - withVlc ? true, wrapQtAppsHook, }: let - inherit (lib) optionals optionalString; + inherit (lib) optionals; in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.1.3"; + version = "1.2.2"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-yca1BJWhSUVamqSKfvEzU3xbzdR+kwfSs0pyS08oUR0="; - fetchSubmodules = true; + hash = "sha256-X752GsP2b7rumQHzw52zI7PeE8tdM9Scgl3nHVcpO/s="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead @@ -68,6 +63,7 @@ stdenv.mkDerivation rec { chromaprint fftw gnutls + kdsingleapplication libXdmcp libcdio libebur128 @@ -76,9 +72,7 @@ stdenv.mkDerivation rec { libpthreadstubs libtasn1 pcre - protobuf qtbase - qtx11extras sqlite taglib ] @@ -89,19 +83,15 @@ stdenv.mkDerivation rec { libsepol p11-kit ] - ++ optionals withGstreamer ( - with gst_all_1; - [ - glib-networking - gst-libav - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gstreamer - ] - ) - ++ optionals withVlc [ libvlc ]; + ++ (with gst_all_1; [ + glib-networking + gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + ]); nativeBuildInputs = [ @@ -115,7 +105,7 @@ stdenv.mkDerivation rec { util-linux ]; - postInstall = optionalString withGstreamer '' + postInstall = '' qtWrapperArgs+=( --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" From 6f860d8ef6d6d67ea4d82fb4458b7d50ab037d78 Mon Sep 17 00:00:00 2001 From: Yaroslav Chvanov Date: Sat, 30 Nov 2024 10:51:50 +0300 Subject: [PATCH 0200/1054] strawberry: drop PCRE dependency While strawberry seems to bundle PCRE2 on MacOS and Windows, it doesn't seem to use it directly. --- pkgs/applications/audio/strawberry/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 94072c6ae69a..bd85eef99f50 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -24,7 +24,6 @@ ninja, nix-update-script, p11-kit, - pcre, pkg-config, qtbase, qttools, @@ -71,7 +70,6 @@ stdenv.mkDerivation rec { libmtp libpthreadstubs libtasn1 - pcre qtbase sqlite taglib From 1b0f797f91c5e6343097a6c071d686d0a820677c Mon Sep 17 00:00:00 2001 From: Ritiek Malhotra Date: Sat, 30 Nov 2024 16:07:12 +0530 Subject: [PATCH 0201/1054] discordchatexporter-cli: support all unix platforms --- pkgs/by-name/di/discordchatexporter-cli/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/di/discordchatexporter-cli/package.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix index 68722d2c6142..81a3b2fa09df 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/package.nix +++ b/pkgs/by-name/di/discordchatexporter-cli/package.nix @@ -40,7 +40,7 @@ buildDotnetModule rec { license = licenses.gpl3Plus; changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md"; maintainers = with maintainers; [ ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; mainProgram = "discordchatexporter-cli"; }; } From 44c70837465d73f661f0e69fefe9648b2b535255 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 13:55:46 +0000 Subject: [PATCH 0202/1054] highs: 1.8.0 -> 1.8.1 --- pkgs/by-name/hi/highs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hi/highs/package.nix b/pkgs/by-name/hi/highs/package.nix index 836e947706e5..73460ab54164 100644 --- a/pkgs/by-name/hi/highs/package.nix +++ b/pkgs/by-name/hi/highs/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "highs"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "ERGO-Code"; repo = "HiGHS"; rev = "v${finalAttrs.version}"; - hash = "sha256-3ACo6V6Y99XPe4dvurWflNGPjHy3irURv4jYHMrgSms="; + hash = "sha256-JuUPnsCNImWpkeh0B//7yM1Wix9SpnfApp8cxX9WeYk="; }; strictDeps = true; From 002ebede7a73f03d9526feaccc3139e1c5dc6603 Mon Sep 17 00:00:00 2001 From: pascal Date: Sat, 30 Nov 2024 15:01:30 +0100 Subject: [PATCH 0203/1054] firefly-iii: fix typo --- nixos/modules/services/web-apps/firefly-iii.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/firefly-iii.nix b/nixos/modules/services/web-apps/firefly-iii.nix index 338f04909320..0a2c81ce0d9b 100644 --- a/nixos/modules/services/web-apps/firefly-iii.nix +++ b/nixos/modules/services/web-apps/firefly-iii.nix @@ -182,7 +182,7 @@ in { DB_PORT = 3306; DB_DATABASE = "firefly"; DB_USERNAME = "firefly"; - DB_PASSWORD_FILE = "/var/secrets/firefly-iii-mysql-password.txt; + DB_PASSWORD_FILE = "/var/secrets/firefly-iii-mysql-password.txt"; } ''; type = submodule { From 3cfb033b0f6bb39d62f6a823393452c8c6314c98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 14:03:35 +0000 Subject: [PATCH 0204/1054] python312Packages.dbt-bigquery: 1.8.2 -> 1.8.3 --- pkgs/development/python-modules/dbt-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbt-bigquery/default.nix b/pkgs/development/python-modules/dbt-bigquery/default.nix index e9eb98b93ca3..7c29273ff82d 100644 --- a/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dbt-bigquery"; - version = "1.8.2"; + version = "1.8.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-bigquery"; rev = "refs/tags/v${version}"; - hash = "sha256-SYQAFvu7nw54X4jxicEA9+lnvMgj/Yp460xz3BFGYCM="; + hash = "sha256-PlYQo4jqCQiHmlPB4aEhecZs3U6miDjhGR7Qct9IPbM="; }; pythonRelaxDeps = [ "agate" ]; From 39b2b3b5a679140291c4a79f9489a69debae3098 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sat, 30 Nov 2024 15:05:41 +0100 Subject: [PATCH 0205/1054] maintainers: add github attribute to amozeo tooling around nixpkgs doesn't use githubId attribute --- maintainers/maintainer-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 51e282bfce87..ee680a4fecfc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1309,6 +1309,7 @@ }; amozeo = { email = "wroclaw223@outlook.com"; + github = "amozeo"; githubId = 37040543; name = "Wroclaw"; }; From fdaeafade52887ff41b42978937b5fff689e81f7 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 30 Nov 2024 14:15:27 +0100 Subject: [PATCH 0206/1054] python312Packages.blake3: 0.4.1 -> 1.0.0 https://github.com/oconnor663/blake3-py/releases/tag/1.0.0 Also add an update script. --- .../python-modules/blake3/Cargo.lock | 190 +++--------------- .../python-modules/blake3/default.nix | 11 +- 2 files changed, 42 insertions(+), 159 deletions(-) diff --git a/pkgs/development/python-modules/blake3/Cargo.lock b/pkgs/development/python-modules/blake3/Cargo.lock index 7b8ef04d66e1..2b5fecda6507 100644 --- a/pkgs/development/python-modules/blake3/Cargo.lock +++ b/pkgs/development/python-modules/blake3/Cargo.lock @@ -16,21 +16,15 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "blake3" -version = "0.4.1" +version = "1.0.0" dependencies = [ - "blake3 1.5.4", + "blake3 1.5.5", "hex", "pyo3", "rayon", @@ -38,9 +32,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" dependencies = [ "arrayref", "arrayvec", @@ -53,9 +47,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.21" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" dependencies = [ "shlex", ] @@ -105,9 +99,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hex" @@ -123,19 +117,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "memmap2" @@ -157,59 +141,36 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.20.3" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +checksum = "f54b3d09cbdd1f8c20650b28e7b09e338881482f4aa908a5f61a00c98fba2690" dependencies = [ "cfg-if", "indoc", "libc", "memoffset", - "parking_lot", + "once_cell", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -219,9 +180,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.3" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +checksum = "3015cf985888fe66cfb63ce0e321c603706cd541b7aec7ddd35c281390af45d8" dependencies = [ "once_cell", "target-lexicon", @@ -229,9 +190,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.3" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +checksum = "6fca7cd8fd809b5ac4eefb89c1f98f7a7651d3739dfb341ca6980090f554c270" dependencies = [ "libc", "pyo3-build-config", @@ -239,9 +200,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.3" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +checksum = "34e657fa5379a79151b6ff5328d9216a84f55dc93b17b08e7c3609a969b73aa0" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -251,9 +212,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.20.3" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +checksum = "295548d5ffd95fd1981d2d3cf4458831b21d60af046b729b6fd143b0ba7aee2f" dependencies = [ "heck", "proc-macro2", @@ -291,38 +252,17 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" -dependencies = [ - "bitflags", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "shlex" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - [[package]] name = "syn" -version = "2.0.77" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -337,76 +277,12 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unindent" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/pkgs/development/python-modules/blake3/default.nix b/pkgs/development/python-modules/blake3/default.nix index c59998b8fb96..24f7afe4f963 100644 --- a/pkgs/development/python-modules/blake3/default.nix +++ b/pkgs/development/python-modules/blake3/default.nix @@ -7,18 +7,19 @@ numpy, pytestCheckHook, rustPlatform, + nix-update-script, }: buildPythonPackage rec { pname = "blake3"; - version = "0.4.1"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "oconnor663"; repo = "blake3-py"; rev = "refs/tags/${version}"; - hash = "sha256-Ju40ea8IQMOPg9BiN47BMmr/WU8HptbqqzVI+jNGpA8="; + hash = "sha256-4fUCBragb4AQ75f1LEUvCiVOLYinjrg9cmJRz4TP4Vs="; }; postPatch = '' @@ -45,6 +46,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "blake3" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--generate-lockfile" + ]; + }; + meta = { description = "Python bindings for the BLAKE3 cryptographic hash function"; homepage = "https://github.com/oconnor663/blake3-py"; From d1a8edd37c4a2681bd173a99c72a8967c4b0313c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 30 Nov 2024 09:21:13 -0800 Subject: [PATCH 0207/1054] bitwarden-cli: 2024.11.0 -> 2024.11.1 Diff: https://github.com/bitwarden/clients/compare/cli-v2024.11.0...cli-v2024.11.1 Changelog: https://github.com/bitwarden/clients/releases/tag/cli-v2024.11.1 --- pkgs/by-name/bi/bitwarden-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 9eaff37058e8..b39c7640d9d9 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2024.11.0"; + version = "2024.11.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-4QTQgW8k3EMf07Xqs2B+VXQOUPzoOgaNvoC02x4zvu8="; + hash = "sha256-J7gmrSAiu59LLP9pKfbv9+H00vXGQCrjkd4GBhkcyTY="; }; postPatch = '' @@ -28,7 +28,7 @@ buildNpmPackage rec { nodejs = nodejs_20; - npmDepsHash = "sha256-YzhCyNMvfXGmgOpl3qWj1Pqd1hY8CJ9QLwQds5ZMnqg="; + npmDepsHash = "sha256-MZoreHKmiUUxhq3tmL4lPp6vPmoQIqG3IPpZE56Z1Kc="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools From d325edd6272a18fa5e7f2e5b5c611badeb58e4a2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 27 Nov 2024 19:01:57 +0000 Subject: [PATCH 0208/1054] nixos-rebuild-ng: introduce models.BuildingAttr --- .../src/nixos_rebuild/__init__.py | 22 ++++++++----------- .../src/nixos_rebuild/models.py | 12 ++++++++++ .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 15 +++++-------- .../nixos-rebuild-ng/src/tests/test_models.py | 13 +++++++++++ .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 16 +++++--------- 5 files changed, 45 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 25519dac6240..a83718c89587 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -9,7 +9,7 @@ from tempfile import TemporaryDirectory from typing import assert_never from . import nix -from .models import Action, Flake, NRError, Profile +from .models import Action, BuildAttr, Flake, NRError, Profile from .process import Remote, cleanup_ssh from .utils import info @@ -170,6 +170,7 @@ def execute(argv: list[str]) -> None: profile = Profile.from_name(args.profile_name) target_host = Remote.from_arg(args.target_host, args.ask_sudo_password, tmpdir_path) + build_attr = BuildAttr.from_arg(args.attr, args.file) flake = Flake.from_arg(args.flake, target_host) if args.upgrade or args.upgrade_all: @@ -204,8 +205,7 @@ def execute(argv: list[str]) -> None: else: path_to_config = nix.nixos_build( "system", - args.attr, - args.file, + build_attr, no_out_link=True, **build_flags, ) @@ -244,8 +244,7 @@ def execute(argv: list[str]) -> None: else: path_to_config = nix.nixos_build( "system", - args.attr, - args.file, + build_attr, dry_run=dry_run, **build_flags, ) @@ -269,8 +268,7 @@ def execute(argv: list[str]) -> None: else: path_to_config = nix.nixos_build( attr, - args.attr, - args.file, + build_attr, **build_flags, ) vm_path = next(path_to_config.glob("bin/run-*-vm"), "./result/bin/run-*-vm") @@ -307,12 +305,10 @@ def execute(argv: list[str]) -> None: ) print(table) case Action.REPL: - # For now just redirect it to `nixos-rebuild` instead of - # duplicating the code - os.execv( - "@nixos_rebuild@", - argv, - ) + if flake: + nix.repl_flake("toplevel", flake, **flake_build_flags) + else: + nix.repl("system", build_attr, **build_flags) case _: assert_never(action) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py index 51cee3b7c517..59d99230061c 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py @@ -45,6 +45,18 @@ class Action(Enum): return [a.value for a in Action] +@dataclass(frozen=True) +class BuildAttr: + path: Path + attr: str | None + + @classmethod + def from_arg(cls, attr: str | None, file: str | None) -> Self | None: + if not (attr or file): + return None + return cls(Path(file or "default.nix"), attr) + + @dataclass(frozen=True) class Flake: path: Path diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index f0c328cff4c0..4009996609c7 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -6,6 +6,7 @@ from typing import Final from .models import ( Action, + BuildAttr, Flake, Generation, GenerationJson, @@ -235,24 +236,20 @@ def list_generations(profile: Profile) -> list[GenerationJson]: def nixos_build( attr: str, - pre_attr: str | None, - file: str | None, + build_attr: BuildAttr | None, **nix_flags: Args, ) -> Path: """Build NixOS attribute using classic Nix. - It will by default build `` with `attr`, however it - optionally supports building from an external file and custom attributes - paths. - Returns the built attribute as path. """ - if pre_attr or file: + run_args: list[str | Path] + if build_attr: run_args = [ "nix-build", - file or "default.nix", + build_attr.path, "--attr", - f"{'.'.join(x for x in [pre_attr, attr] if x)}", + f"{'.'.join(x for x in [build_attr.attr, attr] if x)}", ] else: run_args = ["nix-build", "", "--attr", attr] diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index f30ef4059310..a2646eaec416 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -9,6 +9,19 @@ import nixos_rebuild.models as m from .helpers import get_qualified_name +def test_building_attr_from_arg() -> None: + assert m.BuildAttr.from_arg(None, None) is None + assert m.BuildAttr.from_arg("attr", None) == m.BuildAttr( + Path("default.nix"), "attr" + ) + assert m.BuildAttr.from_arg("attr", "file.nix") == m.BuildAttr( + Path("file.nix"), "attr" + ) + assert m.BuildAttr.from_arg(None, "file.nix") == m.BuildAttr( + Path("file.nix"), None + ) + + def test_flake_parse() -> None: assert m.Flake.parse("/path/to/flake#attr") == m.Flake( Path("/path/to/flake"), "nixosConfigurations.attr" diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 8234f0ff98f9..0d6079e8eb5b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -229,27 +229,21 @@ def test_nixos_build_flake(mock_run: Any) -> None: return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) def test_nixos_build(mock_run: Any, monkeypatch: Any) -> None: - assert n.nixos_build("attr", None, None, nix_flag="foo") == Path("/path/to/file") + assert n.nixos_build("attr", None, nix_flag="foo") == Path("/path/to/file") mock_run.assert_called_with( ["nix-build", "", "--attr", "attr", "--nix-flag", "foo"], stdout=PIPE, ) - n.nixos_build("attr", "preAttr", "file") + n.nixos_build("attr", m.BuildAttr(Path("file"), "preAttr")) mock_run.assert_called_with( - ["nix-build", "file", "--attr", "preAttr.attr"], + ["nix-build", Path("file"), "--attr", "preAttr.attr"], stdout=PIPE, ) - n.nixos_build("attr", None, "file", no_out_link=True) + n.nixos_build("attr", m.BuildAttr(Path("file"), None)) mock_run.assert_called_with( - ["nix-build", "file", "--attr", "attr", "--no-out-link"], - stdout=PIPE, - ) - - n.nixos_build("attr", "preAttr", None, no_out_link=False, keep_going=True) - mock_run.assert_called_with( - ["nix-build", "default.nix", "--attr", "preAttr.attr", "--keep-going"], + ["nix-build", Path("file"), "--attr", "attr"], stdout=PIPE, ) From 88b4eb3aeb0f24a1055dd83bd977b19175cd9d88 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 27 Nov 2024 19:07:16 +0000 Subject: [PATCH 0209/1054] nixos-rebuild-ng: add repl --- pkgs/by-name/ni/nixos-rebuild-ng/README.md | 2 +- pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 5 --- .../src/nixos_rebuild/__init__.py | 1 - .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 38 ++++++++++++++++++ .../src/nixos_rebuild/repl.template.nix | 40 +++++++++++++++++++ .../ni/nixos-rebuild-ng/src/pyproject.toml | 3 ++ .../nixos-rebuild-ng/src/tests/test_models.py | 4 +- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 19 +++++++++ 8 files changed, 102 insertions(+), 10 deletions(-) create mode 100644 pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/repl.template.nix diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/README.md b/pkgs/by-name/ni/nixos-rebuild-ng/README.md index a6199e873060..f34c3d4996ef 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/README.md +++ b/pkgs/by-name/ni/nixos-rebuild-ng/README.md @@ -126,7 +126,7 @@ ruff format . - [ ] Change module system to allow easier opt-in, like `system.switch.enableNg` for `switch-to-configuration-ng` - [ ] Improve documentation -- [ ] `nixos-rebuild repl` (calling old `nixos-rebuild` for now) +- [x] `nixos-rebuild repl` - [ ] `nix` build/bootstrap - [ ] Generate tab completion via [`shtab`](https://docs.iterative.ai/shtab/) - [x] Reduce build closure diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix index b111c7cb108a..4ef9d29807f5 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix +++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix @@ -39,11 +39,6 @@ python3Packages.buildPythonApplication rec { nix ]; - preBuild = '' - substituteInPlace nixos_rebuild/__init__.py \ - --subst-var-by nixos_rebuild ${lib.getExe nixos-rebuild} - ''; - postInstall = '' installManPage ${nixos-rebuild}/share/man/man8/nixos-rebuild.8 diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index a83718c89587..f57991800404 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -1,7 +1,6 @@ import argparse import atexit import json -import os import sys from pathlib import Path from subprocess import run diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 4009996609c7..aeaea3bf03c9 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -1,6 +1,8 @@ import os from datetime import datetime +from importlib.resources import files from pathlib import Path +from string import Template from subprocess import PIPE, CalledProcessError from typing import Final @@ -18,6 +20,7 @@ from .process import run_wrapper from .utils import Args, dict_to_flags, info FLAKE_FLAGS: Final = ["--extra-experimental-features", "nix-command flakes"] +FLAKE_REPL_TEMPLATE: Final = "repl.template.nix" def copy_closure( @@ -279,6 +282,41 @@ def nixos_build_flake( return Path(r.stdout.strip()) +def repl(attr: str, build_attr: BuildAttr | None, **nix_flags: Args) -> None: + run_args: list[str | Path] = ["nix", "repl", "--file"] + if build_attr: + run_args.append(build_attr.path) + if build_attr.attr: + run_args.append(build_attr.attr) + run_wrapper([*run_args, *dict_to_flags(nix_flags)]) + else: + run_wrapper([*run_args, "", *dict_to_flags(nix_flags)]) + + +def repl_flake(attr: str, flake: Flake, **flake_flags: Args) -> None: + expr = Template( + files(__package__).joinpath(FLAKE_REPL_TEMPLATE).read_text() + ).substitute( + flake_path=flake.path, + flake_attr=flake.attr, + bold="\033[1m", + blue="\033[34;1m", + attention="\033[35;1m", + reset="\033[0m", + ) + run_wrapper( + [ + "nix", + *FLAKE_FLAGS, + "repl", + "--impure", + "--expr", + expr, + *dict_to_flags(flake_flags), + ] + ) + + def rollback(profile: Profile, target_host: Remote | None, sudo: bool) -> Path: "Rollback Nix profile, like one created by `nixos-rebuild switch`." run_wrapper( diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/repl.template.nix b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/repl.template.nix new file mode 100644 index 000000000000..0fffd6ecc746 --- /dev/null +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/repl.template.nix @@ -0,0 +1,40 @@ +let + flake = builtins.getFlake ''${flake_path}''; + configuration = flake.${flake_attr}; + motd = '' + $${"\n"} + Hello and welcome to the NixOS configuration + ${flake_attr} + in ${flake_path} + + The following is loaded into nix repl's scope: + + - ${blue}config${reset} All option values + - ${blue}options${reset} Option data and metadata + - ${blue}pkgs${reset} Nixpkgs package set + - ${blue}lib${reset} Nixpkgs library functions + - other module arguments + + - ${blue}flake${reset} Flake outputs, inputs and source info of ${flake_path} + + Use tab completion to browse around ${blue}config${reset}. + + Use ${bold}:r${reset} to ${bold}reload${reset} everything after making a change in the flake. + (assuming ${flake_path} is a mutable flake ref) + + See ${bold}:?${reset} for more repl commands. + + ${attention}warning:${reset} nixos-rebuild repl does not currently enforce pure evaluation. + ''; + scope = + assert configuration._type or null == ''configuration''; + assert configuration.class or ''nixos'' == ''nixos''; + configuration._module.args + // configuration._module.specialArgs + // { + inherit (configuration) config options; + lib = configuration.lib or configuration.pkgs.lib; + inherit flake; + }; +in +builtins.seq scope builtins.trace motd scope diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml b/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml index f26b3cba7056..0dc662814c33 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml @@ -9,6 +9,9 @@ version = "0.0.0" [project.scripts] nixos-rebuild = "nixos_rebuild:main" +[tool.setuptools.package-data] +nixos_rebuild = ["*.template.nix"] + [tool.mypy] # `--strict` config, but explicit options to avoid breaking build when mypy is # updated diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index a2646eaec416..1a604ad53164 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -17,9 +17,7 @@ def test_building_attr_from_arg() -> None: assert m.BuildAttr.from_arg("attr", "file.nix") == m.BuildAttr( Path("file.nix"), "attr" ) - assert m.BuildAttr.from_arg(None, "file.nix") == m.BuildAttr( - Path("file.nix"), None - ) + assert m.BuildAttr.from_arg(None, "file.nix") == m.BuildAttr(Path("file.nix"), None) def test_flake_parse() -> None: diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 0d6079e8eb5b..92411a0f5488 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -248,6 +248,25 @@ def test_nixos_build(mock_run: Any, monkeypatch: Any) -> None: ) +@patch(get_qualified_name(n.run_wrapper, n), autospec=True) +def test_repl(mock_run: Any) -> None: + n.repl("attr", None, nix_flag=True) + mock_run.assert_called_with( + ["nix", "repl", "--file", "", "--nix-flag"] + ) + + n.repl("attr", m.BuildAttr(Path("file.nix"), "myAttr")) + mock_run.assert_called_with(["nix", "repl", "--file", Path("file.nix"), "myAttr"]) + + +@patch(get_qualified_name(n.run_wrapper, n), autospec=True) +def test_repl_flake(mock_run: Any) -> None: + n.repl_flake("attr", m.Flake(Path("flake.nix"), "myAttr"), nix_flag=True) + # This method would be really annoying to test, and it is not that important + # So just check that we are at least calling it + assert mock_run.called + + @patch(get_qualified_name(n.run_wrapper, n), autospec=True) def test_rollback(mock_run: Any, tmp_path: Path) -> None: path = tmp_path / "test" From 0774b36546976a2a0454f51bec02d1b695c5f9dd Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 27 Nov 2024 23:14:22 +0000 Subject: [PATCH 0210/1054] nixos-rebuild-ng: move default path logic to BuildAttr --- .../src/nixos_rebuild/models.py | 6 ++-- .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 34 +++++++------------ .../nixos-rebuild-ng/src/tests/test_models.py | 4 +-- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 12 +++---- 4 files changed, 22 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py index 59d99230061c..3039a3eafc7f 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py @@ -47,13 +47,13 @@ class Action(Enum): @dataclass(frozen=True) class BuildAttr: - path: Path + path: str | Path attr: str | None @classmethod - def from_arg(cls, attr: str | None, file: str | None) -> Self | None: + def from_arg(cls, attr: str | None, file: str | None) -> Self: if not (attr or file): - return None + return cls("", None) return cls(Path(file or "default.nix"), attr) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index aeaea3bf03c9..f56044451f02 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -239,24 +239,20 @@ def list_generations(profile: Profile) -> list[GenerationJson]: def nixos_build( attr: str, - build_attr: BuildAttr | None, + build_attr: BuildAttr, **nix_flags: Args, ) -> Path: """Build NixOS attribute using classic Nix. Returns the built attribute as path. """ - run_args: list[str | Path] - if build_attr: - run_args = [ - "nix-build", - build_attr.path, - "--attr", - f"{'.'.join(x for x in [build_attr.attr, attr] if x)}", - ] - else: - run_args = ["nix-build", "", "--attr", attr] - run_args += dict_to_flags(nix_flags) + run_args = [ + "nix-build", + build_attr.path, + "--attr", + f"{'.'.join(x for x in [build_attr.attr, attr] if x)}", + *dict_to_flags(nix_flags), + ] r = run_wrapper(run_args, stdout=PIPE) return Path(r.stdout.strip()) @@ -282,15 +278,11 @@ def nixos_build_flake( return Path(r.stdout.strip()) -def repl(attr: str, build_attr: BuildAttr | None, **nix_flags: Args) -> None: - run_args: list[str | Path] = ["nix", "repl", "--file"] - if build_attr: - run_args.append(build_attr.path) - if build_attr.attr: - run_args.append(build_attr.attr) - run_wrapper([*run_args, *dict_to_flags(nix_flags)]) - else: - run_wrapper([*run_args, "", *dict_to_flags(nix_flags)]) +def repl(attr: str, build_attr: BuildAttr, **nix_flags: Args) -> None: + run_args = ["nix", "repl", "--file", build_attr.path] + if build_attr.attr: + run_args.append(build_attr.attr) + run_wrapper([*run_args, *dict_to_flags(nix_flags)]) def repl_flake(attr: str, flake: Flake, **flake_flags: Args) -> None: diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index 1a604ad53164..31920e97a25c 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -9,8 +9,8 @@ import nixos_rebuild.models as m from .helpers import get_qualified_name -def test_building_attr_from_arg() -> None: - assert m.BuildAttr.from_arg(None, None) is None +def test_build_attr_from_arg() -> None: + assert m.BuildAttr.from_arg(None, None) == m.BuildAttr("", None) assert m.BuildAttr.from_arg("attr", None) == m.BuildAttr( Path("default.nix"), "attr" ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 92411a0f5488..e47869867a7e 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -229,7 +229,9 @@ def test_nixos_build_flake(mock_run: Any) -> None: return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) def test_nixos_build(mock_run: Any, monkeypatch: Any) -> None: - assert n.nixos_build("attr", None, nix_flag="foo") == Path("/path/to/file") + assert n.nixos_build( + "attr", m.BuildAttr("", None), nix_flag="foo" + ) == Path("/path/to/file") mock_run.assert_called_with( ["nix-build", "", "--attr", "attr", "--nix-flag", "foo"], stdout=PIPE, @@ -241,16 +243,10 @@ def test_nixos_build(mock_run: Any, monkeypatch: Any) -> None: stdout=PIPE, ) - n.nixos_build("attr", m.BuildAttr(Path("file"), None)) - mock_run.assert_called_with( - ["nix-build", Path("file"), "--attr", "attr"], - stdout=PIPE, - ) - @patch(get_qualified_name(n.run_wrapper, n), autospec=True) def test_repl(mock_run: Any) -> None: - n.repl("attr", None, nix_flag=True) + n.repl("attr", m.BuildAttr("", None), nix_flag=True) mock_run.assert_called_with( ["nix", "repl", "--file", "", "--nix-flag"] ) From 5cc71a346a16620c721ac08be73efe1361a60c97 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 27 Nov 2024 23:51:27 +0000 Subject: [PATCH 0211/1054] nixos-rebuild-ng: Profile.from_name -> Profile.from_arg --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 2 +- .../by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py | 2 +- pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index f57991800404..e37f50ef7611 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -167,7 +167,7 @@ def execute(argv: list[str]) -> None: tmpdir_path = Path(tmpdir.name) atexit.register(cleanup_ssh, tmpdir_path) - profile = Profile.from_name(args.profile_name) + profile = Profile.from_arg(args.profile_name) target_host = Remote.from_arg(args.target_host, args.ask_sudo_password, tmpdir_path) build_attr = BuildAttr.from_arg(args.attr, args.file) flake = Flake.from_arg(args.flake, target_host) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py index 3039a3eafc7f..235ce9424e3a 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py @@ -137,7 +137,7 @@ class Profile: path: Path @classmethod - def from_name(cls, name: str = "system") -> Self: + def from_arg(cls, name: str) -> Self: match name: case "system": return cls(name, Path("/nix/var/nix/profiles/system")) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index 31920e97a25c..baeb5977b84f 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -111,13 +111,13 @@ def test_flake_from_arg(mock_node: Any) -> None: @patch(get_qualified_name(m.Path.mkdir, m), autospec=True) -def test_profile_from_name(mock_mkdir: Any) -> None: - assert m.Profile.from_name("system") == m.Profile( +def test_profile_from_arg(mock_mkdir: Any) -> None: + assert m.Profile.from_arg("system") == m.Profile( "system", Path("/nix/var/nix/profiles/system"), ) - assert m.Profile.from_name("something") == m.Profile( + assert m.Profile.from_arg("something") == m.Profile( "something", Path("/nix/var/nix/profiles/system-profiles/something"), ) From 2db09d7f77305e4b6283cf2adb3c7151ecc7b570 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 28 Nov 2024 10:20:41 +0000 Subject: [PATCH 0212/1054] nixos-rebuild-ng: configure logging --- .../src/nixos_rebuild/__init__.py | 24 ++++++++++++------- .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 15 ++++++++---- .../src/nixos_rebuild/process.py | 15 +++++++----- .../src/nixos_rebuild/utils.py | 20 ++++++++++++---- .../nixos-rebuild-ng/src/tests/test_main.py | 5 ++-- 5 files changed, 53 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index e37f50ef7611..51f2c79e7702 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -1,6 +1,7 @@ import argparse import atexit import json +import logging import sys from pathlib import Path from subprocess import run @@ -10,9 +11,10 @@ from typing import assert_never from . import nix from .models import Action, BuildAttr, Flake, NRError, Profile from .process import Remote, cleanup_ssh -from .utils import info +from .utils import LogFormatter -VERBOSE = 0 +logger = logging.getLogger() +logger.setLevel(logging.INFO) def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentParser]]: @@ -103,11 +105,11 @@ def parse_args( } def parser_warn(msg: str) -> None: - info(f"{parser.prog}: warning: {msg}") + print(f"{parser.prog}: warning: {msg}", file=sys.stderr) - global VERBOSE # This flag affects both nix and this script - VERBOSE = args.verbose + if args.verbose: + logger.setLevel(logging.DEBUG) # https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh#L56 if args.action == Action.DRY_RUN.value: @@ -190,7 +192,7 @@ def execute(argv: list[str]) -> None: match action: case Action.SWITCH | Action.BOOT: - info("building the system configuration...") + logger.info("building the system configuration...") if args.rollback: path_to_config = nix.rollback(profile, target_host, sudo=args.sudo) else: @@ -219,7 +221,7 @@ def execute(argv: list[str]) -> None: install_bootloader=args.install_bootloader, ) case Action.TEST | Action.BUILD | Action.DRY_BUILD | Action.DRY_ACTIVATE: - info("building the system configuration...") + logger.info("building the system configuration...") dry_run = action == Action.DRY_BUILD if args.rollback: if action not in (Action.TEST, Action.BUILD): @@ -256,7 +258,7 @@ def execute(argv: list[str]) -> None: specialisation=args.specialisation, ) case Action.BUILD_VM | Action.BUILD_VM_WITH_BOOTLOADER: - info("building the system configuration...") + logger.info("building the system configuration...") attr = "vm" if action == Action.BUILD_VM else "vmWithBootLoader" if flake: path_to_config = nix.nixos_build_flake( @@ -313,10 +315,14 @@ def execute(argv: list[str]) -> None: def main() -> None: + ch = logging.StreamHandler() + ch.setFormatter(LogFormatter("%(levelname)s: %(message)s")) + logger.addHandler(ch) + try: execute(sys.argv) except (Exception, KeyboardInterrupt) as ex: - if VERBOSE: + if logger.level == logging.DEBUG: raise ex else: sys.exit(str(ex)) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index f56044451f02..ab34b0896ffc 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -1,3 +1,4 @@ +import logging import os from datetime import datetime from importlib.resources import files @@ -17,10 +18,11 @@ from .models import ( Remote, ) from .process import run_wrapper -from .utils import Args, dict_to_flags, info +from .utils import Args, dict_to_flags FLAKE_FLAGS: Final = ["--extra-experimental-features", "nix-command flakes"] FLAKE_REPL_TEMPLATE: Final = "repl.template.nix" +logger = logging.getLogger(__name__) def copy_closure( @@ -107,7 +109,7 @@ def get_nixpkgs_rev(nixpkgs_path: Path | None) -> str | None: ) except FileNotFoundError: # Git is not included in the closure so we need to check - info(f"warning: Git not found; cannot figure out revision of '{nixpkgs_path}'") + logger.warning(f"Git not found; cannot figure out revision of '{nixpkgs_path}'") return None if rev := r.stdout.strip(): @@ -203,13 +205,15 @@ def list_generations(profile: Profile) -> list[GenerationJson]: ) try: nixos_version = (generation_path / "nixos-version").read_text().strip() - except IOError: + except IOError as ex: + logger.debug("could not get nixos-version: %s", ex) nixos_version = "Unknown" try: kernel_version = next( (generation_path / "kernel-modules/lib/modules").iterdir() ).name - except IOError: + except IOError as ex: + logger.debug("could not get kernel version: %s", ex) kernel_version = "Unknown" specialisations = [ s.name for s in (generation_path / "specialisation").glob("*") if s.is_dir() @@ -219,7 +223,8 @@ def list_generations(profile: Profile) -> list[GenerationJson]: [generation_path / "sw/bin/nixos-version", "--configuration-revision"], capture_output=True, ).stdout.strip() - except (CalledProcessError, IOError): + except (CalledProcessError, IOError) as ex: + logger.debug("could not get configuration revision: %s", ex) configuration_revision = "Unknown" result.append( diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index db470ee5753c..91a9f04593c8 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -1,5 +1,6 @@ from __future__ import annotations +import logging import os import subprocess from dataclasses import dataclass @@ -7,7 +8,7 @@ from getpass import getpass from pathlib import Path from typing import Self, Sequence, TypedDict, Unpack -from .utils import info +logger = logging.getLogger(__name__) @dataclass(frozen=True) @@ -46,13 +47,13 @@ class Remote: def _validate_opts(opts: list[str], ask_sudo_password: bool | None) -> None: for o in opts: if o in ["-t", "-tt", "RequestTTY=yes", "RequestTTY=force"]: - info( - f"warning: detected option '{o}' in NIX_SSHOPTS. SSH's TTY " - + "may cause issues, it is recommended to remove this option" + logger.warning( + f"detected option '{o}' in NIX_SSHOPTS. SSH's TTY may " + + "cause issues, it is recommended to remove this option" ) if not ask_sudo_password: - info( - "If you want to prompt for sudo password use " + logger.warning( + "if you want to prompt for sudo password use " + "'--ask-sudo-password' option instead" ) @@ -99,6 +100,8 @@ def run_wrapper( if sudo: args = ["sudo", *args] + logger.debug("calling run with args=%s, extra_env=%s", args, extra_env) + return subprocess.run( args, check=check, diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py index 8d4f128075d4..dc8d899ab056 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py @@ -1,11 +1,23 @@ -import sys -from functools import partial -from typing import TypeAlias +import logging +from typing import TypeAlias, override -info = partial(print, file=sys.stderr) Args: TypeAlias = bool | str | list[str] | int | None +class LogFormatter(logging.Formatter): + @override + def format(self, record: logging.LogRecord) -> str: + record.levelname = record.levelname.lower() + match record.levelno: + case logging.INFO: + self._style._fmt = "%(message)s" + case logging.DEBUG: + self._style._fmt = "%(levelname)s: %(name)s: %(message)s" + case _: + self._style._fmt = "%(levelname)s: %(message)s" + return super().format(record) + + def dict_to_flags(d: dict[str, Args]) -> list[str]: flags = [] for key, value in d.items(): diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index e3bb1ba8f6e7..8bb624a44c30 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -1,3 +1,4 @@ +import logging import textwrap from pathlib import Path from subprocess import PIPE, CompletedProcess @@ -43,7 +44,7 @@ def test_parse_args() -> None: "bar", ] ) - assert nr.VERBOSE == 0 + assert nr.logger.level == logging.INFO assert r1.flake == "/etc/nixos" assert r1.install_bootloader is True assert r1.install_grub is True @@ -65,7 +66,7 @@ def test_parse_args() -> None: "-vvv", ] ) - assert nr.VERBOSE == 3 + assert nr.logger.level == logging.DEBUG assert r2.verbose == 3 assert r2.flake is False assert r2.action == "dry-build" From 1e34a97f9f793110ecfc9f5f08a9e86961ad0d57 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 28 Nov 2024 13:12:47 +0000 Subject: [PATCH 0213/1054] nixos-rebuild-ng: add message to help if the user forgot --ask-sudo-password --- .../src/nixos_rebuild/process.py | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index 91a9f04593c8..a64905d7d3bc 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -102,14 +102,22 @@ def run_wrapper( logger.debug("calling run with args=%s, extra_env=%s", args, extra_env) - return subprocess.run( - args, - check=check, - env=env, - input=input, - # Hope nobody is using NixOS with non-UTF8 encodings, but "surrogateescape" - # should still work in those systems. - text=True, - errors="surrogateescape", - **kwargs, - ) + try: + return subprocess.run( + args, + check=check, + env=env, + input=input, + # Hope nobody is using NixOS with non-UTF8 encodings, but "surrogateescape" + # should still work in those systems. + text=True, + errors="surrogateescape", + **kwargs, + ) + except subprocess.CalledProcessError as ex: + if sudo and remote: + logger.error( + "while running command with remote sudo, did you forget to use " + + "--ask-sudo-password?" + ) + raise ex From 7a01349f792840731bbc6e410c118b857dd01e87 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 28 Nov 2024 13:28:46 +0000 Subject: [PATCH 0214/1054] nixos-rebuild-ng: add TRY201 check for ruff --- .../by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 2 +- pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py | 4 ++-- pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 51f2c79e7702..90572f51b1db 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -323,6 +323,6 @@ def main() -> None: execute(sys.argv) except (Exception, KeyboardInterrupt) as ex: if logger.level == logging.DEBUG: - raise ex + raise else: sys.exit(str(ex)) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index a64905d7d3bc..2770a5a7d969 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -114,10 +114,10 @@ def run_wrapper( errors="surrogateescape", **kwargs, ) - except subprocess.CalledProcessError as ex: + except subprocess.CalledProcessError: if sudo and remote: logger.error( "while running command with remote sudo, did you forget to use " + "--ask-sudo-password?" ) - raise ex + raise diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml b/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml index 0dc662814c33..d773e8888923 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml @@ -43,6 +43,8 @@ extend-select = [ "I", # require `check` argument for `subprocess.run` "PLW1510", + # check for needless exception names in raise statements + "TRY201", ] [tool.ruff.lint.per-file-ignores] From 3a0c0975a8b623129c7d1132934e4f3e35f1ce67 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 28 Nov 2024 15:23:23 +0000 Subject: [PATCH 0215/1054] nixos-rebuild-ng: remove unnecessary "from __future__ import annotations" --- pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py | 2 -- pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py | 2 -- pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py | 2 -- 3 files changed, 6 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py index 235ce9424e3a..ffd8c5bde454 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import platform import re import subprocess diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index 2770a5a7d969..945a1154ee1b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import logging import os import subprocess diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py index 0474c6671edd..77ddad740865 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from types import ModuleType from typing import Any, Callable From 73567536e149a08acac4204aceae4ff4843a6037 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 28 Nov 2024 15:32:28 +0000 Subject: [PATCH 0216/1054] nixos-rebuild-ng: add from_host in nix.copy_closure --- .../src/nixos_rebuild/__init__.py | 4 ++-- .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 11 ++++++--- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 23 ++++++++++++++++--- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 90572f51b1db..b53d59f037f7 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -210,7 +210,7 @@ def execute(argv: list[str]) -> None: no_out_link=True, **build_flags, ) - nix.copy_closure(path_to_config, target_host, **copy_flags) + nix.copy_closure(path_to_config, target_host, None, **copy_flags) nix.set_profile(profile, path_to_config, target_host, sudo=args.sudo) nix.switch_to_configuration( path_to_config, @@ -253,7 +253,7 @@ def execute(argv: list[str]) -> None: nix.switch_to_configuration( path_to_config, action, - target_host, + target_host=None, sudo=args.sudo, specialisation=args.specialisation, ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index ab34b0896ffc..3921629edd1e 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -27,10 +27,14 @@ logger = logging.getLogger(__name__) def copy_closure( closure: Path, - target_host: Remote | None, + to_host: Remote | None, + from_host: Remote | None = None, **copy_flags: Args, ) -> None: - host = target_host + """Copy a nix closure to or from host to localhost. + + Also supports copying a closure from a remote to another remote.""" + host = to_host or from_host if not host: return @@ -38,11 +42,12 @@ def copy_closure( [ "nix-copy-closure", *dict_to_flags(copy_flags), - "--to", + "--to" if to_host else "--from", host.host, closure, ], extra_env={"NIX_SSHOPTS": " ".join(host.opts)}, + remote=from_host if to_host else None, ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index e47869867a7e..3d748732775b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -18,11 +18,28 @@ def test_copy_closure(mock_run: Any) -> None: n.copy_closure(closure, None) mock_run.assert_not_called() - target_host = m.Remote("user@host", ["--ssh", "opt"], None) + target_host = m.Remote("user@target.host", ["--ssh", "target-opt"], None) + build_host = m.Remote("user@build.host", ["--ssh", "build-opt"], None) + n.copy_closure(closure, target_host) mock_run.assert_called_with( - ["nix-copy-closure", "--to", "user@host", closure], - extra_env={"NIX_SSHOPTS": "--ssh opt"}, + ["nix-copy-closure", "--to", "user@target.host", closure], + extra_env={"NIX_SSHOPTS": "--ssh target-opt"}, + remote=None, + ) + + n.copy_closure(closure, None, build_host) + mock_run.assert_called_with( + ["nix-copy-closure", "--from", "user@build.host", closure], + extra_env={"NIX_SSHOPTS": "--ssh build-opt"}, + remote=None, + ) + + n.copy_closure(closure, target_host, build_host) + mock_run.assert_called_with( + ["nix-copy-closure", "--to", "user@target.host", closure], + extra_env={"NIX_SSHOPTS": "--ssh target-opt"}, + remote=build_host, ) From 02b943d57ff972d21df41acca540e7bee7f0d9f5 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 28 Nov 2024 15:42:27 +0000 Subject: [PATCH 0217/1054] nixos-rebuild-ng: use find_file in edit --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 3921629edd1e..b129a65d1cf3 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -69,13 +69,7 @@ def edit(flake: Flake | None, **flake_flags: Args) -> None: if flake_flags: raise NRError("'edit' does not support extra Nix flags") nixos_config = Path( - os.getenv("NIXOS_CONFIG") - or run_wrapper( - ["nix-instantiate", "--find-file", "nixos-config"], - stdout=PIPE, - check=False, - ).stdout.strip() - or "/etc/nixos/default.nix" + os.getenv("NIXOS_CONFIG") or find_file("nixos-config") or "/etc/nixos" ) if nixos_config.is_dir(): nixos_config /= "default.nix" @@ -87,7 +81,7 @@ def edit(flake: Flake | None, **flake_flags: Args) -> None: def find_file(file: str, **nix_flags: Args) -> Path | None: - "Find classic Nixpkgs location." + "Find classic Nix file location." r = run_wrapper( ["nix-instantiate", "--find-file", file, *dict_to_flags(nix_flags)], stdout=PIPE, From f7266986d371f814f9f5ab16b228d242aa05e51e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 28 Nov 2024 16:27:38 +0000 Subject: [PATCH 0218/1054] nixos-rebuild-ng: implement --build-host --- .../src/nixos_rebuild/__init__.py | 71 ++++++++---- .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 66 ++++++++++- .../src/nixos_rebuild/process.py | 7 +- .../nixos-rebuild-ng/src/tests/test_main.py | 99 ++++++++++++++++- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 103 +++++++++++++++++- 5 files changed, 317 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index b53d59f037f7..cff4f4f7c945 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -87,7 +87,7 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa main_parser.add_argument("--ask-sudo-password", action="store_true") main_parser.add_argument("--use-remote-sudo", action="store_true") # deprecated main_parser.add_argument("--no-ssh-tty", action="store_true") # deprecated - # parser.add_argument("--build-host") # TODO + main_parser.add_argument("--build-host") main_parser.add_argument("--target-host") main_parser.add_argument("action", choices=Action.values(), nargs="?") @@ -135,15 +135,11 @@ def parse_args( if args.action == Action.EDIT.value and (args.file or args.attr): parser.error("--file and --attr are not supported with 'edit'") - if args.target_host and args.action not in ( + if (args.target_host or args.build_host) and args.action not in ( Action.SWITCH.value, Action.BOOT.value, - Action.TEST.value, - Action.BUILD.value, - Action.DRY_BUILD.value, - Action.DRY_ACTIVATE.value, ): - parser.error(f"--target-host is not supported with '{args.action}'") + parser.error(f"--target-host/--build-host is not supported with '{args.action}'") if args.flake and (args.file or args.attr): parser.error("--flake cannot be used with --file or --attr") @@ -170,6 +166,7 @@ def execute(argv: list[str]) -> None: atexit.register(cleanup_ssh, tmpdir_path) profile = Profile.from_arg(args.profile_name) + build_host = Remote.from_arg(args.build_host, False, tmpdir_path) target_host = Remote.from_arg(args.target_host, args.ask_sudo_password, tmpdir_path) build_attr = BuildAttr.from_arg(args.attr, args.file) flake = Flake.from_arg(args.flake, target_host) @@ -197,25 +194,55 @@ def execute(argv: list[str]) -> None: path_to_config = nix.rollback(profile, target_host, sudo=args.sudo) else: if flake: - path_to_config = nix.nixos_build_flake( - "toplevel", - flake, - no_link=True, - **flake_build_flags, - ) + if build_host: + path_to_config = nix.nixos_remote_build_flake( + "toplevel", + flake, + build_host, + flake_build_flags=flake_build_flags, + copy_flags=copy_flags, + build_flags=build_flags, + ) + else: + path_to_config = nix.nixos_build_flake( + "toplevel", + flake, + no_link=True, + **flake_build_flags, + ) else: - path_to_config = nix.nixos_build( - "system", - build_attr, - no_out_link=True, - **build_flags, - ) - nix.copy_closure(path_to_config, target_host, None, **copy_flags) - nix.set_profile(profile, path_to_config, target_host, sudo=args.sudo) + if build_host: + path_to_config = nix.nixos_remote_build( + "system", + build_attr, + build_host, + instantiate_flags=common_flags, + copy_flags=copy_flags, + build_flags=build_flags, + ) + else: + path_to_config = nix.nixos_build( + "system", + build_attr, + no_out_link=True, + **build_flags, + ) + nix.copy_closure( + path_to_config, + to_host=target_host, + from_host=None, + **copy_flags, + ) + nix.set_profile( + profile, + path_to_config, + target_host=target_host, + sudo=args.sudo, + ) nix.switch_to_configuration( path_to_config, action, - target_host, + target_host=target_host, sudo=args.sudo, specialisation=args.specialisation, install_bootloader=args.install_bootloader, diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index b129a65d1cf3..2f86bf02faa6 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -244,7 +244,7 @@ def list_generations(profile: Profile) -> list[GenerationJson]: def nixos_build( attr: str, build_attr: BuildAttr, - **nix_flags: Args, + **build_flags: Args, ) -> Path: """Build NixOS attribute using classic Nix. @@ -255,7 +255,7 @@ def nixos_build( build_attr.path, "--attr", f"{'.'.join(x for x in [build_attr.attr, attr] if x)}", - *dict_to_flags(nix_flags), + *dict_to_flags(build_flags), ] r = run_wrapper(run_args, stdout=PIPE) return Path(r.stdout.strip()) @@ -264,7 +264,7 @@ def nixos_build( def nixos_build_flake( attr: str, flake: Flake, - **flake_flags: Args, + **flake_build_flags: Args, ) -> Path: """Build NixOS attribute using Flakes. @@ -276,12 +276,70 @@ def nixos_build_flake( "build", "--print-out-paths", f"{flake}.config.system.build.{attr}", - *dict_to_flags(flake_flags), + *dict_to_flags(flake_build_flags), ] r = run_wrapper(run_args, stdout=PIPE) return Path(r.stdout.strip()) +def nixos_remote_build( + attr: str, + build_attr: BuildAttr, + build_host: Remote | None, + build_flags: dict[str, Args] | None = None, + instantiate_flags: dict[str, Args] | None = None, + copy_flags: dict[str, Args] | None = None, +) -> Path: + r = run_wrapper( + [ + "nix-instantiate", + "--raw", + build_attr.path, + "--attr", + f"{'.'.join(x for x in [build_attr.attr, attr] if x)}", + *dict_to_flags(instantiate_flags or {}), + ], + stdout=PIPE, + ) + drv = Path(r.stdout.strip()) + copy_closure(drv, to_host=build_host, from_host=None, **(copy_flags or {})) + r = run_wrapper( + ["nix-store", "--realise", drv, *dict_to_flags(build_flags or {})], + remote=build_host, + stdout=PIPE, + ) + return Path(r.stdout.strip()) + + +def nixos_remote_build_flake( + attr: str, + flake: Flake, + build_host: Remote, + flake_build_flags: dict[str, Args] | None = None, + copy_flags: dict[str, Args] | None = None, + build_flags: dict[str, Args] | None = None, +) -> Path: + r = run_wrapper( + [ + "nix", + *FLAKE_FLAGS, + "eval", + "--raw", + f"{flake}.config.system.build.{attr}.drvPath", + *dict_to_flags(flake_build_flags or {}), + ], + stdout=PIPE, + ) + drv = Path(r.stdout.strip()) + copy_closure(drv, to_host=build_host, from_host=None, **(copy_flags or {})) + r = run_wrapper( + ["nix-store", "--realise", drv, *dict_to_flags(build_flags or {})], + remote=build_host, + stdout=PIPE, + ) + return Path(r.stdout.strip()) + + def repl(attr: str, build_attr: BuildAttr, **nix_flags: Args) -> None: run_args = ["nix", "repl", "--file", build_attr.path] if build_attr.attr: diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index 945a1154ee1b..ed51f1e87937 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -98,7 +98,12 @@ def run_wrapper( if sudo: args = ["sudo", *args] - logger.debug("calling run with args=%s, extra_env=%s", args, extra_env) + logger.debug( + "calling run with args=%s, kwargs=%s, extra_env=%s", + args, + kwargs, + extra_env, + ) try: return subprocess.run( diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 8bb624a44c30..020fbe0a8cd3 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -218,7 +218,7 @@ def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.TemporaryDirectory, nr)) # can't autospec -def test_execute_nix_switch_flake_remote( +def test_execute_nix_switch_flake_target_host( mock_tmpdir: Any, mock_run: Any, tmp_path: Path, @@ -316,6 +316,103 @@ def test_execute_nix_switch_flake_remote( ) +@patch.dict(nr.process.os.environ, {}, clear=True) +@patch(get_qualified_name(nr.process.subprocess.run), autospec=True) +@patch(get_qualified_name(nr.TemporaryDirectory, nr)) # can't autospec +def test_execute_nix_switch_flake_build_host( + mock_tmpdir: Any, + mock_run: Any, + tmp_path: Path, +) -> None: + config_path = tmp_path / "test" + config_path.touch() + mock_run.side_effect = [ + # nixos_build_flake + CompletedProcess([], 0, str(config_path)), + CompletedProcess([], 0), + CompletedProcess([], 0, str(config_path)), + # set_profile + CompletedProcess([], 0), + # copy_closure + CompletedProcess([], 0), + # switch_to_configuration + CompletedProcess([], 0), + ] + mock_tmpdir.return_value.name = "/tmp/test" + + nr.execute( + [ + "nixos-rebuild", + "switch", + "--flake", + "/path/to/config#hostname", + "--use-remote-sudo", + "--build-host", + "user@localhost", + ] + ) + + assert mock_run.call_count == 5 + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "eval", + "--raw", + "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + ["nix-copy-closure", "--to", "user@localhost", config_path], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "ssh", + "-o", + "ControlMaster=auto", + "-o", + "ControlPath=/tmp/test/ssh-%n", + "-o", + "ControlPersist=60", + "user@localhost", + "--", + "nix-store", + "--realise", + config_path, + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ), + call( + [ + "sudo", + "nix-env", + "-p", + Path("/nix/var/nix/profiles/system"), + "--set", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), + call( + ["sudo", config_path / "bin/switch-to-configuration", "switch"], + check=True, + **DEFAULT_RUN_KWARGS, + ), + ] + ) + + @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) def test_execute_switch_rollback(mock_run: Any, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 3d748732775b..c10aa7c28c5f 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -254,13 +254,114 @@ def test_nixos_build(mock_run: Any, monkeypatch: Any) -> None: stdout=PIPE, ) - n.nixos_build("attr", m.BuildAttr(Path("file"), "preAttr")) + assert n.nixos_build("attr", m.BuildAttr(Path("file"), "preAttr")) == Path( + "/path/to/file" + ) mock_run.assert_called_with( ["nix-build", Path("file"), "--attr", "preAttr.attr"], stdout=PIPE, ) +@patch( + get_qualified_name(n.run_wrapper, n), + autospec=True, + return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), +) +def test_nixos_remote_build_flake(mock_run: Any) -> None: + flake = m.Flake.parse(".#hostname") + build_host = m.Remote("user@host", ["--ssh", "opts"], None) + + assert n.nixos_remote_build_flake( + "toplevel", + flake, + build_host, + flake_build_flags={"flake": True}, + copy_flags={"copy": True}, + build_flags={"build": True}, + ) == Path("/path/to/file") + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "eval", + "--raw", + ".#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", + "--flake", + ], + stdout=PIPE, + ), + call( + [ + "nix-copy-closure", + "--copy", + "--to", + "user@host", + Path("/path/to/file"), + ], + extra_env={"NIX_SSHOPTS": "--ssh opts"}, + remote=None, + ), + call( + ["nix-store", "--realise", Path("/path/to/file"), "--build"], + remote=build_host, + stdout=PIPE, + ), + ] + ) + + +@patch( + get_qualified_name(n.run_wrapper, n), + autospec=True, + return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), +) +def test_nixos_remote_build(mock_run: Any, monkeypatch: Any) -> None: + build_host = m.Remote("user@host", ["--ssh", "opts"], None) + assert n.nixos_remote_build( + "attr", + m.BuildAttr("", None), + build_host, + build_flags={"build": True}, + instantiate_flags={"inst": True}, + copy_flags={"copy": True}, + ) == Path("/path/to/file") + mock_run.assert_has_calls( + [ + call( + [ + "nix-instantiate", + "--raw", + "", + "--attr", + "attr", + "--inst", + ], + stdout=PIPE, + ), + call( + [ + "nix-copy-closure", + "--copy", + "--to", + "user@host", + Path("/path/to/file"), + ], + extra_env={"NIX_SSHOPTS": "--ssh opts"}, + remote=None, + ), + call( + ["nix-store", "--realise", Path("/path/to/file"), "--build"], + remote=build_host, + stdout=PIPE, + ), + ] + ) + + @patch(get_qualified_name(n.run_wrapper, n), autospec=True) def test_repl(mock_run: Any) -> None: n.repl("attr", m.BuildAttr("", None), nix_flag=True) From 8a4105cfd7a6f58bf88a5f9e71dd1754f0996b36 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 28 Nov 2024 18:08:43 +0000 Subject: [PATCH 0219/1054] nixos-rebuild-ng: update README.md --- pkgs/by-name/ni/nixos-rebuild-ng/README.md | 27 +++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/README.md b/pkgs/by-name/ni/nixos-rebuild-ng/README.md index f34c3d4996ef..c52d1c06d920 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/README.md +++ b/pkgs/by-name/ni/nixos-rebuild-ng/README.md @@ -97,18 +97,8 @@ ruff format . version (the one that will be switched) and re-exec to it instead. This means that in case of bugs in `nixos-rebuild-ng`, the only way that you will get them fixed is **after** you switch to a new version -- `nix` bootstrap is also **not** implemented yet, so this means that you will - eval with an old version of Nix instead of a newer one. This is unlikely to - cause issues, because the build will happen in the daemon anyway (that is - only changed after the switch), and unless you are using bleeding edge `nix` - features you will probably have zero problems here. You can basically think - that using `nixos-rebuild-ng` is similar to running `nixos-rebuild --fast` - right now - Ignore any performance advantages of the rewrite right now, because of the 2 caveats above -- `--target-host` and `--build-host` are not implemented yet and this is - probably the thing that will be most difficult to implement. Help here is - welcome - Bugs in the profile manipulation can cause corruption of your profile that may be difficult to fix, so right now I only recommend using `nixos-rebuild-ng` if you are testing in a VM or in a filesystem with @@ -118,7 +108,7 @@ ruff format . ## TODO -- [ ] Remote host/builders (via SSH) +- [x] Remote host/builders (via SSH) - [x] Improve nix arguments handling (e.g.: `nixFlags` vs `copyFlags` in the old `nixos-rebuild`) - [ ] `_NIXOS_REBUILD_EXEC` @@ -127,11 +117,20 @@ ruff format . `system.switch.enableNg` for `switch-to-configuration-ng` - [ ] Improve documentation - [x] `nixos-rebuild repl` -- [ ] `nix` build/bootstrap - [ ] Generate tab completion via [`shtab`](https://docs.iterative.ai/shtab/) - [x] Reduce build closure ## TODON'T -- Reimplement `systemd-run` logic (will be moved to the new - [`apply`](https://github.com/NixOS/nixpkgs/pull/344407) script) +- Reimplement `systemd-run` logic: will be moved to the new + [`apply`](https://github.com/NixOS/nixpkgs/pull/344407) script +- Nix bootstrap: it is only used for non-Flake paths and it is basically + useless nowadays. It was created at a time when Nix was changing frequently + and there was a need to bootstrap a new version of Nix before evaluating the + configuration (otherwise the new Nixpkgs version may have code that is only + compatible with a newer version of Nix). Nixpkgs now has a policy to be + compatible with Nix 2.3, and even if this is bumped as long we don't do + drastic minimum version changes this should not be an issue. Also, the daemon + itself always run with the previous version since even we can replace Nix in + `PATH` (so Nix client), but we can't replace the daemon without switching to + a new version. From 34cda442082f6ac50ef3196149dd5e8343789e59 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 28 Nov 2024 19:57:03 +0000 Subject: [PATCH 0220/1054] nixos-rebuild-ng: use `nix build` for remote builds in Flakes, fix remote args --- .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 9 +++++++- .../src/nixos_rebuild/process.py | 12 ++++++++++- .../nixos-rebuild-ng/src/tests/test_main.py | 21 ++++--------------- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 10 ++++++++- .../src/tests/test_process.py | 13 +++--------- 5 files changed, 35 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 2f86bf02faa6..11d13502e13c 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -333,7 +333,14 @@ def nixos_remote_build_flake( drv = Path(r.stdout.strip()) copy_closure(drv, to_host=build_host, from_host=None, **(copy_flags or {})) r = run_wrapper( - ["nix-store", "--realise", drv, *dict_to_flags(build_flags or {})], + [ + "nix", + *FLAKE_FLAGS, + "build", + f"{drv}^*", + "--print-out-paths", + *dict_to_flags(build_flags or {}), + ], remote=build_host, stdout=PIPE, ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index ed51f1e87937..05d2840529a1 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -1,5 +1,6 @@ import logging import os +import shlex import subprocess from dataclasses import dataclass from getpass import getpass @@ -91,7 +92,16 @@ def run_wrapper( input = remote.sudo_password + "\n" else: args = ["sudo", *args] - args = ["ssh", *remote.opts, remote.host, "--", *args] + args = [ + "ssh", + *remote.opts, + remote.host, + "--", + # sadly SSH just join all remaining parameters, expanding glob and + # ignoring quotes + # so we need to use shlex.join() to safely join the arguments + shlex.join(str(a) for a in args), + ] else: if extra_env: env = os.environ | extra_env diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 020fbe0a8cd3..70fc0e7045ea 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -282,12 +282,7 @@ def test_execute_nix_switch_flake_target_host( "ControlPersist=60", "user@localhost", "--", - "sudo", - "nix-env", - "-p", - Path("/nix/var/nix/profiles/system"), - "--set", - config_path, + f"sudo nix-env -p /nix/var/nix/profiles/system --set {config_path}", ], check=True, **DEFAULT_RUN_KWARGS, @@ -303,11 +298,7 @@ def test_execute_nix_switch_flake_target_host( "ControlPersist=60", "user@localhost", "--", - "sudo", - "env", - "NIXOS_INSTALL_BOOTLOADER=0", - config_path / "bin/switch-to-configuration", - "switch", + f"sudo env NIXOS_INSTALL_BOOTLOADER=0 {config_path / 'bin/switch-to-configuration'} switch", ], check=True, **DEFAULT_RUN_KWARGS, @@ -346,7 +337,6 @@ def test_execute_nix_switch_flake_build_host( "switch", "--flake", "/path/to/config#hostname", - "--use-remote-sudo", "--build-host", "user@localhost", ] @@ -384,9 +374,7 @@ def test_execute_nix_switch_flake_build_host( "ControlPersist=60", "user@localhost", "--", - "nix-store", - "--realise", - config_path, + f"nix --extra-experimental-features 'nix-command flakes' build '{config_path}^*' --print-out-paths", ], check=True, stdout=PIPE, @@ -394,7 +382,6 @@ def test_execute_nix_switch_flake_build_host( ), call( [ - "sudo", "nix-env", "-p", Path("/nix/var/nix/profiles/system"), @@ -405,7 +392,7 @@ def test_execute_nix_switch_flake_build_host( **DEFAULT_RUN_KWARGS, ), call( - ["sudo", config_path / "bin/switch-to-configuration", "switch"], + [config_path / "bin/switch-to-configuration", "switch"], check=True, **DEFAULT_RUN_KWARGS, ), diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index c10aa7c28c5f..5a5ee01cb974 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -306,7 +306,15 @@ def test_nixos_remote_build_flake(mock_run: Any) -> None: remote=None, ), call( - ["nix-store", "--realise", Path("/path/to/file"), "--build"], + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "/path/to/file^*", + "--print-out-paths", + "--build", + ], remote=build_host, stdout=PIPE, ), diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py index 6987aac9283b..57d3865bcef4 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py @@ -40,12 +40,12 @@ def test_run(mock_run: Any) -> None: ) p.run_wrapper( - ["test", "--with", "flags"], + ["test", "--with", "some flags"], check=True, remote=m.Remote("user@localhost", ["--ssh", "opt"], "password"), ) mock_run.assert_called_with( - ["ssh", "--ssh", "opt", "user@localhost", "--", "test", "--with", "flags"], + ["ssh", "--ssh", "opt", "user@localhost", "--", "test --with 'some flags'"], check=True, text=True, errors="surrogateescape", @@ -67,14 +67,7 @@ def test_run(mock_run: Any) -> None: "opt", "user@localhost", "--", - "sudo", - "--prompt=", - "--stdin", - "env", - "FOO=bar", - "test", - "--with", - "flags", + "sudo --prompt= --stdin env FOO=bar test --with flags", ], check=True, env=None, From 7d58c66881eba7fdc4701664b6393c4bf035d585 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 28 Nov 2024 20:02:53 +0000 Subject: [PATCH 0221/1054] nixos-rebuild-ng: fix --build-host --- .../nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 2 +- .../ni/nixos-rebuild-ng/src/tests/test_main.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index cff4f4f7c945..ad4b757878dd 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -230,7 +230,7 @@ def execute(argv: list[str]) -> None: nix.copy_closure( path_to_config, to_host=target_host, - from_host=None, + from_host=build_host, **copy_flags, ) nix.set_profile( diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 70fc0e7045ea..eeecf9445978 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -342,7 +342,7 @@ def test_execute_nix_switch_flake_build_host( ] ) - assert mock_run.call_count == 5 + assert mock_run.call_count == 6 mock_run.assert_has_calls( [ call( @@ -380,6 +380,16 @@ def test_execute_nix_switch_flake_build_host( stdout=PIPE, **DEFAULT_RUN_KWARGS, ), + call( + [ + "nix-copy-closure", + "--from", + "user@localhost", + config_path, + ], + check=True, + **DEFAULT_RUN_KWARGS, + ), call( [ "nix-env", From 2ac1f78a110332353d1e5b6020c608830d4358bf Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 28 Nov 2024 20:07:35 +0000 Subject: [PATCH 0222/1054] nixos-rebuild-ng: validate NIX_SSHOPTS only once --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 8 ++++++-- .../ni/nixos-rebuild-ng/src/nixos_rebuild/process.py | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index ad4b757878dd..99391ecf0c98 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -139,7 +139,9 @@ def parse_args( Action.SWITCH.value, Action.BOOT.value, ): - parser.error(f"--target-host/--build-host is not supported with '{args.action}'") + parser.error( + f"--target-host/--build-host is not supported with '{args.action}'" + ) if args.flake and (args.file or args.attr): parser.error("--flake cannot be used with --file or --attr") @@ -166,7 +168,9 @@ def execute(argv: list[str]) -> None: atexit.register(cleanup_ssh, tmpdir_path) profile = Profile.from_arg(args.profile_name) - build_host = Remote.from_arg(args.build_host, False, tmpdir_path) + build_host = Remote.from_arg( + args.build_host, False, tmpdir_path, validate_opts=False + ) target_host = Remote.from_arg(args.target_host, args.ask_sudo_password, tmpdir_path) build_attr = BuildAttr.from_arg(args.attr, args.file) flake = Flake.from_arg(args.flake, target_host) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index 05d2840529a1..6fa5be980c16 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -22,12 +22,14 @@ class Remote: host: str | None, ask_sudo_password: bool | None, tmp_dir: Path, + validate_opts: bool = True, ) -> Self | None: if not host: return None opts = os.getenv("NIX_SSHOPTS", "").split() - cls._validate_opts(opts, ask_sudo_password) + if validate_opts: + cls._validate_opts(opts, ask_sudo_password) opts += [ # SSH ControlMaster flags, allow for faster re-connection "-o", From 29e9b42022b6cf20b2ca7bc0b6b841c51428fc96 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 29 Nov 2024 10:14:43 +0000 Subject: [PATCH 0223/1054] nixos-rebuild-ng: fix --build-host and --target-host case --- .../by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 9 ++++++++- pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py | 5 +++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 11d13502e13c..317c04467a5d 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -46,7 +46,14 @@ def copy_closure( host.host, closure, ], - extra_env={"NIX_SSHOPTS": " ".join(host.opts)}, + extra_env={ + # for the remote to remote case, we can't use host.opts because it + # includes the ControlPane opts that will not work in the remote, + # because the temporary directory that we created will not exist + "NIX_SSHOPTS": os.environ.get("NIX_SSHOPTS", "") + if from_host and to_host + else " ".join(host.opts) + }, remote=from_host if to_host else None, ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 5a5ee01cb974..712bd09b8704 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -13,7 +13,7 @@ from .helpers import get_qualified_name @patch(get_qualified_name(n.run_wrapper, n), autospec=True) -def test_copy_closure(mock_run: Any) -> None: +def test_copy_closure(mock_run: Any, monkeypatch: Any) -> None: closure = Path("/path/to/closure") n.copy_closure(closure, None) mock_run.assert_not_called() @@ -35,11 +35,12 @@ def test_copy_closure(mock_run: Any) -> None: remote=None, ) + monkeypatch.setenv("NIX_SSHOPTS", "--ssh build-target-opt") n.copy_closure(closure, target_host, build_host) mock_run.assert_called_with( ["nix-copy-closure", "--to", "user@target.host", closure], - extra_env={"NIX_SSHOPTS": "--ssh target-opt"}, remote=build_host, + extra_env={"NIX_SSHOPTS": "--ssh build-target-opt"}, ) From c859df048f77690fdf8e1fab5c45513423596af8 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 29 Nov 2024 11:07:44 +0000 Subject: [PATCH 0224/1054] nixos-rebuild-ng: refactor classic Nix to simplify logic --- .../src/nixos_rebuild/__init__.py | 6 +++--- .../ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 4 ++-- .../ni/nixos-rebuild-ng/src/tests/test_main.py | 2 +- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 15 +++++++++++---- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 99391ecf0c98..0ee3c6db0fd7 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -217,7 +217,7 @@ def execute(argv: list[str]) -> None: else: if build_host: path_to_config = nix.nixos_remote_build( - "system", + "toplevel", build_attr, build_host, instantiate_flags=common_flags, @@ -226,7 +226,7 @@ def execute(argv: list[str]) -> None: ) else: path_to_config = nix.nixos_build( - "system", + "toplevel", build_attr, no_out_link=True, **build_flags, @@ -275,7 +275,7 @@ def execute(argv: list[str]) -> None: ) else: path_to_config = nix.nixos_build( - "system", + "toplevel", build_attr, dry_run=dry_run, **build_flags, diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 317c04467a5d..a48dc18d9bf2 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -261,7 +261,7 @@ def nixos_build( "nix-build", build_attr.path, "--attr", - f"{'.'.join(x for x in [build_attr.attr, attr] if x)}", + f"{build_attr.attr + '.' if build_attr.attr else ''}config.system.build.{attr}", *dict_to_flags(build_flags), ] r = run_wrapper(run_args, stdout=PIPE) @@ -303,7 +303,7 @@ def nixos_remote_build( "--raw", build_attr.path, "--attr", - f"{'.'.join(x for x in [build_attr.attr, attr] if x)}", + f"{build_attr.attr + '.' if build_attr.attr else ''}config.system.build.{attr}", *dict_to_flags(instantiate_flags or {}), ], stdout=PIPE, diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index eeecf9445978..b5c93a2dd217 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -122,7 +122,7 @@ def test_execute_nix_boot(mock_run: Any, tmp_path: Path) -> None: "nix-build", "", "--attr", - "system", + "config.system.build.toplevel", "--no-out-link", "-vvv", ], diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 712bd09b8704..dce98cf6b939 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -251,7 +251,14 @@ def test_nixos_build(mock_run: Any, monkeypatch: Any) -> None: "attr", m.BuildAttr("", None), nix_flag="foo" ) == Path("/path/to/file") mock_run.assert_called_with( - ["nix-build", "", "--attr", "attr", "--nix-flag", "foo"], + [ + "nix-build", + "", + "--attr", + "config.system.build.attr", + "--nix-flag", + "foo", + ], stdout=PIPE, ) @@ -259,7 +266,7 @@ def test_nixos_build(mock_run: Any, monkeypatch: Any) -> None: "/path/to/file" ) mock_run.assert_called_with( - ["nix-build", Path("file"), "--attr", "preAttr.attr"], + ["nix-build", Path("file"), "--attr", "preAttr.config.system.build.attr"], stdout=PIPE, ) @@ -332,7 +339,7 @@ def test_nixos_remote_build(mock_run: Any, monkeypatch: Any) -> None: build_host = m.Remote("user@host", ["--ssh", "opts"], None) assert n.nixos_remote_build( "attr", - m.BuildAttr("", None), + m.BuildAttr("", "preAttr"), build_host, build_flags={"build": True}, instantiate_flags={"inst": True}, @@ -346,7 +353,7 @@ def test_nixos_remote_build(mock_run: Any, monkeypatch: Any) -> None: "--raw", "", "--attr", - "attr", + "preAttr.config.system.build.attr", "--inst", ], stdout=PIPE, From 359d3415359066c2200013cde0ee672c8ac7a569 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 29 Nov 2024 11:22:00 +0000 Subject: [PATCH 0225/1054] nixos-rebuild-ng: add {BuildAttr,Flake}.to_attr() --- .../src/nixos_rebuild/models.py | 6 ++++++ .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 8 ++++---- .../nixos-rebuild-ng/src/tests/test_models.py | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py index ffd8c5bde454..47ce0f5ca91d 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py @@ -48,6 +48,9 @@ class BuildAttr: path: str | Path attr: str | None + def to_attr(self, *attrs: str) -> str: + return f"{self.attr + '.' if self.attr else ''}{".".join(attrs)}" + @classmethod def from_arg(cls, attr: str | None, file: str | None) -> Self: if not (attr or file): @@ -61,6 +64,9 @@ class Flake: attr: str _re: ClassVar = re.compile(r"^(?P[^\#]*)\#?(?P[^\#\"]*)$") + def to_attr(self, *attrs: str) -> str: + return f"{self}.{".".join(attrs)}" + @override def __str__(self) -> str: return f"{self.path}#{self.attr}" diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index a48dc18d9bf2..7a42645d904b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -261,7 +261,7 @@ def nixos_build( "nix-build", build_attr.path, "--attr", - f"{build_attr.attr + '.' if build_attr.attr else ''}config.system.build.{attr}", + build_attr.to_attr("config", "system", "build", attr), *dict_to_flags(build_flags), ] r = run_wrapper(run_args, stdout=PIPE) @@ -282,7 +282,7 @@ def nixos_build_flake( *FLAKE_FLAGS, "build", "--print-out-paths", - f"{flake}.config.system.build.{attr}", + flake.to_attr("config", "system", "build", attr), *dict_to_flags(flake_build_flags), ] r = run_wrapper(run_args, stdout=PIPE) @@ -303,7 +303,7 @@ def nixos_remote_build( "--raw", build_attr.path, "--attr", - f"{build_attr.attr + '.' if build_attr.attr else ''}config.system.build.{attr}", + build_attr.to_attr("config", "system", "build", attr), *dict_to_flags(instantiate_flags or {}), ], stdout=PIPE, @@ -332,7 +332,7 @@ def nixos_remote_build_flake( *FLAKE_FLAGS, "eval", "--raw", - f"{flake}.config.system.build.{attr}.drvPath", + flake.to_attr("config", "system", "build", attr, "drvPath"), *dict_to_flags(flake_build_flags or {}), ], stdout=PIPE, diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index baeb5977b84f..4da2d6ed7356 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -20,6 +20,16 @@ def test_build_attr_from_arg() -> None: assert m.BuildAttr.from_arg(None, "file.nix") == m.BuildAttr(Path("file.nix"), None) +def test_build_attr_to_attr() -> None: + assert ( + m.BuildAttr("", None).to_attr("attr1", "attr2") == "attr1.attr2" + ) + assert ( + m.BuildAttr("", "preAttr").to_attr("attr1", "attr2") + == "preAttr.attr1.attr2" + ) + + def test_flake_parse() -> None: assert m.Flake.parse("/path/to/flake#attr") == m.Flake( Path("/path/to/flake"), "nixosConfigurations.attr" @@ -35,6 +45,15 @@ def test_flake_parse() -> None: assert m.Flake.parse(".") == m.Flake(Path("."), "nixosConfigurations.default") +def test_flake_to_attr() -> None: + assert ( + m.Flake(Path("/path/to/flake"), "nixosConfigurations.preAttr").to_attr( + "attr1", "attr2" + ) + == "/path/to/flake#nixosConfigurations.preAttr.attr1.attr2" + ) + + @patch(get_qualified_name(platform.node), autospec=True) def test_flake_from_arg(mock_node: Any) -> None: mock_node.return_value = "hostname" From 3cadcd1653e49a2b9a96ebb4a79bef513cfbe248 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 29 Nov 2024 11:36:39 +0000 Subject: [PATCH 0226/1054] nixos-rebuild-ng: make build functions more generic --- .../src/nixos_rebuild/__init__.py | 34 +- .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 212 +++++------ .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 334 +++++++++--------- 3 files changed, 291 insertions(+), 289 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 0ee3c6db0fd7..ec10db85fcc5 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -194,13 +194,14 @@ def execute(argv: list[str]) -> None: match action: case Action.SWITCH | Action.BOOT: logger.info("building the system configuration...") + attr = "config.system.build.toplevel" if args.rollback: path_to_config = nix.rollback(profile, target_host, sudo=args.sudo) else: if flake: if build_host: - path_to_config = nix.nixos_remote_build_flake( - "toplevel", + path_to_config = nix.remote_build_flake( + attr, flake, build_host, flake_build_flags=flake_build_flags, @@ -208,16 +209,16 @@ def execute(argv: list[str]) -> None: build_flags=build_flags, ) else: - path_to_config = nix.nixos_build_flake( - "toplevel", + path_to_config = nix.build_flake( + attr, flake, no_link=True, **flake_build_flags, ) else: if build_host: - path_to_config = nix.nixos_remote_build( - "toplevel", + path_to_config = nix.remote_build( + attr, build_attr, build_host, instantiate_flags=common_flags, @@ -225,8 +226,8 @@ def execute(argv: list[str]) -> None: build_flags=build_flags, ) else: - path_to_config = nix.nixos_build( - "toplevel", + path_to_config = nix.build( + attr, build_attr, no_out_link=True, **build_flags, @@ -253,6 +254,7 @@ def execute(argv: list[str]) -> None: ) case Action.TEST | Action.BUILD | Action.DRY_BUILD | Action.DRY_ACTIVATE: logger.info("building the system configuration...") + attr = "config.system.build.toplevel" dry_run = action == Action.DRY_BUILD if args.rollback: if action not in (Action.TEST, Action.BUILD): @@ -267,15 +269,15 @@ def execute(argv: list[str]) -> None: else: raise NRError("could not find previous generation") elif flake: - path_to_config = nix.nixos_build_flake( - "toplevel", + path_to_config = nix.build_flake( + attr, flake, dry_run=dry_run, **flake_build_flags, ) else: - path_to_config = nix.nixos_build( - "toplevel", + path_to_config = nix.build( + attr, build_attr, dry_run=dry_run, **build_flags, @@ -292,14 +294,14 @@ def execute(argv: list[str]) -> None: logger.info("building the system configuration...") attr = "vm" if action == Action.BUILD_VM else "vmWithBootLoader" if flake: - path_to_config = nix.nixos_build_flake( - attr, + path_to_config = nix.build_flake( + f"config.system.build.{attr}", flake, **flake_build_flags, ) else: - path_to_config = nix.nixos_build( - attr, + path_to_config = nix.build( + f"config.system.build.{attr}", build_attr, **build_flags, ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 7a42645d904b..ccf927a5e59f 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -25,6 +25,112 @@ FLAKE_REPL_TEMPLATE: Final = "repl.template.nix" logger = logging.getLogger(__name__) +def build( + attr: str, + build_attr: BuildAttr, + **build_flags: Args, +) -> Path: + """Build NixOS attribute using classic Nix. + + Returns the built attribute as path. + """ + run_args = [ + "nix-build", + build_attr.path, + "--attr", + build_attr.to_attr(attr), + *dict_to_flags(build_flags), + ] + r = run_wrapper(run_args, stdout=PIPE) + return Path(r.stdout.strip()) + + +def build_flake( + attr: str, + flake: Flake, + **flake_build_flags: Args, +) -> Path: + """Build NixOS attribute using Flakes. + + Returns the built attribute as path. + """ + run_args = [ + "nix", + *FLAKE_FLAGS, + "build", + "--print-out-paths", + flake.to_attr(attr), + *dict_to_flags(flake_build_flags), + ] + r = run_wrapper(run_args, stdout=PIPE) + return Path(r.stdout.strip()) + + +def remote_build( + attr: str, + build_attr: BuildAttr, + build_host: Remote | None, + build_flags: dict[str, Args] | None = None, + instantiate_flags: dict[str, Args] | None = None, + copy_flags: dict[str, Args] | None = None, +) -> Path: + r = run_wrapper( + [ + "nix-instantiate", + "--raw", + build_attr.path, + "--attr", + build_attr.to_attr(attr), + *dict_to_flags(instantiate_flags or {}), + ], + stdout=PIPE, + ) + drv = Path(r.stdout.strip()) + copy_closure(drv, to_host=build_host, from_host=None, **(copy_flags or {})) + r = run_wrapper( + ["nix-store", "--realise", drv, *dict_to_flags(build_flags or {})], + remote=build_host, + stdout=PIPE, + ) + return Path(r.stdout.strip()) + + +def remote_build_flake( + attr: str, + flake: Flake, + build_host: Remote, + flake_build_flags: dict[str, Args] | None = None, + copy_flags: dict[str, Args] | None = None, + build_flags: dict[str, Args] | None = None, +) -> Path: + r = run_wrapper( + [ + "nix", + *FLAKE_FLAGS, + "eval", + "--raw", + flake.to_attr(attr, "drvPath"), + *dict_to_flags(flake_build_flags or {}), + ], + stdout=PIPE, + ) + drv = Path(r.stdout.strip()) + copy_closure(drv, to_host=build_host, from_host=None, **(copy_flags or {})) + r = run_wrapper( + [ + "nix", + *FLAKE_FLAGS, + "build", + f"{drv}^*", + "--print-out-paths", + *dict_to_flags(build_flags or {}), + ], + remote=build_host, + stdout=PIPE, + ) + return Path(r.stdout.strip()) + + def copy_closure( closure: Path, to_host: Remote | None, @@ -248,112 +354,6 @@ def list_generations(profile: Profile) -> list[GenerationJson]: return result -def nixos_build( - attr: str, - build_attr: BuildAttr, - **build_flags: Args, -) -> Path: - """Build NixOS attribute using classic Nix. - - Returns the built attribute as path. - """ - run_args = [ - "nix-build", - build_attr.path, - "--attr", - build_attr.to_attr("config", "system", "build", attr), - *dict_to_flags(build_flags), - ] - r = run_wrapper(run_args, stdout=PIPE) - return Path(r.stdout.strip()) - - -def nixos_build_flake( - attr: str, - flake: Flake, - **flake_build_flags: Args, -) -> Path: - """Build NixOS attribute using Flakes. - - Returns the built attribute as path. - """ - run_args = [ - "nix", - *FLAKE_FLAGS, - "build", - "--print-out-paths", - flake.to_attr("config", "system", "build", attr), - *dict_to_flags(flake_build_flags), - ] - r = run_wrapper(run_args, stdout=PIPE) - return Path(r.stdout.strip()) - - -def nixos_remote_build( - attr: str, - build_attr: BuildAttr, - build_host: Remote | None, - build_flags: dict[str, Args] | None = None, - instantiate_flags: dict[str, Args] | None = None, - copy_flags: dict[str, Args] | None = None, -) -> Path: - r = run_wrapper( - [ - "nix-instantiate", - "--raw", - build_attr.path, - "--attr", - build_attr.to_attr("config", "system", "build", attr), - *dict_to_flags(instantiate_flags or {}), - ], - stdout=PIPE, - ) - drv = Path(r.stdout.strip()) - copy_closure(drv, to_host=build_host, from_host=None, **(copy_flags or {})) - r = run_wrapper( - ["nix-store", "--realise", drv, *dict_to_flags(build_flags or {})], - remote=build_host, - stdout=PIPE, - ) - return Path(r.stdout.strip()) - - -def nixos_remote_build_flake( - attr: str, - flake: Flake, - build_host: Remote, - flake_build_flags: dict[str, Args] | None = None, - copy_flags: dict[str, Args] | None = None, - build_flags: dict[str, Args] | None = None, -) -> Path: - r = run_wrapper( - [ - "nix", - *FLAKE_FLAGS, - "eval", - "--raw", - flake.to_attr("config", "system", "build", attr, "drvPath"), - *dict_to_flags(flake_build_flags or {}), - ], - stdout=PIPE, - ) - drv = Path(r.stdout.strip()) - copy_closure(drv, to_host=build_host, from_host=None, **(copy_flags or {})) - r = run_wrapper( - [ - "nix", - *FLAKE_FLAGS, - "build", - f"{drv}^*", - "--print-out-paths", - *dict_to_flags(build_flags or {}), - ], - remote=build_host, - stdout=PIPE, - ) - return Path(r.stdout.strip()) - - def repl(attr: str, build_attr: BuildAttr, **nix_flags: Args) -> None: run_args = ["nix", "repl", "--file", build_attr.path] if build_attr.attr: diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index dce98cf6b939..317821d5fea0 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -12,6 +12,173 @@ import nixos_rebuild.nix as n from .helpers import get_qualified_name +@patch( + get_qualified_name(n.run_wrapper, n), + autospec=True, + return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), +) +def test_build(mock_run: Any, monkeypatch: Any) -> None: + assert n.build( + "config.system.build.attr", m.BuildAttr("", None), nix_flag="foo" + ) == Path("/path/to/file") + mock_run.assert_called_with( + [ + "nix-build", + "", + "--attr", + "config.system.build.attr", + "--nix-flag", + "foo", + ], + stdout=PIPE, + ) + + assert n.build( + "config.system.build.attr", m.BuildAttr(Path("file"), "preAttr") + ) == Path("/path/to/file") + mock_run.assert_called_with( + ["nix-build", Path("file"), "--attr", "preAttr.config.system.build.attr"], + stdout=PIPE, + ) + + +@patch( + get_qualified_name(n.run_wrapper, n), + autospec=True, + return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), +) +def test_build_flake(mock_run: Any) -> None: + flake = m.Flake.parse(".#hostname") + + assert n.build_flake( + "config.system.build.toplevel", + flake, + no_link=True, + nix_flag="foo", + ) == Path("/path/to/file") + mock_run.assert_called_with( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "--print-out-paths", + ".#nixosConfigurations.hostname.config.system.build.toplevel", + "--no-link", + "--nix-flag", + "foo", + ], + stdout=PIPE, + ) + + +@patch( + get_qualified_name(n.run_wrapper, n), + autospec=True, + return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), +) +def test_remote_build(mock_run: Any, monkeypatch: Any) -> None: + build_host = m.Remote("user@host", ["--ssh", "opts"], None) + assert n.remote_build( + "config.system.build.toplevel", + m.BuildAttr("", "preAttr"), + build_host, + build_flags={"build": True}, + instantiate_flags={"inst": True}, + copy_flags={"copy": True}, + ) == Path("/path/to/file") + mock_run.assert_has_calls( + [ + call( + [ + "nix-instantiate", + "--raw", + "", + "--attr", + "preAttr.config.system.build.toplevel", + "--inst", + ], + stdout=PIPE, + ), + call( + [ + "nix-copy-closure", + "--copy", + "--to", + "user@host", + Path("/path/to/file"), + ], + extra_env={"NIX_SSHOPTS": "--ssh opts"}, + remote=None, + ), + call( + ["nix-store", "--realise", Path("/path/to/file"), "--build"], + remote=build_host, + stdout=PIPE, + ), + ] + ) + + +@patch( + get_qualified_name(n.run_wrapper, n), + autospec=True, + return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), +) +def test_remote_build_flake(mock_run: Any) -> None: + flake = m.Flake.parse(".#hostname") + build_host = m.Remote("user@host", ["--ssh", "opts"], None) + + assert n.remote_build_flake( + "config.system.build.toplevel", + flake, + build_host, + flake_build_flags={"flake": True}, + copy_flags={"copy": True}, + build_flags={"build": True}, + ) == Path("/path/to/file") + mock_run.assert_has_calls( + [ + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "eval", + "--raw", + ".#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", + "--flake", + ], + stdout=PIPE, + ), + call( + [ + "nix-copy-closure", + "--copy", + "--to", + "user@host", + Path("/path/to/file"), + ], + extra_env={"NIX_SSHOPTS": "--ssh opts"}, + remote=None, + ), + call( + [ + "nix", + "--extra-experimental-features", + "nix-command flakes", + "build", + "/path/to/file^*", + "--print-out-paths", + "--build", + ], + remote=build_host, + stdout=PIPE, + ), + ] + ) + + @patch(get_qualified_name(n.run_wrapper, n), autospec=True) def test_copy_closure(mock_run: Any, monkeypatch: Any) -> None: closure = Path("/path/to/closure") @@ -211,173 +378,6 @@ def test_list_generations(mock_get_generations: Any, tmp_path: Path) -> None: ] -@patch( - get_qualified_name(n.run_wrapper, n), - autospec=True, - return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), -) -def test_nixos_build_flake(mock_run: Any) -> None: - flake = m.Flake.parse(".#hostname") - - assert n.nixos_build_flake( - "toplevel", - flake, - no_link=True, - nix_flag="foo", - ) == Path("/path/to/file") - mock_run.assert_called_with( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "--print-out-paths", - ".#nixosConfigurations.hostname.config.system.build.toplevel", - "--no-link", - "--nix-flag", - "foo", - ], - stdout=PIPE, - ) - - -@patch( - get_qualified_name(n.run_wrapper, n), - autospec=True, - return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), -) -def test_nixos_build(mock_run: Any, monkeypatch: Any) -> None: - assert n.nixos_build( - "attr", m.BuildAttr("", None), nix_flag="foo" - ) == Path("/path/to/file") - mock_run.assert_called_with( - [ - "nix-build", - "", - "--attr", - "config.system.build.attr", - "--nix-flag", - "foo", - ], - stdout=PIPE, - ) - - assert n.nixos_build("attr", m.BuildAttr(Path("file"), "preAttr")) == Path( - "/path/to/file" - ) - mock_run.assert_called_with( - ["nix-build", Path("file"), "--attr", "preAttr.config.system.build.attr"], - stdout=PIPE, - ) - - -@patch( - get_qualified_name(n.run_wrapper, n), - autospec=True, - return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), -) -def test_nixos_remote_build_flake(mock_run: Any) -> None: - flake = m.Flake.parse(".#hostname") - build_host = m.Remote("user@host", ["--ssh", "opts"], None) - - assert n.nixos_remote_build_flake( - "toplevel", - flake, - build_host, - flake_build_flags={"flake": True}, - copy_flags={"copy": True}, - build_flags={"build": True}, - ) == Path("/path/to/file") - mock_run.assert_has_calls( - [ - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "eval", - "--raw", - ".#nixosConfigurations.hostname.config.system.build.toplevel.drvPath", - "--flake", - ], - stdout=PIPE, - ), - call( - [ - "nix-copy-closure", - "--copy", - "--to", - "user@host", - Path("/path/to/file"), - ], - extra_env={"NIX_SSHOPTS": "--ssh opts"}, - remote=None, - ), - call( - [ - "nix", - "--extra-experimental-features", - "nix-command flakes", - "build", - "/path/to/file^*", - "--print-out-paths", - "--build", - ], - remote=build_host, - stdout=PIPE, - ), - ] - ) - - -@patch( - get_qualified_name(n.run_wrapper, n), - autospec=True, - return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), -) -def test_nixos_remote_build(mock_run: Any, monkeypatch: Any) -> None: - build_host = m.Remote("user@host", ["--ssh", "opts"], None) - assert n.nixos_remote_build( - "attr", - m.BuildAttr("", "preAttr"), - build_host, - build_flags={"build": True}, - instantiate_flags={"inst": True}, - copy_flags={"copy": True}, - ) == Path("/path/to/file") - mock_run.assert_has_calls( - [ - call( - [ - "nix-instantiate", - "--raw", - "", - "--attr", - "preAttr.config.system.build.attr", - "--inst", - ], - stdout=PIPE, - ), - call( - [ - "nix-copy-closure", - "--copy", - "--to", - "user@host", - Path("/path/to/file"), - ], - extra_env={"NIX_SSHOPTS": "--ssh opts"}, - remote=None, - ), - call( - ["nix-store", "--realise", Path("/path/to/file"), "--build"], - remote=build_host, - stdout=PIPE, - ), - ] - ) - - @patch(get_qualified_name(n.run_wrapper, n), autospec=True) def test_repl(mock_run: Any) -> None: n.repl("attr", m.BuildAttr("", None), nix_flag=True) From 3fd384af80c6be1c7159acbacb4ccefce3b1c1e6 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 29 Nov 2024 12:49:09 +0000 Subject: [PATCH 0227/1054] nixos-rebuild-ng: implement _NIXOS_REBUILD_REEXEC --- pkgs/by-name/ni/nixos-rebuild-ng/README.md | 10 +------ .../src/nixos_rebuild/__init__.py | 30 ++++++++++++++++--- .../nixos-rebuild-ng/src/tests/test_main.py | 17 +++++------ 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/README.md b/pkgs/by-name/ni/nixos-rebuild-ng/README.md index c52d1c06d920..9a565de2dd18 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/README.md +++ b/pkgs/by-name/ni/nixos-rebuild-ng/README.md @@ -91,14 +91,6 @@ ruff format . conflicting with the current `nixos-rebuild`. This means you can keep both in your system at the same time, but it also means that a few things like bash completion are broken right now (since it looks at `nixos-rebuild` binary) -- `_NIXOS_REBUILD_EXEC` is **not** implemented yet, so different from - `nixos-rebuild`, this will use the current version of `nixos-rebuild-ng` in - your `PATH` to build/set profile/switch, while `nixos-rebuild` builds the new - version (the one that will be switched) and re-exec to it instead. This means - that in case of bugs in `nixos-rebuild-ng`, the only way that you will get - them fixed is **after** you switch to a new version -- Ignore any performance advantages of the rewrite right now, because of the 2 - caveats above - Bugs in the profile manipulation can cause corruption of your profile that may be difficult to fix, so right now I only recommend using `nixos-rebuild-ng` if you are testing in a VM or in a filesystem with @@ -111,7 +103,7 @@ ruff format . - [x] Remote host/builders (via SSH) - [x] Improve nix arguments handling (e.g.: `nixFlags` vs `copyFlags` in the old `nixos-rebuild`) -- [ ] `_NIXOS_REBUILD_EXEC` +- [x] `_NIXOS_REBUILD_REEXEC` - [ ] Port `nixos-rebuild.passthru.tests` - [ ] Change module system to allow easier opt-in, like `system.switch.enableNg` for `switch-to-configuration-ng` diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index ec10db85fcc5..71e630262608 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -2,6 +2,7 @@ import argparse import atexit import json import logging +import os import sys from pathlib import Path from subprocess import run @@ -87,6 +88,7 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa main_parser.add_argument("--ask-sudo-password", action="store_true") main_parser.add_argument("--use-remote-sudo", action="store_true") # deprecated main_parser.add_argument("--no-ssh-tty", action="store_true") # deprecated + main_parser.add_argument("--fast", action="store_true") main_parser.add_argument("--build-host") main_parser.add_argument("--target-host") main_parser.add_argument("action", choices=Action.values(), nargs="?") @@ -174,10 +176,6 @@ def execute(argv: list[str]) -> None: target_host = Remote.from_arg(args.target_host, args.ask_sudo_password, tmpdir_path) build_attr = BuildAttr.from_arg(args.attr, args.file) flake = Flake.from_arg(args.flake, target_host) - - if args.upgrade or args.upgrade_all: - nix.upgrade_channels(bool(args.upgrade_all)) - action = Action(args.action) # Only run shell scripts from the Nixpkgs tree if the action is # "switch", "boot", or "test". With other actions (such as "build"), @@ -185,6 +183,30 @@ def execute(argv: list[str]) -> None: # executed, so it's safe to run nixos-rebuild against a potentially # untrusted tree. can_run = action in (Action.SWITCH, Action.BOOT, Action.TEST) + + # Re-exec to a newer version of the script before building to ensure we get + # the latest fixes + if can_run and not args.fast and not os.environ.get("_NIXOS_REBUILD_REEXEC"): + if flake: + drv = nix.build_flake("pkgs.nixos-rebuild-ng", flake, **flake_build_flags) + else: + drv = nix.build("pkgs.nixos-rebuild-ng", build_attr, **build_flags) + new = drv / "bin/nixos-rebuild-ng" + current = Path(argv[0]) + # Disable re-exec during development + if current.name != "__main__.py" and new != current: + logging.debug( + "detected newer version of script, re-exec'ing, current=%s, new=%s", + argv[0], + new, + ) + cleanup_ssh(tmpdir_path) + tmpdir.cleanup() + os.execve(new, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"}) + + if args.upgrade or args.upgrade_all: + nix.upgrade_channels(bool(args.upgrade_all)) + if can_run and not flake: nixpkgs_path = nix.find_file("nixpkgs", **build_flags) rev = nix.get_nixpkgs_rev(nixpkgs_path) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index b5c93a2dd217..d647f78460b3 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -95,7 +95,7 @@ def test_execute_nix_boot(mock_run: Any, tmp_path: Path) -> None: CompletedProcess([], 0), ] - nr.execute(["nixos-rebuild", "boot", "--no-flake", "-vvv"]) + nr.execute(["nixos-rebuild", "boot", "--no-flake", "-vvv", "--fast"]) assert mock_run.call_count == 6 mock_run.assert_has_calls( @@ -173,6 +173,7 @@ def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: "--install-bootloader", "--sudo", "--verbose", + "--fast", ] ) @@ -246,6 +247,7 @@ def test_execute_nix_switch_flake_target_host( "--use-remote-sudo", "--target-host", "user@localhost", + "--fast", ] ) @@ -339,6 +341,7 @@ def test_execute_nix_switch_flake_build_host( "/path/to/config#hostname", "--build-host", "user@localhost", + "--fast", ] ) @@ -415,7 +418,9 @@ def test_execute_switch_rollback(mock_run: Any, tmp_path: Path) -> None: nixpkgs_path = tmp_path / "nixpkgs" nixpkgs_path.touch() - nr.execute(["nixos-rebuild", "switch", "--rollback", "--install-bootloader"]) + nr.execute( + ["nixos-rebuild", "switch", "--rollback", "--install-bootloader", "--fast"] + ) assert mock_run.call_count >= 2 # ignoring update_nixpkgs_rev calls @@ -467,13 +472,7 @@ def test_execute_test_rollback( ] nr.execute( - [ - "nixos-rebuild", - "test", - "--rollback", - "--profile-name", - "foo", - ] + ["nixos-rebuild", "test", "--rollback", "--profile-name", "foo", "--fast"] ) assert mock_run.call_count == 2 From 776c21be0fc89962e04a0b44dd65ec2ef6d5adc5 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 29 Nov 2024 13:06:51 +0000 Subject: [PATCH 0228/1054] nixos-rebuild-ng: fix cleanup_ssh --- .../src/nixos_rebuild/process.py | 4 +++- .../src/tests/test_process.py | 24 ++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index 6fa5be980c16..1c118d48b850 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -69,7 +69,9 @@ class RunKwargs(TypedDict, total=False): def cleanup_ssh(tmp_dir: Path) -> None: "Close SSH ControlMaster connection." for ctrl in tmp_dir.glob("ssh-*"): - subprocess.run(["ssh", "-o", f"ControlPath={ctrl}", "exit"], check=False) + subprocess.run( + ["ssh", "-o", f"ControlPath={ctrl}", "-O", "exit", "dummyhost"], check=False + ) def run_wrapper( diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py index 57d3865bcef4..998ad5dedc83 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py @@ -1,6 +1,6 @@ from pathlib import Path from typing import Any -from unittest.mock import patch +from unittest.mock import call, patch import nixos_rebuild.models as m import nixos_rebuild.process as p @@ -8,6 +8,28 @@ import nixos_rebuild.process as p from .helpers import get_qualified_name +@patch(get_qualified_name(p.subprocess.run)) +def test_cleanup_ssh(mock_run: Any, tmp_path: Path) -> None: + (tmp_path / "ssh-conn").touch() + + p.cleanup_ssh(tmp_path) + mock_run.assert_has_calls( + [ + call( + [ + "ssh", + "-o", + f"ControlPath={tmp_path}/ssh-conn", + "-O", + "exit", + "dummyhost", + ], + check=False, + ) + ] + ) + + @patch(get_qualified_name(p.subprocess.run)) def test_run(mock_run: Any) -> None: p.run_wrapper(["test", "--with", "flags"], check=True) From fed6778da3a41b30973b054ada0daf9d2b1d334a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 29 Nov 2024 20:04:38 +0000 Subject: [PATCH 0229/1054] nixos-rebuild-ng: move temporary directory to process --- .../src/nixos_rebuild/__init__.py | 15 ++-- .../src/nixos_rebuild/process.py | 28 ++++---- .../nixos-rebuild-ng/src/tests/test_main.py | 31 ++------- .../src/tests/test_process.py | 68 +++++-------------- 4 files changed, 45 insertions(+), 97 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 71e630262608..f0bbabdb66ab 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -6,7 +6,6 @@ import os import sys from pathlib import Path from subprocess import run -from tempfile import TemporaryDirectory from typing import assert_never from . import nix @@ -164,16 +163,11 @@ def execute(argv: list[str]) -> None: flake_build_flags = common_build_flags | vars(args_groups["flake_build_flags"]) copy_flags = common_flags | vars(args_groups["copy_flags"]) - # Will be cleaned up on exit automatically. - tmpdir = TemporaryDirectory(prefix="nixos-rebuild.") - tmpdir_path = Path(tmpdir.name) - atexit.register(cleanup_ssh, tmpdir_path) + atexit.register(cleanup_ssh) profile = Profile.from_arg(args.profile_name) - build_host = Remote.from_arg( - args.build_host, False, tmpdir_path, validate_opts=False - ) - target_host = Remote.from_arg(args.target_host, args.ask_sudo_password, tmpdir_path) + build_host = Remote.from_arg(args.build_host, False, validate_opts=False) + target_host = Remote.from_arg(args.target_host, args.ask_sudo_password) build_attr = BuildAttr.from_arg(args.attr, args.file) flake = Flake.from_arg(args.flake, target_host) action = Action(args.action) @@ -200,8 +194,7 @@ def execute(argv: list[str]) -> None: argv[0], new, ) - cleanup_ssh(tmpdir_path) - tmpdir.cleanup() + cleanup_ssh() os.execve(new, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"}) if args.upgrade or args.upgrade_all: diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index 1c118d48b850..54200f14d85a 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -5,10 +5,22 @@ import subprocess from dataclasses import dataclass from getpass import getpass from pathlib import Path +from tempfile import TemporaryDirectory from typing import Self, Sequence, TypedDict, Unpack logger = logging.getLogger(__name__) +TMPDIR = TemporaryDirectory(prefix="nixos-rebuild.") +TMPDIR_PATH = Path(TMPDIR.name) +SSH_DEFAULT_OPTS = [ + "-o", + "ControlMaster=auto", + "-o", + f"ControlPath={TMPDIR_PATH / "ssh-%n"}", + "-o", + "ControlPersist=60", +] + @dataclass(frozen=True) class Remote: @@ -21,7 +33,6 @@ class Remote: cls, host: str | None, ask_sudo_password: bool | None, - tmp_dir: Path, validate_opts: bool = True, ) -> Self | None: if not host: @@ -30,15 +41,6 @@ class Remote: opts = os.getenv("NIX_SSHOPTS", "").split() if validate_opts: cls._validate_opts(opts, ask_sudo_password) - opts += [ - # SSH ControlMaster flags, allow for faster re-connection - "-o", - "ControlMaster=auto", - "-o", - f"ControlPath={tmp_dir / "ssh-%n"}", - "-o", - "ControlPersist=60", - ] sudo_password = None if ask_sudo_password: sudo_password = getpass(f"[sudo] password for {host}: ") @@ -66,12 +68,13 @@ class RunKwargs(TypedDict, total=False): stdout: int | None -def cleanup_ssh(tmp_dir: Path) -> None: +def cleanup_ssh() -> None: "Close SSH ControlMaster connection." - for ctrl in tmp_dir.glob("ssh-*"): + for ctrl in TMPDIR_PATH.glob("ssh-*"): subprocess.run( ["ssh", "-o", f"ControlPath={ctrl}", "-O", "exit", "dummyhost"], check=False ) + TMPDIR.cleanup() def run_wrapper( @@ -99,6 +102,7 @@ def run_wrapper( args = [ "ssh", *remote.opts, + *SSH_DEFAULT_OPTS, remote.host, "--", # sadly SSH just join all remaining parameters, expanding glob and diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index d647f78460b3..97ae0072a829 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -218,9 +218,9 @@ def test_execute_nix_switch_flake(mock_run: Any, tmp_path: Path) -> None: @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -@patch(get_qualified_name(nr.TemporaryDirectory, nr)) # can't autospec +@patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) def test_execute_nix_switch_flake_target_host( - mock_tmpdir: Any, + mock_cleanup_ssh: Any, mock_run: Any, tmp_path: Path, ) -> None: @@ -236,7 +236,6 @@ def test_execute_nix_switch_flake_target_host( # switch_to_configuration CompletedProcess([], 0), ] - mock_tmpdir.return_value.name = "/tmp/test" nr.execute( [ @@ -276,12 +275,7 @@ def test_execute_nix_switch_flake_target_host( call( [ "ssh", - "-o", - "ControlMaster=auto", - "-o", - "ControlPath=/tmp/test/ssh-%n", - "-o", - "ControlPersist=60", + *nr.process.SSH_DEFAULT_OPTS, "user@localhost", "--", f"sudo nix-env -p /nix/var/nix/profiles/system --set {config_path}", @@ -292,12 +286,7 @@ def test_execute_nix_switch_flake_target_host( call( [ "ssh", - "-o", - "ControlMaster=auto", - "-o", - "ControlPath=/tmp/test/ssh-%n", - "-o", - "ControlPersist=60", + *nr.process.SSH_DEFAULT_OPTS, "user@localhost", "--", f"sudo env NIXOS_INSTALL_BOOTLOADER=0 {config_path / 'bin/switch-to-configuration'} switch", @@ -311,9 +300,9 @@ def test_execute_nix_switch_flake_target_host( @patch.dict(nr.process.os.environ, {}, clear=True) @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) -@patch(get_qualified_name(nr.TemporaryDirectory, nr)) # can't autospec +@patch(get_qualified_name(nr.cleanup_ssh, nr), autospec=True) def test_execute_nix_switch_flake_build_host( - mock_tmpdir: Any, + mock_cleanup_ssh: Any, mock_run: Any, tmp_path: Path, ) -> None: @@ -331,7 +320,6 @@ def test_execute_nix_switch_flake_build_host( # switch_to_configuration CompletedProcess([], 0), ] - mock_tmpdir.return_value.name = "/tmp/test" nr.execute( [ @@ -369,12 +357,7 @@ def test_execute_nix_switch_flake_build_host( call( [ "ssh", - "-o", - "ControlMaster=auto", - "-o", - "ControlPath=/tmp/test/ssh-%n", - "-o", - "ControlPersist=60", + *nr.process.SSH_DEFAULT_OPTS, "user@localhost", "--", f"nix --extra-experimental-features 'nix-command flakes' build '{config_path}^*' --print-out-paths", diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py index 998ad5dedc83..53ed6824e39f 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py @@ -1,6 +1,5 @@ -from pathlib import Path from typing import Any -from unittest.mock import call, patch +from unittest.mock import patch import nixos_rebuild.models as m import nixos_rebuild.process as p @@ -8,29 +7,7 @@ import nixos_rebuild.process as p from .helpers import get_qualified_name -@patch(get_qualified_name(p.subprocess.run)) -def test_cleanup_ssh(mock_run: Any, tmp_path: Path) -> None: - (tmp_path / "ssh-conn").touch() - - p.cleanup_ssh(tmp_path) - mock_run.assert_has_calls( - [ - call( - [ - "ssh", - "-o", - f"ControlPath={tmp_path}/ssh-conn", - "-O", - "exit", - "dummyhost", - ], - check=False, - ) - ] - ) - - -@patch(get_qualified_name(p.subprocess.run)) +@patch(get_qualified_name(p.subprocess.run), autospec=True) def test_run(mock_run: Any) -> None: p.run_wrapper(["test", "--with", "flags"], check=True) mock_run.assert_called_with( @@ -67,7 +44,15 @@ def test_run(mock_run: Any) -> None: remote=m.Remote("user@localhost", ["--ssh", "opt"], "password"), ) mock_run.assert_called_with( - ["ssh", "--ssh", "opt", "user@localhost", "--", "test --with 'some flags'"], + [ + "ssh", + "--ssh", + "opt", + *p.SSH_DEFAULT_OPTS, + "user@localhost", + "--", + "test --with 'some flags'", + ], check=True, text=True, errors="surrogateescape", @@ -87,6 +72,7 @@ def test_run(mock_run: Any) -> None: "ssh", "--ssh", "opt", + *p.SSH_DEFAULT_OPTS, "user@localhost", "--", "sudo --prompt= --stdin env FOO=bar test --with flags", @@ -99,38 +85,20 @@ def test_run(mock_run: Any) -> None: ) -def test_remote_from_name(monkeypatch: Any, tmpdir: Path) -> None: +def test_remote_from_name(monkeypatch: Any) -> None: monkeypatch.setenv("NIX_SSHOPTS", "") - assert m.Remote.from_arg("user@localhost", None, tmpdir) == m.Remote( + assert m.Remote.from_arg("user@localhost", None, False) == m.Remote( "user@localhost", - opts=[ - "-o", - "ControlMaster=auto", - "-o", - f"ControlPath={tmpdir / "ssh-%n"}", - "-o", - "ControlPersist=60", - ], + opts=[], sudo_password=None, ) # get_qualified_name doesn't work because getpass is aliased to another # function with patch(f"{p.__name__}.getpass", return_value="password"): - monkeypatch.setenv("NIX_SSHOPTS", "-f foo -b bar") - assert m.Remote.from_arg("user@localhost", True, tmpdir) == m.Remote( + monkeypatch.setenv("NIX_SSHOPTS", "-f foo -b bar -t") + assert m.Remote.from_arg("user@localhost", True, True) == m.Remote( "user@localhost", - opts=[ - "-f", - "foo", - "-b", - "bar", - "-o", - "ControlMaster=auto", - "-o", - f"ControlPath={tmpdir / "ssh-%n"}", - "-o", - "ControlPersist=60", - ], + opts=["-f", "foo", "-b", "bar", "-t"], sudo_password="password", ) From 6c3ba91ce46f66c455aa895e8e249bf5ee2a7a3f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 29 Nov 2024 20:18:42 +0000 Subject: [PATCH 0230/1054] nixos-rebuild-ng: rename template file to not trigger CI --- pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 2 +- .../src/nixos_rebuild/{repl.template.nix => repl.nix.template} | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/{repl.template.nix => repl.nix.template} (98%) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index ccf927a5e59f..5247a2991b1b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -21,7 +21,7 @@ from .process import run_wrapper from .utils import Args, dict_to_flags FLAKE_FLAGS: Final = ["--extra-experimental-features", "nix-command flakes"] -FLAKE_REPL_TEMPLATE: Final = "repl.template.nix" +FLAKE_REPL_TEMPLATE: Final = "repl.nix.template" logger = logging.getLogger(__name__) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/repl.template.nix b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/repl.nix.template similarity index 98% rename from pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/repl.template.nix rename to pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/repl.nix.template index 0fffd6ecc746..17db87423711 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/repl.template.nix +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/repl.nix.template @@ -1,3 +1,4 @@ +# vim: set syntax=nix: let flake = builtins.getFlake ''${flake_path}''; configuration = flake.${flake_attr}; From bebec2668b43941ec833c81c57e519f328c57862 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 29 Nov 2024 20:29:26 +0000 Subject: [PATCH 0231/1054] nixos-rebuild-ng: add missing flags from nixos-rebuild-ng --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index f0bbabdb66ab..e7124f93001b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -53,7 +53,9 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa classic_build_flags.add_argument("--no-build-output", "-Q", action="store_true") copy_flags = argparse.ArgumentParser(add_help=False) - copy_flags.add_argument("--use-substitutes", "-s", action="store_true") + copy_flags.add_argument( + "--use-substitutes", "--substitute-on-destination", "-s", action="store_true" + ) sub_parsers = { "common_flags": common_flags, @@ -90,6 +92,7 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa main_parser.add_argument("--fast", action="store_true") main_parser.add_argument("--build-host") main_parser.add_argument("--target-host") + main_parser.add_argument("--no-build-nix", action="store_true") # deprecated main_parser.add_argument("action", choices=Action.values(), nargs="?") return main_parser, sub_parsers @@ -133,6 +136,10 @@ def parse_args( if args.no_ssh_tty: parser_warn("--no-ssh-tty deprecated, SSH's TTY is never used anymore") + # TODO: use deprecated=True in Python >=3.13 + if args.no_build_nix: + parser_warn("--no-build-nix deprecated, we do not build nix anymore") + if args.action == Action.EDIT.value and (args.file or args.attr): parser.error("--file and --attr are not supported with 'edit'") From cfe42fba1c5c0f8dde09946d122ee02f4d67f997 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 29 Nov 2024 20:49:44 +0000 Subject: [PATCH 0232/1054] nixos-rebuild-ng: do not fail if re-exec fails --- .../src/nixos_rebuild/__init__.py | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index e7124f93001b..d51a3c273c33 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -5,7 +5,7 @@ import logging import os import sys from pathlib import Path -from subprocess import run +from subprocess import CalledProcessError, run from typing import assert_never from . import nix @@ -185,27 +185,32 @@ def execute(argv: list[str]) -> None: # untrusted tree. can_run = action in (Action.SWITCH, Action.BOOT, Action.TEST) + if args.upgrade or args.upgrade_all: + nix.upgrade_channels(bool(args.upgrade_all)) + # Re-exec to a newer version of the script before building to ensure we get # the latest fixes if can_run and not args.fast and not os.environ.get("_NIXOS_REBUILD_REEXEC"): - if flake: - drv = nix.build_flake("pkgs.nixos-rebuild-ng", flake, **flake_build_flags) - else: - drv = nix.build("pkgs.nixos-rebuild-ng", build_attr, **build_flags) - new = drv / "bin/nixos-rebuild-ng" - current = Path(argv[0]) - # Disable re-exec during development - if current.name != "__main__.py" and new != current: - logging.debug( - "detected newer version of script, re-exec'ing, current=%s, new=%s", - argv[0], - new, - ) - cleanup_ssh() - os.execve(new, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"}) - - if args.upgrade or args.upgrade_all: - nix.upgrade_channels(bool(args.upgrade_all)) + try: + if flake: + drv = nix.build_flake( + "pkgs.nixos-rebuild-ng", flake, **flake_build_flags + ) + else: + drv = nix.build("pkgs.nixos-rebuild-ng", build_attr, **build_flags) + new = drv / "bin/nixos-rebuild-ng" + current = Path(argv[0]) + # Disable re-exec during development + if current.name != "__main__.py" and new != current: + logging.debug( + "detected newer version of script, re-exec'ing, current=%s, new=%s", + argv[0], + new, + ) + cleanup_ssh() + os.execve(new, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"}) + except CalledProcessError: + logger.warning("could not find a newer version of nixos-rebuild") if can_run and not flake: nixpkgs_path = nix.find_file("nixpkgs", **build_flags) From f72572c1470019513b4bf5a5d31ee8640dd5b99e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 29 Nov 2024 20:57:28 +0000 Subject: [PATCH 0233/1054] nixos-rebuild-ng: ignore non-directories in upgrade_channels --- pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 2 +- pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 5247a2991b1b..7cc606561404 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -471,7 +471,7 @@ def upgrade_channels(all: bool = False) -> None: that has a `.update-on-nixos-rebuild` file) or all. """ for channel_path in Path("/nix/var/nix/profiles/per-user/root/channels/").glob("*"): - if ( + if channel_path.is_dir() and ( all or channel_path.name == "nixos" or (channel_path / ".update-on-nixos-rebuild").exists() diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 317821d5fea0..093cba93ef36 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -561,7 +561,8 @@ def test_switch_to_configuration(mock_run: Any, monkeypatch: Any) -> None: Path("/nix/var/nix/profiles/per-user/root/channels/home-manager"), ], ) -def test_upgrade_channels(mock_glob: Any) -> None: +@patch(get_qualified_name(n.Path.is_dir, n), autospec=True, return_value=True) +def test_upgrade_channels(mock_is_dir: Any, mock_glob: Any) -> None: with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: n.upgrade_channels(False) mock_run.assert_called_with(["nix-channel", "--update", "nixos"], check=False) From c50144ab79b9a5cbeea195f032be2f8bb5a73147 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 29 Nov 2024 23:42:34 +0000 Subject: [PATCH 0234/1054] nixos-rebuild-ng: move reexec earlier --- .../src/nixos_rebuild/__init__.py | 82 ++++++++++++------- 1 file changed, 52 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index d51a3c273c33..a6153ae974f8 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -11,7 +11,7 @@ from typing import assert_never from . import nix from .models import Action, BuildAttr, Flake, NRError, Profile from .process import Remote, cleanup_ssh -from .utils import LogFormatter +from .utils import Args, LogFormatter logger = logging.getLogger() logger.setLevel(logging.INFO) @@ -161,22 +161,60 @@ def parse_args( return args, args_groups +def reexec( + argv: list[str], + args: argparse.Namespace, + build_flags: dict[str, Args], + flake_build_flags: dict[str, Args], +) -> None: + drv = None + try: + # Need to set target_host=None, to avoid connecting to remote + if flake := Flake.from_arg(args.flake, None): + drv = nix.build_flake( + "pkgs.nixos-rebuild-ng", + flake, + **flake_build_flags, + no_link=True, + ) + else: + drv = nix.build( + "pkgs.nixos-rebuild-ng", + BuildAttr.from_arg(args.attr, args.file), + **build_flags, + no_out_link=True, + ) + except CalledProcessError: + logger.warning("could not find a newer version of nixos-rebuild") + + if drv: + new = drv / "bin/nixos-rebuild-ng" + current = Path(argv[0]) + # Disable re-exec during development + if current.name != "__main__.py" and new != current: + logging.debug( + "detected newer version of script, re-exec'ing, current=%s, new=%s", + argv[0], + new, + ) + cleanup_ssh() + os.execve(new, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"}) + + def execute(argv: list[str]) -> None: args, args_groups = parse_args(argv) + atexit.register(cleanup_ssh) + common_flags = vars(args_groups["common_flags"]) common_build_flags = common_flags | vars(args_groups["common_build_flags"]) build_flags = common_build_flags | vars(args_groups["classic_build_flags"]) flake_build_flags = common_build_flags | vars(args_groups["flake_build_flags"]) copy_flags = common_flags | vars(args_groups["copy_flags"]) - atexit.register(cleanup_ssh) + if args.upgrade or args.upgrade_all: + nix.upgrade_channels(bool(args.upgrade_all)) - profile = Profile.from_arg(args.profile_name) - build_host = Remote.from_arg(args.build_host, False, validate_opts=False) - target_host = Remote.from_arg(args.target_host, args.ask_sudo_password) - build_attr = BuildAttr.from_arg(args.attr, args.file) - flake = Flake.from_arg(args.flake, target_host) action = Action(args.action) # Only run shell scripts from the Nixpkgs tree if the action is # "switch", "boot", or "test". With other actions (such as "build"), @@ -185,32 +223,16 @@ def execute(argv: list[str]) -> None: # untrusted tree. can_run = action in (Action.SWITCH, Action.BOOT, Action.TEST) - if args.upgrade or args.upgrade_all: - nix.upgrade_channels(bool(args.upgrade_all)) - # Re-exec to a newer version of the script before building to ensure we get # the latest fixes if can_run and not args.fast and not os.environ.get("_NIXOS_REBUILD_REEXEC"): - try: - if flake: - drv = nix.build_flake( - "pkgs.nixos-rebuild-ng", flake, **flake_build_flags - ) - else: - drv = nix.build("pkgs.nixos-rebuild-ng", build_attr, **build_flags) - new = drv / "bin/nixos-rebuild-ng" - current = Path(argv[0]) - # Disable re-exec during development - if current.name != "__main__.py" and new != current: - logging.debug( - "detected newer version of script, re-exec'ing, current=%s, new=%s", - argv[0], - new, - ) - cleanup_ssh() - os.execve(new, argv, os.environ | {"_NIXOS_REBUILD_REEXEC": "1"}) - except CalledProcessError: - logger.warning("could not find a newer version of nixos-rebuild") + reexec(argv, args, build_flags, flake_build_flags) + + profile = Profile.from_arg(args.profile_name) + target_host = Remote.from_arg(args.target_host, args.ask_sudo_password) + build_host = Remote.from_arg(args.build_host, False, validate_opts=False) + build_attr = BuildAttr.from_arg(args.attr, args.file) + flake = Flake.from_arg(args.flake, target_host) if can_run and not flake: nixpkgs_path = nix.find_file("nixpkgs", **build_flags) From b118371ebb1fe22a0723f72832b9062dc1597deb Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 30 Nov 2024 17:45:30 +0000 Subject: [PATCH 0235/1054] nixos-rebuild-ng: add SSH_DEFAULT_OPTS to copy-closure --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 14 ++++++++------ .../src/nixos_rebuild/process.py | 2 +- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 16 ++++++++++------ 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 7cc606561404..e4e1c5663fcb 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -1,5 +1,6 @@ import logging import os +import shlex from datetime import datetime from importlib.resources import files from pathlib import Path @@ -17,7 +18,7 @@ from .models import ( Profile, Remote, ) -from .process import run_wrapper +from .process import SSH_DEFAULT_OPTS, run_wrapper from .utils import Args, dict_to_flags FLAKE_FLAGS: Final = ["--extra-experimental-features", "nix-command flakes"] @@ -153,12 +154,13 @@ def copy_closure( closure, ], extra_env={ - # for the remote to remote case, we can't use host.opts because it - # includes the ControlPane opts that will not work in the remote, - # because the temporary directory that we created will not exist - "NIX_SSHOPTS": os.environ.get("NIX_SSHOPTS", "") + # for the remote to remote case, we can't add SSH_DEFAULT_OPTS to + # host.opts because it includes the ControlPane opts that will not + # work in the remote, because the temporary directory that we + # created will not exist + "NIX_SSHOPTS": shlex.join(host.opts) if from_host and to_host - else " ".join(host.opts) + else shlex.join(SSH_DEFAULT_OPTS + host.opts) }, remote=from_host if to_host else None, ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index 54200f14d85a..a9e8d7dff295 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -38,7 +38,7 @@ class Remote: if not host: return None - opts = os.getenv("NIX_SSHOPTS", "").split() + opts = shlex.split(os.getenv("NIX_SSHOPTS", "")) if validate_opts: cls._validate_opts(opts, ask_sudo_password) sudo_password = None diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 093cba93ef36..0a98270490f9 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -8,6 +8,7 @@ import pytest import nixos_rebuild.models as m import nixos_rebuild.nix as n +import nixos_rebuild.process as p from .helpers import get_qualified_name @@ -108,7 +109,9 @@ def test_remote_build(mock_run: Any, monkeypatch: Any) -> None: "user@host", Path("/path/to/file"), ], - extra_env={"NIX_SSHOPTS": "--ssh opts"}, + extra_env={ + "NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS + ["--ssh opts"]) + }, remote=None, ), call( @@ -159,7 +162,9 @@ def test_remote_build_flake(mock_run: Any) -> None: "user@host", Path("/path/to/file"), ], - extra_env={"NIX_SSHOPTS": "--ssh opts"}, + extra_env={ + "NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS + ["--ssh opts"]) + }, remote=None, ), call( @@ -191,23 +196,22 @@ def test_copy_closure(mock_run: Any, monkeypatch: Any) -> None: n.copy_closure(closure, target_host) mock_run.assert_called_with( ["nix-copy-closure", "--to", "user@target.host", closure], - extra_env={"NIX_SSHOPTS": "--ssh target-opt"}, + extra_env={"NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS + ["--ssh target-opt"])}, remote=None, ) n.copy_closure(closure, None, build_host) mock_run.assert_called_with( ["nix-copy-closure", "--from", "user@build.host", closure], - extra_env={"NIX_SSHOPTS": "--ssh build-opt"}, + extra_env={"NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS + ["--ssh build-opt"])}, remote=None, ) - monkeypatch.setenv("NIX_SSHOPTS", "--ssh build-target-opt") n.copy_closure(closure, target_host, build_host) mock_run.assert_called_with( ["nix-copy-closure", "--to", "user@target.host", closure], remote=build_host, - extra_env={"NIX_SSHOPTS": "--ssh build-target-opt"}, + extra_env={"NIX_SSHOPTS": "--ssh target-opt"}, ) From cab7882bf5215adc8b0187bcbd1c9454f68e493a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 30 Nov 2024 17:46:23 +0000 Subject: [PATCH 0236/1054] nixos-rebuild-ng: move check for missing action argument earlier --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index a6153ae974f8..92394197110a 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -122,6 +122,10 @@ def parse_args( if args.ask_sudo_password: args.sudo = True + if args.help or args.action is None: + r = run(["man", "8", "nixos-rebuild"], check=False) + parser.exit(r.returncode) + # TODO: use deprecated=True in Python >=3.13 if args.install_grub: parser_warn("--install-grub deprecated, use --install-bootloader instead") @@ -154,10 +158,6 @@ def parse_args( if args.flake and (args.file or args.attr): parser.error("--flake cannot be used with --file or --attr") - if args.help or args.action is None: - r = run(["man", "8", "nixos-rebuild"], check=False) - parser.exit(r.returncode) - return args, args_groups From a61aede3688d97cd8dd47f311c7e898cc006d8f7 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Sat, 30 Nov 2024 17:57:06 +0100 Subject: [PATCH 0237/1054] nixos-rebuild-ng: make sure to copy the new closure when doing test or build --- pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 92394197110a..3371424ea214 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -331,6 +331,9 @@ def execute(argv: list[str]) -> None: dry_run=dry_run, **build_flags, ) + # If we are rolling back, the generation that we roll back to, should already be present on the remote + if not args.rollback: + nix.copy_closure(path_to_config, target_host, **copy_flags) if action in (Action.TEST, Action.DRY_ACTIVATE): nix.switch_to_configuration( path_to_config, From e0754deadc12072165025bcaf73614bd573cd4e1 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 30 Nov 2024 19:04:49 +0100 Subject: [PATCH 0238/1054] adw-gtk3: 5.5 -> 5.6 --- pkgs/by-name/ad/adw-gtk3/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix index 339ca0dc2b07..c8676942c34e 100644 --- a/pkgs/by-name/ad/adw-gtk3/package.nix +++ b/pkgs/by-name/ad/adw-gtk3/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "adw-gtk3"; - version = "5.5"; + version = "5.6"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "adw-gtk3"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-WW6lJmGNn+e0jXu319SSX6e6POWfdgsIeg/U1vmwy1U="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-S/H6JGXwEgiqmcH1W+ZyHYOkk0gQtKG9Q3BiI2IjnEM="; }; nativeBuildInputs = [ From 4431a47fcb4a2a97cc40e5e5e931a1d06fd2d08f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 30 Nov 2024 18:04:31 +0000 Subject: [PATCH 0239/1054] nixos-rebuild-ng: add --build-host/--target-host to TEST/BUILD/DRY_BUILD/DRY_ACTIVATE --- .../src/nixos_rebuild/__init__.py | 60 ++++++++++++++----- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 3371424ea214..25f6889314ad 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -150,6 +150,10 @@ def parse_args( if (args.target_host or args.build_host) and args.action not in ( Action.SWITCH.value, Action.BOOT.value, + Action.TEST.value, + Action.BUILD.value, + Action.DRY_BUILD.value, + Action.DRY_ACTIVATE.value, ): parser.error( f"--target-host/--build-host is not supported with '{args.action}'" @@ -318,27 +322,53 @@ def execute(argv: list[str]) -> None: else: raise NRError("could not find previous generation") elif flake: - path_to_config = nix.build_flake( - attr, - flake, - dry_run=dry_run, - **flake_build_flags, - ) + if build_host: + path_to_config = nix.remote_build_flake( + attr, + flake, + build_host, + flake_build_flags=flake_build_flags, + copy_flags=copy_flags, + build_flags=build_flags, + ) + else: + path_to_config = nix.build_flake( + attr, + flake, + dry_run=dry_run, + **flake_build_flags, + ) else: - path_to_config = nix.build( - attr, - build_attr, - dry_run=dry_run, - **build_flags, - ) - # If we are rolling back, the generation that we roll back to, should already be present on the remote + if build_host: + path_to_config = nix.remote_build( + attr, + build_attr, + build_host, + instantiate_flags=common_flags, + copy_flags=copy_flags, + build_flags=build_flags, + ) + else: + path_to_config = nix.build( + attr, + build_attr, + dry_run=dry_run, + **build_flags, + ) + # If we are rolling back, the generation that we roll back to, + # should already be present on the remote if not args.rollback: - nix.copy_closure(path_to_config, target_host, **copy_flags) + nix.copy_closure( + path_to_config, + to_host=target_host, + from_host=build_host, + **copy_flags, + ) if action in (Action.TEST, Action.DRY_ACTIVATE): nix.switch_to_configuration( path_to_config, action, - target_host=None, + target_host=target_host, sudo=args.sudo, specialisation=args.specialisation, ) From 4bc3ac552d0dc20d80333f329bac840ce0445a11 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 30 Nov 2024 18:28:36 +0000 Subject: [PATCH 0240/1054] nixos-rebuild-ng: merge actions --- .../src/nixos_rebuild/__init__.py | 104 ++++++------------ 1 file changed, 32 insertions(+), 72 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 25f6889314ad..14236c289709 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -245,11 +245,35 @@ def execute(argv: list[str]) -> None: (nixpkgs_path / ".version-suffix").write_text(rev) match action: - case Action.SWITCH | Action.BOOT: + case ( + Action.SWITCH + | Action.BOOT + | Action.TEST + | Action.BUILD + | Action.DRY_BUILD + | Action.DRY_ACTIVATE + ): logger.info("building the system configuration...") + attr = "config.system.build.toplevel" + dry_run = action == Action.DRY_BUILD + no_link = action in (Action.SWITCH, Action.BOOT) + if args.rollback: - path_to_config = nix.rollback(profile, target_host, sudo=args.sudo) + if action in (Action.SWITCH, Action.BOOT): + path_to_config = nix.rollback(profile, target_host, sudo=args.sudo) + elif action in (Action.TEST, Action.BUILD): + maybe_path_to_config = nix.rollback_temporary_profile( + profile, + target_host, + sudo=args.sudo, + ) + if maybe_path_to_config: # kinda silly but this makes mypy happy + path_to_config = maybe_path_to_config + else: + raise NRError("could not find previous generation") + else: + raise NRError(f"--rollback is incompatible with '{action}'") else: if flake: if build_host: @@ -265,7 +289,8 @@ def execute(argv: list[str]) -> None: path_to_config = nix.build_flake( attr, flake, - no_link=True, + no_link=no_link, + dry_run=dry_run, **flake_build_flags, ) else: @@ -282,7 +307,8 @@ def execute(argv: list[str]) -> None: path_to_config = nix.build( attr, build_attr, - no_out_link=True, + no_out_link=no_link, + dry_run=dry_run, **build_flags, ) nix.copy_closure( @@ -297,80 +323,14 @@ def execute(argv: list[str]) -> None: target_host=target_host, sudo=args.sudo, ) - nix.switch_to_configuration( - path_to_config, - action, - target_host=target_host, - sudo=args.sudo, - specialisation=args.specialisation, - install_bootloader=args.install_bootloader, - ) - case Action.TEST | Action.BUILD | Action.DRY_BUILD | Action.DRY_ACTIVATE: - logger.info("building the system configuration...") - attr = "config.system.build.toplevel" - dry_run = action == Action.DRY_BUILD - if args.rollback: - if action not in (Action.TEST, Action.BUILD): - raise NRError(f"--rollback is incompatible with '{action}'") - maybe_path_to_config = nix.rollback_temporary_profile( - profile, - target_host, - sudo=args.sudo, - ) - if maybe_path_to_config: # kinda silly but this makes mypy happy - path_to_config = maybe_path_to_config - else: - raise NRError("could not find previous generation") - elif flake: - if build_host: - path_to_config = nix.remote_build_flake( - attr, - flake, - build_host, - flake_build_flags=flake_build_flags, - copy_flags=copy_flags, - build_flags=build_flags, - ) - else: - path_to_config = nix.build_flake( - attr, - flake, - dry_run=dry_run, - **flake_build_flags, - ) - else: - if build_host: - path_to_config = nix.remote_build( - attr, - build_attr, - build_host, - instantiate_flags=common_flags, - copy_flags=copy_flags, - build_flags=build_flags, - ) - else: - path_to_config = nix.build( - attr, - build_attr, - dry_run=dry_run, - **build_flags, - ) - # If we are rolling back, the generation that we roll back to, - # should already be present on the remote - if not args.rollback: - nix.copy_closure( - path_to_config, - to_host=target_host, - from_host=build_host, - **copy_flags, - ) - if action in (Action.TEST, Action.DRY_ACTIVATE): + if action in (Action.SWITCH, Action.BOOT, Action.TEST, Action.DRY_ACTIVATE): nix.switch_to_configuration( path_to_config, action, target_host=target_host, sudo=args.sudo, specialisation=args.specialisation, + install_bootloader=args.install_bootloader, ) case Action.BUILD_VM | Action.BUILD_VM_WITH_BOOTLOADER: logger.info("building the system configuration...") From 09beed419d6b33015279ad37ab1e3ec78f6002b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 19:00:28 +0000 Subject: [PATCH 0241/1054] python312Packages.pyreadstat: 1.2.7 -> 1.2.8 --- pkgs/development/python-modules/pyreadstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index 56894f1c4df4..e59530c63a88 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyreadstat"; - version = "1.2.7"; + version = "1.2.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Roche"; repo = "pyreadstat"; rev = "refs/tags/v${version}"; - hash = "sha256-XuLFLpZbaCj/MHq0+l6GoNqR5nAldAlEJhoO5ioWYTA="; + hash = "sha256-9uDmkEp9CXUCcM09CaVaaG856Q1rY3sKYOkQkGRzakE="; }; build-system = [ From 020f9e10c3f63f9fbeebd68f47399d022218e088 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 30 Nov 2024 23:00:48 +0400 Subject: [PATCH 0242/1054] =?UTF-8?q?python312Packages.osmnx:=201.9.3=20?= =?UTF-8?q?=E2=86=92=202.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/osmnx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index 673296d719f5..8673a0e91afd 100644 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "osmnx"; - version = "1.9.3"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "gboeing"; repo = "osmnx"; rev = "refs/tags/v${version}"; - hash = "sha256-Tn800wFoPi5VkZmu9wUVM+EmCj/xxU2EJ6iwnA1VKXo="; + hash = "sha256-5IvohqEYYvFqAKOYreEsEKjzfJaqShYck2xCSQXXfyQ="; }; build-system = [ hatchling ]; From b69e16a70ecfd78ce929e1f1b55e61f2451bc6a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 19:20:32 +0000 Subject: [PATCH 0243/1054] python312Packages.gsd: 3.4.0 -> 3.4.2 --- pkgs/development/python-modules/gsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 28c9a5aa3d25..88d51e88c33e 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gsd"; - version = "3.4.0"; + version = "3.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = "gsd"; rev = "refs/tags/v${version}"; - hash = "sha256-4HJZZ5UUENHhKePfau6KT4E4qA9YCGpe/IMLyf5egsk="; + hash = "sha256-sBO5tt85BVLUrqSVWUT/tYzeLWyvyyI9ZXjNLt9/uAE="; }; build-system = [ From c2048b2abfa97f816879ae441a05b20e6ca67424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Bori?= Date: Sat, 30 Nov 2024 20:47:39 +0100 Subject: [PATCH 0244/1054] taterclient-ddnet: 9.0.0 -> 9.0.1 --- pkgs/by-name/ta/taterclient-ddnet/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix index 9fc821cfc8a6..f4623be1d96f 100644 --- a/pkgs/by-name/ta/taterclient-ddnet/package.nix +++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix @@ -34,18 +34,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taterclient-ddnet"; - version = "9.0.0"; + version = "9.0.1"; src = fetchFromGitHub { owner = "sjrc6"; repo = "taterclient-ddnet"; - rev = finalAttrs.version; - hash = "sha256-2vWZ5RE65nJrKEtqD2/vK0RKnIK3mSYdlcS/OD9jFvw="; + rev = "refs/tags/V${finalAttrs.version}"; + hash = "sha256-s+GIY29WYbVETtJSLBfP87pakRfxgGcw3Dk3p6HHoYA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname src version; - hash = "sha256-+NY2g8WeuMxsh3WJHhn3ESLxIUnvaf73qjlWaLOYzuM="; + hash = "sha256-u+IhlJYVEYeWnmFzRmcVqJfM3zBy70k9yp0AjRTovwg="; }; nativeBuildInputs = [ From 378be802e852748e6080a6a59f5a6ebbff4a9a3d Mon Sep 17 00:00:00 2001 From: mksafavi Date: Sat, 30 Nov 2024 14:37:58 +0330 Subject: [PATCH 0245/1054] new-lg4ff: 0.4.0 -> 0-unstable-2024-11-25 --- pkgs/os-specific/linux/new-lg4ff/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/new-lg4ff/default.nix b/pkgs/os-specific/linux/new-lg4ff/default.nix index 8eed8edbc166..b87df20fa5c2 100644 --- a/pkgs/os-specific/linux/new-lg4ff/default.nix +++ b/pkgs/os-specific/linux/new-lg4ff/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, kernel, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "new-lg4ff"; - version = "0.4.0"; + version = "0-unstable-2024-11-25"; src = fetchFromGitHub { owner = "berarma"; repo = "new-lg4ff"; - rev = version; - sha256 = "ZFwNdeJcSxzWtqjOF86SZpqhuz8jXZ2drvlQeIqsaNY="; + rev = "6100a34c182536c607af80e119d54a66c6fb2a23"; + sha256 = "sha256-90PnQDGwp94ELvWx6p8QiZucYmTbH3N0GiZbj3fo25g="; }; preBuild = '' - substituteInPlace Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install" + substituteInPlace Makefile --replace-fail "modules_install" "INSTALL_MOD_PATH=$out modules_install" sed -i '/depmod/d' Makefile sed -i "10i\\\trmmod hid-logitech 2> /dev/null || true" Makefile sed -i "11i\\\trmmod hid-logitech-new 2> /dev/null || true" Makefile From 0d2b54f022cf68583e92f020b7d6e684d1d9e3e3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 30 Nov 2024 22:11:18 +0200 Subject: [PATCH 0246/1054] rustPlatform.fetchCargoTarball: dontConfigure (by default) --- pkgs/build-support/rust/fetch-cargo-tarball/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix index aec39315ccc2..e0683b0b95f3 100644 --- a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix +++ b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation ( cargo ] ++ nativeBuildInputs; + dontConfigure = true; buildPhase = '' runHook preBuild From 6ea9eae476d5f325275aa7b604cf3bccf883c576 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 30 Nov 2024 20:19:32 +0000 Subject: [PATCH 0247/1054] nixos-rebuild-ng: avoid usage of implementation details in LogFormatter --- .../src/nixos_rebuild/__init__.py | 2 +- .../nixos-rebuild-ng/src/nixos_rebuild/utils.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 14236c289709..5b90caf545a2 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -391,7 +391,7 @@ def execute(argv: list[str]) -> None: def main() -> None: ch = logging.StreamHandler() - ch.setFormatter(LogFormatter("%(levelname)s: %(message)s")) + ch.setFormatter(LogFormatter()) logger.addHandler(ch) try: diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py index dc8d899ab056..cd89435f2d4f 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py @@ -5,17 +5,17 @@ Args: TypeAlias = bool | str | list[str] | int | None class LogFormatter(logging.Formatter): + formatters = { + logging.INFO: logging.Formatter("%(message)s"), + logging.DEBUG: logging.Formatter("%(levelname)s: %(name)s: %(message)s"), + "DEFAULT": logging.Formatter("%(levelname)s: %(message)s"), + } + @override def format(self, record: logging.LogRecord) -> str: record.levelname = record.levelname.lower() - match record.levelno: - case logging.INFO: - self._style._fmt = "%(message)s" - case logging.DEBUG: - self._style._fmt = "%(levelname)s: %(name)s: %(message)s" - case _: - self._style._fmt = "%(levelname)s: %(message)s" - return super().format(record) + formatter = self.formatters.get(record.levelno, self.formatters["DEFAULT"]) + return formatter.format(record) def dict_to_flags(d: dict[str, Args]) -> list[str]: From 4b5fd880b517f5dd52143ce730d9f7ca3c24223d Mon Sep 17 00:00:00 2001 From: nartsisss Date: Sat, 30 Nov 2024 00:29:30 +0300 Subject: [PATCH 0248/1054] rustfinity: init at 0.2.13 --- pkgs/by-name/ru/rustfinity/package.nix | 41 ++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/ru/rustfinity/package.nix diff --git a/pkgs/by-name/ru/rustfinity/package.nix b/pkgs/by-name/ru/rustfinity/package.nix new file mode 100644 index 000000000000..c3db2c136a21 --- /dev/null +++ b/pkgs/by-name/ru/rustfinity/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + rustPlatform, + fetchCrate, + pkg-config, + openssl, +}: +rustPlatform.buildRustPackage rec { + pname = "rustfinity"; + version = "0.2.13"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-yBWhY4Uta/K/Ka5DzhpZUiv0Y3Yfn4dI4ZARpJqTqY8="; + }; + + cargoHash = "sha256-jeV4R9UwKF5ZW2AZl/WZE2KTMGCzX4/dpP8uUIUD3CI="; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; + + OPENSSL_NO_VENDOR = 1; + + # Requires network and fs access + checkFlags = [ + "--skip=challenge::tests::test_challenge_exists" + "--skip=crates_io::tests::test_get_latest_version" + "--skip=dir::tests::test_get_current_dir" + "--skip=download::tests::download_file::test_downloads_file" + "--skip=download::tests::download_file::test_renames_starter" + ]; + + meta = { + description = "CLI for Rustfinity challenges solving"; + homepage = "https://github.com/dcodesdev/rustfinity.com/tree/main/crates/cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nartsiss ]; + mainProgram = "rustfinity"; + }; +} From d1589acd8a8765e498f43f0e027d4a9e2057b472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Kurucz?= Date: Sat, 30 Nov 2024 21:15:14 +0100 Subject: [PATCH 0249/1054] lsb-release: rewrite with `replaceVars`, and use `@runtimeShell@` --- pkgs/by-name/ls/lsb-release/lsb_release.sh | 2 +- pkgs/by-name/ls/lsb-release/package.nix | 44 ++++++++++++---------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/ls/lsb-release/lsb_release.sh b/pkgs/by-name/ls/lsb-release/lsb_release.sh index ae524181e88a..2031efc8b654 100644 --- a/pkgs/by-name/ls/lsb-release/lsb_release.sh +++ b/pkgs/by-name/ls/lsb-release/lsb_release.sh @@ -1,4 +1,4 @@ -#! @shell@ +#! @runtimeShell@ set -o errexit set -o nounset diff --git a/pkgs/by-name/ls/lsb-release/package.nix b/pkgs/by-name/ls/lsb-release/package.nix index f79c6527539a..6973d50e99aa 100644 --- a/pkgs/by-name/ls/lsb-release/package.nix +++ b/pkgs/by-name/ls/lsb-release/package.nix @@ -1,22 +1,26 @@ -{ substituteAll, lib -, coreutils, getopt +{ + replaceVars, + runCommand, + lib, + runtimeShell, + coreutils, + getopt, }: -substituteAll { - name = "lsb_release"; - - src = ./lsb_release.sh; - - dir = "bin"; - isExecutable = true; - - inherit coreutils getopt; - - meta = with lib; { - description = "Prints certain LSB (Linux Standard Base) and Distribution information"; - mainProgram = "lsb_release"; - license = [ licenses.mit ]; - maintainers = with maintainers; [ primeos ]; - platforms = platforms.linux; - }; -} +runCommand "lsb_release" + { + meta = with lib; { + description = "Prints certain LSB (Linux Standard Base) and Distribution information"; + mainProgram = "lsb_release"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ primeos ]; + platforms = platforms.linux; + }; + } + '' + install -Dm 555 ${ + replaceVars ./lsb_release.sh { + inherit runtimeShell coreutils getopt; + } + } $out/bin/lsb_release + '' From 8b42515dfd58451247a793df416ce717e5ba7161 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 00:28:15 +0000 Subject: [PATCH 0250/1054] lms: 3.60.0 -> 3.61.0 --- pkgs/by-name/lm/lms/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index dec420e3fe52..63d15a9b6f9b 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lms"; - version = "3.60.0"; + version = "3.61.0"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${version}"; - hash = "sha256-sLs73356BaFbKtyQc4cTFm7Wp/UemH8J+tkajXAA0do="; + hash = "sha256-q2LnJhIQYdjvVk+fQQ2tjoEw046DUR1o+RUG2bp/w3M="; }; strictDeps = true; From 96a8441b43bcb6e8ffdbe4282b62b367e179610f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 02:13:24 +0000 Subject: [PATCH 0251/1054] mailpit: 1.21.0 -> 1.21.5 --- pkgs/servers/mail/mailpit/source.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mail/mailpit/source.nix b/pkgs/servers/mail/mailpit/source.nix index f6b15cb7f686..3b417c067274 100644 --- a/pkgs/servers/mail/mailpit/source.nix +++ b/pkgs/servers/mail/mailpit/source.nix @@ -1,6 +1,6 @@ { - version = "1.21.0"; - hash = "sha256-u2mQfqfBfSV716FlGJyFJoRBtTs+WprM/X8i5RLuhZ0="; - npmDepsHash = "sha256-0PjJkGsIpnYVSUpwgtrqWVFMI9Lpjo0j7aprtFvePWQ="; - vendorHash = "sha256-2qqsYYyykmbnnyLHAk4/1HUps7XVQ5ve+niaayb/VQ0="; + version = "1.21.5"; + hash = "sha256-i1Us3ex09RiuSYf+eV8IybxHKfR6jKda61wJj2P3wxw="; + npmDepsHash = "sha256-Vb6XMECl0H+gIth2Qxuxib3SVqB0OdYGpBfr/6P4Hwc="; + vendorHash = "sha256-jnhDyIRCcnyovn/sQmdZ0kQDXU1ZFKMLfXksYAnIvJ8="; } From 453e4c611a51ad8a233f170faffb4f25a470bc35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 08:56:44 +0000 Subject: [PATCH 0252/1054] flottbot: 0.13.1 -> 0.14.0 --- pkgs/by-name/fl/flottbot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flottbot/package.nix b/pkgs/by-name/fl/flottbot/package.nix index ab6273a155cd..73dfe4f78a12 100644 --- a/pkgs/by-name/fl/flottbot/package.nix +++ b/pkgs/by-name/fl/flottbot/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "flottbot"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "target"; repo = "flottbot"; rev = version; - hash = "sha256-Fv4ZBCQA7gwt11ULIiyFwn+QgoMNgu+1TM9yy2Jz7og="; + hash = "sha256-yQjjdw+3JqMyyDOLR42OYVLRNiIjDz1KnSRkC2bUCj8="; }; patches = [ @@ -24,7 +24,7 @@ buildGoModule rec { }) ]; - vendorHash = "sha256-wOUQKFd2Xm/2rvLw8kw8Ejbcq/JUvup/BzZs0fllBYY="; + vendorHash = "sha256-t2iBOrmLca7SMkstNIaNtD5RZ8dxBDFZc1n5/DxLiTQ="; subPackages = [ "cmd/flottbot" ]; From b803e1b03dc698150dff6e856bf7bb22e8751955 Mon Sep 17 00:00:00 2001 From: Emin Karayel Date: Sun, 1 Dec 2024 10:50:43 +0100 Subject: [PATCH 0253/1054] gnomeExtensions.argos: Update to more recent revision with support for GNOME 47 The current extensions does not work with GNOME 47, which the new release nixos-24.11 is based. The above is an update to the latest commit which enables support for GNOME 47. See: https://github.com/p-e-w/argos/commit/cd0de7c79072979bed41e0ad75741bbd8e113950 I tested on my machine and the extension works. --- pkgs/desktops/gnome/extensions/argos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/argos/default.nix b/pkgs/desktops/gnome/extensions/argos/default.nix index 66c979bd54af..9f4719a3226e 100644 --- a/pkgs/desktops/gnome/extensions/argos/default.nix +++ b/pkgs/desktops/gnome/extensions/argos/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "argos"; - version = "unstable-2024-04-03"; + version = "unstable-2024-10-28"; src = fetchFromGitHub { owner = "p-e-w"; repo = "argos"; - rev = "0449229e11bc2bb5c66e6f1d8503635cdf276bcf"; - hash = "sha256-szBk3zW+HzfxTI34lLB1DFdnwZ3W+BgeVgDkwf0UzQU="; + rev = "cd0de7c79072979bed41e0ad75741bbd8e113950"; + hash = "sha256-rNS2rvHZOpl9mSoERfsX6UfEaAb6lWTI9y6HXKrl81E="; }; installPhase = '' From 17147067fce5d46febf852c33782c29b2c004a6e Mon Sep 17 00:00:00 2001 From: Mahmoud Ayman Date: Sun, 1 Dec 2024 12:03:27 +0200 Subject: [PATCH 0254/1054] anki-bin: 24.06.3 -> 24.11 --- pkgs/games/anki/bin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 8daf97caf56b..9fe7773702ef 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -15,22 +15,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "24.06.3"; + version = "24.11"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - hash = "sha256-/oyQy4QHU9DCqYplcuINy5y0d2/n+fJCpgwNDURguYU="; + hash = "sha256-JXn4oxhRODHh6b5hFFj393xMRlaJRVcbMJ5AyXr+jq8="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - hash = "sha256-UQRdp/GhiRGfsBF+mV6hCKpEQGFv/I9D9KTtc1p776o="; + hash = "sha256-d94lfk1pUJgxk4Dylw+fC2qt8wfRJ7tJQYm+Chp1J5k="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - hash = "sha256-zi9yjJirNxFFD7wGa4++J+mDaE5dYZW+X0UUddGkjTU="; + hash = "sha256-AEpyrZBQ+0FI9CxwCacGlbMDMZ7eebBRPkQ0Nstubnk="; }; }; From c4902dad75f98479b5ca13be0d6a5abfc6d3f22a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 1 Dec 2024 12:15:54 +0000 Subject: [PATCH 0255/1054] nixos-rebuild-ng: use raw NIX_SSHOPTS in copy_closure --- .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 14 +++++++------- .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 18 +++++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index e4e1c5663fcb..7c9338b3ef92 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -1,6 +1,5 @@ import logging import os -import shlex from datetime import datetime from importlib.resources import files from pathlib import Path @@ -145,6 +144,7 @@ def copy_closure( if not host: return + sshopts = os.getenv("NIX_SSHOPTS", "") run_wrapper( [ "nix-copy-closure", @@ -154,13 +154,13 @@ def copy_closure( closure, ], extra_env={ - # for the remote to remote case, we can't add SSH_DEFAULT_OPTS to - # host.opts because it includes the ControlPane opts that will not - # work in the remote, because the temporary directory that we - # created will not exist - "NIX_SSHOPTS": shlex.join(host.opts) + # Using raw NIX_SSHOPTS here to avoid messing up with the passed + # parameters, and we do not add the SSH_DEFAULT_OPTS in the remote + # to remote case, otherwise it will fail because of ControlPath + # will not exist in remote + "NIX_SSHOPTS": sshopts if from_host and to_host - else shlex.join(SSH_DEFAULT_OPTS + host.opts) + else " ".join(filter(lambda x: x, [*SSH_DEFAULT_OPTS, sshopts])) }, remote=from_host if to_host else None, ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py index 0a98270490f9..6a34f98bd066 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py @@ -79,7 +79,8 @@ def test_build_flake(mock_run: Any) -> None: return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) def test_remote_build(mock_run: Any, monkeypatch: Any) -> None: - build_host = m.Remote("user@host", ["--ssh", "opts"], None) + build_host = m.Remote("user@host", [], None) + monkeypatch.setenv("NIX_SSHOPTS", "--ssh opts") assert n.remote_build( "config.system.build.toplevel", m.BuildAttr("", "preAttr"), @@ -128,9 +129,10 @@ def test_remote_build(mock_run: Any, monkeypatch: Any) -> None: autospec=True, return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), ) -def test_remote_build_flake(mock_run: Any) -> None: +def test_remote_build_flake(mock_run: Any, monkeypatch: Any) -> None: flake = m.Flake.parse(".#hostname") - build_host = m.Remote("user@host", ["--ssh", "opts"], None) + build_host = m.Remote("user@host", [], None) + monkeypatch.setenv("NIX_SSHOPTS", "--ssh opts") assert n.remote_build_flake( "config.system.build.toplevel", @@ -190,16 +192,17 @@ def test_copy_closure(mock_run: Any, monkeypatch: Any) -> None: n.copy_closure(closure, None) mock_run.assert_not_called() - target_host = m.Remote("user@target.host", ["--ssh", "target-opt"], None) - build_host = m.Remote("user@build.host", ["--ssh", "build-opt"], None) + target_host = m.Remote("user@target.host", [], None) + build_host = m.Remote("user@build.host", [], None) n.copy_closure(closure, target_host) mock_run.assert_called_with( ["nix-copy-closure", "--to", "user@target.host", closure], - extra_env={"NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS + ["--ssh target-opt"])}, + extra_env={"NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS)}, remote=None, ) + monkeypatch.setenv("NIX_SSHOPTS", "--ssh build-opt") n.copy_closure(closure, None, build_host) mock_run.assert_called_with( ["nix-copy-closure", "--from", "user@build.host", closure], @@ -207,11 +210,12 @@ def test_copy_closure(mock_run: Any, monkeypatch: Any) -> None: remote=None, ) + monkeypatch.setenv("NIX_SSHOPTS", "--ssh build-target-opt") n.copy_closure(closure, target_host, build_host) mock_run.assert_called_with( ["nix-copy-closure", "--to", "user@target.host", closure], remote=build_host, - extra_env={"NIX_SSHOPTS": "--ssh target-opt"}, + extra_env={"NIX_SSHOPTS": "--ssh build-target-opt"}, ) From 752c092c47a8ed8d10dcfe4f1e24ab963cc59ae8 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 1 Dec 2024 12:47:20 +0000 Subject: [PATCH 0256/1054] nixos-rebuild-ng: use shlex.quote instead of join in run_wrapper --- .../src/nixos_rebuild/process.py | 9 +++++---- .../nixos-rebuild-ng/src/tests/test_main.py | 20 ++++++++++++++++--- .../src/tests/test_process.py | 13 ++++++++++-- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index a9e8d7dff295..1232275d23c3 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -105,10 +105,11 @@ def run_wrapper( *SSH_DEFAULT_OPTS, remote.host, "--", - # sadly SSH just join all remaining parameters, expanding glob and - # ignoring quotes - # so we need to use shlex.join() to safely join the arguments - shlex.join(str(a) for a in args), + # SSH will join the parameters here and pass it to the shell, so we + # need to quote it to avoid issues. + # We can't use `shlex.join`, otherwise we will hit MAX_ARG_STRLEN + # limits when the command becomes too big. + *[shlex.quote(str(a)) for a in args], ] else: if extra_env: diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 97ae0072a829..9337fda44dc0 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -278,7 +278,12 @@ def test_execute_nix_switch_flake_target_host( *nr.process.SSH_DEFAULT_OPTS, "user@localhost", "--", - f"sudo nix-env -p /nix/var/nix/profiles/system --set {config_path}", + "sudo", + "nix-env", + "-p", + "/nix/var/nix/profiles/system", + "--set", + str(config_path), ], check=True, **DEFAULT_RUN_KWARGS, @@ -289,7 +294,11 @@ def test_execute_nix_switch_flake_target_host( *nr.process.SSH_DEFAULT_OPTS, "user@localhost", "--", - f"sudo env NIXOS_INSTALL_BOOTLOADER=0 {config_path / 'bin/switch-to-configuration'} switch", + "sudo", + "env", + "NIXOS_INSTALL_BOOTLOADER=0", + f"{config_path / 'bin/switch-to-configuration'}", + "switch", ], check=True, **DEFAULT_RUN_KWARGS, @@ -360,7 +369,12 @@ def test_execute_nix_switch_flake_build_host( *nr.process.SSH_DEFAULT_OPTS, "user@localhost", "--", - f"nix --extra-experimental-features 'nix-command flakes' build '{config_path}^*' --print-out-paths", + "nix", + "--extra-experimental-features", + "'nix-command flakes'", + "build", + f"'{config_path}^*'", + "--print-out-paths", ], check=True, stdout=PIPE, diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py index 53ed6824e39f..6c2ca2289245 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py @@ -51,7 +51,9 @@ def test_run(mock_run: Any) -> None: *p.SSH_DEFAULT_OPTS, "user@localhost", "--", - "test --with 'some flags'", + "test", + "--with", + "'some flags'", ], check=True, text=True, @@ -75,7 +77,14 @@ def test_run(mock_run: Any) -> None: *p.SSH_DEFAULT_OPTS, "user@localhost", "--", - "sudo --prompt= --stdin env FOO=bar test --with flags", + "sudo", + "--prompt=", + "--stdin", + "env", + "FOO=bar", + "test", + "--with", + "flags", ], check=True, env=None, From d704aae2cff68bb6dd409c7467dca78f956d713a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 1 Dec 2024 13:10:47 +0000 Subject: [PATCH 0257/1054] nixos-rebuild-ng: add logging for captured output values --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/process.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index 1232275d23c3..946cc70f6a69 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -118,14 +118,14 @@ def run_wrapper( args = ["sudo", *args] logger.debug( - "calling run with args=%s, kwargs=%s, extra_env=%s", + "calling run with args=%r, kwargs=%r, extra_env=%r", args, kwargs, extra_env, ) try: - return subprocess.run( + r = subprocess.run( args, check=check, env=env, @@ -136,6 +136,11 @@ def run_wrapper( errors="surrogateescape", **kwargs, ) + + if kwargs.get("capture_output") or kwargs.get("stderr") or kwargs.get("stdout"): + logger.debug("captured output stdout=%r, stderr=%r", r.stdout, r.stderr) + + return r except subprocess.CalledProcessError: if sudo and remote: logger.error( From fb5178c3c512b3f29d35548b62cce5b74e4651c1 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 1 Dec 2024 13:54:53 +0000 Subject: [PATCH 0258/1054] nixos-rebuild-ng: set capture_output=True to cleanup_ssh --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/process.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index 946cc70f6a69..07d01c6f121b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -71,8 +71,10 @@ class RunKwargs(TypedDict, total=False): def cleanup_ssh() -> None: "Close SSH ControlMaster connection." for ctrl in TMPDIR_PATH.glob("ssh-*"): - subprocess.run( - ["ssh", "-o", f"ControlPath={ctrl}", "-O", "exit", "dummyhost"], check=False + run_wrapper( + ["ssh", "-o", f"ControlPath={ctrl}", "-O", "exit", "dummyhost"], + check=False, + capture_output=True, ) TMPDIR.cleanup() From d334ab8ce77277d5ab9f25614266ed6eb81920c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Bori?= Date: Tue, 26 Nov 2024 19:47:20 +0100 Subject: [PATCH 0259/1054] mediainfo-gui: Code format using `nixfmt-rfc-style` --- pkgs/by-name/me/mediainfo-gui/package.nix | 45 ++++++++++++++++------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix index b649afd83abe..2a4b05524d0c 100644 --- a/pkgs/by-name/me/mediainfo-gui/package.nix +++ b/pkgs/by-name/me/mediainfo-gui/package.nix @@ -1,37 +1,56 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK32 -, desktop-file-utils, libSM, imagemagick, darwin }: +{ + lib, + stdenv, + fetchurl, + autoreconfHook, + pkg-config, + libmediainfo, + wxGTK32, + desktop-file-utils, + libSM, + imagemagick, + darwin, +}: let inherit (darwin.apple_sdk.frameworks) Cocoa; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mediainfo-gui"; version = "24.06"; src = fetchurl { - url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; + url = "https://mediaarea.net/download/source/mediainfo/${finalAttrs.version}/mediainfo_${finalAttrs.version}.tar.xz"; hash = "sha256-MvSoKjHjhuF3/fbkwjcFPkdbUBCJJpqyxylFKgkxNSA="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; - buildInputs = [ libmediainfo wxGTK32 desktop-file-utils libSM imagemagick ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + buildInputs = [ + libmediainfo + wxGTK32 + desktop-file-utils + libSM + imagemagick + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; sourceRoot = "MediaInfo/Project/GNU/GUI"; enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Supplies technical and tag information about a video or audio file (GUI version)"; longDescription = '' MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files. ''; - homepage = "https://mediaarea.net/"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = [ maintainers.devhell ]; + homepage = "https://mediaarea.net"; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ devhell ]; mainProgram = "mediainfo-gui"; }; -} +}) From 27680307b99c5de08da6d058fedc03b96e8f4d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Bori?= Date: Sun, 1 Dec 2024 16:30:00 +0100 Subject: [PATCH 0260/1054] mediainfo-gui: Fix missing GSettings schemas --- pkgs/by-name/me/mediainfo-gui/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix index 2a4b05524d0c..cb4f5a8b0100 100644 --- a/pkgs/by-name/me/mediainfo-gui/package.nix +++ b/pkgs/by-name/me/mediainfo-gui/package.nix @@ -10,6 +10,7 @@ libSM, imagemagick, darwin, + wrapGAppsHook3, }: let @@ -27,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook pkg-config + wrapGAppsHook3 ]; buildInputs = [ From 15dcbec89e672c2142cc6ac2c0d5de25494370cc Mon Sep 17 00:00:00 2001 From: Vladimir Pouzanov Date: Fri, 26 Jan 2024 10:58:15 +0000 Subject: [PATCH 0261/1054] prometheus-libvirt-exporter: init at 2.3.3 --- .../prometheus-libvirt-exporter/package.nix | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix diff --git a/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix b/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix new file mode 100644 index 000000000000..762dd51cad70 --- /dev/null +++ b/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix @@ -0,0 +1,39 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, pkg-config +, libvirt +}: + +buildGoModule rec { + pname = "prometheus-libvirt-exporter"; + version = "2.3.3"; + + src = fetchFromGitHub { + owner = "Tinkoff"; + repo = "libvirt-exporter"; + rev = "refs/tags/${version}"; + hash = "sha256-loh7fgeF1/OuTt2MQSkl/7VnX25idoF57+HtzV9L/ns="; + }; + + vendorHash = null; + + ldflags = [ + "-X=main.Version=${version}" + ]; + + buildInputs = [ + libvirt + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + meta = with lib; { + description = "Prometheus metrics exporter for libvirt"; + homepage = "https://github.com/Tinkoff/libvirt-exporter"; + license = licenses.asl20; + maintainers = with maintainers; [ farcaller ]; + }; +} From dff5a9370c716ebf69b7e9c9a7b508634461e903 Mon Sep 17 00:00:00 2001 From: Vladimir Pouzanov Date: Fri, 26 Jan 2024 10:58:22 +0000 Subject: [PATCH 0262/1054] nixos/prometheus-exporters/libvirt: init --- .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/libvirt.nix | 29 +++++++++++++++++++ .../prometheus-libvirt-exporter/package.nix | 23 ++++++--------- 3 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/libvirt.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 20f0183b752e..159b0296db57 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -52,6 +52,7 @@ let "keylight" "klipper" "knot" + "libvirt" "lnd" "mail" "mikrotik" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/libvirt.nix b/nixos/modules/services/monitoring/prometheus/exporters/libvirt.nix new file mode 100644 index 000000000000..8a4b5f481022 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/libvirt.nix @@ -0,0 +1,29 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.prometheus.exporters.libvirt; +in +{ + port = 9177; + extraOpts = { + libvirtUri = lib.mkOption { + type = lib.types.str; + default = "qemu:///system"; + description = "Libvirt URI from which to extract metrics"; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${lib.getExe pkgs.prometheus-libvirt-exporter} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --libvirt.uri ${cfg.libvirtUri} ${lib.concatStringsSep " " cfg.extraFlags} + ''; + }; + }; +} diff --git a/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix b/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix index 762dd51cad70..3cb89b29ffb0 100644 --- a/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix @@ -1,8 +1,9 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, pkg-config -, libvirt +{ + lib, + buildGoModule, + fetchFromGitHub, + pkg-config, + libvirt, }: buildGoModule rec { @@ -18,17 +19,11 @@ buildGoModule rec { vendorHash = null; - ldflags = [ - "-X=main.Version=${version}" - ]; + ldflags = [ "-X=main.Version=${version}" ]; - buildInputs = [ - libvirt - ]; + buildInputs = [ libvirt ]; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Prometheus metrics exporter for libvirt"; From b18ef326a0a19e58cf60d6cebe58f61516f3d986 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sun, 1 Dec 2024 13:18:44 -0500 Subject: [PATCH 0263/1054] mongodb-6_0: 6.0.18 -> 6.0.19 --- pkgs/servers/nosql/mongodb/6.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index 6c56f007354b..1143a4f50b68 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -10,8 +10,8 @@ let in buildMongoDB { inherit avxSupport; - version = "6.0.18"; - sha256 = "sha256-Nq3xwR/z11HsZs8cC9Yr0Xkjg0l1MLb0YRFHsAeQKTM="; + version = "6.0.19"; + sha256 = "sha256-qcf+6hMg0LASeOoZJPoRCQ9ajCJBqSsBDg2Wp+2SMKY="; patches = [ # Patches a bug that it couldn't build MongoDB 6.0 on gcc 13 because a include in ctype.h was missing ./fix-gcc-13-ctype-6_0.patch From 969a4f9afdfefd857e2cf9a302cc383783a8fad6 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Thu, 21 Nov 2024 17:35:21 -0500 Subject: [PATCH 0264/1054] mongodb-7_0: 7.0.14 -> 7.0.15 --- pkgs/servers/nosql/mongodb/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix index 42a425f4288e..83f02ecb4a54 100644 --- a/pkgs/servers/nosql/mongodb/7.0.nix +++ b/pkgs/servers/nosql/mongodb/7.0.nix @@ -25,8 +25,8 @@ let in buildMongoDB { inherit avxSupport; - version = "7.0.14"; - sha256 = "sha256-3NUv/Rr6V0rH6zHCXJwHZ7ZQOqMJvYGessNVemUF6g0="; + version = "7.0.15"; + sha256 = "sha256-oVH0pBV22J//hVhrwx3uuBT/ML8W2N2HvzqYhuRuM68="; patches = [ # ModuleNotFoundError: No module named 'mongo_tooling_metrics': # NameError: name 'SConsToolingMetrics' is not defined: From b68a2fc588763c3d9a8c8e2deeb62818a6c8f0f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 20:17:43 +0000 Subject: [PATCH 0265/1054] gitoxide: 0.38.0 -> 0.39.0 --- pkgs/applications/version-management/gitoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 37190b2440c3..1edbc3e590f6 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -17,16 +17,16 @@ let ein = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/ein"; in rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.38.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - hash = "sha256-JqWFdZXcmL97w5CochG9kXXH7cN2KMarkNUvfQXbYU0="; + hash = "sha256-xv4xGkrArJ/LTVLs2SYhvxhfNG6sjVm5nZWsi4s34iM="; }; - cargoHash = "sha256-EGPx4NNvgGe+LJ8Gn0ne8O4lCA+9p+E9J7OOhLQDWX0="; + cargoHash = "sha256-36ue3f67Btw0/AM5lTaByrJLKU5r1FJA3sFRJ1IbXXc="; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; From d34056b2189d60118b5914db0d5d349efd25a3e0 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 1 Dec 2024 20:21:58 +0000 Subject: [PATCH 0266/1054] nixos-rebuild-ng: disable _NIXOS_REBUILD_REEXEC for now --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 5b90caf545a2..043aa9a3e157 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -229,7 +229,12 @@ def execute(argv: list[str]) -> None: # Re-exec to a newer version of the script before building to ensure we get # the latest fixes - if can_run and not args.fast and not os.environ.get("_NIXOS_REBUILD_REEXEC"): + if ( + False # disabled until we introduce `config.system.build.nixos-rebuild-ng` + and can_run + and not args.fast + and not os.environ.get("_NIXOS_REBUILD_REEXEC") + ): reexec(argv, args, build_flags, flake_build_flags) profile = Profile.from_arg(args.profile_name) From f44bae80ccb3c46dc14f8d05f98626b16f67d550 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 1 Dec 2024 17:11:25 -0500 Subject: [PATCH 0267/1054] dbip-country-lite: 2024-11 -> 2024-12 --- pkgs/by-name/db/dbip-country-lite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix index c02bdee10547..d7642c25bd0a 100644 --- a/pkgs/by-name/db/dbip-country-lite/package.nix +++ b/pkgs/by-name/db/dbip-country-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2024-11"; + version = "2024-12"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-Ua4hm0duKHAD/cgtOaDqAYT/4lWsuoIdPnM7K0Lqecw="; + hash = "sha256-58g4ch1N1vPPymYx6M7X3Q6l6Sbr5GkEXv/Vi7K9Ivk="; }; dontUnpack = true; From ac49fcf06804a71023c9ae9855d731c274551606 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 1 Dec 2024 17:11:44 -0500 Subject: [PATCH 0268/1054] dbip-city-lite: 2024-11 -> 2024-12 --- pkgs/by-name/db/dbip-city-lite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix index c957eb0bc510..57665c88c938 100644 --- a/pkgs/by-name/db/dbip-city-lite/package.nix +++ b/pkgs/by-name/db/dbip-city-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-city-lite"; - version = "2024-11"; + version = "2024-12"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-w/Dl89AdhIfsfNu4IvVMEVKqZtQcqg0UAjB7HJxq/OE="; + hash = "sha256-IkZ6d9CP+AgYXaWmQTfTz2MTHEV7h/f1HiOAGXxBH+g="; }; dontUnpack = true; From b862d470f85e776a99a22e6c0005759e19349249 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 1 Dec 2024 17:11:51 -0500 Subject: [PATCH 0269/1054] dbip-asn-lite: 2024-11 -> 2024-12 --- pkgs/by-name/db/dbip-asn-lite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix index 2f260a639d7c..471f81965a7c 100644 --- a/pkgs/by-name/db/dbip-asn-lite/package.nix +++ b/pkgs/by-name/db/dbip-asn-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-asn-lite"; - version = "2024-11"; + version = "2024-12"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-uqtn3Dy8GYjRHX3LNky0DUAc+MxEph41AKShxsPdJJM="; + hash = "sha256-tzeXJzgTG6AB46dCYqtdECqMm2nh9PfPigMvRif2+cM="; }; dontUnpack = true; From 0277b5e57ad888fc15242b3e5795a0dd47b8c306 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 22:26:14 +0000 Subject: [PATCH 0270/1054] discordo: 0-unstable-2024-10-13 -> 0-unstable-2024-11-30 --- pkgs/applications/networking/discordo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 0116680f01eb..5c0ca836eab7 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "0-unstable-2024-10-13"; + version = "0-unstable-2024-11-30"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "26b77d9385daa2dc056930fa302a3c06595680ba"; - hash = "sha256-zXqYj8IBDVeDKjm0m8CYEX+tmHLpY2u7A4g38IiDNZk="; + rev = "3286ebecaab3c05ddbab9e6b502a750d07cea5aa"; + hash = "sha256-DaD6Rv/dzky3gjjqtjObTFZp7EJ8+UK6CoFpqZ/HO9U="; }; - vendorHash = "sha256-68NGcdyKuabSdW6CKAJUaJ0k2dpO0bm3OfNQ7qEVcqk="; + vendorHash = "sha256-66Y5hmEEQUBsSfYaj6UzCsFhDkwCDs6y2WOsnYby1gE="; CGO_ENABLED = 0; From d0dc7b771a823e05745f1da6cda94b12a9220e71 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 1 Dec 2024 18:25:07 -0600 Subject: [PATCH 0271/1054] vimPlugins.tiny-devicons-auto-colors-nvim: init at 2024-08-23 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ce370c3e9910..979a43c84b57 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -12628,6 +12628,18 @@ final: prev: meta.homepage = "https://github.com/levouh/tint.nvim/"; }; + tiny-devicons-auto-colors-nvim = buildVimPlugin { + pname = "tiny-devicons-auto-colors.nvim"; + version = "2024-08-23"; + src = fetchFromGitHub { + owner = "rachartier"; + repo = "tiny-devicons-auto-colors.nvim"; + rev = "a39fa4c92268832f6034306793b8acbfec2a7549"; + sha256 = "1mr98s9gx2rnz2w8z8d1vci259c26a9fq0s6qjgvzizz36zipn9m"; + }; + meta.homepage = "https://github.com/rachartier/tiny-devicons-auto-colors.nvim/"; + }; + tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; version = "2024-11-24"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a949fa56fac0..47f4f3d6ff86 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1049,6 +1049,7 @@ https://github.com/ron89/thesaurus_query.vim/,, https://github.com/itchyny/thumbnail.vim/,, https://github.com/vim-scripts/timestamp.vim/,, https://github.com/levouh/tint.nvim/,HEAD, +https://github.com/rachartier/tiny-devicons-auto-colors.nvim/,HEAD, https://github.com/rachartier/tiny-inline-diagnostic.nvim/,HEAD, https://github.com/tomtom/tinykeymap_vim/,,tinykeymap https://github.com/tomtom/tlib_vim/,, From 8cb4eb65322e6c82a11a290e9af5a1ccc875b329 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 00:29:03 +0000 Subject: [PATCH 0272/1054] cables: 0.3.2 -> 0.4.4 --- pkgs/by-name/ca/cables/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cables/package.nix b/pkgs/by-name/ca/cables/package.nix index 4ce71233cb19..f28305e41b77 100644 --- a/pkgs/by-name/ca/cables/package.nix +++ b/pkgs/by-name/ca/cables/package.nix @@ -7,12 +7,12 @@ let pname = "cables"; - version = "0.3.2"; + version = "0.4.4"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage"; - sha256 = "sha256-D5Bgg5D03FPQF2HKow4yehcqToo4dpPudBg0W4UnqFs="; + sha256 = "sha256-+PMENdKs/bcmszlrk0hQILZzKCV8uQbCgR0bbKMk7ic="; }; appimageContents = appimageTools.extract { From 44c6cc48b9a16f8db2c7878c2b25e713c2552f11 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Mon, 2 Dec 2024 08:21:32 +0200 Subject: [PATCH 0273/1054] fsautocomplete: 0.73.2 -> 0.75.0 --- pkgs/by-name/fs/fsautocomplete/deps.nix | 350 ++++++++++++--------- pkgs/by-name/fs/fsautocomplete/package.nix | 19 +- 2 files changed, 208 insertions(+), 161 deletions(-) diff --git a/pkgs/by-name/fs/fsautocomplete/deps.nix b/pkgs/by-name/fs/fsautocomplete/deps.nix index 82fbac560308..167c8a88be11 100644 --- a/pkgs/by-name/fs/fsautocomplete/deps.nix +++ b/pkgs/by-name/fs/fsautocomplete/deps.nix @@ -2,213 +2,269 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "altcover"; version = "8.3.838"; hash = "sha256-1kVHQ9LVW5UeDQM9akVtHAWqaek9xyGdsbj3fnkuC1E="; }) - (fetchNuGet { pname = "BenchmarkDotNet"; version = "0.13.5"; hash = "sha256-DFj37xGD1ZS+kuRwC6/ry6fCcB7Ua3pUeSEcpayh5Ys="; }) - (fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.13.5"; hash = "sha256-wm/xxRicbpcX2+k+pY0bciAqcJDcD/YTZUOBbaCR/Zc="; }) - (fetchNuGet { pname = "CliWrap"; version = "3.4.4"; hash = "sha256-qBNxZ9XE8Ggml6SJO0APLwLzAZPEyK9oLIG6juHSx7w="; }) - (fetchNuGet { pname = "CommandLineParser"; version = "2.4.3"; hash = "sha256-pTyYP26uXXLe6ejCb/yVYpb23ad/Dkl2Ka8NWwQeiqk="; }) - (fetchNuGet { pname = "CommunityToolkit.HighPerformance"; version = "7.0.1"; hash = "sha256-+RgiTMxrNWj3ugtdookh/xZSSZ9N2AAVwwpVC6w7vKM="; }) - (fetchNuGet { pname = "Destructurama.FSharp"; version = "1.2.0"; hash = "sha256-2xoQITsoczLJZ01q5RpZf6QAyadTGFfiT2SKPxVCc30="; }) - (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; hash = "sha256-0kDBRvlMALkuE0G86ACEkZ4hNCeFwMmLPOvleMHJ6OA="; }) - (fetchNuGet { pname = "dotnet-reportgenerator-globaltool"; version = "5.0.2"; hash = "sha256-0Hrww0XM6T5vtk2pjDcurODd0h6iq4g65MMJBE2TPz8="; }) - (fetchNuGet { pname = "DotNet.ReproducibleBuilds"; version = "1.1.1"; hash = "sha256-+E+F4W9AbqVBwbbwPvaaM62btwF4h8dxlZ+GzRfvQHE="; }) - (fetchNuGet { pname = "Expecto"; version = "10.1.0"; hash = "sha256-Cecf3x1iHWSqXzasGsyEiuUgjeLCs14qXJ6KC2Lx/og="; }) - (fetchNuGet { pname = "Expecto.Diff"; version = "9.0.4"; hash = "sha256-8jhTfIWb0aJwUXUihqdjt8PnuvGZCOiVhye3WfKy5hk="; }) - (fetchNuGet { pname = "fantomas"; version = "6.3.1"; hash = "sha256-mPuY2OwVK6dLtI+L8SIK5i7545VQ0ChhUPdQwBlvcE4="; }) - (fetchNuGet { pname = "Fantomas.Client"; version = "0.9.0"; hash = "sha256-LUnFBYZ7LYhPcTRcXx3KfpnY+TRGIGdw8md6F8zkPf4="; }) + (fetchNuGet { pname = "altcover"; version = "9.0.1"; hash = "sha256-wBTGAGUFiy36FILROhs1CTV467UhAcwxvqxoQ9pkrFo="; }) + (fetchNuGet { pname = "BenchmarkDotNet"; version = "0.14.0"; hash = "sha256-Ynfhr0OsW0dKp81caryZXcrBJsA2YScuKQOCiLVg1rI="; }) + (fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.14.0"; hash = "sha256-BKtno0khZ2jZtXF05l9/vsYjbQIqxAimoaSkxyx6L9A="; }) + (fetchNuGet { pname = "CliWrap"; version = "3.6.7"; hash = "sha256-9j3GILP25inLJoQe0E8sF8egVt8ISqEQBGdIShev4Mk="; }) + (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; hash = "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="; }) + (fetchNuGet { pname = "CommunityToolkit.HighPerformance"; version = "8.3.2"; hash = "sha256-8wB8IwDi1u8WLxPHd+6cyAbhGUr1oSi1juULE1crSQc="; }) + (fetchNuGet { pname = "Destructurama.FSharp"; version = "2.0.0"; hash = "sha256-9/aTLL8rO7bJhchVTDTL+F1vDfe0hXrr2FWXygX5HaY="; }) + (fetchNuGet { pname = "DiffPlex"; version = "1.7.2"; hash = "sha256-Vsn81duAmPIPkR40h5bEz7hgtF5Kt5nAAGhQZrQbqxE="; }) + (fetchNuGet { pname = "dotnet-reportgenerator-globaltool"; version = "5.3.8"; hash = "sha256-jJQ6aB7ePEPVKKeGowBM4b1PNRSvDhREBJFFlap2CHU="; }) + (fetchNuGet { pname = "DotNet.ReproducibleBuilds"; version = "1.2.25"; hash = "sha256-Vl9RPq9vCO4bjulPZiOr3gDVKlr9vnuKIIX3KWlRxvw="; }) + (fetchNuGet { pname = "Expecto"; version = "10.2.1"; hash = "sha256-DgwHFsPMySlnMag4kPTviTwrNOD7uPnnJLi9DCZif5s="; }) + (fetchNuGet { pname = "Expecto.Diff"; version = "10.2.1"; hash = "sha256-qLDLd8xZia6eDCt3PmZbnF6BtBBAHHYwe2CCPqTvSnY="; }) + (fetchNuGet { pname = "Fantomas.Client"; version = "0.9.1"; hash = "sha256-KIHugHvwgaCVD/XQ0FjeZKhiSzzHJyovVPtM5IzttJI="; }) (fetchNuGet { pname = "FParsec"; version = "1.1.1"; hash = "sha256-BFTUFsdUDtPf3Y7YYsIHGnR3SykVeE6MAN3NRHv+Qwc="; }) - (fetchNuGet { pname = "fsharp-analyzers"; version = "0.26.0"; hash = "sha256-60Bl36LOb/zVNdH2SBSuQ5O41lP9dKTNZbs5vvYs+3U="; }) + (fetchNuGet { pname = "fsharp-analyzers"; version = "0.28.0"; hash = "sha256-BqGk9MzHHA3oRPNfWuANcM1YELsdhzWI+kLF4mUDUx8="; }) (fetchNuGet { pname = "FSharp.Analyzers.Build"; version = "0.3.0"; hash = "sha256-Lrb30y+i2NuSyFT/kBQz0HKKGDAi1dGso4T7TROTMbE="; }) - (fetchNuGet { pname = "FSharp.Analyzers.SDK"; version = "0.26.0"; hash = "sha256-4Y433meN0SKb/0JFzStpwScpC1Nly+HCjuihiVGVeE8="; }) - (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.8.300"; hash = "sha256-i/vULPC06ZPAsY2t45ZbHjWXViBV1C0FWsN3D94nGmI="; }) + (fetchNuGet { pname = "FSharp.Analyzers.SDK"; version = "0.28.0"; hash = "sha256-3pB20Niv5q65D4BSCqkMUZk24MeO556kRlv0RXdUzYI="; }) + (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.9.100"; hash = "sha256-9mMAYbS0c5Z/9SQ31NaBmDmZxr7hsX4144an5Yc8RgU="; }) (fetchNuGet { pname = "FSharp.Control.AsyncSeq"; version = "3.2.1"; hash = "sha256-ezSZrGMqTQZKt0ojCRKUWuDGx1JVUyNZzkmUZjVqiAk="; }) (fetchNuGet { pname = "FSharp.Control.Reactive"; version = "5.0.5"; hash = "sha256-Dy8f5tIU/uwv6Nyjq8iomIWTi/IArKEnCGY7XvRoGyo="; }) - (fetchNuGet { pname = "FSharp.Core"; version = "8.0.300"; hash = "sha256-BGDVf+oYfTgeqdS5iApzfT+rEhFN3P/9iuJDC1PuHZU="; }) - (fetchNuGet { pname = "FSharp.Data.Adaptive"; version = "1.2.13"; hash = "sha256-P5stVsJ/IrfAO5Z21Vik2FN1c/AfDoQF9SAEiMKBgZo="; }) + (fetchNuGet { pname = "FSharp.Core"; version = "4.3.4"; hash = "sha256-styyo+6mJy+yxE0NZG/b1hxkAjPOnJfMgd9zWzCJ5uk="; }) + (fetchNuGet { pname = "FSharp.Core"; version = "4.7.0"; hash = "sha256-7aa4bga9XWLkq7J5KXv8Bilf1KGum77lSUqp+ooYIUg="; }) + (fetchNuGet { pname = "FSharp.Core"; version = "4.7.2"; hash = "sha256-1eDe16w8+syA35AtrSiViMHQYgwBqmdViS4yCa4AMZ8="; }) + (fetchNuGet { pname = "FSharp.Core"; version = "5.0.1"; hash = "sha256-WPkytjnHlThxzYlPvmpICMfR+4ANTiWNGjEA6LoAcBA="; }) + (fetchNuGet { pname = "FSharp.Core"; version = "6.0.0"; hash = "sha256-aQDRgiGC7iTyzNEmvyd2RBCDcLG0I1dbfncHlkbeUMI="; }) + (fetchNuGet { pname = "FSharp.Core"; version = "6.0.1"; hash = "sha256-Ehsgt3nCJijpaVuJguC1TPVEKSkJd6PSc07D2ZQSemI="; }) + (fetchNuGet { pname = "FSharp.Core"; version = "7.0.300"; hash = "sha256-pDi6WWiwxmpceSUON1UWDNSOSDP8M5n0nSxF1yy59QQ="; }) + (fetchNuGet { pname = "FSharp.Core"; version = "8.0.101"; hash = "sha256-MS6Z8dFRaGn1KxxCr6lScK3AQdksZ7VcphloE6dlL18="; }) + (fetchNuGet { pname = "FSharp.Core"; version = "9.0.100"; hash = "sha256-V1q3CjbRvWZqxpi6cXD/R0F7pyXGGtH83M5Z/ITDrp8="; }) + (fetchNuGet { pname = "FSharp.Data.Adaptive"; version = "1.2.16"; hash = "sha256-H6kc8WMztWG03xISlMJolg8y+RSNdvPF7lY4biNuNfI="; }) (fetchNuGet { pname = "FSharp.Formatting"; version = "14.0.1"; hash = "sha256-SnfSGd4YoXfns6mG9oS7E4OUwU4sqzMSq6zl+juVpGs="; }) (fetchNuGet { pname = "FSharp.UMX"; version = "1.1.0"; hash = "sha256-E0nEJUfxpXo/d+0BIKcJVG0tJr2pjM2gg/cyh0Yt7uc="; }) - (fetchNuGet { pname = "FSharpLint.Core"; version = "0.21.2"; hash = "sha256-AH5W55M6IJiS4ywvVgBMk79bLmXKE7Q4APK2+vNjn4M="; }) + (fetchNuGet { pname = "FSharpLint.Core"; version = "0.23.0"; hash = "sha256-9sLDEXG3jvVEq3eprvnZztdI8dfgDpHwt7ASzarJduc="; }) (fetchNuGet { pname = "FSharpx.Async"; version = "1.14.1"; hash = "sha256-bDZb/ppG8N1L88enRqcy6wIhB+O+5vWPj6c2jfYlDtQ="; }) - (fetchNuGet { pname = "FsToolkit.ErrorHandling"; version = "4.4.0"; hash = "sha256-XsUBzpwDeIOr5DqXsw7KR76M2wcB/n2rjEUABUqMtSg="; }) - (fetchNuGet { pname = "FsToolkit.ErrorHandling.TaskResult"; version = "4.4.0"; hash = "sha256-OJMBFzAYoQqHoQ0T3NZ6BkOIJKbHqkbBiKppt2Ml/OE="; }) + (fetchNuGet { pname = "FsToolkit.ErrorHandling"; version = "4.18.0"; hash = "sha256-3XmWa7BBRJTvFqOxS1Xu55TQYUQJ2v/VyRz8OM8hvuU="; }) + (fetchNuGet { pname = "FsToolkit.ErrorHandling.TaskResult"; version = "4.18.0"; hash = "sha256-TXQ8cZZsFc8RUQBdxIvbLMtngwFtnNBHId5GkEZ0K/8="; }) (fetchNuGet { pname = "Gee.External.Capstone"; version = "2.3.0"; hash = "sha256-wdYT/F8SLL72OIVv/Q/hfLMfhlWMnhDNCTWx+wWlPoU="; }) - (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.0.1"; hash = "sha256-DkhXkjt4aeRkgzvgZSLA1gyINlrkbDL5uQfTbqsLrZQ="; }) - (fetchNuGet { pname = "Google.Protobuf"; version = "3.22.0"; hash = "sha256-x8ZwDIy+uodM/2H2U4VoSFe8o35LI3+HA0vK3DDtXfI="; }) + (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.4.1"; hash = "sha256-bY8RXB3fIsgYIrlLeEuq8dsOfIn8zcbZ0dj2Ra1sFZg="; }) + (fetchNuGet { pname = "Google.Protobuf"; version = "3.22.5"; hash = "sha256-KuPCqobX6vE9RYElAN9vw+FPonFipms7kE/cRDCLmSQ="; }) + (fetchNuGet { pname = "Google.Protobuf"; version = "3.28.3"; hash = "sha256-jiA/FeYEEk/u9O1gtdnOzatym+/uHyaRJSdp34TOb1o="; }) (fetchNuGet { pname = "Grpc"; version = "2.46.6"; hash = "sha256-UvshzRfdXji+35rPAlS5Kcc5On6OxvFJ0Lbhk+CRQv4="; }) (fetchNuGet { pname = "Grpc.Core"; version = "2.46.6"; hash = "sha256-/8HjIi72DMNH8WMCHcinEmNwdHWudZlc3s7K3hEV3tM="; }) - (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.51.0"; hash = "sha256-P0OJ2rfOwaGXc5XJXoiW2sOmPWAPV5qgblNy3idu6a8="; }) - (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.51.0"; hash = "sha256-0CotAbUEJFJ4ed2P1p6Yu3cc0/6Dpz8NlPiiGIpSmNA="; }) - (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.51.0"; hash = "sha256-H+STGNVZyOK+jfMjn47MnN+UpHFW0xJrIoSRiYvj8aw="; }) + (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.66.0"; hash = "sha256-XVZmvlUK0t4bWaIBUAoAm007VhUdUvSSlCDh6P4IV9c="; }) + (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.52.0"; hash = "sha256-4Rhb8PIoV2BiohfRwzx1GYDPbcfqxGAmL2uB0atFFTk="; }) + (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.66.0"; hash = "sha256-bxK/5xFYWpqFmD8N79B79ymSt/u4aKRJkrO5I1ZxDgI="; }) + (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.66.0"; hash = "sha256-M/GsAvCs1vQ29xLYtK1tuxOhk5MPm5lmwn+DPhfcgkA="; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) - (fetchNuGet { pname = "Iced"; version = "1.17.0"; hash = "sha256-6/5E5v5mqSG7yiE2zHUChZZeC47NRgLzQFD4+7bqKaU="; }) - (fetchNuGet { pname = "IcedTasks"; version = "0.11.5"; hash = "sha256-OJQfoUF9ZIr8tQBJjwGTM0B7Mhsh7n8vwrK8VrT9/FA="; }) - (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; hash = "sha256-ap3Uq6AwYjO7FbhAm/JjG9YUAv9vWYVggHQk+l9G5qc="; }) - (fetchNuGet { pname = "Ionide.Analyzers"; version = "0.11.0"; hash = "sha256-AChoZnk+qr0SKsvqIcirrif8KEs/hl9qrExVktc7XfM="; }) + (fetchNuGet { pname = "Iced"; version = "1.21.0"; hash = "sha256-0xYTYX4935Ejm7yUqMWHhJtCNuj4oqK6Weojl6FIfHo="; }) + (fetchNuGet { pname = "IcedTasks"; version = "0.11.7"; hash = "sha256-X0WDX9imlVG3TheFPYCCTXST6ypLclN1DXmXsABG24I="; }) + (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "8.2.0.7535"; hash = "sha256-4BWs04Va9pc/SLeMA/vKoBydhw+Bu6s9MDtoo/Ucft8="; }) + (fetchNuGet { pname = "Ionide.Analyzers"; version = "0.13.0"; hash = "sha256-PQ118rNahGoK7CPMv+NKDAPwm68p71vzMqmX71eu8E8="; }) (fetchNuGet { pname = "Ionide.KeepAChangelog.Tasks"; version = "0.1.8"; hash = "sha256-yyg8Az7VG4rK/AsMC9cUZc67onl6wOGXoUqHm4Wi3xg="; }) (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.6.0"; hash = "sha256-4CUMAzICBpp621nh3zTnIGrKH9YYvyflbXA3HFKtkpc="; }) - (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.65.0"; hash = "sha256-n+kJQFf2EAiSnlP1QH/0EIo8Y8tHxZTXVQMeqTw6aio="; }) - (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.65.0"; hash = "sha256-IDbSOOD2bJ6bxfvw8xoxnEkW1fdXokV5qaVxa7KxWU4="; }) - (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.65.0"; hash = "sha256-GNXwArp1Y4Sq/yVKBOLLuhcYoTQ76Wnibxt/4IYHCJQ="; }) - (fetchNuGet { pname = "Ionide.ProjInfo.Sln"; version = "0.65.0"; hash = "sha256-FMtbVFnOxFnxFVkkw7ec8Hj9iZdiUisfF6LLjYT2Xbg="; }) + (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.68.0"; hash = "sha256-aRkn1YxZquU+eTIZ7kLOmqnKxzCY/fm3sO539MlnnRw="; }) + (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.68.0"; hash = "sha256-L/v/iwv0Lyrrb/53waIUtTUcRff0mHeNOvXI8FOpllE="; }) + (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.68.0"; hash = "sha256-rnoHnT3wSLrwrGa15Uod6PbpvX41i8yOjchxxQA/A44="; }) + (fetchNuGet { pname = "Ionide.ProjInfo.Sln"; version = "0.68.0"; hash = "sha256-wtF91XZWw9W6X2ignQi0M5dxGY8pmaC+4fQWmhAjn8o="; }) (fetchNuGet { pname = "LinkDotNet.StringBuilder"; version = "1.18.0"; hash = "sha256-nvZmHQr3y8SjXru11dhjQUEqoiv9vlknXjjVaKUn8FE="; }) (fetchNuGet { pname = "McMaster.NETCore.Plugins"; version = "1.4.0"; hash = "sha256-PtpD8S74UXyoA80YRDlrp8qR/I7Ws7+4m2EJZzH4WMw="; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; hash = "sha256-+vMXyEbfutY5WOFuFnNF24uLcKJTTdntVrVlSJH4yjI="; }) - (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; hash = "sha256-u3Qu8UftNIz3oIzQUMa7Z0G6VzmDLcAnAeNQ3lB3YVk="; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; hash = "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="; }) - (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "1.1.0"; hash = "sha256-IFvXCMV2joahytylQ2BGSpZd2tdX0Rss++ZcClVT+r0="; }) - (fetchNuGet { pname = "Microsoft.Build"; version = "17.2.0"; hash = "sha256-JzPqbxFyotNhSr5tokVevdqB9+nJKx4YH2hPkC05GiY="; }) - (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.6.3"; hash = "sha256-xu4GNWtHgwOLOCyI/AfaXxPgWehHFQIYSDkLGLlAQT4="; }) - (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.5.3"; hash = "sha256-5PXL9/sEmtM8xO8U8Ce9Dg3rrFKA7K/Ak5jU9Zz6oE4="; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.4.0"; hash = "sha256-THxSNkjJY82lY6iahcH6PCoHjkDi7G7nK5O4i9GTo4k="; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; hash = "sha256-PHxHmsCty8Si5dCUQSizeHkJrHa9+j2nRsg6Sz+5Za0="; }) - (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.4.0"; hash = "sha256-xyMwjD98ic4Bc3MSC31F9r4CFG1tRGODiXrEZxLm+tM="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis"; version = "4.5.0"; hash = "sha256-3WFWy2PC0X3D/ho3OjEgTx0Wh3Y0+urDBBDnzceYNOw="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; hash = "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0"; hash = "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; hash = "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0"; hash = "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.VisualBasic"; version = "4.5.0"; hash = "sha256-Szem/v7hUsx5NdG6Zt7pJ30mgqCbwR4WShPU89xgqEs="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.VisualBasic.Workspaces"; version = "4.5.0"; hash = "sha256-h0iLQdXKU/u/RHyrAeEHgRrsrSHHb/GaEP53d8j+MfI="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; hash = "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.1"; hash = "sha256-MauJBMP1gySvvAsuNB7m+KvcAWsexU9i/tOwavBDxi0="; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.251802"; hash = "sha256-9ZH4rrfACzJP5oiarDW4cD2nczv1SNgZr4GW1J9hlUA="; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "2.2.332302"; hash = "sha256-5R9xK0owZEhXsucqPKnPaTiwhXBnLo92L2AY7IjyxNg="; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "3.0.2"; hash = "sha256-BHuiTEkA76/9QIR9MG8SBhdExgKFFGd//2RjX8V3XJM="; }) + (fetchNuGet { pname = "MessagePack"; version = "2.5.192"; hash = "sha256-M9QUEAIeSoSgO3whVkOou0F8kbKCNJ7HHAvTZgytkPU="; }) + (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.192"; hash = "sha256-DLtncnaQ9Sp5YmWm89+2w3InhdU1ZQxnJgbonAq/1aM="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.36"; hash = "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.36"; hash = "sha256-JQULJyF0ivLoUU1JaFfK/HHg+/qzpN7V2RR2Cc+WlQ4="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.36"; hash = "sha256-zUsVIpV481vMLAXaLEEUpEMA9/f1HGOnvaQnaWdzlyY="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.36"; hash = "sha256-2seqZcz0JeUjkzh3QcGa9TcJ4LUafpFjTRk+Nm8T6T0="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.36"; hash = "sha256-yxLafxiBKkvfkDggPk0P9YZIHBkDJOsFTO7/V9mEHuU="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; hash = "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "9.0.0"; hash = "sha256-BsXNOWEgfFq3Yz7VTtK6m/ov4/erRqyBzieWSIpmc1U="; }) + (fetchNuGet { pname = "Microsoft.Bcl.Cryptography"; version = "9.0.0"; hash = "sha256-yEji2HL9c5zgrNd0XsAwWTLIEi0z89hD0meJzneUoJM="; }) + (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "6.0.0"; hash = "sha256-87myurC/jMcX1f32167j7FTjbZ6FvUE0esrhYTGcvWs="; }) + (fetchNuGet { pname = "Microsoft.Build"; version = "17.12.6"; hash = "sha256-e5RdZsu7xSRhS9oFNszDvyxmQ41uIiw5i1Na7NIJ7zQ="; }) + (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.12.6"; hash = "sha256-FTI/DWIdoI4oSEMjgsG/TT8uxJpO8DQvrfZnXJeiCXY="; }) + (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.7.8"; hash = "sha256-VhZ4jiJi17Cd5AkENXL1tjG9dV/oGj0aY67IGYd7vNs="; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.12.6"; hash = "sha256-kgZd4bDrnej5A+sPYc2gC/GwZriv5b5lNji8omDnvjI="; }) + (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.12.6"; hash = "sha256-rkPYc3XhJoBVHdQ+pHAIzhxcqrk71XMqIZDIdoG94bY="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis"; version = "4.11.0"; hash = "sha256-2fA+FctRBqOeNzvrcMxGNIahJsg7mHlERnt4wecwk8o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.11.0"; hash = "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; hash = "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.11.0"; hash = "sha256-cX/xgM0VmS+Bsu63KZk2ofjFOOy1mzI+CCVEY6kI+Qk="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.11.0"; hash = "sha256-E9jEOjp9g/CFecsc5/QfRKOPXMRpSw0Tf79XsRgL+Mk="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.11.0"; hash = "sha256-A3hmUJzaqRcWndwGKCHXt3in9T5GeV6ypl/ka8dDQr0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.VisualBasic"; version = "4.11.0"; hash = "sha256-ZaR+4UCavAge+LgjzM6DZVlAbFPDtuN3JP5KnbjOJFk="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.VisualBasic.Workspaces"; version = "4.11.0"; hash = "sha256-PzpH1iVtig74ZQIamx7Dnm1KjfqNV38+oRpcza8m9Hs="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.11.0"; hash = "sha256-8+HxGPWrxOsvqFBnx4rrNQRDfeLbPU7DGcQYyNMq/pE="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.12.0"; hash = "sha256-lGjifppD0OBMBp28pjUfPipaeXg739n8cPhtHWoo5RE="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.553101"; hash = "sha256-6jiLj2HA/qT8pru4C1rgnBdUBLBHCNGU6TrTwbe3oOQ="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "3.1.512801"; hash = "sha256-nDE0cI9oVGPE4aKsmq81ojRizZC/Oi+5W4N97bg3c4A="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "3.1.17"; hash = "sha256-vfVqz7GTFNC/JrrHgZ7WkPe/sNHyI29fq6XXS9ks2A4="; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; hash = "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "6.0.0"; hash = "sha256-aGp1qcL1hVmb+HqCWrao3YVXOpGyiDJFDz2Td0cDw2I="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "6.0.1"; hash = "sha256-8xXb65hiKNlCeTCpuZ2yAEFB4FgXYre/BCQn8FajQGU="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.1"; hash = "sha256-v55PAURxnSGYgbv9x+4/pMeI51H27ikRfHBuUB+N5nE="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; hash = "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; hash = "sha256-7NZcKkiXWSuhhVcA/fXHPY/62aGUyMsRdiHm91cWC5Y="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.1"; hash = "sha256-V+CulDoU3NXWn5EjH64JhDVQ0h+ev5BW95T+2uL1hU4="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; hash = "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "9.0.0"; hash = "sha256-hDau5OMVGIg4sc5+ofe14ROqwt63T0NSbzm/Cv0pDrY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "9.0.0"; hash = "sha256-OZVOVGZOyv9uk5XGJrz6irBkPNjxnBxjfSyW30MnU0s="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "9.0.0"; hash = "sha256-uBLeb4z60y8z7NelHs9uT3cLD6wODkdwyfJm6/YZLDM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "9.0.0"; hash = "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "9.0.0"; hash = "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "9.0.0"; hash = "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "9.0.0"; hash = "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "5.0.0"; hash = "sha256-vUwAWMxXiMW+JOiQE5fcJycOfJJzO87ESYAsEPsPqtY="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; hash = "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.2"; hash = "sha256-VRyyMGCMBh25vIIzbLapMAqY8UffqJRvkF/kcYcjZfM="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; hash = "sha256-IeMOza71UDzsEIVIlYuI0RYKk+d+VOC6zCqYCQs6nV4="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; hash = "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; hash = "sha256-au0Y13cGk/dQFKuvSA5NnP/++bErTk0oOTlgmHdI2Mw="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; hash = "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="; }) - (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; hash = "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo="; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; hash = "sha256-Kl8ZAWCMFZcYEfPDr/YG4zfQEuEzlOuhWI40Zl2S4Qo="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; hash = "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; hash = "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE="; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.3"; hash = "sha256-vVIonl+4dlCQuxibOZoGR3o1DAhjAYpFW15dnkUpjMk="; }) - (fetchNuGet { pname = "Microsoft.SourceLink.AzureRepos.Git"; version = "1.1.1"; hash = "sha256-Pyf/qCztg3ybe/5D070W1Huiaj9ZCq6Hsfkuv0VELBU="; }) - (fetchNuGet { pname = "Microsoft.SourceLink.Bitbucket.Git"; version = "1.1.1"; hash = "sha256-yR7+KmYQqNCUh1JrrZhwPy3KL9xUO0+ajlhlGOmJ7dw="; }) - (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.1"; hash = "sha256-b4FaNFneDVDbvJVX1iNyhhLTrnxUfnmyypeJr47GbXY="; }) - (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.1"; hash = "sha256-3hc9ym5ReONp00ruCKio/Ka1gYXo/jDlUHtfK1wZPiU="; }) - (fetchNuGet { pname = "Microsoft.SourceLink.GitLab"; version = "1.1.1"; hash = "sha256-gfT9xzBXzmVlMR/2T2fTapA+udrYUNvP+bO6AhgDpTo="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; hash = "sha256-Qa059jbu0zIXHknnCYkrqFFZwXR8mpuihaTC65PjyGg="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.1"; hash = "sha256-RIt6iAlpq52zaLy1X1dDAQkIVp/SGhAz6x7mYhGmMdk="; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.6.40"; hash = "sha256-5HtsgSPV5RdaPREGDvJ7qMOFubb1wMyHwkfTnZs9Zsc="; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.6.40"; hash = "sha256-WghLNITEsKTV5pCjogmhfsVD3iO7ghTk0KNrOXzKSS0="; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; hash = "sha256-Lkjp9Ove4+CFP06x/toYpJEiAinuTfn/o+oh0fW3pGM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "9.0.0"; hash = "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "9.0.0"; hash = "sha256-wG1LcET+MPRjUdz3HIOTHVEnbG/INFJUqzPErCM79eY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "9.0.0"; hash = "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; hash = "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "9.0.0"; hash = "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "9.0.0"; hash = "sha256-ysPjBq64p6JM4EmeVndryXnhLWHYYszzlVpPxRWkUkw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "9.0.0"; hash = "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "9.0.0"; hash = "sha256-r1Z3sEVSIjeH2UKj+KMj86har68g/zybSqoSjESBcoA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "9.0.0"; hash = "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs="; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.12.6"; hash = "sha256-cZnnBoiUIZOGMUy31sIMAn3gAd4VgSBFFe8pNfzQBtA="; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.6.3"; hash = "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.12.0"; hash = "sha256-DKFEbhh2wPzahNeHdEoFig8tZh/LEVrFc5+zpT43Btg="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.36"; hash = "sha256-9lC/LYnthYhjkWWz2kkFCvlA5LJOv11jdt59SDnpdy0="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.36"; hash = "sha256-VFRDzx7LJuvI5yzKdGmw/31NYVbwHWPKQvueQt5xc10="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.36"; hash = "sha256-DaSWwYACJGolEBuMhzDVCj/rQTdDt061xCVi+gyQnuo="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.36"; hash = "sha256-FrRny9EI6HKCKQbu6mcLj5w4ooSRrODD4Vj2ZMGnMd4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.36"; hash = "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.36"; hash = "sha256-k3rxvUhCEU0pVH8KgEMtkPiSOibn+nBh+0zT2xIfId8="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.36"; hash = "sha256-U8wJ2snSDFqeAgDVLXjnniidC7Cr5aJ1/h/BMSlyu0c="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.36"; hash = "sha256-UfLcrL2Gj/OLz0s92Oo+OCJeDpZFAcQLPLiSNND8D5Y="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.36"; hash = "sha256-0xIJYFzxdMcnCj3wzkFRQZSnQcPHzPHMzePRIOA3oJs="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "7.0.4"; hash = "sha256-VX+zrmzGUBaBbtJyV3ZUp7wTf3YHUYuj5hWCOuaO1Sk="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; hash = "sha256-5rFBJ8Fkw7+11iCG9nMVhOqPCpyVIrbUzrFQhc/2eHw="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.12.0"; hash = "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.12.0"; hash = "sha256-rf8Sh0fQq44Sneuvs64unkkIHg8kOjDGWE35j9iLx5I="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.10.48"; hash = "sha256-WL8c7TjDBHGjsVLMMPf9cin8rirzOdxusEBQlkUfiVU="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.12.19"; hash = "sha256-4lriaeIL8wbirIvT1sxLTsL8dny+0Puq+OFxrp/4nng="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.10.48"; hash = "sha256-EvZGbyxtrJDvHZwsQbZDXtVfWiy0f58oCdTdSzD34wI="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.12.19"; hash = "sha256-7EteBGfUDOOpDihazJ4XGuPA2dvdc7HkpV8zTVl3FdQ="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.8.8"; hash = "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms="; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; hash = "sha256-i6JojctqrqfJ4Wa+BDtaKZEol26jYq5DTQHar2M9B64="; }) - (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.4"; hash = "sha256-HrnRgFsOzfqAWw0fUxi/vkzZd8dMn5zueUeLQWA9qvs="; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.66"; hash = "sha256-35qyZOVDemtsBYjaZSkzuXGp0mIOSFnCeEHWsUXb5BI="; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; hash = "sha256-ESyjt/R7y9dDvvz5Sftozk+e/3Otn38bOcLGGh69Ot0="; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.3.0"; hash = "sha256-DMTS6vJJ5p0lpld2oXGEzcVk+mZV6vBgUTi5OJ9buBY="; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.3.2"; hash = "sha256-6awzrYhug+Tq1R4uRl1Ry8SC+PPSz0o+hJLfWA67Me0="; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.3.2"; hash = "sha256-YXN8ijWIGq6/0CwQ88oSUlJ7zfCm17T3IXZUa2ZK9Dk="; }) - (fetchNuGet { pname = "OpenTelemetry.Exporter.OpenTelemetryProtocol"; version = "1.3.2"; hash = "sha256-OJI1qaTB1V6Ms4HPbgEyX75HqOf7hGjVgCzjiozN5pI="; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.0.0"; hash = "sha256-NLxoW+nvQB6kssdFyJej168XmWVOOPccfS25H+15QQs="; }) - (fetchNuGet { pname = "Paket"; version = "8.0.3"; hash = "sha256-wAIzB3RURvy51UeMMrdHGI2ImKx1GDu3K1eglwEItYs="; }) - (fetchNuGet { pname = "Perfolizer"; version = "0.2.1"; hash = "sha256-nllshKuHU+1jSBfcTz8BTJTGr1TeCFvxjM4OPyLGSgQ="; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q="; }) + (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.6"; hash = "sha256-0qI4MqqpSLqaAazEK1cm40xfmVlY8bMNRcDnxws6ctU="; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.11.74"; hash = "sha256-asIdaqCIjZspTA+hhtjKNajpCo+ZQi3erZLCpBQ5No4="; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.11.79"; hash = "sha256-1bzibVcSH8LJMR8Nb6Q0q/7fieTgxRnVY4C1RvRbrrI="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.12.1"; hash = "sha256-GGpkbas+PNLx35vvr3nyAVz5lY/aeoMx6qjmT368Lpg="; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.10.0"; hash = "sha256-ucUy3vIabYb0TGDhraqMEzT+LLPmXrO1NgAjEeyVCO8="; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.10.0"; hash = "sha256-ZSpQFnNgkk3dO8Q7yokJ/VSl4wp5PuIv9nduxgC6UxU="; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.9.0"; hash = "sha256-raXpHi2DZ3mSLn9dnJYF64XaP23epdfu8zgagSpm8+4="; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.10.0"; hash = "sha256-hLw3Sf1fviAlVJYhaMudVJEdG5pjX5JvVrqv9DgYAk8="; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.OpenTelemetryProtocol"; version = "1.10.0"; hash = "sha256-1sKqD/DsEo1nfD4BuuIde/In7W0wAbIEWD3jvvbO8JA="; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.9.0"; hash = "sha256-Xov89h4Py7MCz6SAOjV0tjtZvvjHbx7NyPXZsY1PZhk="; }) + (fetchNuGet { pname = "Paket"; version = "9.0.2"; hash = "sha256-/NFd2DQE1rmAMNTzNRgGj7aBMunl3Wkf2ju3JnvRiOw="; }) + (fetchNuGet { pname = "Perfolizer"; version = "0.3.17"; hash = "sha256-EfT9EabewLMOAKrxEwpj7QRzqnHODU0tZ08o1w7aV6Q="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-Zu908yAE2vKu/eCWu/EtxeY0bpSu2jg+UPGGvQISq+k="; }) + (fetchNuGet { pname = "runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-PcaO9QXsBKBGh5njpMvsPb56OshLsbqlb3M7QJY29Y4="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-cmNlzevXubNf8vT43Xpa2utU1UQYKUM3fbayxhpnBek="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-heEPCJqlnwfK+TLqdi0IB7CcOqPHQ+6jqKJLSfU0Gsc="; }) + (fetchNuGet { pname = "runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-jJhuPNmDpiWYQmaHJvwRdIt9h+uLSQc2q6q0dzhw8K4="; }) + (fetchNuGet { pname = "runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-Nr8c3+2urG0ePt7fFrkg/iWoICypipXeRz+Zws/ayaM="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.1"; hash = "sha256-Ezxni8//ko4X51Urfz/crb0+dqWfq46eZvVyt0S0tso="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.1"; hash = "sha256-S8mmFpkshoG1D6VgpqV6Ulmjr1lBY05IEvuk3rKFykY="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.1"; hash = "sha256-Mt2QAjNH5nKnwpbyoUe2O+En97CP84EQFoS3CkmYXAM="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-rp2iQsY5dl3jt9Qnw3NkexTqzKNBSxKPG6utsf4Kg0Q="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-UVFRdf1Am2bwb2Vgu5zY+px60ijYZ2wgKlPpxQpT8QM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-bTUoXnUQ0yUIO7PJoSSqPgqQe3VolkSrZeQtXb5OLjU="; }) + (fetchNuGet { pname = "runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-VGL9nvYCMOHAgl6K6nGX+ljhRBci0Aef7bAZLSA0u+Q="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.1"; hash = "sha256-J5RHzSIfUs001NsY82+ZXn0ZIqux+aLvY7uDuXjRd8U="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-740H2o1F3HP+A5hnhwt1CcmDBh+4CYi6ld2A/rFDbWM="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-Xk521T6ppCknW+sjLZUGHWINwbed90F6ObYRH4GQ58s="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-HRGXRnddE8O3AaZIpJtk4WMkveU6VRl1eGlZ13AKewo="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-ZXtvlK1Stke22Pnc8XdnpPl90ev078lnpiuXwtQXpzA="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-SeyZLMv9GFxvt9blmfTAuWcMNc+dL0xhMCm2wUsHVK0="; }) + (fetchNuGet { pname = "runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.3"; hash = "sha256-zhG1bm8Qj1I4XuYg047p3eFI36QrBqVGRTb+gQoCRG8="; }) (fetchNuGet { pname = "SemanticVersioning"; version = "2.0.2"; hash = "sha256-d5tUJshDHk/rhNqt7Rl9S/Fg526el1faeanNHKcqtAg="; }) - (fetchNuGet { pname = "Serilog"; version = "2.11.0"; hash = "sha256-kI7I/NiH7GuR0MQTZsy+m+8+2qT0xMBrY7SXYCocbds="; }) - (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "1.5.0"; hash = "sha256-z78CCkdeV+C4HnrH/HX0D61V3fLxVwOQdLy8So0diy0="; }) - (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.0.1"; hash = "sha256-n0LQOEsUg9M/T1aWryiG2690pyGBjHsk6TRZz2aCGyA="; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; }) + (fetchNuGet { pname = "Serilog"; version = "3.1.1"; hash = "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="; }) + (fetchNuGet { pname = "Serilog"; version = "4.0.0"; hash = "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="; }) + (fetchNuGet { pname = "Serilog"; version = "4.1.0"; hash = "sha256-r89nJ5JE5uZlsRrfB8QJQ1byVVfCWQbySKQ/m9PYj0k="; }) + (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "2.1.0"; hash = "sha256-LDoLpXkleD2MVPK2KBsLGRf5yqrwckBiAnYDbuIbaUM="; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "6.0.0"; hash = "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "6.0.0"; hash = "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="; }) (fetchNuGet { pname = "StreamJsonRpc"; version = "2.16.36"; hash = "sha256-XLCQsY7xu67E8E7WJIvjHtk3iobREPCiljW8jNpfi68="; }) + (fetchNuGet { pname = "StreamJsonRpc"; version = "2.20.17"; hash = "sha256-0uUM1JUC6NLjQOPhpEIKCt0zkd/Sh8FjMCjI2j+TYxw="; }) + (fetchNuGet { pname = "StreamJsonRpc"; version = "2.8.28"; hash = "sha256-iMesOucDwxjGDw2cBKDDzxZskjC1Mc0bszI/frB6qpA="; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) - (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; hash = "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.6.0"; hash = "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="; }) + (fetchNuGet { pname = "System.CodeDom"; version = "8.0.0"; hash = "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338="; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; hash = "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "9.0.0"; hash = "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="; }) (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; hash = "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="; }) - (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; hash = "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw="; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; hash = "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc="; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; hash = "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo="; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; hash = "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4="; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; hash = "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8="; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; hash = "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k="; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="; }) + (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; hash = "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="; }) + (fetchNuGet { pname = "System.Composition"; version = "9.0.0"; hash = "sha256-FehOkQ2u1p8mQ0/wn3cZ+24HjhTLdck8VZYWA1CcgbM="; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "9.0.0"; hash = "sha256-a7y7H6zj+kmYkllNHA402DoVfY9IaqC3Ooys8Vzl24M="; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "9.0.0"; hash = "sha256-tw4vE5JRQ60ubTZBbxoMPhtjOQCC3XoDFUH7NHO7o8U="; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "9.0.0"; hash = "sha256-oOxU+DPEEfMCuNLgW6wSkZp0JY5gYt44FJNnWt+967s="; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "9.0.0"; hash = "sha256-AyIe+di1TqwUBbSJ/sJ8Q8tzsnTN+VBdJw4K8xZz43s="; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "9.0.0"; hash = "sha256-F5fpTUs3Rr7yP/NyIzr+Xn5NdTXXp8rrjBnF9UBBUog="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0"; hash = "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "9.0.0"; hash = "sha256-+pLnTC0YDP6Kjw5DVBiFrV/Q3x5is/+6N6vAtjvhVWk="; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; hash = "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "9.0.0"; hash = "sha256-1VzO9i8Uq2KlTw1wnCCrEdABPZuB2JBD5gBsMTFTSvE="; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "9.0.0"; hash = "sha256-tPvt6yoAp56sK/fe+/ei8M65eavY2UUhRnbrREj/Ems="; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; hash = "sha256-t4FBgTMhuOA5FA23fg0WQOGuH0njV7hJXST/Ln/Znks="; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; hash = "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "9.0.0"; hash = "sha256-LHyYt3rzKjPzxCHW/cynkBBzkl4I2h5wW6WYWG0k1w4="; }) + (fetchNuGet { pname = "System.Formats.Nrbf"; version = "9.0.0"; hash = "sha256-c4qf6CocQUZB0ySGQd8s15PXY7xfrjQqMGXxkwytKyw="; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "8.0.0"; hash = "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "9.0.0"; hash = "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0="; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) - (fetchNuGet { pname = "System.Management"; version = "6.0.0"; hash = "sha256-uZEf0a+9a2dqmzJS1Qxm3TR5ZxBHfeBLNO+q6ct5QWU="; }) + (fetchNuGet { pname = "System.Management"; version = "8.0.0"; hash = "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0="; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.6.0"; hash = "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo="; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; hash = "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00="; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.1"; hash = "sha256-qICFjQo5FcSfNSeb8XOMwA5aUgP+PO0idlO5HVpgusM="; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.6.0"; hash = "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU="; }) (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; hash = "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; hash = "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.7.0"; hash = "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.6.0"; hash = "sha256-913OIkt3v3N12Yke328IRxTtgYUQYNs/eSzOs8wUPkM="; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; hash = "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; hash = "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.0"; hash = "sha256-VJHXPjP05w6RE/Swu8wa2hilEWuji3g9bl/6lBMSC/Q="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "8.0.0"; hash = "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "9.0.0"; hash = "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ="; }) + (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "9.0.0"; hash = "sha256-voF8Csk1WLPikMRrKmGxUOtM9k6W4RB2JAfwjsaF8oo="; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) - (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; hash = "sha256-/EEdeNvp9FrLeVnmowzHk6nn0KmPf6L9Poc7l/R948A="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.7.0"; hash = "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM="; }) + (fetchNuGet { pname = "System.Resources.Extensions"; version = "9.0.0"; hash = "sha256-y2gLEMuAy6QfEyNJxABC/ayMWGnwlpX735jsUQLktho="; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; hash = "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0="; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.1.0"; hash = "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU="; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.1"; hash = "sha256-xll/AF6sF1soQ15prAPIVHSH69CiL4E9OHVDHyrm868="; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.1"; hash = "sha256-Ri4m95ZBfopDUGVahbvUIzuUy9D3FQwcXprP2I6IUUE="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.1"; hash = "sha256-QlO/ppRk/OyDYHCimD867RAlKIOakidD0ICNOt63XNQ="; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; hash = "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo="; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; hash = "sha256-2e0aRybote+OR66bHaNiYpF//4fCiaO3zbR2e9GABUI="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "5.0.0"; hash = "sha256-yprw1SpkT25xpHsGHXO5RYfeZa/ea7CxEdRp4X7GUHE="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "9.0.0"; hash = "sha256-AjG14mGeSc2Ka4QSelGBM1LrGBW3VJX60lnihKyJjGY="; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) - (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.1"; hash = "sha256-spXV8cWZu0V3liek1936REtdpvS4fQwc98JvacO1oJU="; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; hash = "sha256-DOFoX+AKRmrkllykHheR8FfUXYx/Ph+I/HYuReQydXI="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "9.0.0"; hash = "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.2"; hash = "sha256-skaAtIqikbBv1586EocSiwg+QqBs9t5jKUAr/Qb9yi0="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "9.0.0"; hash = "sha256-SQJWwAFrJUddEU6JiZB52FM9tGjRlJAYH8oYVzG5IJU="; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; hash = "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; hash = "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "9.0.0"; hash = "sha256-OvtGrWDjuXdcIuMV504IDiBq9g8vtRIcn5w25x4W9HE="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "9.0.0"; hash = "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "9.0.0"; hash = "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk="; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.1"; hash = "sha256-DxsEZ0nnPozyC1W164yrMUXwnAdHShS9En7ImD/GJMM="; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; hash = "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; hash = "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "9.0.0"; hash = "sha256-depIorJqzjyWew0+aBRgbGh88KWivbp9RrtWZHFr+pI="; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "7.0.0"; hash = "sha256-KTeMhCWcyYEwG7EkA0VkVvHwo0B2FBs5FpjW3BFNVUE="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "9.0.0"; hash = "sha256-nRzcFvLBpcOfyIJdCCZq5vDKZN0xHVuB8yCXoMrwZJA="; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; hash = "sha256-yRivIiENFKMxbSh8SZ/fmKjshwBdFXzbKmZcfDZwKYc="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.6.0"; hash = "sha256-OwIB0dpcdnyfvTUUj6gQfKW2XF2pWsQhykwM1HNCHqY="; }) (fetchNuGet { pname = "telplin"; version = "0.9.6"; hash = "sha256-kBiLPgmdKpCx+0x06E7Sq3xoDAFVjLrBPI5F4rU1j3I="; }) - (fetchNuGet { pname = "YoloDev.Expecto.TestSdk"; version = "0.14.2"; hash = "sha256-Kufv0plq7ypcEeZdZja+PYja9U1aPyjt6IFy5EZ+56A="; }) + (fetchNuGet { pname = "YoloDev.Expecto.TestSdk"; version = "0.14.3"; hash = "sha256-3FIZM+GYsBsFGhLsasF7Ia9nXHSpqooQNe5H7ANy334="; }) ] diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix index b3560f9ab7ed..f4e3b7d74392 100644 --- a/pkgs/by-name/fs/fsautocomplete/package.nix +++ b/pkgs/by-name/fs/fsautocomplete/package.nix @@ -2,46 +2,37 @@ lib, buildDotnetModule, fetchFromGitHub, - fetchpatch, dotnetCorePackages, testers, }: buildDotnetModule (finalAttrs: rec { pname = "fsautocomplete"; - version = "0.73.2"; + version = "0.75.0"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${version}"; - hash = "sha256-iiV/Tw3gOteARrOEbLjPA/jGawoxJVBZg6GvF9p9HHA="; + hash = "sha256-+IkoXj7l6a/iPigIVy334XiwQFm/pD63FWpV2r0x84c="; }; - patches = [ - (fetchpatch { - url = "https://github.com/ionide/FsAutoComplete/pull/1311/commits/e258ba3db47daec9d5befcdc1ae79484c2804cf4.patch"; - hash = "sha256-bKTk5gszyVZObvq78emAtqE6bBg+1doseoxjUnrjOH4="; - }) - ]; - nugetDeps = ./deps.nix; postPatch = '' rm global.json substituteInPlace src/FsAutoComplete/FsAutoComplete.fsproj \ - --replace TargetFrameworks TargetFramework \ + --replace-fail TargetFrameworks TargetFramework \ ''; dotnet-sdk = with dotnetCorePackages; combinePackages [ - sdk_6_0 - sdk_7_0 sdk_8_0 + sdk_9_0 ]; - dotnet-runtime = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.sdk_9_0; projectFile = "src/FsAutoComplete/FsAutoComplete.fsproj"; executables = [ "fsautocomplete" ]; From 868ae9a62f97dcb18d967e4816422f2e68306da9 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 2 Dec 2024 12:20:04 +0530 Subject: [PATCH 0274/1054] lazygit: use go1.22 Regression in go1.23 see https://github.com/jesseduffield/lazygit/issues/4002 Signed-off-by: phanirithvij --- pkgs/by-name/la/lazygit/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index d1fcbdcc7b0e..54ac4b57d9ea 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -1,11 +1,12 @@ { lib, - buildGoModule, + buildGo122Module, fetchFromGitHub, lazygit, testers, }: -buildGoModule rec { +# Regression in go1.23 see https://github.com/jesseduffield/lazygit/issues/4002 +buildGo122Module rec { pname = "lazygit"; version = "0.44.1"; From 9673dfc9770257cc8b48fed660fda689fd7c1bd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 09:16:02 +0000 Subject: [PATCH 0275/1054] seatd: 0.8.0 -> 0.9.1 --- pkgs/by-name/se/seatd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/seatd/package.nix b/pkgs/by-name/se/seatd/package.nix index c10d5085dfc8..b47e6bc46199 100644 --- a/pkgs/by-name/se/seatd/package.nix +++ b/pkgs/by-name/se/seatd/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "seatd"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = "seatd"; rev = finalAttrs.version; - hash = "sha256-YaR4VuY+wrzbnhER4bkwdm0rTY1OVMtixdDEhu7Lnws="; + hash = "sha256-6F+TPSpcEwX4wW5GPy5Ck2AeHyH/Ba2oBUSUnVyAMeA="; }; outputs = [ "bin" "out" "dev" "man" ]; From 4fef32823db684e164c3194549676b1864d0ff04 Mon Sep 17 00:00:00 2001 From: Arsalan Date: Mon, 2 Dec 2024 05:08:45 -0500 Subject: [PATCH 0276/1054] linuxKernel.kernels.linux_zen: 6.11.5-zen1 -> v6.12.1-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index f4eda83e6f64..876b622f2562 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -5,9 +5,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.11.5"; #zen + version = "6.12.1"; #zen suffix = "zen1"; #zen - sha256 = "1w342k54ns6rwkk13l9f7h0qzikn6hbnb2ydxyqalrmll8n2g237"; #zen + sha256 = "18aws41zlayv4xd6489jzrhr8b3kwmrx2q1b50g67v4rsp02sb4p"; #zen isLqx = false; }; # ./update-zen.py lqx From c1d0a025aab8609c00258b163a9d9ac3498118ea Mon Sep 17 00:00:00 2001 From: Arsalan Date: Mon, 2 Dec 2024 05:10:07 -0500 Subject: [PATCH 0277/1054] linuxKernel.kernels.linux_lqx: 6.11.5-lqx1 -> v6.12.1-lqx1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 876b622f2562..47a8ac0151a8 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -12,9 +12,9 @@ let }; # ./update-zen.py lqx lqx = { - version = "6.11.5"; #lqx + version = "6.12.1"; #lqx suffix = "lqx1"; #lqx - sha256 = "0ql7nw6sph4ai44n66c7l06aj4ibhdy45415yzgibin1jg9rqa6d"; #lqx + sha256 = "1q8rdghkgq0kn530pxncwsrfqlf3xfn4mdvxysdizyfn71vmrz8f"; #lqx isLqx = true; }; }; From 95b97177266009620578d04299b741ec07a586b1 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:23:01 +0100 Subject: [PATCH 0278/1054] element-call: 0.6.3 -> 0.7.1 Diff: https://github.com/element-hq/element-call/compare/v0.6.3...v0.7.1 --- pkgs/by-name/el/element-call/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/el/element-call/package.nix b/pkgs/by-name/el/element-call/package.nix index 784df2186338..1a3b90799c56 100644 --- a/pkgs/by-name/el/element-call/package.nix +++ b/pkgs/by-name/el/element-call/package.nix @@ -12,21 +12,21 @@ let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; offlineCacheHash = { - x86_64-linux = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU="; - aarch64-linux = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU="; - x86_64-darwin = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU="; - aarch64-darwin = "sha256-g4PWB1EstNB7gd/yZyrXf+U8Py8OLeea0gDlEXhInhU="; + x86_64-linux = "sha256-bjWPoci9j3LZnOfDgmRVqQp1L2tXBwHQOryn+p5B1Mc="; + aarch64-linux = "sha256-bjWPoci9j3LZnOfDgmRVqQp1L2tXBwHQOryn+p5B1Mc="; + x86_64-darwin = "sha256-bjWPoci9j3LZnOfDgmRVqQp1L2tXBwHQOryn+p5B1Mc="; + aarch64-darwin = "sha256-bjWPoci9j3LZnOfDgmRVqQp1L2tXBwHQOryn+p5B1Mc="; }.${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "element-call"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-call"; rev = "v${finalAttrs.version}"; - hash = "sha256-PyxqUhnlWfcACsoFYrppO7g5e74jI4/xxXBi6oWyWsg="; + hash = "sha256-HmkFr2DroN1uNNH2pnRwE7vsJsEPLYU6yhroiuR/E6Q="; }; offlineCache = fetchYarnDeps { From 539999c8c08ecb8d72434642c136d2ea94257635 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 2 Dec 2024 08:41:50 -0500 Subject: [PATCH 0279/1054] perlPackages.AudioScan: 1.05 -> 1.10 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6c243b3879b3..ab8605ba7055 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1312,10 +1312,10 @@ with self; { AudioScan = buildPerlPackage { pname = "Audio-Scan"; - version = "1.05"; + version = "1.10"; src = fetchurl { - url = "https://github.com/Logitech/slimserver-vendor/raw/public/8.3/CPAN/Audio-Scan-1.05.tar.gz"; - hash = "sha256-9YXC8GHPRWKlV8emmTke7RB0HhiCbALmZQqtQFLcBi4="; + url = "https://github.com/Logitech/slimserver-vendor/raw/public/9.0/CPAN/Audio-Scan-1.10.tar.gz"; + hash = "sha256-Vqi/rnYKijmaWYwTFTyj88aMoDB2cCSHxHeR1bkfqSk="; }; buildInputs = [ pkgs.zlib TestWarn ]; env.NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include"; From b834a52cc3f848209ca59cdc4740a2f6789da657 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 2 Dec 2024 13:42:51 +0000 Subject: [PATCH 0280/1054] slimserver: 8.5.2 -> 9.0.0 https://lyrion.org/getting-started/changelog-lms9/#introducing-lyrion-music-server-version-900-2024-11-29-2ed5e147e --- pkgs/by-name/sl/slimserver/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix index 0fd579e7a3b8..76fa07ba5106 100644 --- a/pkgs/by-name/sl/slimserver/package.nix +++ b/pkgs/by-name/sl/slimserver/package.nix @@ -33,13 +33,13 @@ let in perlPackages.buildPerlPackage rec { pname = "slimserver"; - version = "8.5.2"; + version = "9.0.0"; src = fetchFromGitHub { owner = "LMS-Community"; repo = "slimserver"; rev = version; - hash = "sha256-262SHaxt5ow3nJtNVk10sbiPUfDb/U+Ab97DRjkJZFI="; + hash = "sha256-Sd39J8YOywOOtVHxO3OPABULwRI5VGovS33tAj4TFkw="; }; nativeBuildInputs = [ makeWrapper ]; @@ -151,6 +151,7 @@ perlPackages.buildPerlPackage rec { installPhase = '' cp -r . $out wrapProgram $out/slimserver.pl --prefix LD_LIBRARY_PATH : "${libPath}" --prefix PATH : "${binPath}" + chmod +x $out/scanner.pl wrapProgram $out/scanner.pl --prefix LD_LIBRARY_PATH : "${libPath}" --prefix PATH : "${binPath}" mkdir $out/bin ln -s $out/slimserver.pl $out/bin/slimserver @@ -168,7 +169,7 @@ perlPackages.buildPerlPackage rec { meta = with lib; { homepage = "https://lyrion.org/"; - changelog = "https://github.com/LMS-Community/slimserver/blob/${version}/Changelog${lib.versions.major version}.html"; + changelog = "https://lyrion.org/getting-started/changelog-lms${lib.versions.major version}"; description = "Lyrion Music Server (formerly Logitech Media Server) is open-source server software which controls a wide range of Squeezebox audio players"; # the firmware is not under a free license, so we do not include firmware in the default package # https://github.com/LMS-Community/slimserver/blob/public/8.3/License.txt From 316fbb8f939a15c353365856f1b5dcbf60d5b7ee Mon Sep 17 00:00:00 2001 From: Yechiel Worenklein <41305372+yechielw@users.noreply.github.com> Date: Sun, 1 Dec 2024 07:53:59 +0200 Subject: [PATCH 0281/1054] burpsuite: 2024.10.1 -> 2024.11.1 Changelog: https://portswigger.net/burp/releases/professional-community-2024-11-1 --- pkgs/by-name/bu/burpsuite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index c0354bdc8303..e5c89e604f4a 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -9,20 +9,20 @@ }: let - version = "2024.10.1"; + version = "2024.11.1"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-r/j7nATyd8GbfoLNby5x1/5BVeRv5B/8Ri1fPUwaCoQ="; + hash = "sha256-T2mihC/E9P2ARDs3aN6Acg62W86zNR4rTjngriGl3aU="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-uvX1LTe2slPINrn+ywY3nyu/K+FTczvsW/FnP0z43Q8="; + hash = "sha256-feTqtqnYtT7i+HtJAERcKK3QAdPkXm+JUtl6JZLEHJA="; }; src = fetchurl { From 2cf7ed41454342cf12de20aac6f91a77e9aafc46 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 2 Dec 2024 14:15:33 +0000 Subject: [PATCH 0282/1054] mate.mate-applets: 1.28.0 -> 1.28.1 https://github.com/mate-desktop/mate-applets/compare/v1.28.0...v1.28.1 This replaced GtkSourceView with GtkTextView. --- pkgs/desktops/mate/mate-applets/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index a15fd0054b92..b598e453a95a 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -7,7 +7,6 @@ , dbus-glib , glib , gtk3 -, gtksourceview4 , gucharmap , libmateweather , libnl @@ -27,11 +26,11 @@ stdenv.mkDerivation rec { pname = "mate-applets"; - version = "1.28.0"; + version = "1.28.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "G2vva9XTJvudyCj/kQ5LG5KUtGYMMR3ByQMQ/Zw1ZoY="; + sha256 = "pZZxQVJ9xbFy0yKmADwjruwlMWD2ULs2QwoG3a76fi4="; }; nativeBuildInputs = [ @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { buildInputs = [ dbus-glib gtk3 - gtksourceview4 gucharmap hicolor-icon-theme libgtop From a5291b34f8b5a99c30d9eb002eaf258ed453caed Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 2 Dec 2024 21:14:53 +0530 Subject: [PATCH 0283/1054] lazygit: remove with lib Signed-off-by: phanirithvij --- pkgs/by-name/la/lazygit/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 54ac4b57d9ea..f8f1f886889d 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -13,7 +13,7 @@ buildGo122Module rec { src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-BP5PMgRq8LHLuUYDrWaX1PgfT9VEhj3xeLE2aDMAPF0="; }; @@ -27,12 +27,12 @@ buildGo122Module rec { passthru.tests.version = testers.testVersion { package = lazygit; }; - meta = with lib; { + meta = { description = "Simple terminal UI for git commands"; homepage = "https://github.com/jesseduffield/lazygit"; changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne equirosa khaneliman From e6b09cd21bba003e15af80b7d2f0ece7162b95c3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 2 Dec 2024 17:25:39 +0100 Subject: [PATCH 0284/1054] utm: format with nixfmt --- pkgs/by-name/ut/utm/package.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ut/utm/package.nix b/pkgs/by-name/ut/utm/package.nix index ae3736474a6e..359234b59d62 100644 --- a/pkgs/by-name/ut/utm/package.nix +++ b/pkgs/by-name/ut/utm/package.nix @@ -1,8 +1,9 @@ -{ lib -, undmg -, makeWrapper -, fetchurl -, stdenvNoCC +{ + lib, + undmg, + makeWrapper, + fetchurl, + stdenvNoCC, }: stdenvNoCC.mkDerivation rec { @@ -14,7 +15,10 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-GzwokK/q8S38lbOVhGgNaqbDAAryHJ9eBAAWGpuOQOE="; }; - nativeBuildInputs = [ undmg makeWrapper ]; + nativeBuildInputs = [ + undmg + makeWrapper + ]; sourceRoot = "."; installPhase = '' @@ -62,6 +66,9 @@ stdenvNoCC.mkDerivation rec { license = licenses.asl20; platforms = platforms.darwin; # 11.3 is the minimum supported version as of UTM 4. sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ rrbutani wegank ]; + maintainers = with maintainers; [ + rrbutani + wegank + ]; }; } From 0dd903bb085ab0a9248e899d9c63d81e2fb82807 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Mon, 2 Dec 2024 17:45:26 +0100 Subject: [PATCH 0285/1054] waybar: add option for en-/disabling niri support Signed-off-by: Christoph Heiss --- pkgs/by-name/wa/waybar/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix index 7f5c9ad4432b..8fcd8869a282 100644 --- a/pkgs/by-name/wa/waybar/package.nix +++ b/pkgs/by-name/wa/waybar/package.nix @@ -55,6 +55,7 @@ jackSupport ? true, mpdSupport ? true, mprisSupport ? stdenv.hostPlatform.isLinux, + niriSupport ? true, nlSupport ? true, pipewireSupport ? true, pulseSupport ? true, @@ -187,7 +188,10 @@ stdenv.mkDerivation (finalAttrs: { "upower_glib" = upowerSupport; "wireplumber" = wireplumberSupport; }) - ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); + ++ (lib.mapAttrsToList lib.mesonBool { + "experimental" = experimentalPatches; + "niri" = niriSupport; + }); env = lib.optionalAttrs systemdSupport { PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; From 93dcf8df4c2cd4107fd1af8928792e5bf086339d Mon Sep 17 00:00:00 2001 From: Bazyli Cyran Date: Thu, 28 Nov 2024 17:13:19 +0100 Subject: [PATCH 0286/1054] philipstv: init at 2.1.1 --- .../python-modules/philipstv/default.nix | 73 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 77 insertions(+) create mode 100644 pkgs/development/python-modules/philipstv/default.nix diff --git a/pkgs/development/python-modules/philipstv/default.nix b/pkgs/development/python-modules/philipstv/default.nix new file mode 100644 index 000000000000..4becffc7f750 --- /dev/null +++ b/pkgs/development/python-modules/philipstv/default.nix @@ -0,0 +1,73 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + pythonOlder, + poetry-core, + poetry-dynamic-versioning, + installShellFiles, + pytestCheckHook, + requests-mock, + requests, + pydantic, + click, + appdirs, + stdenv, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "philipstv"; + version = "2.1.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "bcyran"; + repo = "philipstv"; + rev = "refs/tags/${version}"; + hash = "sha256-BvQurZls9NjtHhTXLQ9t8fHkAF/QU/c6mmRvNmE0v90="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + dependencies = [ + requests + pydantic + click + appdirs + ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd philipstv \ + --bash <(_PHILIPSTV_COMPLETE=bash_source $out/bin/philipstv) \ + --zsh <(_PHILIPSTV_COMPLETE=zsh_source $out/bin/philipstv) \ + --fish <(_PHILIPSTV_COMPLETE=fish_source $out/bin/philipstv) + ''; + + pythonImportsCheck = [ "philipstv" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI and library to control Philips Android-powered TVs"; + homepage = "https://github.com/bcyran/philipstv"; + changelog = "https://github.com/bcyran/philipstv/releases/tag/${version}"; + license = lib.licenses.mit; + mainProgram = "philipstv"; + maintainers = with lib.maintainers; [ bcyran ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb347d601be5..e21d1e0ba61c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18470,6 +18470,8 @@ with pkgs; pgmodeler = qt6Packages.callPackage ../applications/misc/pgmodeler { }; + philipstv = with python3Packages; toPythonApplication philipstv; + pjsip = darwin.apple_sdk_11_0.callPackage ../applications/networking/pjsip { inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreFoundation Security; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67119e79acce..802439efa160 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10141,6 +10141,8 @@ self: super: with self; { phik = callPackage ../development/python-modules/phik { }; + philipstv = callPackage ../development/python-modules/philipstv { }; + phone-modem = callPackage ../development/python-modules/phone-modem { }; phonenumbers = callPackage ../development/python-modules/phonenumbers { }; From d448e039571438f09c6f8b43d24bc9e2635c2b99 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 2 Dec 2024 19:26:23 +0100 Subject: [PATCH 0287/1054] utm: 4.5.4 -> 4.6.2 --- pkgs/by-name/ut/utm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ut/utm/package.nix b/pkgs/by-name/ut/utm/package.nix index 359234b59d62..ce8d48ce0016 100644 --- a/pkgs/by-name/ut/utm/package.nix +++ b/pkgs/by-name/ut/utm/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.5.4"; + version = "4.6.2"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - hash = "sha256-GzwokK/q8S38lbOVhGgNaqbDAAryHJ9eBAAWGpuOQOE="; + hash = "sha256-M4R0uSAX0MUTUCsPtdRMPESFET9AEQBtjvM7eTcRCas="; }; nativeBuildInputs = [ From 187df981b7ff7d7122841d4122811896e6039d7c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 2 Dec 2024 19:33:21 +0100 Subject: [PATCH 0288/1054] photoqt: 4.6 -> 4.7 --- pkgs/by-name/ph/photoqt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix index 6e66d6885efc..2fa08c051740 100644 --- a/pkgs/by-name/ph/photoqt/package.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "photoqt"; - version = "4.6"; + version = "4.7"; src = fetchurl { url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - hash = "sha256-5VbGMJ1B9yDbTiri7SZ+r+c9LdfG/C1c0/01QBUvbCY="; + hash = "sha256-uZCeJJsQoIDZ6nf+JbFhbXE4ZHL8pCY0pJOG5w6v4vs="; }; nativeBuildInputs = [ From 75fd236586f263f53ed18378343e243f25640a80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 19:32:37 +0000 Subject: [PATCH 0289/1054] sane-airscan: 0.99.29 -> 0.99.30 --- pkgs/by-name/sa/sane-airscan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/sane-airscan/package.nix b/pkgs/by-name/sa/sane-airscan/package.nix index 83530518aa7d..b4ac219a17e4 100644 --- a/pkgs/by-name/sa/sane-airscan/package.nix +++ b/pkgs/by-name/sa/sane-airscan/package.nix @@ -2,7 +2,7 @@ , libxml2, gnutls, sane-backends }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.29"; + version = "0.99.30"; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ avahi gnutls libjpeg libpng libxml2 libtiff sane-backends ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "sha256-9ErTC9NztyO9o6y2FjQPl2lu1gICasZYm2tnaCVCLt8="; + sha256 = "sha256-JNgKZZuNRB02c+nOjtFj8L5wDY8ErZcv00nYweYULaM="; }; meta = with lib; { From 41a5b2b5636e361b52e9e6c0417fc062480d77d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 20:54:22 +0000 Subject: [PATCH 0290/1054] free42: 3.1.8 -> 3.1.10 --- pkgs/by-name/fr/free42/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix index 5b05e08b8792..d9197e9d667e 100644 --- a/pkgs/by-name/fr/free42/package.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "free42"; - version = "3.1.8"; + version = "3.1.10"; src = fetchFromGitHub { owner = "thomasokken"; repo = "free42"; rev = "v${finalAttrs.version}"; - hash = "sha256-z1HlI2e3mCRJ/sWMdsLF7IpcvTh+Zlrk77M8gaJXMzQ="; + hash = "sha256-X1fNr+0xc15KmR+qbDOkQraYPUj50b1eWmSheIKl4e8="; }; nativeBuildInputs = [ From debf187c9a087c5db69c98dde29ea98a4ef990fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 2 Dec 2024 18:47:36 -0300 Subject: [PATCH 0291/1054] lxqt.lxqt-panel: 2.1.2 -> 2.1.3 Diff: https://github.com/lxqt/lxqt-panel/compare/2.1.2...2.1.3 --- pkgs/desktops/lxqt/lxqt-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 8fe19bc3254c..bee22f7405f5 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "lxqt-panel"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-090zBmRUFac9Tt10l20Vxvn234Br5YPpdLR6+KreEFM="; + hash = "sha256-p4Y+0Ym0NNG4yrlfrLqCQyMYVjyogNb1V1QAooQ82LE="; }; nativeBuildInputs = [ From efbd47f639b7c330768169d90d261f714032f6d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 2 Dec 2024 18:49:11 -0300 Subject: [PATCH 0292/1054] lxqt.lxqt-notificationd: 2.1.0 -> 2.1.1 Diff: https://github.com/lxqt/lxqt-notificationd/compare/2.1.0...2.1.1 --- pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index a88f3317b3ea..4f01a9d7114a 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxqt-notificationd"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-Iu3U036ebh9lMxCn1gt29nCQxs7N2ZLQHfg9HP3FSm0="; + hash = "sha256-L2eXab1V2t7+h51wEh0p2Uzdc3ImR4euoiXVVJ8BguA="; }; nativeBuildInputs = [ From b433ca606573f06e4c26595d92b323bfcf5f85a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Mon, 2 Dec 2024 23:34:49 +0100 Subject: [PATCH 0293/1054] doc/dotnet: bump .NET versions from 6, 7 to 8, 9 --- doc/languages-frameworks/dotnet.section.md | 40 +++++++++++++--------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 3de2bafb5cf3..41f7f380f3ef 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -27,42 +27,48 @@ mkShell { name = "dotnet-env"; packages = [ (with dotnetCorePackages; combinePackages [ - sdk_6_0 - sdk_7_0 + sdk_8_0 + sdk_9_0 ]) ]; } ``` -This will produce a dotnet installation that has the dotnet 6.0 7.0 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: +This will produce a dotnet installation that has the dotnet 8.0 9.0 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: ```ShellSession $ dotnet --info .NET SDK: - Version: 7.0.202 - Commit: 6c74320bc3 + Version: 9.0.100 + Commit: 59db016f11 + Workload version: 9.0.100-manifests.3068a692 + MSBuild version: 17.12.7+5b8665660 Runtime Environment: OS Name: nixos - OS Version: 23.05 + OS Version: 25.05 OS Platform: Linux RID: linux-x64 - Base Path: /nix/store/n2pm44xq20hz7ybsasgmd7p3yh31gnh4-dotnet-sdk-7.0.202/sdk/7.0.202/ + Base Path: /nix/store/a03c70i7x6rjdr6vikczsp5ck3v6rixh-dotnet-sdk-9.0.100/share/dotnet/sdk/9.0.100/ + +.NET workloads installed: +There are no installed workloads to display. +Configured to use loose manifests when installing new manifests. Host: - Version: 7.0.4 + Version: 9.0.0 Architecture: x64 - Commit: 0a396acafe + Commit: 9d5a6a9aa4 .NET SDKs installed: - 6.0.407 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/sdk] - 7.0.202 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/sdk] + 8.0.404 [/nix/store/6wlrjiy10wg766490dcmp6x64zb1vc8j-dotnet-core-combined/share/dotnet/sdk] + 9.0.100 [/nix/store/6wlrjiy10wg766490dcmp6x64zb1vc8j-dotnet-core-combined/share/dotnet/sdk] .NET runtimes installed: - Microsoft.AspNetCore.App 6.0.15 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/shared/Microsoft.AspNetCore.App] - Microsoft.AspNetCore.App 7.0.4 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/shared/Microsoft.AspNetCore.App] - Microsoft.NETCore.App 6.0.15 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/shared/Microsoft.NETCore.App] - Microsoft.NETCore.App 7.0.4 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/shared/Microsoft.NETCore.App] + Microsoft.AspNetCore.App 8.0.11 [/nix/store/6wlrjiy10wg766490dcmp6x64zb1vc8j-dotnet-core-combined/share/dotnet/shared/Microsoft.AspNetCore.App] + Microsoft.AspNetCore.App 9.0.0 [/nix/store/6wlrjiy10wg766490dcmp6x64zb1vc8j-dotnet-core-combined/share/dotnet/shared/Microsoft.AspNetCore.App] + Microsoft.NETCore.App 8.0.11 [/nix/store/6wlrjiy10wg766490dcmp6x64zb1vc8j-dotnet-core-combined/share/dotnet/shared/Microsoft.NETCore.App] + Microsoft.NETCore.App 9.0.0 [/nix/store/6wlrjiy10wg766490dcmp6x64zb1vc8j-dotnet-core-combined/share/dotnet/shared/Microsoft.NETCore.App] Other architectures found: None @@ -146,8 +152,8 @@ in buildDotnetModule rec { buildInputs = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure. - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`. executables = []; # Don't install any executables. From ffd47e132bb1b1fc64bfdf84e31229e291ed4729 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 27 Nov 2024 22:27:30 +0100 Subject: [PATCH 0294/1054] zod-engine: expose pname --- pkgs/by-name/zo/zod/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/zo/zod/package.nix b/pkgs/by-name/zo/zod/package.nix index e0c2031dde25..f4add7f46c0a 100644 --- a/pkgs/by-name/zo/zod/package.nix +++ b/pkgs/by-name/zo/zod/package.nix @@ -16,7 +16,7 @@ , substituteAll }: let - name = "zod-engine"; + pname = "zod-engine"; version = "2011-09-06"; src = fetchzip { url = "mirror://sourceforge/zod/linux_releases/zod_linux-${version}.tar.gz"; @@ -41,7 +41,7 @@ let NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql"; zod_engine = stdenv.mkDerivation { inherit version src postPatch nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; - pname = "${name}-engine"; + pname = "${pname}-engine"; enableParallelBuilding = true; preBuild = "cd zod_src"; installPhase = '' @@ -52,7 +52,7 @@ let }; zod_map_editor = stdenv.mkDerivation { inherit version src postPatch nativeBuildInputs buildInputs hardeningDisable NIX_LDFLAGS; - pname = "${name}-map_editor"; + pname = "${pname}-map_editor"; enableParallelBuilding = true; preBuild = "cd zod_src"; makeFlags = [ "map_editor" ]; @@ -64,7 +64,7 @@ let }; zod_launcher = stdenv.mkDerivation { inherit version src nativeBuildInputs buildInputs zod_engine zod_map_editor; - pname = "${name}-launcher"; + pname = "${pname}-launcher"; # This is necessary because the zod_launcher has terrible fixed-width window # the Idea is to apply the scalingFactor to all positions and sizes and I tested 1,2,3 and 4 # 2,3,4 look acceptable on my 4k monitor and 1 is unreadable. @@ -86,7 +86,7 @@ let install -m755 zod_launcher $out/bin ''; }; - zod_assets = runCommandLocal "${name}-assets" {} '' + zod_assets = runCommandLocal "${pname}-assets" {} '' mkdir -p $out/usr/lib/commander-zod{,blank_maps} cp -r ${src}/assets $out/usr/lib/commander-zod/assets for i in ${src}/*.map ${src}/*.txt; do @@ -98,7 +98,7 @@ let ''; in symlinkJoin { - inherit name; + inherit pname version; paths = [ zod_engine zod_launcher From 8f6c2ad7d12bd32ea1fa2603d8f80444d4d040f3 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 28 Nov 2024 00:09:04 +0100 Subject: [PATCH 0295/1054] zitadel: use pname --- pkgs/by-name/zi/zitadel/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/zi/zitadel/package.nix b/pkgs/by-name/zi/zitadel/package.nix index d744ed153c83..d4181af04340 100644 --- a/pkgs/by-name/zi/zitadel/package.nix +++ b/pkgs/by-name/zi/zitadel/package.nix @@ -95,7 +95,7 @@ let }; in buildGoModule rec { - name = "zitadel"; + pname = "zitadel"; inherit version; src = zitadelRepo; From 7257077fe55f1fdb42e8beec0138ba7f96c8130f Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 28 Nov 2024 18:33:38 +0100 Subject: [PATCH 0296/1054] zathura: expose version --- pkgs/applications/misc/zathura/wrapper.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 4290fff26bcf..282034cc6b38 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -18,7 +18,8 @@ ], }: symlinkJoin { - name = "zathura-with-plugins-${zathura_core.version}"; + inherit (zathura_core) version; + pname = "zathura-with-plugins"; paths = with zathura_core; From 1b0e626b3ac38f6181e838efd598fffb24719c99 Mon Sep 17 00:00:00 2001 From: Victor Nova Date: Thu, 28 Nov 2024 21:00:06 -0800 Subject: [PATCH 0297/1054] maintainers: add lostmsu --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7ddcc64800c9..0ddb51c435e3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12826,6 +12826,13 @@ githubId = 1202012; name = "Ignat Loskutov"; }; + lostmsu = { + email = "lostfreeman@gmail.com"; + github = "lostmsu"; + githubId = 239520; + matrix = "@lostmsu:matrix.org"; + name = "Victor Nova"; + }; lostnet = { email = "lost.networking@gmail.com"; github = "lostnet"; From 8acdab9b3579e07d4aa3cc4f25afeb98740a2194 Mon Sep 17 00:00:00 2001 From: Bastian Asmussen Date: Tue, 3 Dec 2024 01:15:15 +0100 Subject: [PATCH 0298/1054] docker-init: init at v1.30.0 --- .../virtualization/docker/default.nix | 7 +-- pkgs/by-name/do/docker-init/package.nix | 47 +++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/do/docker-init/package.nix diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 36afd5bedcdf..821a1f8cff65 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -8,12 +8,12 @@ rec { , runcRev, runcHash , containerdRev, containerdHash , tiniRev, tiniHash - , buildxSupport ? true, composeSupport ? true, sbomSupport ? false + , buildxSupport ? true, composeSupport ? true, sbomSupport ? false, initSupport ? false # package dependencies , stdenv, fetchFromGitHub, fetchpatch, buildGoModule , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd, runc, tini, libtool - , sqlite, iproute2, docker-buildx, docker-compose, docker-sbom + , sqlite, iproute2, docker-buildx, docker-compose, docker-sbom, docker-init , iptables, e2fsprogs, xz, util-linux, xfsprogs, gitMinimal , procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests , clientOnly ? !stdenv.hostPlatform.isLinux, symlinkJoin @@ -179,7 +179,8 @@ rec { plugins = lib.optional buildxSupport docker-buildx ++ lib.optional composeSupport docker-compose - ++ lib.optional sbomSupport docker-sbom; + ++ lib.optional sbomSupport docker-sbom + ++ lib.optional initSupport docker-init; pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; }; in buildGoModule (lib.optionalAttrs (!clientOnly) { diff --git a/pkgs/by-name/do/docker-init/package.nix b/pkgs/by-name/do/docker-init/package.nix new file mode 100644 index 000000000000..1b3a3d1add58 --- /dev/null +++ b/pkgs/by-name/do/docker-init/package.nix @@ -0,0 +1,47 @@ +{ + stdenv, + fetchurl, + zstd, + lib, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "docker-init"; + version = "v1.3.0"; + tag = "157355"; + + src = fetchurl { + url = "https://desktop.docker.com/linux/main/amd64/${finalAttrs.tag}/docker-desktop-x86_64.pkg.tar.zst"; + hash = "sha256-ysZorPBmoUvTJFFKDbZgQxPamONJKcXezmMrpZSVpwY="; + }; + + nativeBuildInputs = [ + zstd + ]; + + unpackPhase = '' + runHook preUnpack + tar --zstd -xvf $src + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,libexec/docker/cli-plugins} + + cp usr/lib/docker/cli-plugins/docker-init $out/libexec/docker/cli-plugins + ln -s $out/libexec/docker/cli-plugins/docker-init $out/bin/docker-init + runHook postInstall + ''; + + meta = { + description = "Creates Docker-related starter files for your project"; + homepage = "https://docs.docker.com/reference/cli/docker/init"; + downloadPage = "https://docs.docker.com/desktop/release-notes/#4320"; + mainProgram = "docker-init"; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + badPlatforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ BastianAsmussen ]; + }; +}) From 1631e6056ef5e3ef187aa4b90b4679c79ea47dad Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 2 Dec 2024 13:02:53 +0100 Subject: [PATCH 0299/1054] nixos/redmine: Add PrivateMounts to systemd unit settings PrivateMounts seems to be enabled anyway. It's probably enabled by another setting. However, in order to not create a wrong impression, add it to the list and enable it. Signed-off-by: Felix Singer --- nixos/modules/services/misc/redmine.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 4cd2f35113ec..c53157fafd2a 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -442,6 +442,7 @@ in MemoryDenyWriteExecute = true; NoNewPrivileges = true; PrivateDevices = true; + PrivateMounts = true; PrivateTmp = true; ProcSubset = "pid"; ProtectClock = true; From 4a02d96f95a354f0611ea1e0221bf5a8a816571e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 06:24:27 +0000 Subject: [PATCH 0300/1054] staruml: 6.2.2 -> 6.3.0 --- pkgs/by-name/st/staruml/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix index 3df3516b239d..cf5574be84b0 100644 --- a/pkgs/by-name/st/staruml/package.nix +++ b/pkgs/by-name/st/staruml/package.nix @@ -24,12 +24,12 @@ let ]; in stdenv.mkDerivation (finalAttrs: { - version = "6.2.2"; + version = "6.3.0"; pname = "staruml"; src = fetchurl { url = "https://files.staruml.io/releases-v6/StarUML_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-1zxrT7phXeQYNbWHWMyPuHiUglrPSMPP0bfAcfvt8dM="; + sha256 = "sha256-G63MxjefAJ0J40HzrI9j/sRkHLIdUzBf0GSbw6fAFoI="; }; nativeBuildInputs = [ wrapGAppsHook3 dpkg ]; From 8f72df359887a3bafb44dad279fc0360c7db7e3e Mon Sep 17 00:00:00 2001 From: dish Date: Tue, 3 Dec 2024 01:41:41 -0500 Subject: [PATCH 0301/1054] nodePackages.kaput-cli: drop --- .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 365 ------------------ 3 files changed, 367 deletions(-) diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 38eb64559fd5..d18dd10b11e2 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -32,7 +32,6 @@ graphql-language-service-cli = "graphql-lsp"; grunt-cli = "grunt"; gulp-cli = "gulp"; - kaput-cli = "kaput"; less = "lessc"; localtunnel = "lt"; lua-fmt = "luafmt"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 24a13c554103..6c57b171efe2 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -119,7 +119,6 @@ , "json-server" , "jsonlint" , "jsonplaceholder" -, "kaput-cli" , "katex" , "keyoxide" , "lcov-result-merger" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index e7c23ab18931..9d2c50812251 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -7249,42 +7249,6 @@ let sha512 = "/2WZxKCNjeHlQogCs1VBtJWlPXjwWke/9gMrwsVsrUt00g2V6LUBvwgwrxhrXepjOmq4IZ5QeNbpDMEOUlx/JA=="; }; }; - "@oclif/command-1.8.36" = { - name = "_at_oclif_slash_command"; - packageName = "@oclif/command"; - version = "1.8.36"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.36.tgz"; - sha512 = "/zACSgaYGtAQRzc7HjzrlIs14FuEYAZrMOEwicRoUnZVyRunG4+t5iSEeQu0Xy2bgbCD0U1SP/EdeNZSTXRwjQ=="; - }; - }; - "@oclif/config-1.18.16" = { - name = "_at_oclif_slash_config"; - packageName = "@oclif/config"; - version = "1.18.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.16.tgz"; - sha512 = "VskIxVcN22qJzxRUq+raalq6Q3HUde7sokB7/xk5TqRZGEKRVbFeqdQBxDWwQeudiJEgcNiMvIFbMQ43dY37FA=="; - }; - }; - "@oclif/config-1.18.17" = { - name = "_at_oclif_slash_config"; - packageName = "@oclif/config"; - version = "1.18.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.17.tgz"; - sha512 = "k77qyeUvjU8qAJ3XK3fr/QVAqsZO8QOBuESnfeM5HHtPNLSyfVcwiMM2zveSW5xRdLSG3MfV8QnLVkuyCL2ENg=="; - }; - }; - "@oclif/config-1.18.2" = { - name = "_at_oclif_slash_config"; - packageName = "@oclif/config"; - version = "1.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.2.tgz"; - sha512 = "cE3qfHWv8hGRCP31j7fIS7BfCflm/BNZ2HNqHexH+fDrdF2f1D5S8VmXWLC77ffv3oDvWyvE9AZeR0RfmHCCaA=="; - }; - }; "@oclif/core-1.26.2" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; @@ -7312,15 +7276,6 @@ let sha512 = "aXM2O4g7f+kPNzhhOfqGOVRVYDxTVrH7Y720MuH0Twq5WHMxI4XwntnyBaRscoCPG6FWhItZLtiZxsvaUdupGg=="; }; }; - "@oclif/errors-1.3.5" = { - name = "_at_oclif_slash_errors"; - packageName = "@oclif/errors"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.3.5.tgz"; - sha512 = "OivucXPH/eLLlOT7FkCMoZXiaVYf8I/w1eTAM1+gKzfhALwWTusxEx7wBmW0uzvkSg/9ovWLycPaBgJbM3LOCQ=="; - }; - }; "@oclif/errors-1.3.6" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -7330,15 +7285,6 @@ let sha512 = "fYaU4aDceETd89KXP+3cLyg9EHZsLD3RxF2IU9yxahhBpspWjkWi3Dy3bTgcwZ3V47BgxQaGapzJWDM33XIVDQ=="; }; }; - "@oclif/help-1.0.15" = { - name = "_at_oclif_slash_help"; - packageName = "@oclif/help"; - version = "1.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.15.tgz"; - sha512 = "Yt8UHoetk/XqohYX76DfdrUYLsPKMc5pgkzsZVHDyBSkLiGRzujVaGZdjr32ckVZU9q3a47IjhWxhip7Dz5W/g=="; - }; - }; "@oclif/linewrap-1.0.0" = { name = "_at_oclif_slash_linewrap"; packageName = "@oclif/linewrap"; @@ -7348,15 +7294,6 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.17" = { - name = "_at_oclif_slash_parser"; - packageName = "@oclif/parser"; - version = "3.8.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.17.tgz"; - sha512 = "l04iSd0xoh/16TGVpXb81Gg3z7tlQGrEup16BrVLsZBK6SEYpYHRJZnM32BwZrHI97ZSFfuSwVlzoo6HdsaK8A=="; - }; - }; "@oclif/plugin-autocomplete-2.3.10" = { name = "_at_oclif_slash_plugin-autocomplete"; packageName = "@oclif/plugin-autocomplete"; @@ -7366,15 +7303,6 @@ let sha512 = "Ow1AR8WtjzlyCtiWWPgzMyT8SbcDJFr47009riLioHa+MHX2BCDtVn2DVnN/E6b9JlPV5ptQpjefoRSNWBesmg=="; }; }; - "@oclif/plugin-help-3.3.1" = { - name = "_at_oclif_slash_plugin-help"; - packageName = "@oclif/plugin-help"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.3.1.tgz"; - sha512 = "QuSiseNRJygaqAdABYFWn/H1CwIZCp9zp/PLid6yXvy6VcQV7OenEFF5XuYaCvSARe2Tg9r8Jqls5+fw1A9CbQ=="; - }; - }; "@oclif/plugin-help-5.2.20" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; @@ -8482,15 +8410,6 @@ let sha512 = "ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA=="; }; }; - "@putdotio/api-client-8.49.0" = { - name = "_at_putdotio_slash_api-client"; - packageName = "@putdotio/api-client"; - version = "8.49.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.49.0.tgz"; - sha512 = "PqD4exebcZIZ7lZj9tYg5NAFqU/wjSiZNM1ak0uXpff3qG+Pw6T/pW5gt0lrWwq132Ct68/Q4by18jg9uXBqMw=="; - }; - }; "@react-native/normalize-color-2.1.0" = { name = "_at_react-native_slash_normalize-color"; packageName = "@react-native/normalize-color"; @@ -17230,15 +17149,6 @@ let sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA=="; }; }; - "cli-ux-5.6.7" = { - name = "cli-ux"; - packageName = "cli-ux"; - version = "5.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.6.7.tgz"; - sha512 = "dsKAurMNyFDnO6X1TiiRNiVbL90XReLKcvIq4H777NMqXGBxBws23ag8ubCJE97vVZEgWG2eSUhsyLf63Jv8+g=="; - }; - }; "cli-width-2.2.1" = { name = "cli-width"; packageName = "cli-width"; @@ -18211,15 +18121,6 @@ let sha512 = "fIWyWUXrJ45cHCIQX+Ck1hrZDIf/9DR0P0Zewn3uNht28hbt5OfGUq8rRWsxi96pZWPyBEd0eY9ama01JTaknA=="; }; }; - "conf-6.2.4" = { - name = "conf"; - packageName = "conf"; - version = "6.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-6.2.4.tgz"; - sha512 = "GjgyPRLo1qK1LR9RWAdUagqo+DP18f5HWCFk4va7GS+wpxQTOzfuKTwKOvGW2c01/YXNicAyyoyuSddmdkBzZQ=="; - }; - }; "config-chain-1.1.13" = { name = "config-chain"; packageName = "config-chain"; @@ -20390,15 +20291,6 @@ let sha512 = "XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug=="; }; }; - "debounce-fn-3.0.1" = { - name = "debounce-fn"; - packageName = "debounce-fn"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debounce-fn/-/debounce-fn-3.0.1.tgz"; - sha512 = "aBoJh5AhpqlRoHZjHmOzZlRx+wz2xVwGL9rjs+Kj0EWUrL4/h4K7OD176thl2Tdoqui/AaA4xhHrNArGLAaI3Q=="; - }; - }; "debounce-fn-5.1.2" = { name = "debounce-fn"; packageName = "debounce-fn"; @@ -24162,15 +24054,6 @@ let sha512 = "M5Ge0JIrn12EtIVpje2G+hI5X78hmX4UDzynZ7Vnp1MiPSqleEonmgr2Rh59eygEEgq3YJ1GDP96rnM8tnVg/Q=="; }; }; - "extract-stack-2.0.0" = { - name = "extract-stack"; - packageName = "extract-stack"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-stack/-/extract-stack-2.0.0.tgz"; - sha512 = "AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ=="; - }; - }; "extract-zip-2.0.1" = { name = "extract-zip"; packageName = "extract-zip"; @@ -31309,15 +31192,6 @@ let sha512 = "TcezgCLdtAn0dTzPXK6kdnzJV4k9vcdTVxt7l0teFV+7LGWRCFIhs49U3WeNKU0aereFtlR5N5qrSWBGqPlw0A=="; }; }; - "js-base64-2.6.3" = { - name = "js-base64"; - packageName = "js-base64"; - version = "2.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.3.tgz"; - sha512 = "fiUvdfCaAXoQTHdKMgTvg6IkecXDcVz6V5rlftUTclF9IKBjMizvSdQaCl/z/6TApDeby5NL+axYou3i0mu1Pg=="; - }; - }; "js-base64-3.7.7" = { name = "js-base64"; packageName = "js-base64"; @@ -31696,15 +31570,6 @@ let sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; }; }; - "json-schema-typed-7.0.3" = { - name = "json-schema-typed"; - packageName = "json-schema-typed"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz"; - sha512 = "7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="; - }; - }; "json-schema-typed-8.0.1" = { name = "json-schema-typed"; packageName = "json-schema-typed"; @@ -37620,15 +37485,6 @@ let sha512 = "M85rnSC7WQ7wnfQTARPT4LrK7nwCHLdDFOCcItZMhTQjyCebJH8GciKqYJNgaOFZs9nFmTmd/VMyi3OW5jA47w=="; }; }; - "node-downloader-helper-1.0.19" = { - name = "node-downloader-helper"; - packageName = "node-downloader-helper"; - version = "1.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-1.0.19.tgz"; - sha512 = "Bwp8WWDDP5ftg+FmAKU08a9+oiUTPoYzMvXgUqZZPQ7VMo1qKBzW3XdTXHeYnqjGLfkTZ2GPibgAWpApfpeS2g=="; - }; - }; "node-emoji-1.10.0" = { name = "node-emoji"; packageName = "node-emoji"; @@ -71837,227 +71693,6 @@ in bypassCache = true; reconstructLock = true; }; - kaput-cli = nodeEnv.buildNodePackage { - name = "kaput-cli"; - packageName = "kaput-cli"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/kaput-cli/-/kaput-cli-1.1.1.tgz"; - sha512 = "JbF3PiO1wNawJnOQlb4nJZ2rvDfDWnD7ROCdzqgFXhqi3XTNXBqjpoC7PT3ylfNR6BGibjchndH27VieqyMA0A=="; - }; - dependencies = [ - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/command-1.8.36" - sources."@oclif/config-1.18.17" - sources."@oclif/errors-1.3.6" - (sources."@oclif/help-1.0.15" // { - dependencies = [ - sources."@oclif/config-1.18.16" - sources."wrap-ansi-6.2.0" - ]; - }) - sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.17" - (sources."@oclif/plugin-help-3.3.1" // { - dependencies = [ - sources."@oclif/config-1.18.2" - (sources."@oclif/errors-1.3.5" // { - dependencies = [ - sources."wrap-ansi-7.0.0" - ]; - }) - sources."wrap-ansi-6.2.0" - ]; - }) - sources."@oclif/screen-1.0.4" - (sources."@putdotio/api-client-8.49.0" // { - dependencies = [ - sources."axios-0.21.4" - ]; - }) - sources."ajv-6.12.6" - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."ansicolors-0.3.2" - sources."argparse-1.0.10" - sources."array-union-2.1.0" - (sources."axios-0.19.2" // { - dependencies = [ - sources."debug-3.1.0" - sources."follow-redirects-1.5.10" - sources."ms-2.0.0" - ]; - }) - sources."braces-3.0.3" - sources."call-bind-1.0.7" - sources."cardinal-2.1.1" - sources."chalk-4.1.2" - sources."chardet-0.7.0" - sources."clean-stack-3.0.1" - sources."cli-cursor-3.1.0" - sources."cli-progress-3.12.0" - (sources."cli-ux-5.6.7" // { - dependencies = [ - sources."supports-color-8.1.1" - ]; - }) - sources."cli-width-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - (sources."conf-6.2.4" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."cross-spawn-7.0.3" - sources."d-1.0.2" - sources."debounce-fn-3.0.1" - sources."debug-4.3.7" - sources."define-data-property-1.1.4" - sources."dir-glob-3.0.1" - sources."dot-prop-5.3.0" - sources."dotenv-8.6.0" - sources."emoji-regex-8.0.0" - sources."env-paths-2.2.1" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" - sources."es5-ext-0.10.64" - sources."es6-iterator-2.0.3" - sources."es6-symbol-3.1.4" - sources."escape-string-regexp-4.0.0" - sources."esniff-2.0.1" - sources."esprima-4.0.1" - sources."event-emitter-0.3.5" - sources."ext-1.7.0" - sources."external-editor-3.1.0" - sources."extract-stack-2.0.0" - sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.2" - sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.17.1" - (sources."figures-3.2.0" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."fill-range-7.1.1" - sources."find-up-3.0.0" - sources."follow-redirects-1.15.9" - sources."fs-extra-8.1.0" - sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.4" - sources."glob-parent-5.1.2" - sources."globby-11.1.0" - sources."gopd-1.0.1" - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbols-1.0.3" - sources."hasown-2.0.2" - sources."hyperlinker-1.0.0" - sources."iconv-lite-0.4.24" - sources."ignore-5.3.2" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."inquirer-7.3.3" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-typedarray-1.0.0" - sources."is-wsl-2.2.0" - sources."isexe-2.0.0" - sources."js-base64-2.6.3" - sources."js-yaml-3.14.1" - sources."json-schema-traverse-0.4.1" - sources."json-schema-typed-7.0.3" - sources."jsonfile-4.0.0" - sources."locate-path-3.0.0" - sources."lodash-4.17.21" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."merge2-1.4.1" - sources."micromatch-4.0.8" - sources."mimic-fn-2.1.0" - sources."moment-2.30.1" - sources."ms-2.1.3" - sources."mute-stream-0.0.8" - sources."natural-orderby-2.0.3" - sources."next-tick-1.1.0" - sources."node-downloader-helper-1.0.19" - sources."object-inspect-1.13.2" - sources."object-treeify-1.1.33" - sources."onetime-5.1.2" - sources."os-tmpdir-1.0.2" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."password-prompt-1.1.3" - sources."path-exists-3.0.0" - sources."path-key-3.1.1" - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."pkg-up-3.1.0" - sources."punycode-2.3.1" - sources."qs-6.13.0" - sources."queue-microtask-1.2.3" - sources."redeyed-2.1.1" - sources."restore-cursor-3.1.0" - sources."reusify-1.0.4" - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - (sources."rxjs-6.6.7" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - sources."safer-buffer-2.1.2" - sources."semver-7.6.3" - sources."set-function-length-1.2.2" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."side-channel-1.0.6" - sources."signal-exit-3.0.7" - sources."slash-3.0.0" - sources."sprintf-js-1.0.3" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" - sources."supports-hyperlinks-2.3.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."to-regex-range-5.0.1" - sources."tslib-2.7.0" - sources."type-2.7.3" - sources."type-fest-0.21.3" - sources."typedarray-to-buffer-3.1.5" - sources."universalify-0.1.2" - sources."uri-js-4.4.1" - sources."urijs-1.19.11" - sources."which-2.0.2" - sources."widest-line-3.1.0" - sources."wrap-ansi-7.0.0" - sources."write-file-atomic-3.0.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "CLI tools for Put.io"; - homepage = "https://github.com/davidchalifoux/kaput-cli"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; katex = nodeEnv.buildNodePackage { name = "katex"; packageName = "katex"; From f2d4dc7a32bff560afe0e02660d1ae110751700c Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Tue, 3 Dec 2024 08:37:33 +0100 Subject: [PATCH 0302/1054] doc: lib.types.attrsWith init documentation --- .../manual/development/option-types.section.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md index b44a84553b37..a9c8f2f8a88d 100644 --- a/nixos/doc/manual/development/option-types.section.md +++ b/nixos/doc/manual/development/option-types.section.md @@ -399,6 +399,23 @@ Composed types are types that take a type as parameter. `listOf returned instead for the same `mkIf false` definition. ::: +`types.attrsWith` { *`elemType`*, *`lazy`* ? false } + +: An attribute set of where all the values are of *`elemType`* type. + + **Parameters** + + `elemType` (Required) + : Specifies the type of the values contained in the attribute set. + + `lazy` + : Determines whether the attribute set is lazily evaluated. See: `types.lazyAttrsOf` + + **Behavior** + + - `attrsWith { elemType = t; }` is equivalent to `attrsOf t` + - `attrsWith { lazy = true; elemType = t; }` is equivalent to `lazyAttrsOf t` + `types.uniq` *`t`* : Ensures that type *`t`* cannot be merged. It is used to ensure option From e94d44a63dcd465fdaa9cf03834c965ff83862bf Mon Sep 17 00:00:00 2001 From: dish Date: Tue, 3 Dec 2024 01:41:49 -0500 Subject: [PATCH 0303/1054] kaput-cli: init at 2.5.0 --- pkgs/by-name/ka/kaput-cli/package.nix | 45 ++++++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/by-name/ka/kaput-cli/package.nix diff --git a/pkgs/by-name/ka/kaput-cli/package.nix b/pkgs/by-name/ka/kaput-cli/package.nix new file mode 100644 index 000000000000..a03f37ff97bf --- /dev/null +++ b/pkgs/by-name/ka/kaput-cli/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "kaput-cli"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "davidchalifoux"; + repo = "kaput-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-sy8k9L9rmiRFzvhLc+hYl9OqmmP8INLxMNRjAx7/V8g="; + }; + + cargoHash = "sha256-fnTcCVppI5wIzwG2fA8LjpC1+gTAhdRkWv/EQXUok0c="; + + env = { + OPENSSL_NO_VENDOR = 1; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/davidchalifoux/kaput-cli/releases/tag/v${version}"; + description = "unofficial CLI client for Put.io"; + homepage = "https://kaput.sh/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "kaput"; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index a65be6e33ae7..a38d11119a23 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -124,6 +124,7 @@ mapAliases { ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19 inherit (pkgs) jake; # added 2023-08-19 inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 + inherit (pkgs) kaput-cli; # added 2024-12-03 karma = pkgs.karma-runner; # added 2023-07-29 leetcode-cli = self.vsc-leetcode-cli; # added 2023-08-31 inherit (pkgs) lv_font_conv; # added 2024-06-28 From 8de3e9040f12fa76f2bb22f281d1549f50d2dcaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 30 Nov 2024 09:34:56 +0100 Subject: [PATCH 0304/1054] add mergify rules for nixpkgs --- .mergify.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 000000000000..761678fd3fa0 --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,22 @@ +queue_rules: + # This rule is for https://docs.mergify.com/commands/queue/ + # and can be triggered with: @mergifyio queue + - name: default + merge_conditions: + # all github action checks in this list are required to merge a pull request + - check-success=Attributes + - check-success=Check + - check-success=Outpaths (aarch64-darwin) + - check-success=Outpaths (aarch64-linux) + - check-success=Outpaths (x86_64-darwin) + - check-success=Outpaths (x86_64-linux) + - check-success=Process + - check-success=Request + - check-success=Tag + - check-success=editorconfig-check + - check-success=label-pr + - check-success=nix-files-parseable-check + - check-success=nixfmt-check + - check-success=nixpkgs-vet + # queue up to 5 pull requests at a time + batch_size: 5 From ee19f3a3648a5b4248dce07bfc9d3258fd2d80d5 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 3 Dec 2024 17:18:36 +0900 Subject: [PATCH 0305/1054] lima: format with nixfmt-rfc-style --- .../virtualization/lima/default.nix | 58 ++++++++++--------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 9878b425329b..cd6ed327fbc1 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, installShellFiles -, qemu -, sigtool -, makeWrapper -, nix-update-script -, apple-sdk_15 +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + qemu, + sigtool, + makeWrapper, + nix-update-script, + apple-sdk_15, }: buildGoModule rec { @@ -23,8 +24,10 @@ buildGoModule rec { vendorHash = "sha256-nNSBwvhKSWs6to37+RLziYQqVOYfvjYib3fRRALACho="; - nativeBuildInputs = [ makeWrapper installShellFiles ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; + nativeBuildInputs = [ + makeWrapper + installShellFiles + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; @@ -48,20 +51,23 @@ buildGoModule rec { export LIMA_HOME="$(mktemp -d)" ''; - installPhase = '' - runHook preInstall - mkdir -p $out - cp -r _output/* $out - wrapProgram $out/bin/limactl \ - --prefix PATH : ${lib.makeBinPath [ qemu ]} - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd limactl \ - --bash <($out/bin/limactl completion bash) \ - --fish <($out/bin/limactl completion fish) \ - --zsh <($out/bin/limactl completion zsh) - '' + '' - runHook postInstall - ''; + installPhase = + '' + runHook preInstall + mkdir -p $out + cp -r _output/* $out + wrapProgram $out/bin/limactl \ + --prefix PATH : ${lib.makeBinPath [ qemu ]} + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd limactl \ + --bash <($out/bin/limactl completion bash) \ + --fish <($out/bin/limactl completion fish) \ + --zsh <($out/bin/limactl completion zsh) + '' + + '' + runHook postInstall + ''; doInstallCheck = true; installCheckPhase = '' From 2b5db6273584eba44a8b20783f4630c700aafbec Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 3 Dec 2024 17:23:10 +0900 Subject: [PATCH 0306/1054] lima: add passthru.tests.version --- pkgs/applications/virtualization/lima/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index cd6ed327fbc1..5869fa6bb3b5 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -7,8 +7,10 @@ qemu, sigtool, makeWrapper, + testers, nix-update-script, apple-sdk_15, + lima, }: buildGoModule rec { @@ -74,7 +76,10 @@ buildGoModule rec { USER=nix $out/bin/limactl validate templates/default.yaml ''; - passthru.updateScript = nix-update-script { }; + passthru = { + tests.version = testers.testVersion { package = lima; }; + updateScript = nix-update-script { }; + }; meta = with lib; { homepage = "https://github.com/lima-vm/lima"; From 3bef6979b2592cafd88b9b2de05fb62f3a55d978 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 3 Dec 2024 17:37:20 +0900 Subject: [PATCH 0307/1054] lima: 1.0.1 -> 1.0.2 Release: https://github.com/lima-vm/lima/releases/tag/v1.0.2 Diff: https://github.com/lima-vm/lima/compare/v1.0.1...v1.0.2 --- pkgs/applications/virtualization/lima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 5869fa6bb3b5..a9a297ced97d 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "lima"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XYB8Nxbs76xmiiZ7IYfgn+UgUr6CLOalQrl6Ibo+DRc="; + sha256 = "sha256-LNsxMrbEgdosGDDUNvMZq/hpP5azNiIHjKTp0Iw/PC0="; }; - vendorHash = "sha256-nNSBwvhKSWs6to37+RLziYQqVOYfvjYib3fRRALACho="; + vendorHash = "sha256-taozyQBJvkCsJAaOHg1gFK4qOnepRbzIn4jHzxfAn6A="; nativeBuildInputs = [ makeWrapper From 5b7a21358d674be722cc0c81b9d2c04a2b710916 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sat, 9 Nov 2024 11:22:25 +0100 Subject: [PATCH 0308/1054] lib/types: init {types.attrsWith} --- lib/tests/modules.sh | 3 + lib/tests/modules/lazy-attrsWith.nix | 45 ++++++++++++++ lib/types.nix | 89 ++++++++++++++++++---------- 3 files changed, 106 insertions(+), 31 deletions(-) create mode 100644 lib/tests/modules/lazy-attrsWith.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 2884c00d0768..2443c080180b 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -575,6 +575,9 @@ checkConfigOutput '^38|27$' options.submoduleLine38.declarationPositions.1.line # nested options work checkConfigOutput '^34$' options.nested.nestedLine34.declarationPositions.0.line ./declaration-positions.nix +# AttrsWith tests +checkConfigOutput '^11$' config.result ./lazy-attrsWith.nix + cat <"]); - getSubModules = elemType.getSubModules; - substSubModules = m: attrsOf (elemType.substSubModules m); - functor = (defaultFunctor name) // { wrapped = elemType; }; - nestedTypes.elemType = elemType; - }; + attrsOf = elemType: attrsWith { inherit elemType; }; # A version of attrsOf that's lazy in its values at the expense of # conditional definitions not working properly. E.g. defining a value with # `foo.attr = mkIf false 10`, then `foo ? attr == true`, whereas with # attrsOf it would correctly be `false`. Accessing `foo.attr` would throw an # error that it's not defined. Use only if conditional definitions don't make sense. - lazyAttrsOf = elemType: mkOptionType rec { - name = "lazyAttrsOf"; - description = "lazy attribute set of ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}"; + lazyAttrsOf = elemType: attrsWith { inherit elemType; lazy = true; }; + + # base type for lazyAttrsOf and attrsOf + attrsWith = { + elemType, + lazy ? false, + }: + let + typeName = if lazy then "lazyAttrsOf" else "attrsOf"; + # Push down position info. + pushPositions = map (def: mapAttrs (n: v: { inherit (def) file; value = v; }) def.value); + in + mkOptionType { + name = typeName; + description = (if lazy then "lazy attribute set" else "attribute set") + " of ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}"; descriptionClass = "composite"; check = isAttrs; - merge = loc: defs: - zipAttrsWith (name: defs: - let merged = mergeDefinitions (loc ++ [name]) elemType defs; - # mergedValue will trigger an appropriate error when accessed - in merged.optionalValue.value or elemType.emptyValue.value or merged.mergedValue - ) - # Push down position info. - (map (def: mapAttrs (n: v: { inherit (def) file; value = v; }) def.value) defs); + merge = if lazy then ( + # Lazy merge Function + loc: defs: + zipAttrsWith (name: defs: + let merged = mergeDefinitions (loc ++ [name]) elemType defs; + # mergedValue will trigger an appropriate error when accessed + in merged.optionalValue.value or elemType.emptyValue.value or merged.mergedValue + ) + # Push down position info. + (pushPositions defs) + ) else ( + # Non-lazy merge Function + loc: defs: + mapAttrs (n: v: v.value) (filterAttrs (n: v: v ? value) (zipAttrsWith (name: defs: + (mergeDefinitions (loc ++ [name]) elemType (defs)).optionalValue + ) + # Push down position info. + (pushPositions defs))) + ); emptyValue = { value = {}; }; getSubOptions = prefix: elemType.getSubOptions (prefix ++ [""]); getSubModules = elemType.getSubModules; - substSubModules = m: lazyAttrsOf (elemType.substSubModules m); - functor = (defaultFunctor name) // { wrapped = elemType; }; + substSubModules = m: attrsWith { elemType = elemType.substSubModules m; inherit lazy; }; + functor = defaultFunctor "attrsWith" // { + wrapped = elemType; + payload = { + # Important!: Add new function attributes here in case of future changes + inherit elemType lazy; + }; + binOp = lhs: rhs: + let + elemType = lhs.elemType.typeMerge rhs.elemType.functor; + lazy = + if lhs.lazy == rhs.lazy then + lhs.lazy + else + null; + in + if elemType == null || lazy == null then + null + else + { + inherit elemType lazy; + }; + }; nestedTypes.elemType = elemType; }; From bd353d322c6fe384a98d7f0f5b473ce768a02efc Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 25 Nov 2024 16:06:23 +0100 Subject: [PATCH 0309/1054] lib/types: Test attrsWith type merging Co-Authored-By: @hsjobeki --- lib/tests/modules.sh | 6 ++-- lib/tests/modules/lazy-attrsWith.nix | 46 ++++++++++++++++++---------- lib/types.nix | 3 +- 3 files changed, 35 insertions(+), 20 deletions(-) diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 2443c080180b..4c00ecaab605 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -386,6 +386,10 @@ checkConfigOutput '^true$' config.conditionalWorks ./declare-attrsOf.nix ./attrs checkConfigOutput '^false$' config.conditionalWorks ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix checkConfigOutput '^"empty"$' config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix +# Check attrsWith type merging +checkConfigError 'The option `mergedLazyNonLazy'\'' in `.*'\'' is already declared in `.*'\''\.' options.mergedLazyNonLazy ./lazy-attrsWith.nix +checkConfigOutput '^11$' config.lazyResult ./lazy-attrsWith.nix +checkConfigError 'infinite recursion encountered' config.nonLazyResult ./lazy-attrsWith.nix # Even with multiple assignments, a type error should be thrown if any of them aren't valid checkConfigError 'A definition for option .* is not of type .*' \ @@ -575,8 +579,6 @@ checkConfigOutput '^38|27$' options.submoduleLine38.declarationPositions.1.line # nested options work checkConfigOutput '^34$' options.nested.nestedLine34.declarationPositions.0.line ./declaration-positions.nix -# AttrsWith tests -checkConfigOutput '^11$' config.result ./lazy-attrsWith.nix cat < Date: Mon, 25 Nov 2024 16:58:58 +0100 Subject: [PATCH 0310/1054] lib/types: Add deprecation to attrsWith Co-Authored-By: @infinisil --- lib/modules.nix | 29 ++++++++++++++++++++++++++--- lib/types.nix | 38 ++++++++++++++++++++++++-------------- 2 files changed, 50 insertions(+), 17 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 855ffaf25ed8..2294585723ba 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -751,9 +751,32 @@ let t' = opt.options.type; mergedType = t.typeMerge t'.functor; typesMergeable = mergedType != null; - typeSet = if (bothHave "type") && typesMergeable - then { type = mergedType; } - else {}; + + # TODO: Remove this when all downstream reliances of internals: 'functor.wrapped' are sufficiently migrated. + # A function that adds the deprecated wrapped message to a type. + addDeprecatedWrapped = t: + t // { + functor = t.functor // { + wrapped = t.functor.wrappedDeprecationMessage { + inherit loc; + }; + }; + }; + + mergedType' = + if mergedType ? functor.wrappedDeprecationMessage then + addDeprecatedWrapped mergedType + else + mergedType; + + typeSet = + if (bothHave "type") && typesMergeable then + { type = mergedType'; } + else if opt.options ? type && opt.options.type ? functor.wrappedDeprecationMessage then + { type = addDeprecatedWrapped opt.options.type; } + else + {}; + bothHave = k: opt.options ? ${k} && res ? ${k}; in if bothHave "default" || diff --git a/lib/types.nix b/lib/types.nix index a286f16227a0..41c53ec89ba6 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -83,11 +83,15 @@ rec { # Default type merging function # takes two type functors and return the merged type defaultTypeMerge = f: f': - let mergedWrapped = f.wrapped.typeMerge f'.wrapped.functor; - mergedPayload = f.binOp f.payload f'.payload; + let + mergedWrapped = f.wrapped.typeMerge f'.wrapped.functor; + mergedPayload = f.binOp f.payload f'.payload; - hasPayload = assert (f'.payload != null) == (f.payload != null); f.payload != null; - hasWrapped = assert (f'.wrapped != null) == (f.wrapped != null); f.wrapped != null; + hasPayload = assert (f'.payload != null) == (f.payload != null); f.payload != null; + hasWrapped = assert (f'.wrapped != null) == (f.wrapped != null); f.wrapped != null; + + typeFromPayload = if mergedPayload == null then null else f.type mergedPayload; + typeFromWrapped = if mergedWrapped == null then null else f.type mergedWrapped; in # Abort early: cannot merge different types if f.name != f'.name @@ -95,23 +99,23 @@ rec { else if hasPayload then - if hasWrapped then + # Just return the payload if returning wrapped is deprecated + if f ? wrappedDeprecationMessage then + typeFromPayload + else if hasWrapped then # Has both wrapped and payload throw '' Type ${f.name} defines both `functor.payload` and `functor.wrapped` at the same time, which is not supported. Use either `functor.payload` or `functor.wrapped` but not both. - If your code worked before remove `functor.payload` from the type definition. + If your code worked before remove either `functor.wrapped` or `functor.payload` from the type definition. '' else - # Has payload - if mergedPayload == null then null else f.type mergedPayload + typeFromPayload else if hasWrapped then - # Has wrapped - # TODO(@hsjobeki): This could also be a warning and removed in the future - if mergedWrapped == null then null else f.type mergedWrapped + typeFromWrapped else f.type; @@ -592,7 +596,8 @@ rec { lazyAttrsOf = elemType: attrsWith { inherit elemType; lazy = true; }; # base type for lazyAttrsOf and attrsOf - attrsWith = { + attrsWith = + { elemType, lazy ? false, }: @@ -630,8 +635,13 @@ rec { getSubModules = elemType.getSubModules; substSubModules = m: attrsWith { elemType = elemType.substSubModules m; inherit lazy; }; functor = defaultFunctor "attrsWith" // { - # TODO: This breaks stuff - # wrapped = elemType; + wrappedDeprecationMessage = { loc }: lib.warn '' + Using 'functor.wrapped' on option types will be deprecated. + + Use 'nestedTypes.elemType' instead. + + option: '${showOption loc}' + '' elemType; payload = { # Important!: Add new function attributes here in case of future changes inherit elemType lazy; From dbb085549e1951295a0c2e2dd8142e6d492a0623 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Dec 2024 15:54:20 +0100 Subject: [PATCH 0311/1054] lib/modules: Minor performance optimisation Co-Authored-By: Johannes Kirschbauer --- lib/modules.nix | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 2294585723ba..f5b8af0e9858 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -763,17 +763,24 @@ let }; }; - mergedType' = - if mergedType ? functor.wrappedDeprecationMessage then - addDeprecatedWrapped mergedType - else - mergedType; - typeSet = - if (bothHave "type") && typesMergeable then - { type = mergedType'; } - else if opt.options ? type && opt.options.type ? functor.wrappedDeprecationMessage then - { type = addDeprecatedWrapped opt.options.type; } + if opt.options ? type then + if res ? type then + if typesMergeable then + { + type = + if mergedType ? functor.wrappedDeprecationMessage then + addDeprecatedWrapped mergedType + else + mergedType; + } + else + # Keep in sync with the same error below! + throw "The option `${showOption loc}' in `${opt._file}' is already declared in ${showFiles res.declarations}." + else if opt.options.type ? functor.wrappedDeprecationMessage then + { type = addDeprecatedWrapped opt.options.type; } + else + {} else {}; @@ -782,9 +789,9 @@ let if bothHave "default" || bothHave "example" || bothHave "description" || - bothHave "apply" || - (bothHave "type" && (! typesMergeable)) + bothHave "apply" then + # Keep in sync with the same error above! throw "The option `${showOption loc}' in `${opt._file}' is already declared in ${showFiles res.declarations}." else let From e60e2e6916b5f78f274a040de8ecc44462b0ae6e Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Dec 2024 16:08:59 +0100 Subject: [PATCH 0312/1054] lib/types: standardise attrsOf functor.wrapped warning and add a test --- lib/tests/modules.sh | 4 ++++ lib/types.nix | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 4c00ecaab605..6085d4b7984a 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -391,6 +391,10 @@ checkConfigError 'The option `mergedLazyNonLazy'\'' in `.*'\'' is already declar checkConfigOutput '^11$' config.lazyResult ./lazy-attrsWith.nix checkConfigError 'infinite recursion encountered' config.nonLazyResult ./lazy-attrsWith.nix +# Test the attrsOf functor.wrapped warning +# shellcheck disable=2016 +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `type.functor.wrapped` attribute of the option `mergedLazyLazy` is accessed, use `nestedTypes.elemType` instead.' options.mergedLazyLazy.type.functor.wrapped ./lazy-attrsWith.nix + # Even with multiple assignments, a type error should be thrown if any of them aren't valid checkConfigError 'A definition for option .* is not of type .*' \ config.value ./declare-int-unsigned-value.nix ./define-value-list.nix ./define-value-int-positive.nix diff --git a/lib/types.nix b/lib/types.nix index 41c53ec89ba6..caa7b6e7b5f2 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -636,12 +636,8 @@ rec { substSubModules = m: attrsWith { elemType = elemType.substSubModules m; inherit lazy; }; functor = defaultFunctor "attrsWith" // { wrappedDeprecationMessage = { loc }: lib.warn '' - Using 'functor.wrapped' on option types will be deprecated. - - Use 'nestedTypes.elemType' instead. - - option: '${showOption loc}' - '' elemType; + The deprecated `type.functor.wrapped` attribute of the option `${showOption loc}` is accessed, use `type.nestedTypes.elemType` instead. + '' elemType; payload = { # Important!: Add new function attributes here in case of future changes inherit elemType lazy; From 58c115499f8c395d151ba9dba4a18c7734650649 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Mon, 2 Dec 2024 16:39:29 +0100 Subject: [PATCH 0313/1054] lib.types: improve performance on attrsWith --- lib/types.nix | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index caa7b6e7b5f2..dd1e8ab9d016 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -597,17 +597,31 @@ rec { # base type for lazyAttrsOf and attrsOf attrsWith = + let + # Push down position info. + pushPositions = map (def: mapAttrs (n: v: { inherit (def) file; value = v; }) def.value); + binOp = lhs: rhs: + let + elemType = lhs.elemType.typeMerge rhs.elemType.functor; + lazy = + if lhs.lazy == rhs.lazy then + lhs.lazy + else + null; + in + if elemType == null || lazy == null then + null + else + { + inherit elemType lazy; + }; + in { elemType, lazy ? false, }: - let - typeName = if lazy then "lazyAttrsOf" else "attrsOf"; - # Push down position info. - pushPositions = map (def: mapAttrs (n: v: { inherit (def) file; value = v; }) def.value); - in mkOptionType { - name = typeName; + name = if lazy then "lazyAttrsOf" else "attrsOf"; description = (if lazy then "lazy attribute set" else "attribute set") + " of ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}"; descriptionClass = "composite"; check = isAttrs; @@ -642,21 +656,7 @@ rec { # Important!: Add new function attributes here in case of future changes inherit elemType lazy; }; - binOp = lhs: rhs: - let - elemType = lhs.elemType.typeMerge rhs.elemType.functor; - lazy = - if lhs.lazy == rhs.lazy then - lhs.lazy - else - null; - in - if elemType == null || lazy == null then - null - else - { - inherit elemType lazy; - }; + inherit binOp; }; nestedTypes.elemType = elemType; }; From ce8f304bb68f88be5e32975c3299f2e16abe05c0 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Tue, 3 Dec 2024 10:04:23 +0100 Subject: [PATCH 0314/1054] lib.types.attrsWith: remove failing test --- lib/tests/modules.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 6085d4b7984a..4c00ecaab605 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -391,10 +391,6 @@ checkConfigError 'The option `mergedLazyNonLazy'\'' in `.*'\'' is already declar checkConfigOutput '^11$' config.lazyResult ./lazy-attrsWith.nix checkConfigError 'infinite recursion encountered' config.nonLazyResult ./lazy-attrsWith.nix -# Test the attrsOf functor.wrapped warning -# shellcheck disable=2016 -NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `type.functor.wrapped` attribute of the option `mergedLazyLazy` is accessed, use `nestedTypes.elemType` instead.' options.mergedLazyLazy.type.functor.wrapped ./lazy-attrsWith.nix - # Even with multiple assignments, a type error should be thrown if any of them aren't valid checkConfigError 'A definition for option .* is not of type .*' \ config.value ./declare-int-unsigned-value.nix ./define-value-list.nix ./define-value-int-positive.nix From ea3e278f5bda90d8f81803da451e49769a1dbc08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 09:36:14 +0000 Subject: [PATCH 0315/1054] python312Packages.recipe-scrapers: 15.2.1 -> 15.3.2 --- pkgs/development/python-modules/recipe-scrapers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index eba4cd32df88..de3f12e7680b 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "15.2.1"; + version = "15.3.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-2rwy7tfTKaUmPJv59WMVGAOUP+vGWquJbF/3BbS3kkA="; + hash = "sha256-Q3pbvLbSpV1DOUGSGydgmGOCGrlfGKVENneC6iuVNxs="; }; nativeBuildInputs = [ setuptools ]; From c8ecb7f23376faf8d482b77c7be98797d3fb476d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 09:47:21 +0000 Subject: [PATCH 0316/1054] python312Packages.voip-utils: 0.2.0 -> 0.2.1 --- pkgs/development/python-modules/voip-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/voip-utils/default.nix b/pkgs/development/python-modules/voip-utils/default.nix index 04e0eb2ede82..b6c105ad9924 100644 --- a/pkgs/development/python-modules/voip-utils/default.nix +++ b/pkgs/development/python-modules/voip-utils/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "voip-utils"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "voip-utils"; - rev = "refs/tags/${version}"; - hash = "sha256-/DBBTL+t0VQJL43HgXGdhMHMKr8uBEkJ7Mf7Xp1mwhU="; + rev = "refs/tags/v${version}"; + hash = "sha256-ONvbkYP1hGMYOVZs5gvs/cr+Tde9gT3jloP6veqE/Ac="; }; postPatch = '' From 69b1c90060b23d929349bec30aedb0b1de8d809d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 1 Dec 2024 23:33:56 -0300 Subject: [PATCH 0317/1054] python312Packages.latex2pydata: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/latex2pydata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/latex2pydata/default.nix b/pkgs/development/python-modules/latex2pydata/default.nix index 80005a173af0..865af9756e09 100644 --- a/pkgs/development/python-modules/latex2pydata/default.nix +++ b/pkgs/development/python-modules/latex2pydata/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "latex2pydata"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Ega1cHSP187njyelb0yiCdpk08QZyObelRa2S79AE1E="; + hash = "sha256-9MsAwzP8j52mh+azaEkfkaLmDOBWZoVnr9LnGSvK3mk="; }; build-system = [ From 15ca3525fe63abcb0cd5f77e303dbffeab98d879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 3 Dec 2024 06:51:31 -0300 Subject: [PATCH 0318/1054] python312packages.latex2pydata: format with nixfmt --- .../python-modules/latex2pydata/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/latex2pydata/default.nix b/pkgs/development/python-modules/latex2pydata/default.nix index 865af9756e09..e4bbd47c0eb0 100644 --- a/pkgs/development/python-modules/latex2pydata/default.nix +++ b/pkgs/development/python-modules/latex2pydata/default.nix @@ -1,8 +1,9 @@ -{ lib -, fetchPypi -, buildPythonPackage -, setuptools -, pytestCheckHook +{ + lib, + fetchPypi, + buildPythonPackage, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { From 63a2350155f99a6f3d15c90929e2e8b23e2f5bf0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 09:58:15 +0000 Subject: [PATCH 0319/1054] stella: 7.0 -> 7.0b --- pkgs/by-name/st/stella/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stella/package.nix b/pkgs/by-name/st/stella/package.nix index 16d812206934..90cea0687bf1 100644 --- a/pkgs/by-name/st/stella/package.nix +++ b/pkgs/by-name/st/stella/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stella"; - version = "7.0"; + version = "7.0b"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; rev = finalAttrs.version; - hash = "sha256-c7A1gFvYkxxwuwrntw/w8FYD24l5m1Uip+44Pe664lE="; + hash = "sha256-310rGYfCVRoTi9kq9XqmvTCVLLDY/PG2qgBG1kNT/DY="; }; nativeBuildInputs = [ From 48011bb5515dbaf85bcca5ce14a75e95ecebd354 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 3 Dec 2024 10:41:52 +0000 Subject: [PATCH 0320/1054] nixos/doc/rl-2505: document retroarch refactoring changes --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index a82932ce6626..6dd69941c270 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -53,6 +53,8 @@ [official website](https://www.nerdfonts.com/font-downloads) as the titles in preview images, with the "Nerd Font" suffix and any whitespaces trimmed. +- `retroarch` has been refactored and the older `retroarch.override { cores = [ ... ]; }` to create a RetroArch derivation with custom cores doesn't work anymore, use `retroarch.withCores (cores: [ ... ])` instead. If you need more customization (e.g.: custom settings), use `wrapRetroArch` instead. + - `gkraken` software and `hardware.gkraken.enable` option have been removed, use `coolercontrol` via `programs.coolercontrol.enable` option instead. - `containerd` has been updated to v2, which contains breaking changes. See the [containerd From 9226d4e9ee551ff7db365937949711ccd96611b4 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 3 Dec 2024 11:35:02 +0100 Subject: [PATCH 0321/1054] nixos/filesystems: don't silently ignore label when device is set Before this change, when both device and label were set, the label would be silently ignored. This is especially problematic when the device is set in another module, and it's not immediately obvious why the label is not having any effect. Additionally, some other modules use the device option to get the device of a filesystem, but this option is not populated when only the label is set, causing those modules to conclude that the filesystem does not have a backing device. With this change, we populate the device option using the label when the label is set. This means that we get a clear error message when both the device and label are set, and that the device is properly populated whenever the label is used to specify the backing device. --- nixos/modules/tasks/filesystems.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 5c95cd3d451e..b7d18dfe4173 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -4,6 +4,8 @@ with lib; with utils; let + # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces + escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; addCheckDesc = desc: elemType: check: types.addCheck elemType check // { description = "${elemType.description} (with check: ${desc})"; }; @@ -136,6 +138,8 @@ let }; + config.device = lib.mkIf (config.label != null) "/dev/disk/by-label/${escape config.label}"; + config.options = let inInitrd = utils.fsNeededForBoot config; in mkMerge [ @@ -196,11 +200,8 @@ let ]; isBindMount = fs: builtins.elem "bind" fs.options; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs; - # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces - escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; in fstabFileSystems: { }: concatMapStrings (fs: (if fs.device != null then escape fs.device - else if fs.label != null then "/dev/disk/by-label/${escape fs.label}" else throw "No device specified for mount point ‘${fs.mountPoint}’.") + " " + escape fs.mountPoint + " " + fs.fsType From 781b44b39d1738e544ca0acfe391beda22408c22 Mon Sep 17 00:00:00 2001 From: nicoo Date: Thu, 28 Nov 2024 16:36:29 +0000 Subject: [PATCH 0322/1054] lib.packagesFromDirectoryRecursive: document inputs better Cut out redundant boilerplate, explain what the `callPackage` parameter is. Co-authored-by: Valentin Gagarin --- lib/filesystem.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/filesystem.nix b/lib/filesystem.nix index 2f43792017f9..17ca23606f8b 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -318,18 +318,12 @@ in # Inputs - Structured function argument + `callPackage` + : The function used to convert a Nix file's path into a leaf of the attribute set. + It is typically the `callPackage` function, taken from either `pkgs` or a new scope corresponding to the `directory`. - : Attribute set containing the following attributes. - Additional attributes are ignored. - - `callPackage` - - : `pkgs.callPackage` - - `directory` - - : The directory to read package files from + `directory` + : The directory to read package files from. # Examples From 25bdcd51e86eaee6d5e2a0d908cdd0caa82b2ccd Mon Sep 17 00:00:00 2001 From: nicoo Date: Thu, 28 Nov 2024 16:55:04 +0000 Subject: [PATCH 0323/1054] lib.packagesFromDirectoryRecursive: Split and explain examples, warn about scope limitation --- lib/filesystem.nix | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/lib/filesystem.nix b/lib/filesystem.nix index 17ca23606f8b..b8ce722dac55 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -328,7 +328,7 @@ in # Examples :::{.example} - ## `lib.filesystem.packagesFromDirectoryRecursive` usage example + ## Basic use of `lib.packagesFromDirectoryRecursive` ```nix packagesFromDirectoryRecursive { @@ -336,17 +336,48 @@ in directory = ./my-packages; } => { ... } + ``` + In this case, `callPackage` will only search `pkgs` for a file's input parameters. + In other words, a file cannot refer to another file in the directory in its input parameters. + ::: + + ::::{.example} + ## Create a scope for the nix files found in a directory + ```nix lib.makeScope pkgs.newScope ( self: packagesFromDirectoryRecursive { - callPackage = self.callPackage; + inherit (self) callPackage; directory = ./my-packages; } ) => { ... } ``` + For example, take the following directory structure: + ``` + my-packages + ├── a.nix → { b }: assert b ? b1; ... + └── b + ├── b1.nix → { a }: ... + └── b2.nix + ``` + + Here, `b1.nix` can specify `{ a }` as a parameter, which `callPackage` will resolve as expected. + Likewise, `a.nix` receive an attrset corresponding to the contents of the `b` directory. + + :::{.note} + `a.nix` cannot directly take as inputs packages defined in a child directory, such as `b1`. ::: + + :::{.warning} + As of now, `lib.packagesFromDirectoryRecursive` cannot create nested scopes for sub-directories. + + In particular, files under `b/` can only require (as inputs) other files under `my-packages`, + but not to those in the same directory, nor those in a parent directory; e.g, `b2.nix` cannot directly + require `b1`. + ::: + :::: */ packagesFromDirectoryRecursive = { From 360444f92de73ae0ab54524e7734cf584cf84aa3 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 3 Dec 2024 12:56:51 +0100 Subject: [PATCH 0324/1054] haruna: 1.1.2 -> 1.2.1 --- pkgs/applications/video/haruna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 8f629079f6b0..96a6235bf9d1 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "haruna"; - version = "1.1.2"; + version = "1.2.1"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-PjELW0evn53gIbScrM2bYEpb9U/TE/lOCD2DiJ1aodo="; + hash = "sha256-RxHCs5NiKORikbTyNwRD27aQfX5id4K/Lp1bQ8cAwVo="; domain = "invent.kde.org"; }; From debea81ba7f3b06c34edfeb5b2bec0907d912d66 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 3 Dec 2024 12:19:10 +0000 Subject: [PATCH 0325/1054] nixos-rebuild-ng: don't try to register the profile when doing build or test --- .../nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 043aa9a3e157..d41a0fcbd1bf 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -322,12 +322,13 @@ def execute(argv: list[str]) -> None: from_host=build_host, **copy_flags, ) - nix.set_profile( - profile, - path_to_config, - target_host=target_host, - sudo=args.sudo, - ) + if action in (Action.SWITCH, Action.BOOT): + nix.set_profile( + profile, + path_to_config, + target_host=target_host, + sudo=args.sudo, + ) if action in (Action.SWITCH, Action.BOOT, Action.TEST, Action.DRY_ACTIVATE): nix.switch_to_configuration( path_to_config, From 7392ad0ac211623b44492e79b561043d800f5fef Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:25 +0800 Subject: [PATCH 0326/1054] cinnamon-common: 6.2.9 -> 6.4.1 https://github.com/linuxmint/cinnamon/compare/6.2.9...6.4.1 --- pkgs/by-name/ci/cinnamon-common/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix index 538884f8278c..1f9410611301 100644 --- a/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/pkgs/by-name/ci/cinnamon-common/package.nix @@ -9,6 +9,7 @@ , cjs , evolution-data-server , fetchFromGitHub +, gcr , gdk-pixbuf , gettext , libgnomekbd @@ -18,6 +19,7 @@ , gtk3 , intltool , json-glib +, libsecret , libstartup_notification , libXtst , libXdamage @@ -71,13 +73,13 @@ in # TODO (after 25.05 branch-off): Rename to pkgs.cinnamon stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "6.2.9"; + version = "6.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-CW87zZogjdTOCp6mx5ctV6T9YQVQGo3yw0lPTkiCNkE="; + hash = "sha256-xkM6t1AiFpfAJOUEP2eeWBtYLQa36FNxrpPiRgHot3w="; }; patches = [ @@ -94,11 +96,13 @@ stdenv.mkDerivation rec { cjs dbus evolution-data-server # for calendar-server + gcr gdk-pixbuf glib gsound gtk3 json-glib + libsecret libstartup_notification libXtst libXdamage @@ -136,6 +140,7 @@ stdenv.mkDerivation rec { intltool gtk-doc perl + python3.pkgs.libsass # for pysassc python3.pkgs.wrapPython pkg-config ]; @@ -160,12 +165,13 @@ stdenv.mkDerivation rec { substituteInPlace ./modules/cs_info.py --replace-fail "lspci" "${pciutils}/bin/lspci" substituteInPlace ./modules/cs_keyboard.py --replace-fail "/usr/bin/cinnamon-dbus-command" "$out/bin/cinnamon-dbus-command" substituteInPlace ./modules/cs_themes.py --replace-fail "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d" + substituteInPlace ./modules/cs_user.py --replace-fail "/usr/bin/passwd" "/run/wrappers/bin/passwd" popd substituteInPlace ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} \ --replace-fail "exec cinnamon-session" "exec ${cinnamon-session}/bin/cinnamon-session" - patchShebangs src/data-to-c.pl + patchShebangs src/data-to-c.pl data/theme/parse-sass.sh ''; postInstall = '' From 8c1957866a00bdb20793163719d74efc14da6a14 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:26 +0800 Subject: [PATCH 0327/1054] cinnamon-control-center: 6.2.0 -> 6.4.0 https://github.com/linuxmint/cinnamon-control-center/compare/6.2.0...6.4.0 The datetime panel was removed, so I assume we don't need tzdata anymore. --- .../by-name/ci/cinnamon-control-center/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-control-center/package.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix index 2c9308f15a92..f18f5329679a 100644 --- a/pkgs/by-name/ci/cinnamon-control-center/package.nix +++ b/pkgs/by-name/ci/cinnamon-control-center/package.nix @@ -19,7 +19,6 @@ , libgudev , libwacom , wrapGAppsHook3 -, tzdata , glibc , libnma , modemmanager @@ -34,13 +33,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "6.2.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Blod69RzPTE3DztRo0PK0MKCE+vq0HWrcJcC/1e8eRI="; + hash = "sha256-hS1vFrwMYUinFLWx33nnlcXwcMkqDCivElI1HaZsSSE="; }; buildInputs = [ @@ -57,7 +56,6 @@ stdenv.mkDerivation rec { colord libgudev libwacom - tzdata networkmanager libnma modemmanager @@ -67,15 +65,7 @@ stdenv.mkDerivation rec { upower ]; - /* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/" - ./panels/datetime/tz.h:32:# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" - ./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */ - postPatch = '' - sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c - sed 's|TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"|TZ_DATA_FILE "${tzdata}/share/zoneinfo/zone.tab"|g' -i ./panels/datetime/tz.h - sed 's|"/usr/share/i18n/locales/"|"${glibc}/share/i18n/locales/"|g' -i panels/datetime/test-endianess.c - patchShebangs meson_install_schemas.py ''; From cf53922046891e87daea3f7ce83f5f8161a84189 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:27 +0800 Subject: [PATCH 0328/1054] cinnamon-desktop: 6.2.0 -> 6.4.1 https://github.com/linuxmint/cinnamon-desktop/compare/6.2.0...6.4.1 --- pkgs/by-name/ci/cinnamon-desktop/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix index 9bb7b706f02d..d69797b0d776 100644 --- a/pkgs/by-name/ci/cinnamon-desktop/package.nix +++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix @@ -3,6 +3,7 @@ , gobject-introspection , gtk3 , intltool +, isocodes , meson , ninja , pkg-config @@ -19,13 +20,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "6.2.0"; + version = "6.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-9uewZh0GHQAenTcZpLchgFXSt3vOhxLbaepsJIkjTdI="; + hash = "sha256-YKGVuT28MLcLO9T8ZJqbHqMN0SAn1P1l8JTDBo4n838="; }; outputs = [ "out" "dev" ]; @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf + isocodes systemd xkeyboard_config xorg.libxkbfile From c6e2429cbe9ee7258a201f0a9d26084bc44633ce Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:28 +0800 Subject: [PATCH 0329/1054] cinnamon-menus: 6.2.0 -> 6.4.0 https://github.com/linuxmint/cinnamon-menus/compare/6.2.0...6.4.0 --- pkgs/by-name/ci/cinnamon-menus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-menus/package.nix b/pkgs/by-name/ci/cinnamon-menus/package.nix index 62066ff8dade..6177303fa9db 100644 --- a/pkgs/by-name/ci/cinnamon-menus/package.nix +++ b/pkgs/by-name/ci/cinnamon-menus/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "6.2.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-HOipeUV9daPSsJ+SHPlsyEAg2SwKQkZBm1JUoNtDZAY="; + hash = "sha256-ug1RSP2TBrypi0aGhF05k39koY3rGgJi0LuWyuuICd0="; }; buildInputs = [ From 52e2bbc30ca09882753021b3c32c7de30b973b22 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:29 +0800 Subject: [PATCH 0330/1054] cinnamon-screensaver: 6.2.1 -> 6.4.0 https://github.com/linuxmint/cinnamon-screensaver/compare/6.2.1...6.4.0 --- .../by-name/ci/cinnamon-screensaver/package.nix | 17 +++++++++++++---- .../preserve-existing-gi-typelib-path.patch | 14 ++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/ci/cinnamon-screensaver/preserve-existing-gi-typelib-path.patch diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix index 7ea3f4a0a13f..23e963088e19 100644 --- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix +++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix @@ -28,15 +28,21 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "6.2.1"; + version = "6.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-f1Z3fmtCokWNLJwsTOAIAZB3lwFfqakJJco3umyEaYk="; + hash = "sha256-XlEu/aBwNeu+CC6IRnFTF6LUnb7VY2+OOGsdCvQYweA="; }; + patches = [ + # Do not override GI_TYPELIB_PATH set by wrapGAppsHook3. + # https://github.com/linuxmint/cinnamon-screensaver/pull/456#discussion_r1702738776. + ./preserve-existing-gi-typelib-path.patch + ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 @@ -80,8 +86,6 @@ stdenv.mkDerivation rec { # cscreensaver hardcodes absolute paths everywhere. Nuke from orbit. find . -type f -exec sed -i \ -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \ - -e s,/usr/lib/cinnamon-screensaver,$out/lib,g \ - -e s,/usr/share/cinnamon-screensaver,$out/share,g \ -e s,/usr/share/iso-flag-png,${iso-flags-png-320x240}/share/iso-flags-png,g \ {} + ''; @@ -93,6 +97,11 @@ stdenv.mkDerivation rec { ) ''; + postFixup = '' + # Shared objects can't be wrapped. + mv $out/libexec/cinnamon-screensaver/{.libcscreensaver.so-wrapped,libcscreensaver.so} + ''; + meta = with lib; { homepage = "https://github.com/linuxmint/cinnamon-screensaver"; description = "Cinnamon screen locker and screensaver program"; diff --git a/pkgs/by-name/ci/cinnamon-screensaver/preserve-existing-gi-typelib-path.patch b/pkgs/by-name/ci/cinnamon-screensaver/preserve-existing-gi-typelib-path.patch new file mode 100644 index 000000000000..7cb1b9a94868 --- /dev/null +++ b/pkgs/by-name/ci/cinnamon-screensaver/preserve-existing-gi-typelib-path.patch @@ -0,0 +1,14 @@ +diff --git a/src/binfile.in b/src/binfile.in +index 0674567..1faba9c 100644 +--- a/src/binfile.in ++++ b/src/binfile.in +@@ -5,7 +5,7 @@ if [ "$XDG_SESSION_TYPE" = "wayland" ]; then + exit 1 + fi + +-export GI_TYPELIB_PATH="@typelibdir@" +-export LD_LIBRARY_PATH="@pkglibdir@" ++export GI_TYPELIB_PATH="@typelibdir@${GI_TYPELIB_PATH:+:}$GI_TYPELIB_PATH" ++export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + + exec @install_dir@/@target@ "$@" From e2163b4a7b7ed9db81f8bd98853cae583326960f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:31 +0800 Subject: [PATCH 0331/1054] cinnamon-session: 6.2.1 -> 6.4.0 https://github.com/linuxmint/cinnamon-session/compare/6.2.1...6.4.0 cinnamon-session-quit.py is patched automatically as soon as pythonEnv is added to buildInputs. --- pkgs/by-name/ci/cinnamon-session/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix index 790e0cfe6efc..d6c58c0ac8a8 100644 --- a/pkgs/by-name/ci/cinnamon-session/package.nix +++ b/pkgs/by-name/ci/cinnamon-session/package.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "6.2.1"; + version = "6.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-mr+QOFogzoloasGt1uK6zH/KHuH+uWYzXAZxPYkW57A="; + hash = "sha256-4uTKcmwfEytoAy4CFiOedYJqmPtBFBHk0P1gEGgm6pU="; }; patches = [ @@ -88,9 +88,8 @@ stdenv.mkDerivation rec { postPatch = '' # patchShebangs requires executable file - chmod +x data/meson_install_schemas.py cinnamon-session-quit/cinnamon-session-quit.py - patchShebangs --build data/meson_install_schemas.py - patchShebangs --host cinnamon-session-quit/cinnamon-session-quit.py + chmod +x data/meson_install_schemas.py + patchShebangs data/meson_install_schemas.py ''; preFixup = '' From 465940ad05b3273ef024f5a56a46ebe74894c36d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:32 +0800 Subject: [PATCH 0332/1054] cinnamon-settings-daemon: 6.2.0 -> 6.4.1 https://github.com/linuxmint/cinnamon-settings-daemon/compare/6.2.0...6.4.1 --- pkgs/by-name/ci/cinnamon-settings-daemon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix index b704f21e294b..1844fd9795af 100644 --- a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix +++ b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "6.2.0"; + version = "6.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-OAG5Tes+0bi+vKqm77Y7OykTpUkMdRaXIJYLuomIDMo="; + hash = "sha256-GY5uq+CLBKhHYr5RTVlE3vqCfP6+2Tmztw0ymwT4jKU="; }; patches = [ From e1e722bc5bd320f36ed6790decd5cd5ee56a0aa3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:33 +0800 Subject: [PATCH 0333/1054] cinnamon-translations: 6.2.2 -> 6.4.0 https://github.com/linuxmint/cinnamon-translations/compare/6.2.2...6.4.0 --- pkgs/by-name/ci/cinnamon-translations/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-translations/package.nix b/pkgs/by-name/ci/cinnamon-translations/package.nix index 503db8783de4..66fd9e8fa2b7 100644 --- a/pkgs/by-name/ci/cinnamon-translations/package.nix +++ b/pkgs/by-name/ci/cinnamon-translations/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "6.2.2"; + version = "6.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-uZVF2CsKTQOvMJsyXBW405W3vdIGxYlW8+xPiwSgUSg="; + hash = "sha256-aR1O/NaEJcu4W3bGMWVeaIVGeuMYTrQrPfeS1V+4Nmk="; }; nativeBuildInputs = [ From 6b1ff5c7e366456e02eb809907c0dc3ec42e6306 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:34 +0800 Subject: [PATCH 0334/1054] cjs: 6.2.0 -> 6.4.0 https://github.com/linuxmint/cjs/compare/6.2.0...6.4.0 --- pkgs/by-name/cj/cjs/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cj/cjs/package.nix b/pkgs/by-name/cj/cjs/package.nix index 57cfe2796740..8203ad4a9ecd 100644 --- a/pkgs/by-name/cj/cjs/package.nix +++ b/pkgs/by-name/cj/cjs/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cjs"; - version = "6.2.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cjs"; rev = version; - hash = "sha256-/74E10txRjwN9RkjVB8M0MPYakJ659yJWanc4DC09wg="; + hash = "sha256-2lkIWroOo3hxu9/L/Ty7CADzVrZ0ohyHVmm65NoNlD4="; }; outputs = [ "out" "dev" ]; @@ -60,9 +60,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs --build build/choose-tests-locale.sh - - # https://github.com/linuxmint/cjs/issues/123 - substituteInPlace meson.build --replace-fail "extra_args: '--warn-error'," "" ''; meta = with lib; { From d62cd526c8462cb16ce2b3dbf49e8119afec0c7d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:40 +0800 Subject: [PATCH 0335/1054] muffin: 6.2.0 -> 6.4.1 https://github.com/linuxmint/muffin/compare/6.2.0...6.4.1 --- pkgs/by-name/mu/muffin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix index c1a67a0d2737..a95834b04c25 100644 --- a/pkgs/by-name/mu/muffin/package.nix +++ b/pkgs/by-name/mu/muffin/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "6.2.0"; + version = "6.4.1"; outputs = [ "out" "dev" "man" ]; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-k8hUYA4/OzL2TB8s5DJpa2nFXV2U9eY09TLkqBDq9WE="; + hash = "sha256-cGC1yGft3uEqefm2DvZrMaROoZKYd6LNY0IJ+58f6vs="; }; patches = [ From d3d93401373f283a323d005b462ea6617a7ad82c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:41 +0800 Subject: [PATCH 0336/1054] nemo: 6.2.8 -> 6.4.2 https://github.com/linuxmint/nemo/compare/6.2.8...6.4.2 --- pkgs/by-name/ne/nemo/package.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ne/nemo/package.nix b/pkgs/by-name/ne/nemo/package.nix index 8a7cee2c85a4..a73b9e60aaec 100644 --- a/pkgs/by-name/ne/nemo/package.nix +++ b/pkgs/by-name/ne/nemo/package.nix @@ -7,7 +7,7 @@ , lib , stdenv , wrapGAppsHook3 -, libxml2 +, libxmlb , gtk3 , gvfs , cinnamon-desktop @@ -19,17 +19,26 @@ , shared-mime-info , cinnamon-translations , libgsf +, python3 }: +let + # For action-layout-editor. + pythonEnv = python3.withPackages (pp: with pp; [ + pycairo + pygobject3 + python-xapp + ]); +in stdenv.mkDerivation rec { pname = "nemo"; - version = "6.2.8"; + version = "6.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-1GJLsUlptwXcZUWIOztskV0nHA9BnPmnVeTgUwJ+QDQ="; + hash = "sha256-J7GQV+T5Lsmu1eELQJE9C3uLI6SoTJNPp648MYqEHvo="; }; patches = [ @@ -44,7 +53,8 @@ stdenv.mkDerivation rec { glib gtk3 cinnamon-desktop - libxml2 + libxmlb # action-layout-editor + pythonEnv xapp libexif exempi From c2cbfebd92437e90357bd8608f80aedce48033b7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:43 +0800 Subject: [PATCH 0337/1054] nemo-emblems: 6.2.1 -> 6.4.0 https://github.com/linuxmint/nemo-extensions/compare/nemo-emblems-6.2.1...6.4.0 --- pkgs/by-name/ne/nemo-emblems/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nemo-emblems/package.nix b/pkgs/by-name/ne/nemo-emblems/package.nix index 6f87281ed08c..467211a3830a 100644 --- a/pkgs/by-name/ne/nemo-emblems/package.nix +++ b/pkgs/by-name/ne/nemo-emblems/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "nemo-emblems"; - version = "6.2.1"; + version = "6.4.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo-extensions"; - rev = "nemo-emblems-${version}"; - hash = "sha256-HfWZntG+SHrzkN4fa3qYj9+fM6zF32qFquL/InoUi/k="; + rev = version; + hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y="; }; format = "setuptools"; From f5571c171f348bc2afa9ceca3b106ab4156a56ad Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:44 +0800 Subject: [PATCH 0338/1054] nemo-fileroller: 6.2.0 -> 6.4.0 https://github.com/linuxmint/nemo-extensions/compare/6.2.0...6.4.0 --- pkgs/by-name/ne/nemo-fileroller/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nemo-fileroller/package.nix b/pkgs/by-name/ne/nemo-fileroller/package.nix index be45cd9193cb..9800fd9bb3d2 100644 --- a/pkgs/by-name/ne/nemo-fileroller/package.nix +++ b/pkgs/by-name/ne/nemo-fileroller/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nemo-fileroller"; - version = "6.2.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo-extensions"; rev = version; - hash = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA="; + hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y="; }; sourceRoot = "${src.name}/nemo-fileroller"; From 8c9f81eb53c785c3e528d57e41f4636ddafb72d5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:45 +0800 Subject: [PATCH 0339/1054] nemo-python: 6.2.0 -> 6.4.0 https://github.com/linuxmint/nemo-extensions/compare/6.2.0...6.4.0 --- pkgs/by-name/ne/nemo-python/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nemo-python/package.nix b/pkgs/by-name/ne/nemo-python/package.nix index 7397149f41a7..9c1651d34c19 100644 --- a/pkgs/by-name/ne/nemo-python/package.nix +++ b/pkgs/by-name/ne/nemo-python/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nemo-python"; - version = "6.2.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo-extensions"; rev = version; - hash = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA="; + hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y="; }; sourceRoot = "${src.name}/nemo-python"; From e83ca8870e310320adba842ef642e716fd34c66a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 30 Nov 2024 11:34:57 +0800 Subject: [PATCH 0340/1054] nixos/cinnamon: Enable power-profiles-daemon https://github.com/linuxmint/cinnamon/commit/7a4afa6c03838df8b328abeaeb26917bb094a0b8 If you use tlp you can disable this again in your config. --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 7f824680b92e..3fda248ff5be 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -111,6 +111,7 @@ in services.gnome.glib-networking.enable = true; services.gnome.gnome-keyring.enable = true; services.gvfs.enable = true; + services.power-profiles-daemon.enable = mkDefault true; services.switcherooControl.enable = mkDefault true; # xapp-gpu-offload-helper services.touchegg.enable = mkDefault true; services.udisks2.enable = true; From d3b00bb894e577ebaf93d1fa6b89aa0eb8bd2b72 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:51:11 +0800 Subject: [PATCH 0341/1054] nixos/cinnamon: Remove polkit_gnome Cinnamon ships its own polkit agent. https://github.com/linuxmint/cinnamon/commit/9945a8aca1550a19d377cdcb19f8addab994260e --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 3fda248ff5be..5b0a28d85f25 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -152,9 +152,6 @@ in # cinnamon-killer-daemon: provided by cinnamon-common networkmanagerapplet # session requirement - also nm-applet not needed - # For a polkit authentication agent - polkit_gnome - # packages nemo-with-extensions gnome-online-accounts-gtk From b2b15dbc81ef290c1ee80aff3dfa674e672978be Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 30 Nov 2024 14:03:13 +0800 Subject: [PATCH 0342/1054] nixos/doc/rl-2505: Mention Cinnamon 6.4 --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 83ad39e636df..a1664cbc9f02 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -60,6 +60,8 @@ +- Cinnamon has been updated to 6.4. + - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries. From c6e9bd02ca1197289185ef9df5fc9b295352965f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 3 Dec 2024 12:54:13 +0000 Subject: [PATCH 0343/1054] nixos-rebuild-ng: add test to `nixos-rebuild build` --- .../nixos-rebuild-ng/src/tests/test_main.py | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index 9337fda44dc0..913103985f66 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -445,6 +445,35 @@ def test_execute_switch_rollback(mock_run: Any, tmp_path: Path) -> None: ) +@patch(get_qualified_name(nr.process.subprocess.run), autospec=True) +def test_execute_build(mock_run: Any, tmp_path: Path) -> None: + config_path = tmp_path / "test" + config_path.touch() + mock_run.side_effect = [ + # nixos_build_flake + CompletedProcess([], 0, str(config_path)), + ] + + nr.execute(["nixos-rebuild", "build", "--no-flake", "--fast"]) + + assert mock_run.call_count == 1 + mock_run.assert_has_calls( + [ + call( + [ + "nix-build", + "", + "--attr", + "config.system.build.toplevel", + ], + check=True, + stdout=PIPE, + **DEFAULT_RUN_KWARGS, + ) + ] + ) + + @patch(get_qualified_name(nr.process.subprocess.run), autospec=True) @patch(get_qualified_name(nr.nix.Path.exists, nr.nix), autospec=True, return_value=True) @patch(get_qualified_name(nr.nix.Path.mkdir, nr.nix), autospec=True) From 8207bfe50a8fe480eebdef146eb1042fc06e3ece Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 2 Dec 2024 15:26:42 +0000 Subject: [PATCH 0344/1054] nixos/uptime-kuma: Order lockdown settings lexicographically Signed-off-by: Felix Singer --- .../services/monitoring/uptime-kuma.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/monitoring/uptime-kuma.nix b/nixos/modules/services/monitoring/uptime-kuma.nix index 1d7ff10227a9..00e13871bb3b 100644 --- a/nixos/modules/services/monitoring/uptime-kuma.nix +++ b/nixos/modules/services/monitoring/uptime-kuma.nix @@ -51,21 +51,21 @@ in DynamicUser = true; ExecStart = "${cfg.package}/bin/uptime-kuma-server"; Restart = "on-failure"; - ProtectHome = true; - ProtectSystem = "strict"; - PrivateTmp = true; - PrivateDevices = true; - ProtectHostname = true; - ProtectClock = true; - ProtectKernelTunables = true; - ProtectKernelModules = true; - ProtectKernelLogs = true; - ProtectControlGroups = true; NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RemoveIPC = true; RestrictRealtime = true; RestrictSUIDSGID = true; - RemoveIPC = true; - PrivateMounts = true; }; }; }; From 4a661643978dffe7da3e29fd4681e90379a119c2 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 2 Dec 2024 15:58:16 +0000 Subject: [PATCH 0345/1054] nixos/uptime-kuma: Add additional lockdown settings to systemd unit Signed-off-by: Felix Singer --- nixos/modules/services/monitoring/uptime-kuma.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/services/monitoring/uptime-kuma.nix b/nixos/modules/services/monitoring/uptime-kuma.nix index 00e13871bb3b..0dd636fe1cc3 100644 --- a/nixos/modules/services/monitoring/uptime-kuma.nix +++ b/nixos/modules/services/monitoring/uptime-kuma.nix @@ -51,6 +51,10 @@ in DynamicUser = true; ExecStart = "${cfg.package}/bin/uptime-kuma-server"; Restart = "on-failure"; + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + LockPersonality = true; + MemoryDenyWriteExecute = false; # enabling it breaks execution NoNewPrivileges = true; PrivateDevices = true; PrivateMounts = true; @@ -62,10 +66,15 @@ in ProtectKernelLogs = true; ProtectKernelModules = true; ProtectKernelTunables = true; + ProtectProc = "noaccess"; ProtectSystem = "strict"; RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" "AF_NETLINK" ]; + RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + UMask = 027; }; }; }; From ded2c6807a9732518cf215d8efebefb212f1df3c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 3 Dec 2024 14:41:08 +0100 Subject: [PATCH 0346/1054] eintopf: 0.14.2 -> 0.14.3 --- pkgs/by-name/ei/eintopf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ei/eintopf/package.nix b/pkgs/by-name/ei/eintopf/package.nix index 8cb08bc68d56..778741640a30 100644 --- a/pkgs/by-name/ei/eintopf/package.nix +++ b/pkgs/by-name/ei/eintopf/package.nix @@ -7,13 +7,13 @@ }: let - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Klasse-Methode"; repo = "eintopf"; rev = "v${version}"; - hash = "sha256-38lVbgAjKsg/yXGFmIdw4KmvfIDCAE3K6qhvza3c+dU="; + hash = "sha256-cWHWRxZFoArBB5PiuY6EQubKJKm3/79fwNhnABOtBrM="; }; frontend = callPackage ./frontend.nix { inherit src version; }; in From bf9afe0e85aacce5336c14fb56d3bcba24ccfcde Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Tue, 3 Dec 2024 13:49:37 +0000 Subject: [PATCH 0347/1054] koboldcpp: 1.78 -> 1.79.1 Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.79.1 Diff: https://github.com/LostRuins/koboldcpp/compare/v1.78...v1.79.1 --- pkgs/by-name/ko/koboldcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index b3b16042acbb..499c5ddd3fe1 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -44,13 +44,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.78"; + version = "1.79.1"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-6RvodNWO/IVGlKxC/zt0itYDzymhk+hEBpbmQ1jHigU="; + hash = "sha256-RHeEI6mJklGF7BQXxLwxSr1xD6GsI9+fio888UxKru0="; }; enableParallelBuilding = true; From 3463d22cd84e38697e9d43a4953ff84c3ce9074a Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 2 Dec 2024 21:21:10 -0400 Subject: [PATCH 0348/1054] buildDotnetGlobalTool: format with nixfmt --- .../build-dotnet-global-tool/default.nix | 84 +++++++++++-------- 1 file changed, 49 insertions(+), 35 deletions(-) diff --git a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix index 2177000c3627..9d199a6d0a4e 100644 --- a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix @@ -1,53 +1,67 @@ -{ buildDotnetModule, emptyDirectory, fetchNupkg, dotnet-sdk }: +{ + buildDotnetModule, + emptyDirectory, + fetchNupkg, + dotnet-sdk, +}: -{ pname -, version +{ + pname, + version, # Name of the nuget package to install, if different from pname -, nugetName ? pname + nugetName ? pname, # Hash of the nuget package to install, will be given on first build # nugetHash uses SRI hash and should be preferred -, nugetHash ? "" -, nugetSha256 ? "" + nugetHash ? "", + nugetSha256 ? "", # Additional nuget deps needed by the tool package -, nugetDeps ? (_: []) + nugetDeps ? (_: [ ]), # Executables to wrap into `$out/bin`, same as in `buildDotnetModule`, but with # a default of `pname` instead of null, to avoid auto-wrapping everything -, executables ? pname + executables ? pname, # The dotnet runtime to use, dotnet tools need a full SDK to function -, dotnet-runtime ? dotnet-sdk -, ... -} @ args: + dotnet-runtime ? dotnet-sdk, + ... +}@args: -buildDotnetModule (args // { - inherit pname version dotnet-runtime executables; +buildDotnetModule ( + args + // { + inherit + pname + version + dotnet-runtime + executables + ; - src = emptyDirectory; + src = emptyDirectory; - buildInputs = [ - (fetchNupkg { - pname = nugetName; - inherit version; - sha256 = nugetSha256; - hash = nugetHash; - installable = true; - }) - ]; + buildInputs = [ + (fetchNupkg { + pname = nugetName; + inherit version; + sha256 = nugetSha256; + hash = nugetHash; + installable = true; + }) + ]; - dotnetGlobalTool = true; + dotnetGlobalTool = true; - useDotnetFromEnv = true; + useDotnetFromEnv = true; - dontBuild = true; + dontBuild = true; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - dotnet tool install --tool-path $out/lib/${pname} ${nugetName} + dotnet tool install --tool-path $out/lib/${pname} ${nugetName} - # remove files that contain nix store paths to temp nuget sources we made - find $out -name 'project.assets.json' -delete - find $out -name '.nupkg.metadata' -delete + # remove files that contain nix store paths to temp nuget sources we made + find $out -name 'project.assets.json' -delete + find $out -name '.nupkg.metadata' -delete - runHook postInstall - ''; -}) + runHook postInstall + ''; + } +) From 07a92bc00666ed8c9aaecaf2a50907d7ebbcbf01 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 2 Dec 2024 21:27:55 -0400 Subject: [PATCH 0349/1054] buildDotnetGlobalTools: add finalAttrs support --- .../build-dotnet-global-tool/default.nix | 102 +++++++++--------- 1 file changed, 54 insertions(+), 48 deletions(-) diff --git a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix index 9d199a6d0a4e..4b8ad583d82d 100644 --- a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix @@ -3,65 +3,71 @@ emptyDirectory, fetchNupkg, dotnet-sdk, + lib, }: -{ - pname, - version, - # Name of the nuget package to install, if different from pname - nugetName ? pname, - # Hash of the nuget package to install, will be given on first build - # nugetHash uses SRI hash and should be preferred - nugetHash ? "", - nugetSha256 ? "", - # Additional nuget deps needed by the tool package - nugetDeps ? (_: [ ]), - # Executables to wrap into `$out/bin`, same as in `buildDotnetModule`, but with - # a default of `pname` instead of null, to avoid auto-wrapping everything - executables ? pname, - # The dotnet runtime to use, dotnet tools need a full SDK to function - dotnet-runtime ? dotnet-sdk, - ... -}@args: +fnOrAttrs: buildDotnetModule ( - args - // { - inherit - pname - version - dotnet-runtime - executables - ; + finalAttrs: + ( + { + pname, + version, + # Name of the nuget package to install, if different from pname + nugetName ? pname, + # Hash of the nuget package to install, will be given on first build + # nugetHash uses SRI hash and should be preferred + nugetHash ? "", + nugetSha256 ? "", + # Additional nuget deps needed by the tool package + nugetDeps ? (_: [ ]), + # Executables to wrap into `$out/bin`, same as in `buildDotnetModule`, but with + # a default of `pname` instead of null, to avoid auto-wrapping everything + executables ? pname, + # The dotnet runtime to use, dotnet tools need a full SDK to function + dotnet-runtime ? dotnet-sdk, + ... + }@args: + args + // { + inherit + pname + version + dotnet-runtime + executables + ; - src = emptyDirectory; + src = emptyDirectory; - buildInputs = [ - (fetchNupkg { - pname = nugetName; - inherit version; - sha256 = nugetSha256; - hash = nugetHash; - installable = true; - }) - ]; + buildInputs = [ + (fetchNupkg { + pname = nugetName; + inherit version; + sha256 = nugetSha256; + hash = nugetHash; + installable = true; + }) + ]; - dotnetGlobalTool = true; + dotnetGlobalTool = true; - useDotnetFromEnv = true; + useDotnetFromEnv = true; - dontBuild = true; + dontBuild = true; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - dotnet tool install --tool-path $out/lib/${pname} ${nugetName} + dotnet tool install --tool-path $out/lib/${pname} ${nugetName} - # remove files that contain nix store paths to temp nuget sources we made - find $out -name 'project.assets.json' -delete - find $out -name '.nupkg.metadata' -delete + # remove files that contain nix store paths to temp nuget sources we made + find $out -name 'project.assets.json' -delete + find $out -name '.nupkg.metadata' -delete - runHook postInstall - ''; - } + runHook postInstall + ''; + } + ) + (if lib.isFunction fnOrAttrs then fnOrAttrs finalAttrs else fnOrAttrs) ) From 04b0485fd09e7b65df0f91b49bc1b126e8f5d547 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 3 Dec 2024 23:16:59 +0900 Subject: [PATCH 0350/1054] kind: enable doCheck Disabled in #94632, however now succeeded --- pkgs/by-name/ki/kind/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ki/kind/package.nix b/pkgs/by-name/ki/kind/package.nix index 239ecdcf1d6b..43dc0bef27d8 100644 --- a/pkgs/by-name/ki/kind/package.nix +++ b/pkgs/by-name/ki/kind/package.nix @@ -26,8 +26,6 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - doCheck = false; - postInstall = '' installShellCompletion --cmd kind \ --bash <($out/bin/kind completion bash) \ From e768200e3f00c22cf2601e8d1c15535bc9b7ba14 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 3 Dec 2024 23:22:23 +0900 Subject: [PATCH 0351/1054] kind: format with nixfmt-rfc-style --- pkgs/by-name/ki/kind/package.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kind/package.nix b/pkgs/by-name/ki/kind/package.nix index 43dc0bef27d8..b71ae9742298 100644 --- a/pkgs/by-name/ki/kind/package.nix +++ b/pkgs/by-name/ki/kind/package.nix @@ -1,4 +1,9 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: buildGoModule rec { pname = "kind"; @@ -24,7 +29,10 @@ buildGoModule rec { CGO_ENABLED = 0; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; postInstall = '' installShellCompletion --cmd kind \ @@ -36,7 +44,10 @@ buildGoModule rec { meta = with lib; { description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; homepage = "https://github.com/kubernetes-sigs/kind"; - maintainers = with maintainers; [ offline rawkode ]; + maintainers = with maintainers; [ + offline + rawkode + ]; license = licenses.asl20; mainProgram = "kind"; }; From 6eb18c4f7087b5ed2dd20ae1d01ddbde5caab2f2 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 3 Dec 2024 23:24:45 +0900 Subject: [PATCH 0352/1054] kind: add passthru.tests and clarify updateScript --- pkgs/by-name/ki/kind/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/ki/kind/package.nix b/pkgs/by-name/ki/kind/package.nix index b71ae9742298..2824fcb7e854 100644 --- a/pkgs/by-name/ki/kind/package.nix +++ b/pkgs/by-name/ki/kind/package.nix @@ -3,6 +3,9 @@ buildGoModule, fetchFromGitHub, installShellFiles, + testers, + nix-update-script, + kind, }: buildGoModule rec { @@ -41,6 +44,13 @@ buildGoModule rec { --zsh <($out/bin/kind completion zsh) ''; + passthru = { + tests.version = testers.testVersion { + package = kind; + }; + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; homepage = "https://github.com/kubernetes-sigs/kind"; From 04f1c8b4eab2d07d390015461d182dc5818f89c4 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 2 Dec 2024 22:32:11 -0400 Subject: [PATCH 0353/1054] buildDotnetGlobalTool: add default updateScript --- .../build-dotnet-global-tool/default.nix | 24 +++++++----- .../dotnet/build-dotnet-global-tool/update.sh | 24 ++++++++++++ pkgs/by-name/cs/csharp-ls/package.nix | 5 --- pkgs/development/tools/fable/default.nix | 1 - pkgs/development/tools/fable/update.sh | 39 ------------------- 5 files changed, 39 insertions(+), 54 deletions(-) create mode 100755 pkgs/build-support/dotnet/build-dotnet-global-tool/update.sh delete mode 100755 pkgs/development/tools/fable/update.sh diff --git a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix index 4b8ad583d82d..f6a832386b9f 100644 --- a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix @@ -29,6 +29,15 @@ buildDotnetModule ( dotnet-runtime ? dotnet-sdk, ... }@args: + let + nupkg = fetchNupkg { + pname = nugetName; + inherit version; + sha256 = nugetSha256; + hash = nugetHash; + installable = true; + }; + in args // { inherit @@ -40,15 +49,7 @@ buildDotnetModule ( src = emptyDirectory; - buildInputs = [ - (fetchNupkg { - pname = nugetName; - inherit version; - sha256 = nugetSha256; - hash = nugetHash; - installable = true; - }) - ]; + buildInputs = [ nupkg ]; dotnetGlobalTool = true; @@ -67,6 +68,11 @@ buildDotnetModule ( runHook postInstall ''; + + passthru = { + updateScript = ./update.sh; + nupkg = nupkg; + } // args.passthru or {}; } ) (if lib.isFunction fnOrAttrs then fnOrAttrs finalAttrs else fnOrAttrs) diff --git a/pkgs/build-support/dotnet/build-dotnet-global-tool/update.sh b/pkgs/build-support/dotnet/build-dotnet-global-tool/update.sh new file mode 100755 index 000000000000..e00fae9ace36 --- /dev/null +++ b/pkgs/build-support/dotnet/build-dotnet-global-tool/update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq nix common-updater-scripts +# shellcheck shell=bash + +set -euo pipefail + +attr=$UPDATE_NIX_ATTR_PATH + +nixeval() { + nix --extra-experimental-features nix-command eval --json --impure -f . "$1" | jq -r . +} + +nugetName=$(nixeval "$attr.nupkg.pname") + +# always skip prerelease versions for now +version=$(curl -fsSL "https://api.nuget.org/v3-flatcontainer/$nugetName/index.json" | + jq -er '.versions | last(.[] | select(match("^[0-9]+\\.[0-9]+\\.[0-9]+$")))') + +if [[ $version == $(nixeval "$attr.version") ]]; then + echo "$attr" is already version "$version" + exit 0 +fi + +update-source-version "$attr" "$version" --source-key=nupkg.src diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix index 1ae39b36d2bb..4f2972575637 100644 --- a/pkgs/by-name/cs/csharp-ls/package.nix +++ b/pkgs/by-name/cs/csharp-ls/package.nix @@ -2,7 +2,6 @@ lib, buildDotnetGlobalTool, dotnetCorePackages, - nix-update-script, }: let inherit (dotnetCorePackages) sdk_8_0; @@ -17,10 +16,6 @@ buildDotnetGlobalTool rec { dotnet-sdk = sdk_8_0; dotnet-runtime = sdk_8_0; - passthru = { - updateScript = nix-update-script { }; - }; - meta = { description = "Roslyn-based LSP language server for C#"; mainProgram = "csharp-ls"; diff --git a/pkgs/development/tools/fable/default.nix b/pkgs/development/tools/fable/default.nix index ea5362daa90f..172c3d310321 100644 --- a/pkgs/development/tools/fable/default.nix +++ b/pkgs/development/tools/fable/default.nix @@ -5,7 +5,6 @@ buildDotnetGlobalTool { version = "4.20.0"; nugetHash = "sha256-K3908gEbl9crT4wmZfBtvag5Z6qYABfalBfLZlqZuDk="; - passthru.updateScript = ./update.sh; meta = with lib; { description = "Fable is an F# to JavaScript compiler"; diff --git a/pkgs/development/tools/fable/update.sh b/pkgs/development/tools/fable/update.sh deleted file mode 100755 index 181570d1a0de..000000000000 --- a/pkgs/development/tools/fable/update.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix-prefetch jq - -set -euo pipefail -URL="https://github.com/fable-compiler/fable" -PKG="Fable" -ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/default.nix" -if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find default.nix in $ROOT" - exit 1 -fi - -TMP="$(mktemp -d)" -clean_up() { - rm -rf "$TMP" -} -trap clean_up EXIT SIGINT SIGTERM -PACKAGES="$TMP/packages" -SRC_RW="$TMP/src" - -mkdir -p $SRC_RW -mkdir -p $PACKAGES - - -VER=$(curl -s "https://api.github.com/repos/fable-compiler/fable/releases/latest" | jq -r .tag_name | grep -oP '\d+\.\d+\.\d+' ) - -CURRENT_VER=$(grep -oP '(?<=version = ")[^"]+' "$NIX_DRV") -if [[ "$CURRENT_VER" == "$VER" ]]; then - echo "$PKG is already up to date: $CURRENT_VER" - exit -fi - - -NUGET_URL="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')$PKG/$VER/$PKG.$VER.nupkg" -HASH=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$NUGET_URL")") - -sed -i "s/version = \".*\"/version = \"$VER\"/" "$NIX_DRV" -sed -i "s#nugetHash = \"sha256-.\{44\}\"#nugetHash = \"$HASH\"#" "$NIX_DRV" From 79e336184f5c5d0a1d55abd721193863534e27fe Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 2 Dec 2024 22:35:10 -0400 Subject: [PATCH 0354/1054] fable: add version test --- pkgs/development/tools/fable/default.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/fable/default.nix b/pkgs/development/tools/fable/default.nix index 172c3d310321..5ea966199cdb 100644 --- a/pkgs/development/tools/fable/default.nix +++ b/pkgs/development/tools/fable/default.nix @@ -1,11 +1,22 @@ -{ buildDotnetGlobalTool, lib }: +{ + buildDotnetGlobalTool, + lib, + testers, +}: -buildDotnetGlobalTool { +buildDotnetGlobalTool (finalAttrs: { pname = "fable"; version = "4.20.0"; nugetHash = "sha256-K3908gEbl9crT4wmZfBtvag5Z6qYABfalBfLZlqZuDk="; + passthru.tests = testers.testVersion { + package = finalAttrs.finalPackage; + # the version is written with an escape sequence for colour, and I couldn't + # find a way to disable it + version = "[37m${finalAttrs.version}"; + }; + meta = with lib; { description = "Fable is an F# to JavaScript compiler"; mainProgram = "fable"; @@ -13,6 +24,9 @@ buildDotnetGlobalTool { changelog = "https://github.com/fable-compiler/fable/releases/tag/v${version}"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ anpin mdarocha ]; + maintainers = with maintainers; [ + anpin + mdarocha + ]; }; -} +}) From f355a9b9d75a398e09b0773bb1d8b7f636bd0434 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 3 Dec 2024 03:32:32 +0000 Subject: [PATCH 0355/1054] csharpier: 0.29.1 -> 0.30.2 --- pkgs/by-name/cs/csharpier/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cs/csharpier/package.nix b/pkgs/by-name/cs/csharpier/package.nix index ab9c003e2765..7bc0c0d26a9d 100644 --- a/pkgs/by-name/cs/csharpier/package.nix +++ b/pkgs/by-name/cs/csharpier/package.nix @@ -2,10 +2,10 @@ buildDotnetGlobalTool { pname = "csharpier"; - version = "0.29.1"; + version = "0.30.2"; executables = "dotnet-csharpier"; - nugetHash = "sha256-VW9QzbQfbY3Tz+Gz3hQ7VC4wOtwfIYV1Yq2WJz6bL04="; + nugetHash = "sha256-MrpsVlIYyrlu3VvEPcLQRgD2lhfu8ZTN3pUZrZ9nQcA="; meta = with lib; { description = "Opinionated code formatter for C#"; From fb426e653dda5e30de0ae656a9ff817e2ba9efa4 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 3 Dec 2024 03:32:36 +0000 Subject: [PATCH 0356/1054] fable: 4.20.0 -> 4.24.0 --- pkgs/development/tools/fable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/fable/default.nix b/pkgs/development/tools/fable/default.nix index 5ea966199cdb..31013115cb09 100644 --- a/pkgs/development/tools/fable/default.nix +++ b/pkgs/development/tools/fable/default.nix @@ -6,9 +6,9 @@ buildDotnetGlobalTool (finalAttrs: { pname = "fable"; - version = "4.20.0"; + version = "4.24.0"; - nugetHash = "sha256-K3908gEbl9crT4wmZfBtvag5Z6qYABfalBfLZlqZuDk="; + nugetHash = "sha256-ERewWqfEyyZKpHFFALpMGJT0fDWywBYY5buU/wTZZTg="; passthru.tests = testers.testVersion { package = finalAttrs.finalPackage; From 082d748b2b76a3198806c3e1ddf2aab3dcef75a0 Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Tue, 3 Dec 2024 15:53:19 +0100 Subject: [PATCH 0357/1054] mariadb-galera: 26.4.20 -> 26.4.21 Changelog: https://releases.galeracluster.com/galera-4/release-notes-galera-26.4.21.txt --- pkgs/by-name/ma/mariadb-galera/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mariadb-galera/package.nix b/pkgs/by-name/ma/mariadb-galera/package.nix index ebb3eb23c954..cf7df33288de 100644 --- a/pkgs/by-name/ma/mariadb-galera/package.nix +++ b/pkgs/by-name/ma/mariadb-galera/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.20"; + version = "26.4.21"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - hash = "sha256-R2YQtAuqPkOtcvjS5PPcqAqu153N2+0/WjZt96ZSI1A="; + hash = "sha256-mXnQOs2WNdXORBqcfQPgDoJjbyrpypGDOkgP09JZ9Qo="; fetchSubmodules = true; }; From 8df16a12a622bcf3aecd876b8e257bf217db261b Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Tue, 3 Dec 2024 22:54:48 +0800 Subject: [PATCH 0358/1054] ibm-plex: add sans-sc family --- pkgs/by-name/ib/ibm-plex/hashes.nix | 1 + pkgs/by-name/ib/ibm-plex/update.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/by-name/ib/ibm-plex/hashes.nix b/pkgs/by-name/ib/ibm-plex/hashes.nix index d22fdab47244..87997ed6362f 100644 --- a/pkgs/by-name/ib/ibm-plex/hashes.nix +++ b/pkgs/by-name/ib/ibm-plex/hashes.nix @@ -6,6 +6,7 @@ "sans-devanagari" = "sha256-K57OVqcH5r9tZx8NFEoz1P3xpUooqpF7xxJzNmnObwE="; "sans-thai" = "sha256-JZVbvZdj+IfBthiqivOXHrvAUe392M9ECGsiJkm0saE="; "sans-thai-looped" = "sha256-cry/Ctwt1bsrdbvWkJIYWLjsvV6a1lLFsT85znqERnw="; + "sans-sc" = "sha256-Q3cEVlR/UkNZaGIhNMIdojId6fHmAsZdLwMsKq1zLRY="; "sans-tc" = "sha256-kZvzSK6fEjfVMR4kxC4lxtD7GskqvJZx8BBJVT4T9MU="; "sans-kr" = "sha256-FsHxMvLlI4yylgG96DOZIdW2DYpk7I+c5QgkVIkNZIE="; "sans-jp" = "sha256-hUl/SSkN6q3pDTtrY2mJepw3ljhhLJskGbxfsTl9TuI="; diff --git a/pkgs/by-name/ib/ibm-plex/update.sh b/pkgs/by-name/ib/ibm-plex/update.sh index e974a306b50d..dd91a5521e9d 100755 --- a/pkgs/by-name/ib/ibm-plex/update.sh +++ b/pkgs/by-name/ib/ibm-plex/update.sh @@ -11,6 +11,7 @@ families=( "sans-devanagari" "sans-thai" "sans-thai-looped" + "sans-sc" "sans-tc" "sans-kr" "sans-jp" From a6a87f182150a50d7dffbd77a8e361f1a58b00c6 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 3 Dec 2024 03:32:41 +0000 Subject: [PATCH 0359/1054] pbm: 1.3.2 -> 1.4.3 --- pkgs/by-name/pb/pbm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pb/pbm/package.nix b/pkgs/by-name/pb/pbm/package.nix index 8a444311ffd6..57646c1db161 100644 --- a/pkgs/by-name/pb/pbm/package.nix +++ b/pkgs/by-name/pb/pbm/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "pbm"; - version = "1.3.2"; + version = "1.4.3"; - nugetHash = "sha256-xu3g8NFLZYnHzBuoIhIiAzaPJqY0xhLWLYi+ORRADH8="; + nugetHash = "sha256-R6dmF3HPI2BAcNGLCm6WwBlk4ev6T6jaiJUAWYKf2S4="; meta = with lib; { description = "CLI for managing Akka.NET applications and Akka.NET Clusters"; From 8e497c4232fd2ce640046203e441f3ce64f3b45a Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 3 Dec 2024 03:32:46 +0000 Subject: [PATCH 0360/1054] upgrade-assistant: 0.5.820 -> 0.5.829 --- pkgs/by-name/up/upgrade-assistant/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/up/upgrade-assistant/package.nix b/pkgs/by-name/up/upgrade-assistant/package.nix index 4550a3f7b71e..06e361d74267 100644 --- a/pkgs/by-name/up/upgrade-assistant/package.nix +++ b/pkgs/by-name/up/upgrade-assistant/package.nix @@ -1,9 +1,9 @@ { lib, buildDotnetGlobalTool }: buildDotnetGlobalTool { pname = "upgrade-assistant"; - version = "0.5.820"; + version = "0.5.829"; - nugetHash = "sha256-GB+q5aZRkBTeXUbIPjkPsll6pSI/H6Iyh5mY53uT284="; + nugetHash = "sha256-N0xEmPQ88jfirGPLJykeAJQYGwELFzKwUWdFxIgiwhY="; meta = { homepage = "https://github.com/dotnet/upgrade-assistant"; From 98e9372c1c7f3cf9fc76715ea6904bd797dc33d1 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 3 Dec 2024 12:53:04 +0000 Subject: [PATCH 0361/1054] nixos-rebuild: refactor if-else in match --- .../src/nixos_rebuild/__init__.py | 86 ++++++++++--------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index d41a0fcbd1bf..c7dbf8acb350 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -263,11 +263,12 @@ def execute(argv: list[str]) -> None: attr = "config.system.build.toplevel" dry_run = action == Action.DRY_BUILD no_link = action in (Action.SWITCH, Action.BOOT) + rollback = bool(args.rollback) - if args.rollback: - if action in (Action.SWITCH, Action.BOOT): + match (action, rollback, build_host, flake): + case (Action.SWITCH | Action.BOOT, True, _, _): path_to_config = nix.rollback(profile, target_host, sudo=args.sudo) - elif action in (Action.TEST, Action.BUILD): + case (Action.TEST | Action.BUILD, True, _, _): maybe_path_to_config = nix.rollback_temporary_profile( profile, target_host, @@ -277,45 +278,48 @@ def execute(argv: list[str]) -> None: path_to_config = maybe_path_to_config else: raise NRError("could not find previous generation") - else: + case (_, True, _, _): raise NRError(f"--rollback is incompatible with '{action}'") - else: - if flake: - if build_host: - path_to_config = nix.remote_build_flake( - attr, - flake, - build_host, - flake_build_flags=flake_build_flags, - copy_flags=copy_flags, - build_flags=build_flags, - ) - else: - path_to_config = nix.build_flake( - attr, - flake, - no_link=no_link, - dry_run=dry_run, - **flake_build_flags, - ) - else: - if build_host: - path_to_config = nix.remote_build( - attr, - build_attr, - build_host, - instantiate_flags=common_flags, - copy_flags=copy_flags, - build_flags=build_flags, - ) - else: - path_to_config = nix.build( - attr, - build_attr, - no_out_link=no_link, - dry_run=dry_run, - **build_flags, - ) + case (_, False, Remote(_), Flake(_)): + path_to_config = nix.remote_build_flake( + attr, + flake, + build_host, + flake_build_flags=flake_build_flags, + copy_flags=copy_flags, + build_flags=build_flags, + ) + case (_, False, None, Flake(_)): + path_to_config = nix.build_flake( + attr, + flake, + no_link=no_link, + dry_run=dry_run, + **flake_build_flags, + ) + case (_, False, Remote(_), None): + path_to_config = nix.remote_build( + attr, + build_attr, + build_host, + instantiate_flags=common_flags, + copy_flags=copy_flags, + build_flags=build_flags, + ) + case (_, False, None, None): + path_to_config = nix.build( + attr, + build_attr, + no_out_link=no_link, + dry_run=dry_run, + **build_flags, + ) + case m: + # should never happen, but mypy is not smart enough to + # handle this with assert_never + raise NRError(f"invalid match for build: {m}") + + if not rollback: nix.copy_closure( path_to_config, to_host=target_host, From 0c19c97a6423fb3f403da239438a305040b31efc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 3 Dec 2024 12:46:17 +0100 Subject: [PATCH 0362/1054] tinymist: 0.12.4 -> 0.12.8 Diff: https://github.com/Myriad-Dreamin/tinymist/compare/refs/tags/v0.12.4...0.12.8 Changelog: https://github.com/Myriad-Dreamin/tinymist/blob/v0.12.8/CHANGELOG.md --- .../vscode/extensions/myriad-dreamin.tinymist/default.nix | 2 +- pkgs/by-name/ti/tinymist/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 8ab1b08e1cc8..eb8db3fd45f6 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-AwVjRwjwx53/2jNz2VdluIh+zhNqbAP883xw8ULzZK0="; + hash = "sha256-dHxeyqVe7cA/xK0RpprWRt5xPViyLHHal0pO6xhq4aE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 8e762cafc645..5ff9d8a4a1ed 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.12.4"; + version = "0.12.8"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "refs/tags/v${version}"; - hash = "sha256-xX0dA6ode2YGT+aFCHDn1LjQHWcXdqRiKP+sxdoPvI0="; + hash = "sha256-yEvWPCFxdwc+fJOYRpxH1M5Fr+SedPm5fIE5tS1Fzhk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mkL7zQM7LOp9MxmGL2JZsFErnKp3rc0OSwek10Uj5tc="; + cargoHash = "sha256-k4X62J5SUDkg70acESbwlqQIF9mnQzNgA0pvHuxCwfs="; nativeBuildInputs = [ pkg-config ]; From 9237762267648d71424d9cea35ec79c7887754d6 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Tue, 3 Dec 2024 10:50:33 -0500 Subject: [PATCH 0363/1054] wpaperd: 1.0.1 -> 1.1.1 Supersedes https://github.com/NixOS/nixpkgs/pull/357623 Note: `wpaperd --version` will show 1.0.1 since it wasn't changed for this release. See https://github.com/danyspin97/wpaperd/commit/459c4e9c8bdd0f8b0572751efc96b59a2dd4cc78 --- pkgs/by-name/wp/wpaperd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wp/wpaperd/package.nix b/pkgs/by-name/wp/wpaperd/package.nix index fce9bc27cd85..4c90e058a706 100644 --- a/pkgs/by-name/wp/wpaperd/package.nix +++ b/pkgs/by-name/wp/wpaperd/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wpaperd"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "danyspin97"; repo = "wpaperd"; rev = version; - hash = "sha256-5riZ/6yjgsW++SUIyJP5rFG65tkjJKgtvDLIGaoiHN0="; + hash = "sha256-eCD+eNdiVWLEmpkt0EaID534t6eE2OIVCgWMie5kbFE="; }; - cargoHash = "sha256-EkCGLxUQeSCR88Y95Hog9TAjpYMmZHlOqEM//ENiCco="; + cargoHash = "sha256-BlndjwvVYUaotCMKkArZ4EtFTLVcVhPDiY2QBnc5NUo="; nativeBuildInputs = [ pkg-config From 6a846811979776dc76dbe910cf846f605a0c7efe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 16:45:08 +0000 Subject: [PATCH 0364/1054] python312Packages.textblob: 0.18.0 -> 0.18.0.post0 --- pkgs/development/python-modules/textblob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textblob/default.nix b/pkgs/development/python-modules/textblob/default.nix index 0cf523eecea6..ff55bb7f1a2e 100644 --- a/pkgs/development/python-modules/textblob/default.nix +++ b/pkgs/development/python-modules/textblob/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "textblob"; - version = "0.18.0"; + version = "0.18.0.post0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-61B7Yr8ig6cfVr7T4PxO7H04jvdrA2mc+ZQWZXKo2vM="; + hash = "sha256-gTHFLGMLzfYdBMNZ+TnJjVuDagH7oiTZ564i/CdODMs="; }; build-system = [ flit-core ]; From c496490561595887b8b237ee5d45a7a2e1680137 Mon Sep 17 00:00:00 2001 From: Karolis Stasaitis Date: Tue, 3 Dec 2024 18:02:51 +0100 Subject: [PATCH 0365/1054] uhubctl: fix darwin build --- pkgs/by-name/uh/uhubctl/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/uh/uhubctl/package.nix b/pkgs/by-name/uh/uhubctl/package.nix index c4ea65eebd97..8feda34f2ad3 100644 --- a/pkgs/by-name/uh/uhubctl/package.nix +++ b/pkgs/by-name/uh/uhubctl/package.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchFromGitHub +, which +, pkg-config , libusb1 }: @@ -15,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-mpeDePHLsa4sGe2+8X9KQ8AYn7wtybDnaZzxnf4oETQ="; }; + nativeBuildInputs = [ which pkg-config ]; + buildInputs = [ libusb1 ]; installFlags = [ "prefix=${placeholder "out"}" ]; @@ -23,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mvp/uhubctl"; description = "Utility to control USB power per-port on smart USB hubs"; license = licenses.gpl2Only; - maintainers = with maintainers; [ prusnak ]; + maintainers = with maintainers; [ prusnak carlossless ]; platforms = with platforms; linux ++ darwin; mainProgram = "uhubctl"; }; From 142346385c5b073ece5c6bb25412e290e706bc4e Mon Sep 17 00:00:00 2001 From: dansbandit <4530687+dansbandit@users.noreply.github.com> Date: Sat, 30 Sep 2023 06:24:06 +0200 Subject: [PATCH 0366/1054] qt6Packages.qtspell: init at 1.0.1 --- .../development/libraries/qtspell/default.nix | 55 +++++++++++++++++++ pkgs/top-level/qt6-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/libraries/qtspell/default.nix diff --git a/pkgs/development/libraries/qtspell/default.nix b/pkgs/development/libraries/qtspell/default.nix new file mode 100644 index 000000000000..1e5069d8b5d8 --- /dev/null +++ b/pkgs/development/libraries/qtspell/default.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + doxygen, + enchant, + glib, + llvmPackages, + pkg-config, + qtbase, + qttools, +}: + +stdenv.mkDerivation rec { + pname = "qtspell"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "manisandro"; + repo = "qtspell"; + rev = "${version}"; + hash = "sha256-yaR3eCUbK2KTpvzO2G5sr+NEJ2mDnzJzzzwlU780zqU="; + }; + + nativeBuildInputs = [ + cmake + doxygen + pkg-config + qttools + ]; + + buildInputs = + [ + enchant + qtbase + ] + ++ lib.optionals stdenv.isDarwin [ + glib + llvmPackages.clang + ]; + + cmakeFlags = [ "-DQT_VER=6" ]; + + dontWrapQtApps = true; + + meta = with lib; { + description = "Provides spell-checking to Qt's text widgets, using the enchant spell-checking library"; + homepage = "https://github.com/manisandro/qtspell"; + changelog = "https://github.com/manisandro/qtspell/blob/version/NEWS"; + maintainers = with maintainers; [ dansbandit ]; + license = licenses.gpl3Only; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 366fa799fa0e..2e15947efd49 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -90,6 +90,8 @@ makeScopeWithSplicing' { qscintilla = callPackage ../development/libraries/qscintilla { }; + qtspell = callPackage ../development/libraries/qtspell { }; + qwlroots = callPackage ../development/libraries/qwlroots { wlroots = pkgs.wlroots_0_17; }; From f46d51206908fc1e76b596acef8e1a578a86add6 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 3 Dec 2024 18:07:21 +0100 Subject: [PATCH 0367/1054] peertube: Document current lack of darwin support in meta --- pkgs/servers/peertube/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 58f9a74b8f0b..7999a2c0ddb7 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -190,7 +190,11 @@ stdenv.mkDerivation rec { ''; license = licenses.agpl3Plus; homepage = "https://joinpeertube.org/"; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ + "x86_64-linux" "aarch64-linux" + # feasible, looking for maintainer to help out + # "x86_64-darwin" "aarch64-darwin" + ]; maintainers = with maintainers; [ immae izorkin stevenroose ]; }; } From 4e258ac67f5d8c9babd99ddc135afc69c43c6284 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 17:38:53 +0000 Subject: [PATCH 0368/1054] python312Packages.grad-cam: 1.5.3 -> 1.5.4 --- pkgs/development/python-modules/grad-cam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix index 09c3473a2038..b7757c60cac3 100644 --- a/pkgs/development/python-modules/grad-cam/default.nix +++ b/pkgs/development/python-modules/grad-cam/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "grad-cam"; - version = "1.5.3"; + version = "1.5.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-q9PcG836Az+2o1XqeKNh0+z9GN9UGinmGyOAhD5B3Zw="; + hash = "sha256-kgu6bM3XWFM/0d5P1ZbNzquPC7E4tnUnHpW2FKHwEUc="; }; nativeBuildInputs = [ From 9e7ccb4d80efc11c4174817cc2bb52b59a9cabd6 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Wed, 4 Dec 2024 02:07:21 +0800 Subject: [PATCH 0369/1054] brave: fix darwin build --- pkgs/by-name/br/brave/make-brave.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index 6f7f5d0687d8..11f77869d0a4 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -242,7 +242,7 @@ stdenv.mkDerivation { mkdir -p $out/{Applications,bin} - cp -r "Brave Browser.app" $out/Applications/ + cp -r . "$out/Applications/Brave Browser.app" makeWrapper "$out/Applications/Brave Browser.app/Contents/MacOS/Brave Browser" $out/bin/brave From 57a7c3206589d442fa8bb74858585e0a4b19d2b8 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 3 Dec 2024 18:42:26 +0000 Subject: [PATCH 0370/1054] icloudpd: 1.24.4 -> 1.25.0 --- pkgs/by-name/ic/icloudpd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index e1d634a5f90d..2725853f39bd 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "icloudpd"; - version = "1.24.4"; + version = "1.25.0"; pyproject = true; src = fetchFromGitHub { owner = "icloud-photos-downloader"; repo = "icloud_photos_downloader"; rev = "v${version}"; - hash = "sha256-/axw1RSfQX9RIoICs2Zcn9ScWTcqU9mHAhotaMduAp8="; + hash = "sha256-7I/mthqlV5+EWaLRlCmBZPJaf7dWm8alpUtmlxvUNsY="; }; pythonRelaxDeps = true; From 2f46896cb8fd4521e45025d30d1af91951eb86fb Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 28 Nov 2024 19:05:28 +0100 Subject: [PATCH 0371/1054] xonotic: set pname and version --- pkgs/games/xonotic/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index c3356cc254e4..3977f87f8e93 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -158,18 +158,16 @@ in rec { rm -rf $(ls | grep -v "^data$" | grep -v "^key_0.d0pk$") ''; meta.hydraPlatforms = []; - passthru.version = version; + inherit version pname; }; xonotic = runCommand "xonotic${variant}-${version}" { - inherit xonotic-unwrapped; + inherit xonotic-unwrapped version; + pname = "${pname}${variant}"; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; desktopItems = [ desktopItem ]; - passthru = { - inherit version; - meta = meta // { - hydraPlatforms = []; - }; + meta = meta // { + hydraPlatforms = []; }; } ('' mkdir -p $out/bin From 0eae5911560d29d186bdff9d84d29d4a085cbe13 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 28 Nov 2024 19:08:31 +0100 Subject: [PATCH 0372/1054] xmoji: use pname --- pkgs/by-name/xm/xmoji/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/xm/xmoji/package.nix b/pkgs/by-name/xm/xmoji/package.nix index b19a711ae7eb..3b84f88682cf 100644 --- a/pkgs/by-name/xm/xmoji/package.nix +++ b/pkgs/by-name/xm/xmoji/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { - name = "xmoji"; + pname = "xmoji"; version = "0.8"; src = fetchFromGitHub { From d8af5c5da2251f29724fcfc49082a033d85777a4 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 28 Nov 2024 19:17:09 +0100 Subject: [PATCH 0373/1054] x16.run: set pname and version --- pkgs/by-name/x1/x16/run.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/x1/x16/run.nix b/pkgs/by-name/x1/x16/run.nix index 274e98afecca..a9f72da4d32c 100644 --- a/pkgs/by-name/x1/x16/run.nix +++ b/pkgs/by-name/x1/x16/run.nix @@ -22,7 +22,8 @@ let }; in symlinkJoin { - name = "run-x16-${emulator.version}"; + pname = "run-x16"; + inherit (emulator) version; paths = [ emulator From da1f92145527c12446a167f0efdb610b771289cd Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 2 Dec 2024 23:17:54 +0100 Subject: [PATCH 0374/1054] python3Packages.molbar: use pname instead of name --- pkgs/development/python-modules/molbar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/molbar/default.nix b/pkgs/development/python-modules/molbar/default.nix index be23018274fa..d2f608a8049c 100644 --- a/pkgs/development/python-modules/molbar/default.nix +++ b/pkgs/development/python-modules/molbar/default.nix @@ -19,7 +19,7 @@ }: buildPythonPackage rec { - name = "MolBar"; + pname = "MolBar"; version = "1.1.1"; src = fetchgit { From fc34c16e9f1de05ede0bdfb6c7b855e7e16dfb06 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 2 Dec 2024 23:21:07 +0100 Subject: [PATCH 0375/1054] python3Packages.dscribe: use pname instead of name --- pkgs/development/python-modules/dscribe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dscribe/default.nix b/pkgs/development/python-modules/dscribe/default.nix index 59ff3cdd88d3..f2cacd604524 100644 --- a/pkgs/development/python-modules/dscribe/default.nix +++ b/pkgs/development/python-modules/dscribe/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { - name = "dscribe"; + pname = "dscribe"; version = "2.1.1"; src = fetchFromGitHub { From 56dcfcd9b4f265a32bc98198e0830d264bbd6085 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 2 Dec 2024 23:24:31 +0100 Subject: [PATCH 0376/1054] gepetto-gui: expose version and pname --- pkgs/by-name/ge/gepetto-viewer/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ge/gepetto-viewer/package.nix b/pkgs/by-name/ge/gepetto-viewer/package.nix index 9abddf1ac581..0270c84daca2 100644 --- a/pkgs/by-name/ge/gepetto-viewer/package.nix +++ b/pkgs/by-name/ge/gepetto-viewer/package.nix @@ -93,6 +93,8 @@ let plugins: runCommand "gepetto-gui" { + inherit (finalAttrs) version; + pname = "gepetto-gui"; meta = { # can't just "inherit (gepetto-viewer) meta;" because: # error: derivation '/nix/store/…-gepetto-gui.drv' does not have wanted outputs 'bin' From 83ae8e7fc75d9ea6f99ff93d693071499e995695 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 2 Dec 2024 23:38:00 +0100 Subject: [PATCH 0377/1054] python3Packages.magic: expose version and pname --- pkgs/development/python-modules/magic/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/magic/default.nix b/pkgs/development/python-modules/magic/default.nix index fac5e681fbb8..b37f0d604cf3 100644 --- a/pkgs/development/python-modules/magic/default.nix +++ b/pkgs/development/python-modules/magic/default.nix @@ -6,9 +6,7 @@ }: buildPythonPackage { - name = pkgs.file.name; - - src = pkgs.file.src; + inherit (pkgs.file) pname version src; patchPhase = '' substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" From eb48ff562196c485af75879bc81ef99bf52cd231 Mon Sep 17 00:00:00 2001 From: emilylange Date: Tue, 3 Dec 2024 20:11:33 +0100 Subject: [PATCH 0378/1054] chromium,chromedriver: 131.0.6778.85 -> 131.0.6778.108 https://chromereleases.googleblog.com/2024/12/stable-channel-update-for-desktop.html This update includes 4 security fixes. CVEs: CVE-2024-12053 --- .../networking/browsers/chromium/info.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index b1f96ef6c89b..618730284074 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,9 +1,9 @@ { "chromium": { - "version": "131.0.6778.85", + "version": "131.0.6778.108", "chromedriver": { - "hash_darwin": "sha256-li9wQkcgh5ORPu2kjdyfwvvuykRz1gTL3b8UVQs+MY4=", - "hash_darwin_aarch64": "sha256-r/C6QpmkVzovLJKfMTjUome9nL5WoEvPGRFB+AJJFqk=" + "hash_darwin": "sha256-X0kzihCQsICn5SRdU+THdthov0EPxsmMcrm6YJ6hMhs=", + "hash_darwin_aarch64": "sha256-3Qdj44cZD4wQTzkBx47ZCfqHE2HckkLuqYKpJxxfESk=" }, "deps": { "depot_tools": { @@ -19,8 +19,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "3d81e41b6f3ac8bcae63b32e8145c9eb0cd60a2d", - "hash": "sha256-fREToEHVbTD0IVGx/sn7csSju4BYajWZ+LDCiKWV4cI=", + "rev": "3b014839fbc4fb688b2f5af512d6ce312ad208b1", + "hash": "sha256-ypzu3LveMFcOFm7+JlaERjzs3SK/n9+sfm5wOKB8/zw=", "recompress": true }, "src/third_party/clang-format/script": { @@ -120,8 +120,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "7e742cac42c29a14ab7f54b134b2f17592711267", - "hash": "sha256-K2gwKNwonzCIu4hnlYuOaYyKaRV11hwDzF4oykiKsl0=" + "rev": "740d2502dbbd719a76c5a8d3fb4dac1b5363f42e", + "hash": "sha256-R41YVv4uWCU6SsACXPRppeCDguTs+/NVJckvMGGTgJE=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -600,8 +600,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "94631d9b9a10697325589e1642af63a0137cac94", - "hash": "sha256-SKKLOxjimQWt8W+Q3wlCJaUC/lxw6EIZDFBuVQKmnVY=" + "rev": "f14f6b1ab7cf544c0190074488d17821281cfa4d", + "hash": "sha256-0p57otDuIShl6MngYs22XA1QYxptDVa3vCwJsH59H34=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -725,8 +725,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "8445abdf8069cadcbd134369b70d0ebd436ef477", - "hash": "sha256-EitEjXNtm0gB9wtAwIYHBHkU7paHg5zvsTz171hRmK4=" + "rev": "79aff54b0fa9238ce3518dd9eaf9610cd6f22e82", + "hash": "sha256-xkMnUduSG88EWiwq6PITN0KgAKjFd4QOis3dgxedK30=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -760,8 +760,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "bd2671b973062afc614b852ec190524b80aaef8a", - "hash": "sha256-uq0CE7Chqzy2d+iifC3hV9RTnDVinpwjl1pOzyNGbSo=" + "rev": "e38771cb283b9689683c5ac0b5831dd89f8ec690", + "hash": "sha256-csSDnepYxil0R3PD/LVxW7JBcasOKG4l6q6vj8zHV/I=" } } }, From 4d74c042ba2a807ffa3374704619e3ad121032f4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 22 Nov 2024 17:15:16 -0500 Subject: [PATCH 0379/1054] garage: use new darwin sdk pattern --- pkgs/tools/filesystems/garage/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 34f9da67ae64..3f8f2389a81d 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -6,7 +6,6 @@ , pkg-config , protobuf , cacert -, Security , garage , nixosTests }: @@ -35,7 +34,7 @@ let buildInputs = [ openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; checkInputs = [ cacert diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02fe78d397cc..f84daf2d6f8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3483,9 +3483,7 @@ with pkgs; gaphor = python3Packages.callPackage ../tools/misc/gaphor { }; - inherit (callPackages ../tools/filesystems/garage { - inherit (darwin.apple_sdk.frameworks) Security; - }) + inherit (callPackages ../tools/filesystems/garage { }) garage garage_0_8 garage_0_9 garage_0_8_7 garage_0_9_4 From bbdbf9c935b4286fc6ce7a4a0fc534d0d043d168 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 22 Nov 2024 17:17:00 -0500 Subject: [PATCH 0380/1054] python312Packages.cryptg: use new darwin sdk pattern --- pkgs/development/python-modules/cryptg/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix index 73d5258efbe3..517e66eb565d 100644 --- a/pkgs/development/python-modules/cryptg/default.nix +++ b/pkgs/development/python-modules/cryptg/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, @@ -9,7 +8,6 @@ rustc, setuptools, setuptools-rust, - libiconv, }: buildPythonPackage rec { @@ -42,8 +40,6 @@ buildPythonPackage rec { cargo ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - # has no tests doCheck = false; From 6b7f41b403569812de6668fae5c1098a8725a2ea Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 22 Nov 2024 17:17:53 -0500 Subject: [PATCH 0381/1054] openpgp-card-tools: use new darwin sdk pattern --- pkgs/by-name/op/openpgp-card-tools/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix index 08f64ba4547a..f58d31470029 100644 --- a/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -8,7 +8,6 @@ , dbus , testers , openpgp-card-tools -, darwin }: rustPlatform.buildRustPackage rec { @@ -27,10 +26,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config rustPlatform.bindgenHook ]; - buildInputs = [ pcsclite dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.PCSC - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ pcsclite dbus ]; passthru = { tests.version = testers.testVersion { From fa0ec055fb3b7155b4c0de478b5030f52bd6c609 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 22 Nov 2024 17:18:43 -0500 Subject: [PATCH 0382/1054] sequoia-chameleon-gnupg: use new darwin sdk pattern --- pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix index 0ea596c07ab8..8d93ec1087bd 100644 --- a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix +++ b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix @@ -6,7 +6,6 @@ , nettle , openssl , sqlite -, darwin }: rustPlatform.buildRustPackage rec { @@ -31,9 +30,6 @@ rustPlatform.buildRustPackage rec { nettle openssl sqlite - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; # gpgconf: error creating socket directory From 14aee1533f32ec9711a6fca947fb90e92a5476a3 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 22 Nov 2024 17:19:31 -0500 Subject: [PATCH 0383/1054] ostree-rs-ext: use new darwin sdk pattern --- pkgs/by-name/os/ostree-rs-ext/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/os/ostree-rs-ext/package.nix b/pkgs/by-name/os/ostree-rs-ext/package.nix index ece63fe6768a..542dfd11cfcf 100644 --- a/pkgs/by-name/os/ostree-rs-ext/package.nix +++ b/pkgs/by-name/os/ostree-rs-ext/package.nix @@ -8,7 +8,6 @@ , zlib , ostree , stdenv -, darwin , util-linux , skopeo , gnutar @@ -44,9 +43,6 @@ rustPlatform.buildRustPackage rec { openssl zlib ostree - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security ]; checkFlags = [ From 9ef707ba9522a98dc7d38721ea74164c654efaed Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 22 Nov 2024 17:20:40 -0500 Subject: [PATCH 0384/1054] reindeer: use new darwin sdk pattern --- pkgs/by-name/re/reindeer/package.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index 8f552c7834e7..7b35831cccef 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -3,9 +3,6 @@ , fetchFromGitHub , pkg-config , openssl -, stdenv -, libiconv -, darwin , nix-update-script }: @@ -23,12 +20,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-OjA0OKotAdRLGRkl8n3Gn2+Z8JVcGjQYHtOszWnnFdM="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - ]; + + buildInputs = [ openssl ]; passthru.updateScript = nix-update-script { }; From 9ae65801e4a08fa3aba61816d149227c731e52a4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 22 Nov 2024 17:22:36 -0500 Subject: [PATCH 0385/1054] cargo-limit: use new darwin sdk pattern --- pkgs/by-name/ca/cargo-limit/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/ca/cargo-limit/package.nix b/pkgs/by-name/ca/cargo-limit/package.nix index 7132ebff02ad..2a143699f5ac 100644 --- a/pkgs/by-name/ca/cargo-limit/package.nix +++ b/pkgs/by-name/ca/cargo-limit/package.nix @@ -2,8 +2,6 @@ , rustPlatform , fetchFromGitHub , nix-update-script -, stdenv -, libiconv }: rustPlatform.buildRustPackage rec { @@ -19,8 +17,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - passthru = { updateScript = nix-update-script { }; }; From cf34f2300ceb750f67df2d9946f81139ad8e0c48 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 22 Nov 2024 17:23:06 -0500 Subject: [PATCH 0386/1054] cargo-fuzz: use new darwin sdk pattern --- pkgs/by-name/ca/cargo-fuzz/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-fuzz/package.nix b/pkgs/by-name/ca/cargo-fuzz/package.nix index 6c296e8ccbce..c23108abcf40 100644 --- a/pkgs/by-name/ca/cargo-fuzz/package.nix +++ b/pkgs/by-name/ca/cargo-fuzz/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, stdenv, libiconv }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; @@ -13,8 +13,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-sfvepPpYtgA0TuUlu0CD50HX933AVQbUGzJBNAzFR94="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; - doCheck = false; meta = with lib; { From 7bc42ab29b9a68d1fdd5dfd40ac3f487049e27a5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 22 Nov 2024 17:23:37 -0500 Subject: [PATCH 0387/1054] cargo-feature: use new darwin sdk pattern --- pkgs/by-name/ca/cargo-feature/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/ca/cargo-feature/package.nix b/pkgs/by-name/ca/cargo-feature/package.nix index 469099900219..3dda99f542f1 100644 --- a/pkgs/by-name/ca/cargo-feature/package.nix +++ b/pkgs/by-name/ca/cargo-feature/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - libiconv, }: rustPlatform.buildRustPackage rec { @@ -19,8 +17,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; - checkFlags = [ # The following tests require empty CARGO_BUILD_TARGET env variable, but we # set it ever since https://github.com/NixOS/nixpkgs/pull/298108. From f5a35dd142da7431db2c7a1a8592656ef37dd4d0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 22 Nov 2024 17:24:09 -0500 Subject: [PATCH 0388/1054] cargo-unfmt: use new darwin sdk pattern --- pkgs/by-name/ca/cargo-unfmt/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/ca/cargo-unfmt/package.nix b/pkgs/by-name/ca/cargo-unfmt/package.nix index e53cc07c330c..42a1ea9b57f8 100644 --- a/pkgs/by-name/ca/cargo-unfmt/package.nix +++ b/pkgs/by-name/ca/cargo-unfmt/package.nix @@ -1,9 +1,6 @@ { lib -, stdenv , fetchFromGitHub , rustPlatform -, darwin -, libiconv }: rustPlatform.buildRustPackage { @@ -19,8 +16,6 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-mMeHTYCUIZR3jVvTxfyH4I9wGfUdCWcyn9djnksAY8k="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; - # Doc tests are broken on 0.3.3 doCheck = false; From aa05b55564c5bce55cd1e2f548af79b7445f9b82 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 22 Nov 2024 17:25:20 -0500 Subject: [PATCH 0389/1054] eza: use new darwin sdk pattern --- pkgs/by-name/ez/eza/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 9c2c21a52044..1bdd3e5fdae2 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -1,14 +1,11 @@ { lib , gitSupport ? true -, stdenv , fetchFromGitHub , rustPlatform , cmake , pandoc , pkg-config , zlib -, darwin -, libiconv , installShellFiles # once eza upstream gets support for setting up a compatibility symlink for exa, we should change # the handling here from postInstall to passing the required argument to the builder. @@ -29,8 +26,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-fXrw753Hn4fbeX6+GRoH9MKrH0udjxnBK7AVCHnqIcs="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; - buildInputs = [ zlib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ zlib ]; buildNoDefaultFeatures = true; buildFeatures = lib.optional gitSupport "git"; From 2a0676973f9195eb0068c1015034a5b89acd7bd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Dec 2024 12:03:28 -0800 Subject: [PATCH 0390/1054] libdeltachat: 1.151.2 -> 1.151.4 Diff: https://github.com/deltachat/deltachat-core-rust/compare/v1.151.2...v1.151.4 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.151.4/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index fd0ccb459534..82ed9b18c5f2 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.151.2"; + version = "1.151.4"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-PSVRLJAnogWu9XUoVv/PBXkXxC4xS3FS7UE3fQ/jnKY="; + hash = "sha256-GySzclwnplL6GwK01Msn4REzW2eiynLKtEjonvUzMto="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-OlwIcfseJSN/f57T3g0OcBPQ/KvtquV51nJqNcd2Q7I="; + hash = "sha256-vTmHF7qoAWfou27v6TRPSRvLB+ge/7/aBgW6Bb7tkkI="; }; nativeBuildInputs = [ From 2f2926f5938977608be8b66a3d0634d1a8a8d6d0 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Fri, 25 Oct 2024 19:13:27 +1300 Subject: [PATCH 0391/1054] dmd: patch test needspkgmod.d Closes #350898 --- pkgs/by-name/dm/dmd/generic.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix index cf8cae7b4f5a..1c68817ead2e 100644 --- a/pkgs/by-name/dm/dmd/generic.nix +++ b/pkgs/by-name/dm/dmd/generic.nix @@ -82,6 +82,13 @@ stdenv.mkDerivation (finalAttrs: { extraPrefix = "dmd/"; hash = "sha256-N21mAPfaTo+zGCip4njejasraV5IsWVqlGR5eOdFZZE="; }) + ] ++ lib.optionals (lib.versionOlder version "2.110.0") [ + (fetchpatch { + url = "https://github.com/dlang/dmd/commit/fdd25893e0ac04893d6eba8652903d499b7b0dfc.patch"; + stripLen = 1; + extraPrefix = "dmd/"; + hash = "sha256-Uccb8rBPBLAEPWbOYWgdR5xN3wJoIkKKhLGu58IK1sM="; + }) ]; postPatch = '' From ec1676e3cc190aedaf559409c06f783bcd639a2b Mon Sep 17 00:00:00 2001 From: genga Date: Wed, 4 Dec 2024 00:18:03 +0300 Subject: [PATCH 0392/1054] repren: init at 1.0.1 repren: update meta --- pkgs/by-name/re/repren/package.nix | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/re/repren/package.nix diff --git a/pkgs/by-name/re/repren/package.nix b/pkgs/by-name/re/repren/package.nix new file mode 100644 index 000000000000..08001520d047 --- /dev/null +++ b/pkgs/by-name/re/repren/package.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "repren"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jlevy"; + repo = "repren"; + rev = "refs/tags/${version}"; + hash = "sha256-X1+WIfa75KLhulAF5blnwbyXjFtZTwkM0nAqAvxwW5A="; + }; + + build-system = with python3Packages; [ + poetry-core + ]; + + meta = { + description = "Simple but flexible command-line tool for rewriting file contents"; + homepage = "https://github.com/jlevy/repren"; + changelog = "https://github.com/jlevy/repren/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "repren"; + }; +} From 58e0732fb33cdf8215f77740ccd16ae117259aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 3 Dec 2024 22:26:55 +0100 Subject: [PATCH 0393/1054] hwinfo: split lib from bin output bin currently depends on perl, which is a big dependency for `nixos-facter` --- pkgs/by-name/hw/hwinfo/package.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix index cfb940d66cd1..15a20ebd10a8 100644 --- a/pkgs/by-name/hw/hwinfo/package.nix +++ b/pkgs/by-name/hw/hwinfo/package.nix @@ -69,6 +69,13 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs src/ids/convert_hd ''; + outputs = [ + "bin" + "dev" + "lib" + "out" + ]; + # The pci/usb ids in hwinfo are ancient. We can get a more up-to-date list simply by copying from systemd preBuild = '' # since we don't have .git, we cannot run this. @@ -94,6 +101,13 @@ stdenv.mkDerivation (finalAttrs: { ]; installFlags = [ "DESTDIR=$(out)" ]; + enableParallelBuilding = false; # broken parallel dependencies + + postInstall = '' + moveToOutput bin "$bin" + moveToOutput lib "$lib" + ''; + passthru = { tests = { version = testers.testVersion { package = finalAttrs.finalPackage; }; From 2813a19a27bf98499ec592ac2c35cf9131f9bf32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 3 Dec 2024 22:27:31 +0100 Subject: [PATCH 0394/1054] nixos-facter: 0.2.0 -> 0.3.0 --- pkgs/by-name/ni/nixos-facter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix index c9d2f1d5171e..0fc7167c9b55 100644 --- a/pkgs/by-name/ni/nixos-facter/package.nix +++ b/pkgs/by-name/ni/nixos-facter/package.nix @@ -24,13 +24,13 @@ let in buildGoModule rec { pname = "nixos-facter"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "numtide"; repo = "nixos-facter"; rev = "v${version}"; - hash = "sha256-Rird32KB+V1xGBZvrEaPDPOhl5YMClIljOLcFO/0vOU="; + hash = "sha256-T7x9xU/Tr2BKfrHQHrP6Mm6rNUWYASjEPzHIKgyS7aE="; }; vendorHash = "sha256-qDzd+aq08PN9kl1YkvNLGvWaFVh7xFXJhGdx/ELwYGY="; From 641d29d1726944072ef473d287f4a8609bce1bb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 21:41:54 +0000 Subject: [PATCH 0395/1054] python312Packages.streamdeck: 0.9.5 -> 0.9.6 --- pkgs/development/python-modules/streamdeck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/streamdeck/default.nix b/pkgs/development/python-modules/streamdeck/default.nix index ba23f550e0c2..e921659e2284 100644 --- a/pkgs/development/python-modules/streamdeck/default.nix +++ b/pkgs/development/python-modules/streamdeck/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "streamdeck"; - version = "0.9.5"; + version = "0.9.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-BHliZrRFd64D+UD1xcpp2HAH4D0Z7tibawJobAMM65E="; + hash = "sha256-7ELZtxGzUuonStMFputI7OHu06W//nC5KOCC3OD3iPA="; }; patches = [ From 384f6f592b99f7ed384da7282d6aa6166eae075b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 3 Dec 2024 22:45:06 +0100 Subject: [PATCH 0396/1054] authentik: flag with `knownVulnerabilities` The bump to 2024.10.x is currently stalled in #345940. The fix for CVE-2024-52289 involves a backward incompatible API and DB change so it is also not great for a backport even if we cherry-picks the security fixes. Given no NixOS module is available in nixpkgs marking the package with `knownVulnerabilities` should have a limited impact. --- pkgs/by-name/au/authentik/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index ed1da779fb23..4915cc4a1fbc 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -30,6 +30,12 @@ let license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ jvanbruegge risson ]; + knownVulnerabilities = [ + "CVE-2024-52307" + "CVE-2024-52287" + "CVE-2024-52289" + "Authentik 2024.6.x is end-of-life, consider using https://github.com/nix-community/authentik-nix for an up-to-date alternative" + ]; }; website = buildNpmPackage { From 617c502f9804c88037b6947f0bafde148eca2714 Mon Sep 17 00:00:00 2001 From: Marcel Date: Sun, 1 Dec 2024 00:24:05 +0100 Subject: [PATCH 0397/1054] angular-language-server: 18.2.0 -> 19.0.3 --- pkgs/by-name/an/angular-language-server/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/angular-language-server/package.nix b/pkgs/by-name/an/angular-language-server/package.nix index 0cf1776ee82e..016c2f64639f 100644 --- a/pkgs/by-name/an/angular-language-server/package.nix +++ b/pkgs/by-name/an/angular-language-server/package.nix @@ -9,16 +9,17 @@ writeShellApplication, curl, common-updater-scripts, + jq, unzip, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "angular-language-server"; - version = "18.2.0"; + version = "19.0.3"; src = fetchurl { name = "angular-language-server-${finalAttrs.version}.zip"; url = "https://github.com/angular/vscode-ng-language-service/releases/download/v${finalAttrs.version}/ng-template.vsix"; - hash = "sha256-rl04nqSSBMjZfPW8Y+UtFLFLDFd5FSxJs3S937mhDWE="; + hash = "sha256-QVvXwzSaj5wMYEwMMXGJwRwg7v6HdB0JKLkQiUNR0y4="; }; nativeBuildInputs = [ @@ -56,6 +57,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runtimeInputs = [ curl common-updater-scripts + jq ]; text = '' if [ -z "''${GITHUB_TOKEN:-}" ]; then From 65c5afda0ac6cf60df0b1327c30d9ec70acd804b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Dec 2024 23:28:22 +0100 Subject: [PATCH 0398/1054] python312Packages.publicsuffixlist: 1.0.2.20241130 -> 1.0.2.20241203 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20241203-gha/CHANGES.md --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 8fc0df74f506..76c0347248be 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20241130"; + version = "1.0.2.20241203"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ogQgadq8wVNlq8LI5FxWPdLiRVyzCD7D6cLRLGL5vsQ="; + hash = "sha256-rx0kVdLEFHTVH2TDZBUC8X/BtpUhEK8bpr4Fg8y/IvA="; }; build-system = [ setuptools ]; From dfb1b885fd949e8ce78f514f4690d1b4c3a5dc61 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Dec 2024 21:19:09 +0100 Subject: [PATCH 0399/1054] python312Packages.jsonargparse: 4.34.0 -> 4.34.1 Diff: https://github.com/omni-us/jsonargparse/compare/refs/tags/v4.34.0...v4.34.1 Changelog: https://github.com/omni-us/jsonargparse/blob/4.34.1/CHANGELOG.rst --- pkgs/development/python-modules/jsonargparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index a8334404ae66..521a1c92eac7 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "jsonargparse"; - version = "4.34.0"; + version = "4.34.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "omni-us"; repo = "jsonargparse"; rev = "refs/tags/v${version}"; - hash = "sha256-dj2539vTmzsGNvHqjsCzqo2sqOh2ink8Ut4Mi0qCDzI="; + hash = "sha256-clqQGb9IC1PeySvssbo5fF+MU9W/oDnwiDsPeV5InNA="; }; build-system = [ setuptools ]; From fa6228744096d143e4fe2658def4b0fb6bb1c07e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Dec 2024 21:20:06 +0100 Subject: [PATCH 0400/1054] python312Packages.mailchecker: 6.0.11 -> 6.0.13 Changelog: https://github.com/FGRibreau/mailchecker/blob/v6.0.13/CHANGELOG.md --- pkgs/development/python-modules/mailchecker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index af96457afa4e..5d11aeb2bbb7 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "6.0.11"; + version = "6.0.13"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vySQ4mo6msOFdgg44/zHMhpr4ZgP2tV0bQe2OgZHmqI="; + hash = "sha256-03Qew5vfLGkUFNw2Hg1nLwjiCkTXDNJy/QfiWc/bhjU="; }; build-system = [ setuptools ]; From cec1aec3946e2b677cb466b53fe9e7e3fcdaba88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Dec 2024 23:45:03 +0100 Subject: [PATCH 0401/1054] python312Packages.librouteros: 3.3.0 -> 3.3.1 Diff: https://github.com/luqasz/librouteros/compare/refs/tags/3.3.0...3.3.1 Changelog: https://github.com/luqasz/librouteros/blob/3.3.1/CHANGELOG.rst --- pkgs/development/python-modules/librouteros/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/librouteros/default.nix b/pkgs/development/python-modules/librouteros/default.nix index c1892e247860..069a353dd0b0 100644 --- a/pkgs/development/python-modules/librouteros/default.nix +++ b/pkgs/development/python-modules/librouteros/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "librouteros"; - version = "3.3.0"; + version = "3.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "luqasz"; repo = "librouteros"; rev = "refs/tags/${version}"; - hash = "sha256-dbeKJ3iG0eEW+sJJoZmQXyUad6mPhIlCAdJyQZT+CCQ="; + hash = "sha256-vwM7psrb+7ww+oAc3l7y1YkNzgLyxX2VvHbLxcqQypo="; }; build-system = [ poetry-core ]; From e7099625a328f2a9912a05f4d10d0c7441868d64 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Dec 2024 23:46:45 +0100 Subject: [PATCH 0402/1054] python312Packages.gehomesdk: 0.5.29 -> 0.5.30 Changelog: https://github.com/simbaja/gehome/blob/master/CHANGELOG.md --- pkgs/development/python-modules/gehomesdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index a6aad3f63261..256a06ac83ab 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.29"; + version = "0.5.30"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-sV5V+D0K02qmP9Z0WqYSvNsKTeXkdrY9CsRtvYq1JcE="; + hash = "sha256-yBIj74n3XHPTTZRHGMPSOKVOrAsJFG70zGGIKS06N3k="; }; build-system = [ setuptools ]; From 957dcdf4862749ad011bdbcd6dbf1671b77b52c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Dec 2024 23:52:16 +0100 Subject: [PATCH 0403/1054] cnspec: 11.32.0 -> 11.33.0 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.32.0...v11.33.0 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.33.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index cdf66385c103..6c2ea87aeb8f 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.32.0"; + version = "11.33.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-Jret8LFSswdbb6MUEn2RlytWBcARAvk+Sm2EmjCmSig="; + hash = "sha256-RAMA+tBgOL9PeRGD2O3aeNGca1FsNiDV0lx0SlJl77c="; }; proxyVendor = true; - vendorHash = "sha256-+EhNEHLt337G0UAuXvlpz19YQ+q9J8TMv0j9TI8FsxM="; + vendorHash = "sha256-T+eGhpjLwAmCKmgONLQ0HDF6qTyFXG+dbNN9doUyC3k="; subPackages = [ "apps/cnspec" ]; From cd8b3d654d3f1ee45fa5011c88c12cd8617fe328 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Thu, 28 Nov 2024 18:37:40 +0000 Subject: [PATCH 0404/1054] nexusmods-app: 0.6.3 -> 0.7.0 - `fetchFromGithub` -> `fetchgit` for git-lfs support (Needed for at least one test) - Bump .NET SDK & runtime 8 -> 9 - Still need .NET 8 runtime for StrawberryShake --- pkgs/by-name/ne/nexusmods-app/deps.nix | 388 ++++++++++------------ pkgs/by-name/ne/nexusmods-app/package.nix | 26 +- 2 files changed, 190 insertions(+), 224 deletions(-) diff --git a/pkgs/by-name/ne/nexusmods-app/deps.nix b/pkgs/by-name/ne/nexusmods-app/deps.nix index 52f96d17a2b8..2cc3c42480e8 100644 --- a/pkgs/by-name/ne/nexusmods-app/deps.nix +++ b/pkgs/by-name/ne/nexusmods-app/deps.nix @@ -2,65 +2,73 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Argon"; version = "0.11.0"; hash = "sha256-bE5aMJ8QyRUhGwpiZAKhe9TTjdW2kVlh8Q7SiBFZx14="; }) - (fetchNuGet { pname = "Argon"; version = "0.17.0"; hash = "sha256-jrJWZAGrx970RAQlWOuCbFaxcnaE3UA1TNIZHdCz7gg="; }) - (fetchNuGet { pname = "Argon"; version = "0.21.0"; hash = "sha256-gy/lXMenEjseR4fBbhgU0KItqY3viVhXDsEUi6PdKc4="; }) + (fetchNuGet { pname = "Argon"; version = "0.24.2"; hash = "sha256-QUwH6v4XKPU9T/mO/TNvMhoUv8yZHMr/Yg39NO+YV+0="; }) (fetchNuGet { pname = "AutoFixture"; version = "4.18.1"; hash = "sha256-reP+aoYiPcIj4GbCIhjd5/OhuWVLCtD4hKuLPHe2EXI="; }) (fetchNuGet { pname = "AutoFixture.Xunit2"; version = "4.18.1"; hash = "sha256-5hZm1Rx4n0e2JNsJ6lketE3c8z6AFdquTgKCQORqRfc="; }) (fetchNuGet { pname = "Avalonia"; version = "11.0.0"; hash = "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="; }) - (fetchNuGet { pname = "Avalonia"; version = "11.1.4"; hash = "sha256-Gf9u4vQZXRku8syk7rRyl5wA9pBtjMB5/6ihkplqgiE="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.1.3"; hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.2.0"; hash = "sha256-kG3tnsLdodlvIjYd5feBZ0quGd2FsvV8FIy7uD5UZ5Q="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.2.1"; hash = "sha256-KdjhwDKlii12v7HNI3NsYAM1qYoXKRsVN2scQJbYMTc="; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.22045.20230930"; hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="; }) (fetchNuGet { pname = "Avalonia.AvaloniaEdit"; version = "11.1.0"; hash = "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="; }) (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.28"; hash = "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="; }) (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.1.4"; hash = "sha256-7PTiLe1GsS4km/C7/aooH2CrRuR++y0eTV20J2+BcSM="; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.1.4"; hash = "sha256-EuCMo2FGx6OEOBP7+ElwWqfcoh0tELltoqEM/Qig278="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.2.1"; hash = "sha256-yhjVW5pH8Y0JF1vbfcdL5MQfx24wb+Lkp8OBo51he8U="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.2.1"; hash = "sha256-IFzA7ztuhgddckQV9DlwkUTSk3RQqkJddCHAtu9yhbY="; }) (fetchNuGet { pname = "Avalonia.Controls.TreeDataGrid"; version = "11.0.10"; hash = "sha256-1R2AFOKQQPemN7qXsdxCGXcfMSRztRiC86DLqiV6CpY="; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.1.4"; hash = "sha256-Rqt7mKZy1e7IMNWjdFRS2KBsHlw38/3lHQUgkZYZNJU="; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.1.4"; hash = "sha256-YlUNX0AIgyw74fsnfdmv7J/ox1T4rnSCTuiYl1OQrqM="; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.1.4"; hash = "sha256-8vW9F08OBruC862nZnypc8sLxOZXe7NGOYJ/x6m9eRk="; }) - (fetchNuGet { pname = "Avalonia.Headless"; version = "11.1.4"; hash = "sha256-EAWcMTC3xo4NLY8mlgwa9yFJEET9EP/BGy93HbHuZ0Q="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.2.1"; hash = "sha256-Bu4ZEu81g6oWnxd+ew9BZ8zwYETjY8InQsaYvYnGqX4="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.2.1"; hash = "sha256-gJhi2clOc+a4NDRZfEoT5BwLTq8DLAWtaxo5FI/OJaY="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.2.1"; hash = "sha256-2j9VfG8uD2BVF+p9REPQ4dp8E41vUh+R3Lh6v5AVmHA="; }) + (fetchNuGet { pname = "Avalonia.Headless"; version = "11.2.1"; hash = "sha256-3nPxjkPgeH1gJie7b39ezGMe12ZHc5lhuQbYDkoYxME="; }) (fetchNuGet { pname = "Avalonia.Labs.Panels"; version = "11.2.0"; hash = "sha256-DhzjF4nhq8XXrCVHh9Eu1NTjVF2oPDNoto4BDQU7EJk="; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.1.4"; hash = "sha256-FyB+1QdvNtsU1iCXF/FxI3j2UDd8/c9Qa6jUEa0iiH0="; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.1.4"; hash = "sha256-J+4zwLZvrSTIR9aFedkB6yhKSz6bB9pnVkPJPbxJ/XA="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.2.1"; hash = "sha256-bBJsvp6gHfBcAWPNKpAAFCk1Wi0gP3tw4qimI93px0U="; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.2.1"; hash = "sha256-zEO6YkOuWdSj22KgvKO54UCHnw4rn9F3cd8xXsKRe7s="; }) (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.4"; hash = "sha256-P8+yP2oPwO9eY6MYHQyikB8JOQhIZfY+UQ27Rz0SHts="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.2.1"; hash = "sha256-RlO65QbExBdjEUY66CTlHefRdTZWzZbN4ksibVXxKv4="; }) (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; hash = "sha256-A01nrs3Ij1eTo6tPmu7++T1K+Wo/H/9LvpeuOUGbQeU="; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.0"; hash = "sha256-w4ozV8lIs5vxoYP5D5Lut2iTMiJKVPbjdtqDB1sb0MI="; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.4"; hash = "sha256-i0HQokpcQ3+sGB111p6iuV1F89Xef6u8pZVyPiTNnCc="; }) - (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.1.0.1"; hash = "sha256-WRU0C4cdCiL9+vkop8avI65cQLKZC86KaVxTjMN5gmA="; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.1.4"; hash = "sha256-9In92SiSxnqP0Nj5HYpNM8vL/xcaq4Kwozs3fAm9qC4="; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.1.4"; hash = "sha256-CVKoptReOkphMoUro82JjXjBfeREXUnBS4r2vUtX8pU="; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.1.4"; hash = "sha256-bFKOAoF3NU8bqsH5Td5uHwso5n4Ftgml34GInnwU9f8="; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.1.4"; hash = "sha256-pmNTcg3LgDu4gaprE/glGjv11CDb/2RygkAZ+AWV0qQ="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.2.0"; hash = "sha256-rNR+l+vLtlzTU+F51FpOi4Ujy7nR5+lbTc3NQte8s/o="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.2.1"; hash = "sha256-F8Q4q5MaeyCkAm4rc6dPG1DhH5mZMvGzzyr2Z3AUe8s="; }) + (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.2.0"; hash = "sha256-bbmOWYlVZyQ65BVTYW7BPr++VoM3VwqQLeMzZ6ZnI/o="; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.2.1"; hash = "sha256-yDCJJ9OkL5EIEXr05pdnOK1p+Yp7YIRJn4MVjLX84kE="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.2.1"; hash = "sha256-cdMQ03nOT8jL9cnZrntpzfwgMF/dctE9610eXPV60tA="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.2.1"; hash = "sha256-QsQXXKz8vqKwaijR/fZINXHH7Hripwdm+92i9f1k3Xg="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.2.1"; hash = "sha256-Y2Zem7GhWFHHUwwDT1qUldUCRt8vWZZXi3Fxq+p/Pdg="; }) (fetchNuGet { pname = "AvaloniaEdit.TextMate"; version = "11.1.0"; hash = "sha256-Nv52bUxA02VcsKCbMqEAkNBl46gznSivRZ3llLHrhkM="; }) - (fetchNuGet { pname = "BenchmarkDotNet"; version = "0.13.12"; hash = "sha256-Xq7hnNeO1BbJVIlkDKEysJFgxn46eCvpujhQKZrIbt0="; }) - (fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.13.12"; hash = "sha256-v3DRb2y0fbp9v8UGl9sou2HKx78SemK0UKh+rdsuv2s="; }) - (fetchNuGet { pname = "BitFaster.Caching"; version = "2.5.0"; hash = "sha256-HUGbbOYdGnWS2XYpgmDsWaAWCZzQFkdPCqfl9OBd5eA="; }) + (fetchNuGet { pname = "Bannerlord.LauncherManager"; version = "1.0.138"; hash = "sha256-U954PUK8oq1mFBqNjONMXi1DYSudT7gjpueWYBIXDdo="; }) + (fetchNuGet { pname = "Bannerlord.LauncherManager.Localization"; version = "1.0.138"; hash = "sha256-i7OhCR6pceJU7xyaY1pi67PLSnyDX5YDCIrbHw1Jcuc="; }) + (fetchNuGet { pname = "Bannerlord.LauncherManager.Models"; version = "1.0.138"; hash = "sha256-mo7Xmj7Ntxgy2/aMzywuyCJ9w/Y1FzbhKOf7fR6ebjw="; }) + (fetchNuGet { pname = "Bannerlord.ModuleManager"; version = "5.0.225"; hash = "sha256-Kpc2iwgylMJ0w8aL5QkmwHnRsfRXzhV5lFxpbEv0OcU="; }) + (fetchNuGet { pname = "Bannerlord.ModuleManager"; version = "6.0.242"; hash = "sha256-nHBchr6mLQNOWEyfPGi4nzspaIviQY4j+fGJkUTN0Bs="; }) + (fetchNuGet { pname = "Bannerlord.ModuleManager.Models"; version = "5.0.221"; hash = "sha256-CWlslG730Ife/Q5ILmNE38IcFikWqlfIqRm6/UwZkzM="; }) + (fetchNuGet { pname = "Bannerlord.ModuleManager.Models"; version = "6.0.242"; hash = "sha256-iRTxQ7VhrYziaAy3jzD7qEXzq6bOM8eIrB6kyZMurkY="; }) + (fetchNuGet { pname = "BenchmarkDotNet"; version = "0.14.0"; hash = "sha256-Ynfhr0OsW0dKp81caryZXcrBJsA2YScuKQOCiLVg1rI="; }) + (fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.14.0"; hash = "sha256-BKtno0khZ2jZtXF05l9/vsYjbQIqxAimoaSkxyx6L9A="; }) + (fetchNuGet { pname = "BitFaster.Caching"; version = "2.5.2"; hash = "sha256-rZz3zNPt7DB+H5VDpI3nOrh5Nl4XYvU50CJXGfl3+5A="; }) (fetchNuGet { pname = "BsDiff"; version = "1.1.0"; hash = "sha256-JWmzAE+5k8BeGicl4rQNK3Q5F9+VnBpTtUwlKs72pmI="; }) (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; hash = "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="; }) - (fetchNuGet { pname = "CliWrap"; version = "3.6.6"; hash = "sha256-2fdVlcdgA5Phl/DKas/CKF828GwiJ9L8lB1c1zXU9Qo="; }) + (fetchNuGet { pname = "CliWrap"; version = "3.6.7"; hash = "sha256-9j3GILP25inLJoQe0E8sF8egVt8ISqEQBGdIShev4Mk="; }) (fetchNuGet { pname = "ColorDocument.Avalonia"; version = "11.0.3-a1"; hash = "sha256-Pkh5FX+4pBzep5oCCyhIiR559QyFCEb1vrfEgG0wREw="; }) (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.3-a1"; hash = "sha256-fWJuApxnJLISayQJIKEBVOt/t1Qyj+0s+RezZkMnPio="; }) (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; hash = "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="; }) (fetchNuGet { pname = "coverlet.collector"; version = "6.0.2"; hash = "sha256-LdSQUrOmjFug47LjtqgtN2MM6BcfG0HR5iL+prVHlDo="; }) - (fetchNuGet { pname = "DiffEngine"; version = "12.3.0"; hash = "sha256-vIrZz9dlY+jvQnBoIrI0PCFwnVOfJbJ+GX6v4PqHaR0="; }) - (fetchNuGet { pname = "DiffEngine"; version = "15.4.0"; hash = "sha256-ZzsgNMLghDPQcTJytqBgcJQ6MwL7/MavgCGislckC/0="; }) - (fetchNuGet { pname = "DiffEngine"; version = "15.5.1"; hash = "sha256-yf87PBbj3l2xmWj0bnupPxMRWSTIHZD3idvFI1i56P4="; }) + (fetchNuGet { pname = "DiffEngine"; version = "15.5.3"; hash = "sha256-oZG++i9oWBJhSPHERAQwVODA0GWtp//r2oHpnjgmCeA="; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.2"; hash = "sha256-Vsn81duAmPIPkR40h5bEz7hgtF5Kt5nAAGhQZrQbqxE="; }) (fetchNuGet { pname = "DynamicData"; version = "8.3.27"; hash = "sha256-iPZfL1x36PLf5Lq96zRFvR5OLcoRn7OdJIao98X8wac="; }) (fetchNuGet { pname = "DynamicData"; version = "8.4.1"; hash = "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4="; }) + (fetchNuGet { pname = "DynamicData"; version = "9.0.1"; hash = "sha256-dvo4eSHg8S9oS5QhvfCrbV+y7BVtlYRwH7PN7N1GubM="; }) (fetchNuGet { pname = "DynamicData"; version = "9.0.4"; hash = "sha256-3pyiJeWRwfaT7p1ArsoR13aI78Jo13aHOEw3BelTS9g="; }) - (fetchNuGet { pname = "EmptyFiles"; version = "4.5.1"; hash = "sha256-7mJ1PfPFeQEE35e+KKKp/QiGbO70gK/xOMFQEv2lPBY="; }) - (fetchNuGet { pname = "EmptyFiles"; version = "8.2.0"; hash = "sha256-8jC8injDZyxginjBLvhAeyta3TTZ6AJXs/buF5h34oE="; }) - (fetchNuGet { pname = "EmptyFiles"; version = "8.4.0"; hash = "sha256-b0ZTW0x9ctT19ooGdlFPlrtk52iFuaoxVkt1nRdGqp4="; }) + (fetchNuGet { pname = "EmptyFiles"; version = "8.5.0"; hash = "sha256-mLraPiJa1JiXOWQ17GUp8MWuBNrIjcYYjItQRfMjP8s="; }) (fetchNuGet { pname = "ExCSS"; version = "4.2.3"; hash = "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I="; }) (fetchNuGet { pname = "Fare"; version = "2.1.1"; hash = "sha256-n9X3GE2qsT2wpmDymD1AyCYcOoY/c0+t+aIWLiaST70="; }) - (fetchNuGet { pname = "FluentAssertions"; version = "6.12.0"; hash = "sha256-LGlPe+G7lBwj5u3ttQZiKX2+C195ddRAHPuDkY6x0BE="; }) - (fetchNuGet { pname = "FluentAssertions.Analyzers"; version = "0.31.0"; hash = "sha256-eQCPS/c+zyRMLgAVggdelLAHVSlqdgDGKIICQxRUdcw="; }) + (fetchNuGet { pname = "FetchBannerlordVersion"; version = "1.0.6.46"; hash = "sha256-NS3B8XD4Y398dOXUdjstJ8xrZ+WLGHtGBl+Ewj8agh0="; }) + (fetchNuGet { pname = "FetchBannerlordVersion.Models"; version = "1.0.6.46"; hash = "sha256-VgTNwXUHGgtoBoLCcXVGgph5Mf36oYYqhISmEgUQMk8="; }) + (fetchNuGet { pname = "FluentAssertions"; version = "5.0.0"; hash = "sha256-jmGbSHbZhonYWIxqqux8ZOBVY2GNEG9eppNsIn6wEBc="; }) + (fetchNuGet { pname = "FluentAssertions"; version = "6.12.2"; hash = "sha256-yvbnZapTF610zG8YhMOESn0iXudX4xVCdoSKVo6eu+w="; }) + (fetchNuGet { pname = "FluentAssertions.Analyzers"; version = "0.34.1"; hash = "sha256-4n26IoSLJRLxyPDyJwF7T+za5xbHO27qM7CarniTADk="; }) (fetchNuGet { pname = "FluentAssertions.OneOf"; version = "0.0.5"; hash = "sha256-T/yzpRPwEKh0r6JUPgH2GYkSt36PqOZYr9Qi0grGczo="; }) (fetchNuGet { pname = "FluentResults"; version = "3.15.2"; hash = "sha256-NhS7sLhgXDAI4Qwb285HWRtPfUDN6K0tTkKx2QRsI9w="; }) (fetchNuGet { pname = "Fody"; version = "6.8.0"; hash = "sha256-2laYscz0i0LalGTAup7dsh6XlYRZSojYpp8XOwZJJfg="; }) + (fetchNuGet { pname = "FomodInstaller.Interface"; version = "1.0.0"; hash = "sha256-ChhqiNGmj+deuIIYXJWsz7Xmolv9YaeLUlwfothQyjA="; }) (fetchNuGet { pname = "FomodInstaller.Interface"; version = "1.2.0"; hash = "sha256-sxylVEA7uiaBtxbQHAeRElsVbZPIj2nm27Ozlik8wmg="; }) (fetchNuGet { pname = "FomodInstaller.Scripting"; version = "1.0.0"; hash = "sha256-GNqbLS+lU6aNThUUCfJpmZgP+rd4lF0fKyfMn2Y7Ckg="; }) (fetchNuGet { pname = "FomodInstaller.Scripting.XmlScript"; version = "1.0.0"; hash = "sha256-fbekooynf0jQD0k0zbYueDvOTxPa3FIZUKjCcVMPeeY="; }) @@ -77,29 +85,21 @@ (fetchNuGet { pname = "GameFinder.StoreHandlers.Xbox"; version = "4.3.3"; hash = "sha256-uzIPKS3O/uxqXZMysZfgRlQaDUSUhj1y9hCKAwwhK0g="; }) (fetchNuGet { pname = "GameFinder.Wine"; version = "4.3.3"; hash = "sha256-aEFkI7UVHsipCxdvHq3P+mrThgYdrFhpK6EbyFYqU6Y="; }) (fetchNuGet { pname = "Gee.External.Capstone"; version = "2.3.0"; hash = "sha256-wdYT/F8SLL72OIVv/Q/hfLMfhlWMnhDNCTWx+wWlPoU="; }) - (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.3.3"; hash = "sha256-/TxZ7f3AvArXXe6isyom6ZHLFZR2hi1ejaQuY/6KN4s="; }) + (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.4.1"; hash = "sha256-bY8RXB3fIsgYIrlLeEuq8dsOfIn8zcbZ0dj2Ra1sFZg="; }) (fetchNuGet { pname = "Google.Protobuf"; version = "3.22.5"; hash = "sha256-KuPCqobX6vE9RYElAN9vw+FPonFipms7kE/cRDCLmSQ="; }) (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.52.0"; hash = "sha256-ISgN3zWwvV8qD7JFkaYveLbke09+UtUBy3Tux+ZHLNc="; }) (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.52.0"; hash = "sha256-4Rhb8PIoV2BiohfRwzx1GYDPbcfqxGAmL2uB0atFFTk="; }) (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.52.0"; hash = "sha256-XoY+jt+JIt6SzvCjUSXKKa9Q8Bu5UrNJv2z1hCBKDrY="; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; hash = "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; hash = "sha256-LlPQO/NYgIMWicvLOtWsQzCp512QpIImYDP9/n2rDOc="; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.2"; hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; hash = "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0.2"; hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; hash = "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; hash = "sha256-6oFcdKb17UX5wyAUeCCKXGvzkf0w3MNdZOVMvs54tqw="; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0.2"; hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; hash = "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0.2"; hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; hash = "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; hash = "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0.3-preview.2.2"; hash = "sha256-1NlcTnXrWUYZ2r2/N3SPxNIjNcyIpiiv3g7h8XxpNkM="; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0.2"; hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="; }) - (fetchNuGet { pname = "HotChocolate.Language.SyntaxTree"; version = "13.9.12"; hash = "sha256-P3URpDpomujoYqFrBxj8uwJsuUJvvfyDKkXw0v6ROrY="; }) - (fetchNuGet { pname = "HotChocolate.Transport.Abstractions"; version = "13.9.12"; hash = "sha256-Mnlmb0OYEuWpbNhvm1GHaUmyEXsuijGmFZXRlfG7Sxo="; }) - (fetchNuGet { pname = "HotChocolate.Transport.Http"; version = "13.9.12"; hash = "sha256-3aW+ZSy8h6AB3nLuq8hYtp0i5slviA3ZpB//AOPOqP4="; }) - (fetchNuGet { pname = "HotChocolate.Utilities"; version = "13.9.12"; hash = "sha256-PW88yHRQIOW5Rmvp98oRxDMkGRCFC1ajxWHadYHuaok="; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.52"; hash = "sha256-52YYrpZKJO1MrgST7K2u8SY00YyKvg43J4AMIw83BAQ="; }) + (fetchNuGet { pname = "HotChocolate.Language.SyntaxTree"; version = "14.1.0"; hash = "sha256-4cRFDfLW+A0378BZ0wzPrc7FOiuTdCtlA4gyitSrhiI="; }) + (fetchNuGet { pname = "HotChocolate.Transport.Abstractions"; version = "14.1.0"; hash = "sha256-i8i4ovnxHcFRrnU/a3U01izWEa+OsOjxgLDRq7wo1vs="; }) + (fetchNuGet { pname = "HotChocolate.Transport.Http"; version = "14.1.0"; hash = "sha256-e5VoAtmieIhNvhtGMnmPXqYAZE9SrXlfyJmDKF7LBJo="; }) + (fetchNuGet { pname = "HotChocolate.Utilities"; version = "14.1.0"; hash = "sha256-KIYlc1jDG1BT6gZGZoei6ypHXZo9I3dN4zM/NpDWJuI="; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.70"; hash = "sha256-V/SI2N1+jNkwjSQRd2Y/XVVhdOKvSNz3/NeIFE9V3wY="; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; hash = "sha256-1wGwf5KAmDeiH0Dz8KcTdZw+UMkiNsjKOIOt/VJnnqE="; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.2.0"; hash = "sha256-5Q6oRaV8wHPONHreKvB74VjV2FW36mwC3n+05It5vyI="; }) @@ -153,41 +153,41 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; hash = "sha256-N3D1z5aoGwAZ6+ZxrWMtXgacvQcgDG+aLrQQI9uysmM="; }) (fetchNuGet { pname = "Iced"; version = "1.17.0"; hash = "sha256-6/5E5v5mqSG7yiE2zHUChZZeC47NRgLzQFD4+7bqKaU="; }) (fetchNuGet { pname = "ini-parser-netstandard"; version = "2.5.2"; hash = "sha256-idb2hvuDlxl83x0yttGHnTgEQmwLLdUT7QfMeGDXVJE="; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; hash = "sha256-/Eykez68qYMO5mlmUelzAke8aJehyp8fspO5Z+yt5G4="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2024.3.0"; hash = "sha256-BQYhE7JDJ9Bw588KyWzOvQFvQTiRa0K9maVkI9lZgBc="; }) (fetchNuGet { pname = "K4os.Compression.LZ4"; version = "1.3.7-beta"; hash = "sha256-mMNIMLSXnKFF3oAgX+k/n0wipxyRDGE1z2BrI2+7ALc="; }) + (fetchNuGet { pname = "K4os.Compression.LZ4"; version = "1.3.8"; hash = "sha256-OmT3JwO4qpkZDL7XqiFqZCyxySj64s9t+mXcN1T+IyA="; }) (fetchNuGet { pname = "LinqGen"; version = "0.3.1"; hash = "sha256-Yyt1uShHigHVCIjPT8jL2Kth9L9yq1MGrCM5w2+tj9o="; }) (fetchNuGet { pname = "LiveChartsCore"; version = "2.0.0-rc2"; hash = "sha256-JSw2bwHOvUDx+axSufcvKSD9RPmqi366tbiIcsym3As="; }) (fetchNuGet { pname = "LiveChartsCore.SkiaSharpView"; version = "2.0.0-rc2"; hash = "sha256-tKBTT75B77po0jDqWJL0mOzXkCKmHAGPlQV3biKtZdw="; }) (fetchNuGet { pname = "LiveChartsCore.SkiaSharpView.Avalonia"; version = "2.0.0-rc2"; hash = "sha256-pHMtCkoz4sz2MLlVGFbFwwONLC3vzy+9Cg0OmEJ+f/s="; }) - (fetchNuGet { pname = "Magick.NET-Q16-AnyCPU"; version = "13.8.0"; hash = "sha256-KbnkvMxZiw8P/YYU1wKN8ptFzbSTd8KRMj7tvdxwI5Y="; }) - (fetchNuGet { pname = "Magick.NET.Core"; version = "13.8.0"; hash = "sha256-7nxM6i4VbMOi3ETLGLf59KQg1ZUhLLBzPJQU4flNYsE="; }) + (fetchNuGet { pname = "Magick.NET-Q16-AnyCPU"; version = "14.0.0"; hash = "sha256-hsFqy7F1s9pO3SWnOuKc4AWEoG7fR8CKSkjfo7pKvzY="; }) + (fetchNuGet { pname = "Magick.NET.Core"; version = "14.0.0"; hash = "sha256-mwh8d7qmM7m6IbnLSPNq8ZMcD24/1ypM3Gdf6GZm0ao="; }) (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.3-a1"; hash = "sha256-KkRzr8BXmUCGCVv/64gg1aiXHUY0yGj5t12OsYAidcw="; }) (fetchNuGet { pname = "MartinCostello.Logging.XUnit"; version = "0.3.0"; hash = "sha256-RhcRcww2ZYaB1ZZ/qRN95fMffcsfqP4EKLVeR4+5S9A="; }) - (fetchNuGet { pname = "MemoryPack"; version = "1.21.1"; hash = "sha256-FMtUCr66kAFj/6oFZyCg16BVh9yTJK+vKLSKo2VZFac="; }) - (fetchNuGet { pname = "MemoryPack.Core"; version = "1.21.1"; hash = "sha256-Frjo5sha/5O3OsLG6ProZ5eAXSxicedjyXfPCx2dM0E="; }) - (fetchNuGet { pname = "MemoryPack.Generator"; version = "1.21.1"; hash = "sha256-o86imC1OyV5teN+sKujffkPDvcITk1l763jFNYyILDY="; }) - (fetchNuGet { pname = "MemoryPack.Streaming"; version = "1.21.1"; hash = "sha256-eOttUpzWeMD0s+49p0sxFc1h+FM7wkU/n2Q4e0S8d2s="; }) + (fetchNuGet { pname = "MemoryPack"; version = "1.21.3"; hash = "sha256-x0riT7EvbuyX91wq9PIEwDQe1aiBrYD9R9Io16JvprM="; }) + (fetchNuGet { pname = "MemoryPack.Core"; version = "1.21.3"; hash = "sha256-99ys+oZfBxcmal9PE14bxmR+svGk+J3FqAzxG7qVOHg="; }) + (fetchNuGet { pname = "MemoryPack.Generator"; version = "1.21.3"; hash = "sha256-TdbsUp0jB/1T4nU1dHS25iizpXLXJ0KWzqo3skMV6KE="; }) + (fetchNuGet { pname = "MemoryPack.Streaming"; version = "1.21.3"; hash = "sha256-WWJx+aMHnjKVPrOSt0QE0iFh/rNhZCCbUrnww3HdqfI="; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) - (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; hash = "sha256-CCytWp0v8C6NZa+o4cRXvA2u/ZOEA3TiG9+luszAwes="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "8.0.8"; hash = "sha256-9jbe61IgPsBx0EOFZRArRj+J1yInWYr/smM8fFhvekg="; }) + (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "6.0.0"; hash = "sha256-lNL5C4W7/p8homWooO/3ZKDZQ2M0FUTDixJwqWBPVbo="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "8.0.0"; hash = "sha256-e4wqTJUgPfq6CfRwuXTw32K9vB+hOpSLxSZDpzv23Yg="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "9.0.0"; hash = "sha256-LFyhPIJNZLBqOEF4uZ1SpqN/NhjpCHqhzO4R2ApXuj0="; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; hash = "sha256-QYVojfqSZKbF8P6D/aacfxfumMaRUD9SEEQbzw73Bbc="; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; hash = "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "8.0.0"; hash = "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzer.Testing"; version = "1.1.2"; hash = "sha256-NeOzfN/9WiX/GsZicQ+oDUuPrZgrxTcP8w7kszAKaaY="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "1.0.0"; hash = "sha256-40uYDx51I8gbyvIaCgo8HIsCoe1NjzQ1sCPb96gpeOs="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; hash = "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; hash = "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "1.0.1"; hash = "sha256-jjWtdrHSISgBF1m94P0DsVbQa4YxKnf2CWRWYHQLTG8="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.1.0"; hash = "sha256-g3RLyeHfdOOF6H89VLJi06/k8/eJ6j2dgNYZ/MBdfNU="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.7.0"; hash = "sha256-nDDpCy8WQADxo7LzWkDupuxs0GCjvuhX8EeKpjTnRP4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.11.0"; hash = "sha256-cX/xgM0VmS+Bsu63KZk2ofjFOOy1mzI+CCVEY6kI+Qk="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.8.0"; hash = "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.1.0"; hash = "sha256-pM9WXvxZI3SS89CGVjxqtAyZyfyiZQzW0UnNCDiQrQA="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.7.0"; hash = "sha256-0FoP+zHqbhLhyjTPx8I7MCfHqCbmhwE8aRCVe4eC49M="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.11.0"; hash = "sha256-E9jEOjp9g/CFecsc5/QfRKOPXMRpSw0Tf79XsRgL+Mk="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.8.0"; hash = "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing"; version = "1.1.2"; hash = "sha256-WkdcHsqrFQnXEkcuyWPIPybY25QDzpMEem9KflPwFn0="; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit"; version = "1.1.2"; hash = "sha256-wYCDZopLucktDQpzACb/BTj+t4arpFuqUEAKxfjLk7U="; }) @@ -203,81 +203,96 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; }) (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.251802"; hash = "sha256-9ZH4rrfACzJP5oiarDW4cD2nczv1SNgZr4GW1J9hlUA="; }) (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "2.2.332302"; hash = "sha256-5R9xK0owZEhXsucqPKnPaTiwhXBnLo92L2AY7IjyxNg="; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "3.0.2"; hash = "sha256-BHuiTEkA76/9QIR9MG8SBhdExgKFFGd//2RjX8V3XJM="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "3.1.8"; hash = "sha256-JFrNrQrXjOJI7v4MpQEDMfmfndM4ThtDZkATAGin9lE="; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; hash = "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="; }) - (fetchNuGet { pname = "Microsoft.Extensions.AmbientMetadata.Application"; version = "8.9.1"; hash = "sha256-BtBmKX01A5ye8tlpbII7vajsP3bEXEqBh5ipzR6mEtY="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Compliance.Abstractions"; version = "8.9.1"; hash = "sha256-mOPKILicnuf3FVF0G2K0cEcOQ3605wHu8qAb9J2FBIA="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.1"; hash = "sha256-pnO6GdmnPJ8D4pmMpkxwgM4GggwGd2Uk+5s6OfJnhAg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.AmbientMetadata.Application"; version = "9.0.0"; hash = "sha256-1cEpOtFLK7J9Hnq28Av+pdKaYjRldWVNRD2zhBsbWps="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Compliance.Abstractions"; version = "9.0.0"; hash = "sha256-Se92b6d4EEpL9HCD0OwFRlRSGM64+U4PVEid9ncuAqk="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.1"; hash = "sha256-3DdHcNmy+JKWB4Q8ixzE4N/hUAvx2o4YlYal4Riwiyw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "9.0.0"; hash = "sha256-uBLeb4z60y8z7NelHs9uT3cLD6wODkdwyfJm6/YZLDM="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.1.1"; hash = "sha256-FVdAa88PLAbWXTnEoa7AVSaC9AEjQ66LoxdtJ5nRIVk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "9.0.0"; hash = "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; hash = "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.1"; hash = "sha256-KYPQYYspiBGiez7JshmEjy4kFt7ASzVxQeVsygIEvHA="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.2"; hash = "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "9.0.0"; hash = "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "8.0.0"; hash = "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "9.0.0"; hash = "sha256-RE6DotU1FM1sy5p3hukT+WOFsDYJRsKX6jx5vhlPceM="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "8.0.0"; hash = "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "9.0.0"; hash = "sha256-tDJx2prYZpr0RKSwmJfsK9FlUGwaDmyuSz2kqQxsWoI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; hash = "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "9.0.0"; hash = "sha256-PsLo6mrLGYfbi96rfCG8YS1APXkUXBG4hLstpT60I4s="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; hash = "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "9.0.0"; hash = "sha256-qQn7Ol0CvPYuyecYWYBkPpTMdocO7I6n+jXQI2udzLI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "8.0.0"; hash = "sha256-/yj5QaEzeRStvOFoBpPRPXlEehGtr2E6/rJb+OEPIK8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.UserSecrets"; version = "9.0.0"; hash = "sha256-GoEk+Qq7lbiwWurHYx1LkDaUzIpOzaoTiVGDPfViGak="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "9.0.0"; hash = "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; hash = "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.1"; hash = "sha256-BMU00QmmhtH3jP5cepJnoTrxrPESWeDU0i5UrIpIwGY="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.1"; hash = "sha256-lzTYLpRDAi3wW9uRrkTNJtMmaYdtGJJHdBLbUKu60PM="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.AutoActivation"; version = "8.9.1"; hash = "sha256-hyQhv2w+AbTHms4pRIayMdzjsQHaUTzg3Xn2XE/oQXE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.2"; hash = "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "9.0.0"; hash = "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.AutoActivation"; version = "9.0.0"; hash = "sha256-45NiMtCHV4BDkwnSZmsTRJ8dHMDm5WAGhJh4x+z7TiM="; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.0"; hash = "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "9.0.0"; hash = "sha256-JMbhtjdcWRlrcrbgPlowfj26+pM+MYhnPIaYKnv9byU="; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.ExceptionSummarization"; version = "8.9.1"; hash = "sha256-veY5VVnDt23crTrfMteWrvShMr2pw5V0VCdjElblrgo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "9.0.0"; hash = "sha256-wG1LcET+MPRjUdz3HIOTHVEnbG/INFJUqzPErCM79eY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.ExceptionSummarization"; version = "9.0.0"; hash = "sha256-Nj8l1ba5iZ5Tubu+vY3a5dgTRkYmGNP2wtXC8Re8aCg="; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; hash = "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "9.0.0"; hash = "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc="; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; hash = "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "9.0.0"; hash = "sha256-IzFpjKHmF1L3eVbFLUZa2N5aH3oJkJ7KE1duGIS7DP8="; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; hash = "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "9.0.0"; hash = "sha256-eBLa8pW/y/hRj+JbEr340zbHRABIeFlcdqE0jf5/Uhc="; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "8.0.0"; hash = "sha256-sKHa+w4/pMeQb5RRFqLtMTUJy5H6hSIGWchbH2pxSrg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "9.0.0"; hash = "sha256-apIN4Cz86ujsMp/ibxcvguA9uCFaFqOsZ4kAUPX5ASI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "9.0.0"; hash = "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY="; }) (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "8.0.0"; hash = "sha256-UgljypOLld1lL7k7h1noazNzvyEHIJw+r+6uGzucFSY="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Http.Diagnostics"; version = "8.9.1"; hash = "sha256-8Lvmx0fquKkq18T8qMQXK1yC2pO3bMDyU5DnPJdVx68="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Http.Resilience"; version = "8.9.1"; hash = "sha256-/nBpINrO7OWj1jJnOAhoVYrelSfXl4eDh6mmel48yYU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "9.0.0"; hash = "sha256-MsStH3oUfyBbcSEoxm+rfxFBKI/rtB5PZrSGvtDjVe0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http.Diagnostics"; version = "9.0.0"; hash = "sha256-4XtkhRMXTFR1I85rJ73BFa01XDRW/fz4+Jig0S/Wm3M="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http.Resilience"; version = "9.0.0"; hash = "sha256-GFGvnupmgvTgbmknxpF7H3DmxqvX9JOdxKuK2lR6bVM="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; hash = "sha256-Bg3bFJPjQRJnPvlEc5v7lzwRaUTzKwXDtz81GjCTfMo="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.1.1"; hash = "sha256-HnEBmAhweBalCAeX+KZ4kEL3GXEVDBg6Uq4H4LJ56oo="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "9.0.0"; hash = "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; hash = "sha256-cBBNcoREIdCDnwZtnTG+BoAFmVb71P1nhFOAH07UsfQ="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.1"; hash = "sha256-TzbYgz4EemrYKHMvB9HWDkFmq0BkTetKPUwBpYHk9+k="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.0.3"; hash = "sha256-UFawgCAhbN5HCtJy39XO4sz5N/P/Zyrs0uqrQHc4SPI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.1"; hash = "sha256-v3FWpuKXlBIW5NwqQx0Ffb6y58RlevIyO/byqeLphJ8="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.1"; hash = "sha256-TYce3qvMr92JbAZ62ATBsocaH0joJzw0px0tYGZ9N0U="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "9.0.0"; hash = "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; hash = "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "9.0.0"; hash = "sha256-ysPjBq64p6JM4EmeVndryXnhLWHYYszzlVpPxRWkUkw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; hash = "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "9.0.0"; hash = "sha256-N2t9EUdlS6ippD4Z04qUUyBuQ4tKSR/8TpmKScb5zRw="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "8.0.0"; hash = "sha256-AJunzYBZM2wCg86hnPnMrBuWIIyW/4PnIVoDSU969cA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Debug"; version = "9.0.0"; hash = "sha256-5W6fP9Eb98U3MTWKeLzSNl2cRFpE694OOPjpWp/qTAk="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "8.0.0"; hash = "sha256-vXBm4yhWGP4uow0CqstuqOkxO8yeZEM15JTTenjPbhc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventLog"; version = "9.0.0"; hash = "sha256-mIL1I85Ef5+/mXl24odoUpcXet+jCZTRtKCd5z6YUwI="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "8.0.0"; hash = "sha256-kaR7YOlq5s8W9nZDtH/lKtnfGbrgOuQY4DUPcA2lcj0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.EventSource"; version = "9.0.0"; hash = "sha256-pplZskMsR3gGbs3I0wycGsvIMPIpfWFJpOsR9GkiYRw="; }) (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "8.0.0"; hash = "sha256-FxFr5GC0y6vnp5YD2A2vISXYizAz3k/QyrH7sBXP5kg="; }) - (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "8.0.6"; hash = "sha256-GnQgqdQTsoLj09avT9k7ypbbTHKoD61J2Pma4Jm/Pq8="; }) - (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "8.0.8"; hash = "sha256-9AZmxZ4YcUgHOxxdmklJdIlQSGg7C9BLVz9cvaDdu5c="; }) + (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "9.0.0"; hash = "sha256-mX2Y2bHwScjXh1xQOweawmwo7jYLw+MhePibk/96dMY="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; hash = "sha256-EMvaXxGzueI8lT97bYJQr0kAj1IK0pjnAcWN82hTnzw="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.1.1"; hash = "sha256-dCPA56Wv9cLuz720PmVbk2oXda1t9ZSAlP8/clDU93E="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.2"; hash = "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "9.0.0"; hash = "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck="; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; hash = "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.1"; hash = "sha256-nbu2OeQGWeG8QKpoAOxIQ8aPzDbWHgbzLXh55xqeeQw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "9.0.0"; hash = "sha256-r1Z3sEVSIjeH2UKj+KMj86har68g/zybSqoSjESBcoA="; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Resilience"; version = "8.9.1"; hash = "sha256-j1GSkggNhVOLLZufJK8zWRfuNkZmV7TcHeOnDLGVkJs="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Telemetry"; version = "8.9.1"; hash = "sha256-QZDuSYnlGDKhGe3VQ+gHbMzq7QlmNd88jRPUPBF1VN0="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Telemetry.Abstractions"; version = "8.9.1"; hash = "sha256-E8XhPlDZIqi2DpIOYhQgLnoEceDOlz34ZzMRN6bL1lk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "9.0.0"; hash = "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Resilience"; version = "9.0.0"; hash = "sha256-3zd2zOR8C3+VaPpUnJ+wcCaBbvzU8DjGGuaZ/dxsqQQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Telemetry"; version = "9.0.0"; hash = "sha256-MKltsZC6s7sE8mO1XpOOzgFbp3CJS7sHGMH92DjXSso="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Telemetry.Abstractions"; version = "9.0.0"; hash = "sha256-rGeoVSc3RJlhL8Sv8CgDh2+BOiFHllKl2K9vtXxl+Ec="; }) (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "3.0.0"; hash = "sha256-WBXkqxC5g4tJ481sa1uft39LqA/5hx5yOfiTfMRMg/4="; }) - (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "8.0.8"; hash = "sha256-CHoURIMKGMbEvvQnO6f/+dETIOBklViNcq8rnDuAVpE="; }) + (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "9.0.0"; hash = "sha256-fJ42UoMaftaGZbMA5LlGhZNns1hQY2eLkw6EEeCYcAQ="; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.11.1"; hash = "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "8.0.0"; hash = "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="; }) (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "8.0.0"; hash = "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.11.1"; hash = "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.1"; hash = "sha256-KfqM1E0jhAg07QfpjfEcjQ+HX13XZfdvveT5qxm89Sk="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.11.1"; hash = "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU="; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Composition"; version = "16.1.8"; hash = "sha256-yFT4t3Uk31R5EPdAxxsTAmRuiv58MlYoYL4JT1ywlHQ="; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Composition.NetFxAttributes"; version = "16.1.8"; hash = "sha256-FFemIG+m8RWUPo5W+kCHPh5Yn4fGS+tpjGiQTcT0sAE="; }) @@ -285,72 +300,72 @@ (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.10.48"; hash = "sha256-EvZGbyxtrJDvHZwsQbZDXtVfWiy0f58oCdTdSzD34wI="; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.0.82"; hash = "sha256-7JFaA/HZHVjsEtTh/iHDRLi5RcuA39KKvvCkuI4JQFc="; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.8.8"; hash = "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms="; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; hash = "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk="; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.4.0"; hash = "sha256-ZumsykAAIYKmVtP4QI5kZ0J10n2zcOZZ69PmAK0SEiE="; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) (fetchNuGet { pname = "Nerdbank.FullDuplexStream"; version = "1.1.12"; hash = "sha256-PZwy+qQ8nOdH5gRRQ24go2yh+YmZQhziwbyWC+1qoJc="; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.11.74"; hash = "sha256-asIdaqCIjZspTA+hhtjKNajpCo+ZQi3erZLCpBQ5No4="; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.11.79"; hash = "sha256-1bzibVcSH8LJMR8Nb6Q0q/7fieTgxRnVY4C1RvRbrrI="; }) (fetchNuGet { pname = "NetEscapades.EnumGenerators"; version = "1.0.0-beta07"; hash = "sha256-SYIuk1B2birutYx6d0vbCshEd8ZEH0pDVrNm9daBxwY="; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; hash = "sha256-ExWI1EKDCRishcfAeHVS/RoJphqSqohmJIC/wz3ZtVo="; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.1"; hash = "sha256-4Xf3RZrJomAh3jaZrEAJX3oPmOowGV8yDB9Y3h0Dw4U="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) - (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; hash = "sha256-qofIFqViDsdBOE/X0IvzfGUklSrULaH8MoZQ+YrcMOQ="; }) + (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; hash = "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA="; }) (fetchNuGet { pname = "NexusMods.Archives.Nx"; version = "0.6.1"; hash = "sha256-NDUxypEccSlGBG9nYTJJiTqYrZWjSjV1xt/uUbtfeS8="; }) - (fetchNuGet { pname = "NexusMods.Hashing.xxHash3"; version = "3.0.2"; hash = "sha256-AJwEgi+feVf61XQRZ4kmULkBq5+HKBVIZ30QwaAc04U="; }) - (fetchNuGet { pname = "NexusMods.Hashing.xxHash3.Paths"; version = "3.0.2"; hash = "sha256-Z6LrrMEQ+Kvuvc8hmudSdlrnoT739fglu87/dZIuMeY="; }) - (fetchNuGet { pname = "NexusMods.MnemonicDB"; version = "0.9.95"; hash = "sha256-C4jjS/7yfvNAj/qeHWtMpEId5MtNsOogl0BRvoUFjxQ="; }) - (fetchNuGet { pname = "NexusMods.MnemonicDB.Abstractions"; version = "0.9.95"; hash = "sha256-doLqDfSCuYwMENRTBaHH7OudS43jPhGyXW4GlY4ApFQ="; }) - (fetchNuGet { pname = "NexusMods.MnemonicDB.SourceGenerator"; version = "0.9.95"; hash = "sha256-soxAI6LIlEzFZdld3CV8bSl+rJnQqPjSm++cb20eOlU="; }) + (fetchNuGet { pname = "NexusMods.Hashing.xxHash3"; version = "3.0.3"; hash = "sha256-lhuuHZvH1klH6HE00h1On6icd6CLdFqvLLkfb3x1VVY="; }) + (fetchNuGet { pname = "NexusMods.Hashing.xxHash3.Paths"; version = "3.0.3"; hash = "sha256-UeOX3Y8MGmAgWHWH3GolsA/MyNM9iam75pxxRXhd50M="; }) + (fetchNuGet { pname = "NexusMods.MnemonicDB"; version = "0.9.97"; hash = "sha256-b0k/hM6UYvMTZN2QMk53QN9Fw/pomXJ88k9QqfrAF+s="; }) + (fetchNuGet { pname = "NexusMods.MnemonicDB.Abstractions"; version = "0.9.97"; hash = "sha256-EnWQMeXMKwziMoBXKf7t+Ru6EHZBml4Pt3h1eSP1Ud0="; }) + (fetchNuGet { pname = "NexusMods.MnemonicDB.SourceGenerator"; version = "0.9.97"; hash = "sha256-KOZVhS3H/qY6bRW9HmSF1Ud4fXv5oEWORDdYET9Ochw="; }) (fetchNuGet { pname = "NexusMods.Paths"; version = "0.10.0"; hash = "sha256-tzUKPBrGNyZvVgScDAP0qvVF5nV6635v3NlBvzpnz1M="; }) - (fetchNuGet { pname = "NexusMods.Paths"; version = "0.9.5"; hash = "sha256-30IlPuu35i0VrUJSaLy86wSYwVCIDgdZc2HctnKuo6o="; }) - (fetchNuGet { pname = "NexusMods.Paths.Extensions.Nx"; version = "0.10.0"; hash = "sha256-DktYpARh+UwtrjSYck5dtuQ3YyroZqTJysAZ6jxneEU="; }) - (fetchNuGet { pname = "NexusMods.Paths.TestingHelpers"; version = "0.10.0"; hash = "sha256-U0hBPyVLyNU4j3qWkVnwETIPirZfkXiHZxgvKiLUYZU="; }) - (fetchNuGet { pname = "NLog"; version = "5.3.2"; hash = "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc="; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; hash = "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g="; }) - (fetchNuGet { pname = "Noggog.CSharpExt"; version = "2.64.0"; hash = "sha256-t1V6l01P299yJCQiMtCsUp6tW61vfLZBeAUEAqYuLRg="; }) - (fetchNuGet { pname = "NSubstitute"; version = "5.1.0"; hash = "sha256-ORpubFd6VoRjA9ZeyZdJPY/xnQXM90O6McMswt8VVG4="; }) + (fetchNuGet { pname = "NexusMods.Paths"; version = "0.15.0"; hash = "sha256-No2kbrDVmJ5ySLm7jH+gNAfNLVnsv4AtLT1phcuOFLc="; }) + (fetchNuGet { pname = "NexusMods.Paths.Extensions.Nx"; version = "0.15.0"; hash = "sha256-8QT+Iu32u4m5wqMG2bAqramnUQPLDmUB8/c+ew4fRqM="; }) + (fetchNuGet { pname = "NexusMods.Paths.TestingHelpers"; version = "0.15.0"; hash = "sha256-xUZIAND1Ob0SRuoTTuJqw7N2j/4ncIlck3lgfeWxd5M="; }) + (fetchNuGet { pname = "NLog"; version = "5.3.4"; hash = "sha256-Cwr1Wu9VbOcRz3GdVKkt7lIpNwC1E4Hdb0g+qEkEr3k="; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.14"; hash = "sha256-Ckb3z1Ou5dAncADgylCu7yOGfQ7Vh47Oc48PInAi1lA="; }) + (fetchNuGet { pname = "Noggog.CSharpExt"; version = "2.67.3"; hash = "sha256-UjONR5k+miASf4OxLPF9fccYLkfRJsVnktmvvEQDzUc="; }) + (fetchNuGet { pname = "NSubstitute"; version = "5.3.0"; hash = "sha256-fa6Hn9Qmpia2labWOs1Xp2LnJBOHfrWIwxvqKRRccs0="; }) (fetchNuGet { pname = "NSubstitute.Analyzers.CSharp"; version = "1.0.17"; hash = "sha256-HyMhNJMze3ALJbl71pprjuLCqS+KLA/bOeX4Sng/eb4="; }) (fetchNuGet { pname = "NuGet.Common"; version = "6.3.4"; hash = "sha256-GDzEyx9/wdVOUAri94uoDjChmfDnBhI90nBfzoHarts="; }) (fetchNuGet { pname = "NuGet.Configuration"; version = "6.3.4"; hash = "sha256-qXIONIKcCIXJUmNJQs7MINQ18qIEUByTtW5xsORoZoc="; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.3.4"; hash = "sha256-zqogus3HXQYSiqfnhVH2jd2VZXa+uTsmaw/uwD8dlgY="; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; hash = "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g="; }) (fetchNuGet { pname = "NuGet.Packaging"; version = "6.3.4"; hash = "sha256-1LKM5vgfNKn8v2LcqialwmcynACISR57q13n7I2lQbU="; }) (fetchNuGet { pname = "NuGet.Protocol"; version = "6.3.4"; hash = "sha256-j3L4bDzM+0/U4dm9q914DNpOzPpOPWhaolfOFKosdAQ="; }) (fetchNuGet { pname = "NuGet.Resolver"; version = "6.3.4"; hash = "sha256-rXYXgdJMtwne3skk4jMgqyZlwh3QCTX9hIHvvXafxUM="; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "6.3.4"; hash = "sha256-6CMYVQeGfXu+xner3T3mgl/iQfXiYixoHizmrNA6bvQ="; }) - (fetchNuGet { pname = "ObservableCollections"; version = "3.1.0"; hash = "sha256-Tt49jiDU8rVMTZNpjZK96r1cJ1BBJpG2fbg8GyQ6zOE="; }) - (fetchNuGet { pname = "ObservableCollections.R3"; version = "3.1.0"; hash = "sha256-XUvkmnMDJKN0VLLawp0lr8aMQjrXD1qJbvpSjbFTYFc="; }) + (fetchNuGet { pname = "ObservableCollections"; version = "3.3.2"; hash = "sha256-pM/2bPf2QvgOhkqA/cSpd/0jAqhOXrtLn01WWZiuoGc="; }) + (fetchNuGet { pname = "ObservableCollections.R3"; version = "3.3.2"; hash = "sha256-q/Ch2JW4H/CvE0oFxmqQDKbgQVo1HfHmtuhMrnFQSEU="; }) (fetchNuGet { pname = "OneOf"; version = "2.1.125"; hash = "sha256-3XkBNSEMwlNyNpY/H2gtJ47Mc7905p/CJH9d/VJyO3s="; }) (fetchNuGet { pname = "OneOf"; version = "3.0.271"; hash = "sha256-tFWy8Jg/XVJfVOddjXeCAizq/AUljJrq6J8PF6ArYSU="; }) (fetchNuGet { pname = "OneOf.Extended"; version = "2.1.125"; hash = "sha256-wJaz49zNFzZwSpMTeabEoJR65Kvk7NCrAqyTKxjfFkg="; }) (fetchNuGet { pname = "Onigwrap"; version = "1.0.6"; hash = "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU="; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.8.1"; hash = "sha256-AldbsateY7uhKy/0JM2sEgiOF1wGr5CwTifsuH6Tnuo="; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.1"; hash = "sha256-xdMOKY90bGTcvRdBsBqj08Du3qRmDC1BecX+aK3dTTA="; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.1"; hash = "sha256-j4XUh9cnF5SbyhRoNwjOWS3EXIl9ZSEFgkJZjQEN2lM="; }) - (fetchNuGet { pname = "OpenTelemetry.Exporter.OpenTelemetryProtocol"; version = "1.8.1"; hash = "sha256-smQQOI5i7lG0nnv5CHvzIjCQkago1z+E4W/rnn19iCA="; }) - (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.1"; hash = "sha256-uA8Lfof/cvQknxBoSDBxTdljAA+oMCOSiUVIsbBOcQc="; }) - (fetchNuGet { pname = "Pathoschild.Http.FluentClient"; version = "4.3.0"; hash = "sha256-F8895rKyjJ0XGo21IjR+qp5BpLaYn9LxMMQ3TRDY7JQ="; }) - (fetchNuGet { pname = "Perfolizer"; version = "0.2.1"; hash = "sha256-nllshKuHU+1jSBfcTz8BTJTGr1TeCFvxjM4OPyLGSgQ="; }) - (fetchNuGet { pname = "Polly"; version = "8.4.2"; hash = "sha256-cuaH3SdTEdwLA1VddtY6CsmHTiDuYk0dVJ79r/6jSpQ="; }) - (fetchNuGet { pname = "Polly.Core"; version = "8.4.1"; hash = "sha256-EksA3U5cmsri2joM+SMtbdwOUMUVxIXT8DnH4DSAIpA="; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.10.0"; hash = "sha256-ucUy3vIabYb0TGDhraqMEzT+LLPmXrO1NgAjEeyVCO8="; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.10.0"; hash = "sha256-ZSpQFnNgkk3dO8Q7yokJ/VSl4wp5PuIv9nduxgC6UxU="; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.10.0"; hash = "sha256-hLw3Sf1fviAlVJYhaMudVJEdG5pjX5JvVrqv9DgYAk8="; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.OpenTelemetryProtocol"; version = "1.10.0"; hash = "sha256-1sKqD/DsEo1nfD4BuuIde/In7W0wAbIEWD3jvvbO8JA="; }) + (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.10.0"; hash = "sha256-+O9oaAUYaKUItLAaT7yQUs2nrHVDNkj8YcFuUxiTy6M="; }) + (fetchNuGet { pname = "Pathoschild.Http.FluentClient"; version = "4.4.1"; hash = "sha256-UmMMhtOkhC3l8XHVPsI2aLg9lYgHOePSnkPcUaJumTo="; }) + (fetchNuGet { pname = "Perfolizer"; version = "0.3.17"; hash = "sha256-EfT9EabewLMOAKrxEwpj7QRzqnHODU0tZ08o1w7aV6Q="; }) + (fetchNuGet { pname = "Polly"; version = "8.5.0"; hash = "sha256-oXIqYMkFXoF/9y704LJSX5Non9mry19OSKA7JFviu5Q="; }) (fetchNuGet { pname = "Polly.Core"; version = "8.4.2"; hash = "sha256-4fn5n6Bu29uqWg8ciii3MDsi9bO2/moPa9B3cJ9Ihe8="; }) - (fetchNuGet { pname = "Polly.Extensions"; version = "8.4.1"; hash = "sha256-uLBo6enk9L+S1bPtazfZ/GmUKjDNQOnX3lsqJj7wyrE="; }) - (fetchNuGet { pname = "Polly.RateLimiting"; version = "8.4.1"; hash = "sha256-J6wvD0bVk9+KRb80LkCe9qWRjSd5O2rH/dMDVTKL53A="; }) - (fetchNuGet { pname = "Projektanker.Icons.Avalonia"; version = "9.4.0"; hash = "sha256-SVzkayPUk/7WXQW2Wn3ri4ia92WvJoXTrPmcT8C+J8U="; }) - (fetchNuGet { pname = "Projektanker.Icons.Avalonia.MaterialDesign"; version = "9.4.0"; hash = "sha256-OTXZAbTsIWjJ7CduyuW57RoExC0eHYIwk9yq3TEGEXE="; }) + (fetchNuGet { pname = "Polly.Core"; version = "8.5.0"; hash = "sha256-vN/OoQi5F8+oKNO46FwjPcKrgfhGMGjAQ2yCQUlHtOc="; }) + (fetchNuGet { pname = "Polly.Extensions"; version = "8.4.2"; hash = "sha256-oyf9CNi8NXLyeMLwBBCifFvV6erIEaurs8i9BZdr0ik="; }) + (fetchNuGet { pname = "Polly.RateLimiting"; version = "8.4.2"; hash = "sha256-432TfbcJ8UUhDWKLcAFksMjbcU0PlLrK+BrrDxFw4/8="; }) + (fetchNuGet { pname = "Projektanker.Icons.Avalonia"; version = "9.4.1"; hash = "sha256-RK62Wls48/j7QZTLlzHOLCXV0jK/0WBra5367zyit7s="; }) + (fetchNuGet { pname = "Projektanker.Icons.Avalonia.MaterialDesign"; version = "9.4.1"; hash = "sha256-YfGVVfl/Yon9WgJCZscXZMbZoCNg+OvGFvdPSxe+Q1I="; }) (fetchNuGet { pname = "QoiSharp"; version = "1.0.0"; hash = "sha256-iN/yCXVN0M5+T/Ye9KJ+EGoLsaBxFU/uCIXvX17EhkM="; }) (fetchNuGet { pname = "R3"; version = "1.0.0"; hash = "sha256-CikGDRUi/EDN2j32cBRl0g+QtdCVYPUizBt41oSVlUA="; }) - (fetchNuGet { pname = "R3"; version = "1.2.8"; hash = "sha256-XUKt8G668ZhjGVuiyaCtqrrVWj8EBL5CqbOiI5fADz4="; }) (fetchNuGet { pname = "R3"; version = "1.2.9"; hash = "sha256-Wb3ELPbVhxEMqkrQq5vIjGC36VAzIuMdiYqSAEnVXpY="; }) (fetchNuGet { pname = "R3Extensions.Avalonia"; version = "1.2.9"; hash = "sha256-ZNah6u4+a13E93rYGtZIyYPIb3mkopIjjCzYUgmjCxQ="; }) - (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; hash = "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="; }) (fetchNuGet { pname = "ReactiveUI"; version = "19.5.41"; hash = "sha256-FsdD1lBZyegqOVzJhZHAz1owCLh7GbVUYXiORbo5euk="; }) + (fetchNuGet { pname = "ReactiveUI"; version = "20.1.1"; hash = "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE="; }) (fetchNuGet { pname = "ReactiveUI"; version = "20.1.63"; hash = "sha256-fcLBYRz5WFlPYtIiLA1k/6xxxWhlclVMj7li8z04g68="; }) (fetchNuGet { pname = "ReactiveUI.Fody"; version = "19.5.41"; hash = "sha256-LfKELxAfApQLL0fDd7UJCsZML5C4MFN+Gc5ECaBXmUM="; }) (fetchNuGet { pname = "Reloaded.Memory"; version = "9.4.1"; hash = "sha256-bXaTAUx+/SiiMLmxuPumV9z5w1HcHpzEoNuR+xNhafs="; }) - (fetchNuGet { pname = "RocksDB"; version = "8.11.3.46984"; hash = "sha256-kCSgenerSMTh5h/hHoueV45uuAARRsJi94c62L2mVEQ="; }) + (fetchNuGet { pname = "Reloaded.Memory"; version = "9.4.2"; hash = "sha256-GGS949WoLUPwCYyfbdTOAgXgbV/N0seqL3RegwyPkls="; }) + (fetchNuGet { pname = "RocksDB"; version = "9.4.0.50294"; hash = "sha256-SHt+2Kaj2eCqoeeH28EGlyRUi+g9Y3e9OzVvp946F7I="; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) @@ -371,13 +386,9 @@ (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; }) (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.1.0"; hash = "sha256-085JrZxNEwIHdBWKKKFsh1JzpF0AblvrUsz5T8kH4jQ="; }) (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.0.1"; hash = "sha256-5nWnTQrA1T6t9r8MqIiV4yTNu+IH0of2OX1qteoS+8E="; }) (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; hash = "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w="; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) @@ -399,54 +410,41 @@ (fetchNuGet { pname = "SHA3.Net"; version = "2.0.0"; hash = "sha256-rNwk9ry52bN95FeNqNC29FokNRRzKw3XnojO/UzHlYc="; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; hash = "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="; }) (fetchNuGet { pname = "SharpZstd.Interop"; version = "1.5.6"; hash = "sha256-Y1sCo7RTRtXjkTG2ZAPFx/qXzX4yW8BEaot7Ngfbg8g="; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "2.0.0.1"; hash = "sha256-nnuebZfFeOHcyRsGKsqM1wmmN6sI1VXr7mbIep02AcA="; }) - (fetchNuGet { pname = "SimpleInfoName"; version = "2.1.1"; hash = "sha256-7yBNIivLnST0MeMTKdZeo5ZG57c4J7PdasFSVabdKyM="; }) - (fetchNuGet { pname = "SimpleInfoName"; version = "2.2.0"; hash = "sha256-oCOH+xj8aBF4H2fCi2e8kCkYUAjmoy/RDSh+jONCpjU="; }) - (fetchNuGet { pname = "SimpleInfoName"; version = "2.3.0"; hash = "sha256-xGVpfnNOqo8Ep3E2LnGyclsccu5/MUfpoYIzNMqJJ/U="; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "2.0.0.2"; hash = "sha256-Q1ok5/R8FWDCQubbhPsbRWigGqfiADFYUoiLlCvk/20="; }) + (fetchNuGet { pname = "SimpleInfoName"; version = "3.0.1"; hash = "sha256-9p/BiEqlQczjjUfpUxcFKn71cLAJC7GGvYqRs8fSuuQ="; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; hash = "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; }) (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.6"; hash = "sha256-gpHiTuHfiXgbkBkzipXb8EXIatefsod75nyrFdPcwcA="; }) (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.8"; hash = "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; hash = "sha256-eExWAAURgnwwm2fRwsK/rf+TeOAPs2n02XZzC0zeUjU="; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.8"; hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; hash = "sha256-8G4swiLMr6XS3kjfO/YC1PyoVdfSq7nxZthZZ+KTKqQ="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.6"; hash = "sha256-7hOMjlYTOiNPLNwfLFUjTcdgiGEtmYUI1EubiRiC6bo="; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.8"; hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; hash = "sha256-/SkV2pIZnt0ziSKB7gt7U2Rltk2Id+zOzbmqgfWUtvA="; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.8"; hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; hash = "sha256-2PhMTwRHitT13KCKiZltKIFieAvNY4jBmVZ2ndVynA8="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; hash = "sha256-ljD4QmAO2/vwA6I8GIUNkONpOzmGsOVJJy9vPDnjVfA="; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.8"; hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="; }) (fetchNuGet { pname = "Spectre.Console"; version = "0.49.1"; hash = "sha256-tqSVojyuQjuB34lXo759NOcyLgNIw815mKXJPq5JFDo="; }) (fetchNuGet { pname = "Spectre.Console.Cli"; version = "0.49.1"; hash = "sha256-sar9rhft1ivDMj1kU683+4KxUPUZL+Fb++ewMA6RD4Q="; }) (fetchNuGet { pname = "Spectre.Console.Testing"; version = "0.49.1"; hash = "sha256-NFZE0ubRmjeOOnkf8EXCp8lya0XK1tclMmtodxJPt1I="; }) - (fetchNuGet { pname = "Splat"; version = "14.4.1"; hash = "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="; }) (fetchNuGet { pname = "Splat"; version = "14.8.12"; hash = "sha256-9KTsYPHVN/wiL8/Yy1KQafrFRy7x8VCEHdzgB+9+8SU="; }) (fetchNuGet { pname = "Splat"; version = "15.1.1"; hash = "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg="; }) (fetchNuGet { pname = "Splat"; version = "15.2.22"; hash = "sha256-GSD6XrFYlYj6jkmI7Z4bYCcRIQCRAyzcuVWHmAll5K4="; }) (fetchNuGet { pname = "Splat.Microsoft.Extensions.Logging"; version = "15.2.22"; hash = "sha256-4QO7NAcOqTDxwsheB2wyXRdH626JylEbahQaKWKZpIc="; }) - (fetchNuGet { pname = "StrawberryShake.Core"; version = "13.9.12"; hash = "sha256-f5BirgBloRc4b0CQxwO7qIOCOXmVbrfdayLaZMou17A="; }) - (fetchNuGet { pname = "StrawberryShake.Resources"; version = "13.9.12"; hash = "sha256-6eaWUu5996Sj/Fc+gZorYfM5jzrN7/R1rUURk5ni2ec="; }) - (fetchNuGet { pname = "StrawberryShake.Server"; version = "13.9.12"; hash = "sha256-Pq9c3RABhk+UKpVxgmU2RfD8wB+20VKNeURnPkWrlTI="; }) - (fetchNuGet { pname = "StrawberryShake.Transport.Http"; version = "13.9.12"; hash = "sha256-GLC9ETwAKF/gyO2IidlzDHu6F3b1HwPT1tT5gGlXvtk="; }) - (fetchNuGet { pname = "StrawberryShake.Transport.WebSockets"; version = "13.9.12"; hash = "sha256-J3qCENJfcBdk5yNgbE8mAHuQcWH97CZ1NWZa0I3cAIA="; }) - (fetchNuGet { pname = "Svg.Custom"; version = "2.0.0.1"; hash = "sha256-ljkiz8xEaIMatjiGe49/LKBaPWR5D2/EY8CCNHZO4j4="; }) - (fetchNuGet { pname = "Svg.Model"; version = "2.0.0.1"; hash = "sha256-ICYIWmoBMM+nuUPQQSbwM2xggPDL+VZUG2UsnotU8Qw="; }) - (fetchNuGet { pname = "Svg.Skia"; version = "2.0.0.1"; hash = "sha256-3kGK9hc9BjaQu6u5mQ9heGKCDLpBDblgQ4VxRFLMa0Q="; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; hash = "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="; }) + (fetchNuGet { pname = "StrawberryShake.Core"; version = "14.1.0"; hash = "sha256-h1Ozv0vdR2UvHIw3JqoBNKPVuD1S31aui7IQ8i8hcnE="; }) + (fetchNuGet { pname = "StrawberryShake.Resources"; version = "14.1.0"; hash = "sha256-6uOb5V7UeHM9OKUTJ4p8/YwvI16LcrC12tPhSAw3U0Q="; }) + (fetchNuGet { pname = "StrawberryShake.Server"; version = "14.1.0"; hash = "sha256-6K6TnX8YL0Dbt8wTv9FmBlbSo+UfaucHi9a5CqWCjoY="; }) + (fetchNuGet { pname = "StrawberryShake.Transport.Http"; version = "14.1.0"; hash = "sha256-Pa2vACAYMgLrAxiZUR7PxBvPY9wrclQRYGZod/VMG5Q="; }) + (fetchNuGet { pname = "StrawberryShake.Transport.WebSockets"; version = "14.1.0"; hash = "sha256-Hqp6GSxMcYorg5v8ns24DNfUDwYGY3urg0FKPleD86I="; }) + (fetchNuGet { pname = "Svg.Custom"; version = "2.0.0.2"; hash = "sha256-6sWw1V2oPdLgLDybH/FT/hUo+CKZiaIfOYv0KUaiTxk="; }) + (fetchNuGet { pname = "Svg.Model"; version = "2.0.0.2"; hash = "sha256-TGkz0qMKvvjMdliqHEsJE1rqKIbezUZrkjofKRduAk8="; }) + (fetchNuGet { pname = "Svg.Skia"; version = "2.0.0.2"; hash = "sha256-8F9LAgj3pdfv5VmnsuS/iHAmI1tajvuSZeTeenS13Lc="; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; hash = "sha256-+YUymoyS0O+xVyF2+LiAdZlMww8nofPN4ja9ylYqRo8="; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) (fetchNuGet { pname = "System.CodeDom"; version = "5.0.0"; hash = "sha256-UNqyPrK9eshU5kgJukvPamkaxLAp9BmR/J22OjEX+pM="; }) - (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; hash = "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="; }) (fetchNuGet { pname = "System.CodeDom"; version = "8.0.0"; hash = "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338="; }) + (fetchNuGet { pname = "System.CodeDom"; version = "9.0.0"; hash = "sha256-578lcBgswW0eM16r0EnJzfGodPx86RxxFoZHc2PSzsw="; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; hash = "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8="; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.1.36"; hash = "sha256-x/UyLEyveCYI+JAWo9xallSPbl78dIVuW2pGqgTY/C0="; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.2.0"; hash = "sha256-FQ3l+ulbLSPhQ0JcQCC4D4SzjTnHsRqcOj56Ywy7pMo="; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) @@ -470,77 +468,56 @@ (fetchNuGet { pname = "System.Composition.TypedParts"; version = "1.0.31"; hash = "sha256-w9ApcUJr7jYP4Vf5+efIIqoWmr5v9R56W4uC0n8KktQ="; }) (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; hash = "sha256-6ZzNdk35qQG3ttiAi4OXrihla7LVP+y2fL3bx40/32s="; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.4.0"; hash = "sha256-+8wGYllXnIxRzy9dLhZFB88GoPj8ivYXS0KUfcivT8I="; }) - (fetchNuGet { pname = "System.Console"; version = "4.0.0"; hash = "sha256-jtZfT/TpJtLisV/y5Mk3IfCpE79zwhBYXtyGP9jC3Xo="; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.0"; hash = "sha256-i3zFUgxQd1NqPVQS9dIY+H6kPP/a2/7JNKXPkPGEPog="; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; hash = "sha256-dYh9UoFesuGcHY+ewsI+z2WnNy+bwHPsHQ3t85cbzNg="; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "9.0.0"; hash = "sha256-1VzO9i8Uq2KlTw1wnCCrEdABPZuB2JBD5gBsMTFTSvE="; }) (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; hash = "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="; }) (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; hash = "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.0"; hash = "sha256-TYGBFoRvTXG8HpuuJMhDXS2O9fVlFpwhgH54nyG7Nss="; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "9.0.0"; hash = "sha256-tPvt6yoAp56sK/fe+/ei8M65eavY2UUhRnbrREj/Ems="; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; hash = "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ="; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; hash = "sha256-9nL3dN4w/dZ49W1pCkTjRqZm6Dh0mMVExNungcBHrKs="; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.0"; hash = "sha256-H/5dMWOOuPh7n/tw8fhysuRh/yPL1AMq3dJhojHNQwk="; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; hash = "sha256-EJN3LbN+b0O9Dr2eg7kfThCYpne0iJ/H/GIyUTNVYC8="; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; hash = "sha256-zLtkPryJwqTGcJqMC6zoMMvMrT+aAL5GoumjmMtqUEI="; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) - (fetchNuGet { pname = "System.IO.Abstractions"; version = "20.0.28"; hash = "sha256-Sol8py0Mb2JywBChk7AFUvQwJGkZV7LX/5pNYoGSEJE="; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; hash = "sha256-UT4KEfJNZOk7b4X0AqLFUsqfHu6myVH/BhbRKYc+1Uc="; }) + (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.29"; hash = "sha256-91e2/Bd4ZgANw19mKkTdxAy2tv7NutyG0lQTKhMiEpo="; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1"; hash = "sha256-An0Twb9JODl/nuVm6MR0kJ3aj4WxGpI/1/vVp5b94kA="; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) - (fetchNuGet { pname = "System.IO.Hashing"; version = "7.0.0"; hash = "sha256-qSnksoYgYj7yui822gJh/xdww0D6zjkCR9zyE9CqNG4="; }) (fetchNuGet { pname = "System.IO.Hashing"; version = "8.0.0"; hash = "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "9.0.0"; hash = "sha256-k6Pdndm5fTD6CB1QsQfP7G+2h4B30CWIsuvjHuBg3fc="; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; hash = "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "8.0.0"; hash = "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="; }) - (fetchNuGet { pname = "System.Linq"; version = "4.0.0"; hash = "sha256-35erMNo/BY47a6y+Q3ejR3giRdHJz+J/j1NiPoBDPNk="; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; hash = "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) (fetchNuGet { pname = "System.Management"; version = "5.0.0"; hash = "sha256-upx2lBRhITuOz9rKth+pBNGvxaLNU3ZOSaS0D+7YHiY="; }) - (fetchNuGet { pname = "System.Management"; version = "6.0.2"; hash = "sha256-8l3Gyx/cn42ovS4q/ID4zSltJoL/pe0B/LUVD17tC6Q="; }) (fetchNuGet { pname = "System.Management"; version = "8.0.0"; hash = "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0="; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; hash = "sha256-7JhQNSvE6JigM1qmmhzOX3NiZ6ek82R4whQNb+FpBzg="; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; hash = "sha256-y6PnGuObJvOkhl9CXNFJQcV3SXuEz5yRLOCxGGTEucQ="; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) - (fetchNuGet { pname = "System.Net.Http.Json"; version = "8.0.0"; hash = "sha256-DUSAYDU0jvlTDnHE/nW5z0RjeRJDy1EsitRQaI2bLHA="; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; hash = "sha256-2YSijNhCdw/ZU2yfH7vE+ReA8pgxRCXPnWr+ab36v4M="; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; hash = "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0="; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; hash = "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="; }) - (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; hash = "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="; }) (fetchNuGet { pname = "System.Reactive"; version = "6.0.1"; hash = "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.0.0"; hash = "sha256-R5ti/45m2PUY0E4uY32/fEOAdzgQJGGKlnEXMjxM7P8="; }) (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) @@ -548,63 +525,51 @@ (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; hash = "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.0.21"; hash = "sha256-0yqDWxwaw57YQ5dl8qdo+2o6VvG8qKp4il093uWWAUs="; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.3.0"; hash = "sha256-a/RQr++mSsziWaOTknicfIQX/zJrwPFExfhK6PM0tfg="; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; hash = "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "8.0.0"; hash = "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.0"; hash = "sha256-lVcTbDGt86Nk/tP/w7EtyEqHq2DiEKtjZ984myBxhYU="; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.0.0"; hash = "sha256-Jrzty9irg5zTbNG07Fnex/rjElhITsoFHLAB8fkY/S4="; }) (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; hash = "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; hash = "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; hash = "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; hash = "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; hash = "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; hash = "sha256-1pJt5ZGxLPTX1mjOi8qZPXyyOMkYV0NstoUCv91HYPg="; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.4.0"; hash = "sha256-J3T2ECVdL0JiBA999CUz77az545CVOYB11/NPA/huEc="; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; hash = "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; hash = "sha256-BelNIpEyToEp/VYKnje/q1P7KNEpQNtOzGPU18pLGpE="; }) (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; hash = "sha256-7F+m3HnmBsgE4xWF8FeCGlaEgQM3drqA6HEaQr6MEoU="; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; hash = "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo="; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; hash = "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M="; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0"; hash = "sha256-ZO7ha39J5uHkIF2RoEKv/bW/bLbVvYMO4+rWyYsKHik="; }) (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; hash = "sha256-mLijAozynzjiOMyh2P5BHcfVq3Ovd0T/phG08SIbXZs="; }) (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; hash = "sha256-kq/tvYQSa24mKSvikFK2fKUAnexSL4PO4LkPppqtYkE="; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0"; hash = "sha256-sEdPftfTxQd/8DpdpqUZC2XWC0SjVCPqAkEleLl17EQ="; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; hash = "sha256-sBUUhJP+yYDXvcjNMKqNpn8yzGUpVABwK9vVUvYKjzI="; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) (fetchNuGet { pname = "System.Security.Permissions"; version = "4.5.0"; hash = "sha256-Fa6dX6Gyse1A/RBoin8cVaHQePbfBvp6jjWxUXPhXKQ="; }) (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.4.0"; hash = "sha256-lwNBM33EW45j6o8bM4hKWirEUZCvep0VYFchc50JOYc="; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; hash = "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) @@ -616,43 +581,39 @@ (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.5"; hash = "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; hash = "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "8.0.0"; hash = "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg="; }) (fetchNuGet { pname = "System.Threading.RateLimiting"; version = "8.0.0"; hash = "sha256-KOEWEt6ZthvZHJ2Wp70d9nBhBrPqobGQDi2twlKYh/w="; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.0"; hash = "sha256-xMxjhMOu9xPrOQFWkFyVHz6LPVd2U99EKYZIdB93XKc="; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.6.0"; hash = "sha256-YYrT3GRzVBdendxt8FUDCnOBJi0nw/CJ9VrzcPJWLSg="; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; hash = "sha256-5lU6zt1O9JDSPr2KAHw4BYgysHnt0yyZrMNa5IIjxZY="; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "20.0.28"; hash = "sha256-SwR51XEqt10sMgvrq9lSPgOIhtgzgA+GnzMqSL6RgtY="; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "20.0.28"; hash = "sha256-evySmax2pcTz1Hb7+W/Pc7UiIpqaWM3o3A1nqU3CzXU="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.29"; hash = "sha256-OFpu9RcDRPLYntQyesBevoG1XxyH96ukHOH0uXqO5ls="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.29"; hash = "sha256-2q1HzbyRPIm6VKYzZzZnkXBJzV8S+HBtT6Lej1pv84Y="; }) (fetchNuGet { pname = "TextMateSharp"; version = "1.0.59"; hash = "sha256-qfAGSgVpTrWMZSk0TFDVP1IgWWi6O1jEEvWc0Pvw9i0="; }) - (fetchNuGet { pname = "TextMateSharp"; version = "1.0.63"; hash = "sha256-be3i2lVNvfNmMdylWMNl2nfHHvX2HguW5tL3m1o86YQ="; }) - (fetchNuGet { pname = "TextMateSharp.Grammars"; version = "1.0.63"; hash = "sha256-AWMIh+dM5AsScOfBLiSYciLkuaCDkhVAFLYklz33gfk="; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.16.0"; hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="; }) - (fetchNuGet { pname = "TransparentValueObjects"; version = "1.0.1"; hash = "sha256-nTnJNjj0p0ztiZA9DPYdzTWKHXC2C6uQXJG7Pad//rA="; }) + (fetchNuGet { pname = "TextMateSharp"; version = "1.0.64"; hash = "sha256-49Fdf6ndcb4BKMlWYjkjpJ3pLp17Z10FcGJpfdXvvzc="; }) + (fetchNuGet { pname = "TextMateSharp.Grammars"; version = "1.0.59"; hash = "sha256-ru5VxQK4PFRJhHu+MvCzDt3EwbC/94n1whtDovUAUDA="; }) + (fetchNuGet { pname = "TextMateSharp.Grammars"; version = "1.0.64"; hash = "sha256-ykBZOyvaX1/iFmZjue754qJG4jfPx38ZdHevEZvh7w8="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.20.0"; hash = "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="; }) + (fetchNuGet { pname = "TransparentValueObjects"; version = "1.0.2"; hash = "sha256-5d9pIf8hbbcBtj6/oc87f98xEuhBiT6Yq5FR2b/mvUQ="; }) (fetchNuGet { pname = "Validation"; version = "2.3.7"; hash = "sha256-VTSUT1Ij87fN8zlz7w2HTIUMMx3NBRdbfXmMtFvV5es="; }) (fetchNuGet { pname = "Validation"; version = "2.4.18"; hash = "sha256-ByITVSjsqVglWPIRaZ3i1P3bHh8+OB6BWgDA8f8qTFI="; }) (fetchNuGet { pname = "ValveKeyValue"; version = "0.10.0.360"; hash = "sha256-LPQ6isUsA3cQKiO6ADijrCQ2ucx4TD01+kGzei3jIGY="; }) - (fetchNuGet { pname = "Verify"; version = "21.3.0"; hash = "sha256-6KO3r+oLH8s3kk/HDDh51OuAmwPpd7hhxaAF9Q4MhuE="; }) - (fetchNuGet { pname = "Verify"; version = "24.2.0"; hash = "sha256-wYm+h4wNoljNb3TZ+m25l6m0bGztZUkvygQektZrezA="; }) - (fetchNuGet { pname = "Verify"; version = "26.6.0"; hash = "sha256-kwPXrg+MLhp25lphCKfeS7f6NRwojfM1ichJUV4Ssy0="; }) - (fetchNuGet { pname = "Verify.ImageMagick"; version = "3.4.2"; hash = "sha256-FOS9yiV90VSb1QD5bEM3aorLc/MDqXZtfJGp8H3qsDw="; }) - (fetchNuGet { pname = "Verify.SourceGenerators"; version = "2.2.0"; hash = "sha256-GOI0iRFa1qekkERAPc/FZlEbEDlw3CyoAF/k8w/LwmU="; }) - (fetchNuGet { pname = "Verify.Xunit"; version = "26.6.0"; hash = "sha256-cPFPTa1not6565QD5k4PRr/EdFtDl0Hbh2Qu/qyCybM="; }) + (fetchNuGet { pname = "Verify"; version = "26.5.0"; hash = "sha256-74kcD01cOebR2lFFnLEJseY6wLpoBzA5FPa73rWIoMM="; }) + (fetchNuGet { pname = "Verify"; version = "27.0.0"; hash = "sha256-eBvZNh7NAUJgyHD/LOdxhd0GnZOADdshhb0HA8Gz8j8="; }) + (fetchNuGet { pname = "Verify"; version = "28.2.1"; hash = "sha256-SF2IgbAseEANZDnFXGd//oQ9uLusWrk0TY/GynyBqTI="; }) + (fetchNuGet { pname = "Verify.ImageMagick"; version = "3.6.0"; hash = "sha256-U6i0pR1ceSDy7+iiRN8RQen3okp6X3De0DK8R5IxxfA="; }) + (fetchNuGet { pname = "Verify.SourceGenerators"; version = "2.5.0"; hash = "sha256-i9TpQJ2+JhSQ7RXkdmC6pkND32V4cLyEaPLGrD/EpYk="; }) + (fetchNuGet { pname = "Verify.Xunit"; version = "28.2.1"; hash = "sha256-2PeJmxMrO8Q3muNtPdscxLsb9q04cTPZ8jQZIG1mDbM="; }) + (fetchNuGet { pname = "Weave"; version = "2.1.0"; hash = "sha256-jyo3pdqJOz3y1GO//jIGxJ9WwRlqMFK+BZET4NfSHVw="; }) (fetchNuGet { pname = "xunit"; version = "2.9.2"; hash = "sha256-h5+yTTfCmokCPy4lqdEw8RGzQlrlsQAW3Am0Jh0q7oo="; }) (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.1"; hash = "sha256-v5iPVeoUFsZp9zQMt3rg6xgw6UwF4VMIgzVYFIeb/zA="; }) (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.2"; hash = "sha256-w5APCW7suBdoDOmQqm/8Gq6+Sk88JcTR09zjmj9s17E="; }) @@ -661,19 +622,18 @@ (fetchNuGet { pname = "xunit.assert"; version = "2.3.0"; hash = "sha256-lN+NiUEQoHWmoamUjvsNt2PVhHXYeHJHjHRk1BTs6R8="; }) (fetchNuGet { pname = "xunit.assert"; version = "2.9.2"; hash = "sha256-EE6r526Q4cHn0Ourf1ENpXZ37Lj/P2uNvonHgpdcnq4="; }) (fetchNuGet { pname = "xunit.core"; version = "2.9.2"; hash = "sha256-zhjV1I5xh0RFckgTEK72tIkLxVl4CPmter2UB++oye8="; }) - (fetchNuGet { pname = "Xunit.DependencyInjection"; version = "9.4.0"; hash = "sha256-wK569FbONK5cXoKT0hQEiNA46gRAv00hBmsWIaeYoGs="; }) + (fetchNuGet { pname = "Xunit.DependencyInjection"; version = "9.0.0"; hash = "sha256-nH51bonRwshBIaRYHQr9DUZrQo8q5dggJ03+ngC5bXg="; }) + (fetchNuGet { pname = "Xunit.DependencyInjection"; version = "9.6.0"; hash = "sha256-lZVjKJH961mNw7aX32aG7wSZyCgHoT9okuX92HNqF9c="; }) (fetchNuGet { pname = "Xunit.DependencyInjection.Logging"; version = "9.0.0"; hash = "sha256-9MerQYIgsByxcZmczyp/fW6ZWgzo4ql6j9Iv/Y47E4A="; }) (fetchNuGet { pname = "Xunit.DependencyInjection.SkippableFact"; version = "9.0.0"; hash = "sha256-Ub6eSd9/bIhgbqQO+yWtiGfuLIkxSgl6TWfUL4ABkFI="; }) (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.2.0"; hash = "sha256-et3Se7paKJlg8Ha4Xr9+He40M6vblxyOwS2BQxOgLlE="; }) (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.0"; hash = "sha256-LbuXEcEJjGn3L6FCbC119+MY/QLvfLlGkCeAsCsZqGE="; }) (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.2"; hash = "sha256-wlTMUOQg5NaAPEsWkNSr8QSPbbCNSicpFajp1rowCsA="; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.9.0"; hash = "sha256-dYulj4Y+kEs2dpjGvKPuIhk3gszlVo+yN1XSfjrjPxw="; }) (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.9.2"; hash = "sha256-MQAC/4d67Nssu3R+pHPh6vHitBXQYxEEZkVVMGW720c="; }) (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.0"; hash = "sha256-chRJEazwq93yhVONlbtTI1znqYy0gdAoQajPRnhM/i4="; }) (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.2"; hash = "sha256-l5Q60IBYWE5tYJCdFEEQnO5rIlXcNEM5S4Ut8vFnL2U="; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.9.0"; hash = "sha256-1wRMsC+ZGdP4U/turB4mRfO0yh6uN47Vn1DJHyN/N3s="; }) (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.9.2"; hash = "sha256-f+9UfoPyK3JIDhQSW0Yu9c4PGqUqZC96DMINCYi2i80="; }) (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.8.2"; hash = "sha256-UlfK348r8kJuraywfdCtpJJxHkv04wPNzpUaz4UM/60="; }) (fetchNuGet { pname = "Xunit.SkippableFact"; version = "1.4.13"; hash = "sha256-pLtx0/2oTKYO1Y1Vg3k/Eli2OWHT5uorGdBp2uXvFfw="; }) - (fetchNuGet { pname = "ZstdSharp.Port"; version = "0.8.1"; hash = "sha256-PeQvyz3lUrK+t+n1dFtNXCLztQtAfkqUuM6mOqBZHLg="; }) + (fetchNuGet { pname = "ZstdSharp.Port"; version = "0.8.2"; hash = "sha256-mwU4YWaBrbbqQeQ+7ohm/0ewWPD6S8Y2pg6Rqxbi4Ts="; }) ] diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 2c91a23febf9..0e67d7fd783b 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -5,7 +5,7 @@ copyDesktopItems, desktop-file-utils, dotnetCorePackages, - fetchFromGitHub, + fetchgit, imagemagick, lib, runCommand, @@ -24,14 +24,14 @@ let in buildDotnetModule (finalAttrs: { inherit pname; - version = "0.6.3"; + version = "0.7.0"; - src = fetchFromGitHub { - owner = "Nexus-Mods"; - repo = "NexusMods.App"; - rev = "v${finalAttrs.version}"; + src = fetchgit { + url = "https://github.com/Nexus-Mods/NexusMods.App.git"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-7o+orpXLvZa+F0wEh3nVnYMe4ZkiaVJQOWvhWdNmcSk="; fetchSubmodules = true; - hash = "sha256-6oygXJEiTqb0xe7mKRUsZgghfTqrllCRXJy6IDeqJQI="; + fetchLFS = true; }; enableParallelBuilding = false; @@ -59,8 +59,14 @@ buildDotnetModule (finalAttrs: { nugetDeps = ./deps.nix; mapNuGetDependencies = true; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; + # TODO: remove .NET 8; StrawberryShake currently needs it + dotnet-sdk = + with dotnetCorePackages; + combinePackages [ + sdk_9_0 + runtime_8_0 + ]; + dotnet-runtime = dotnetCorePackages.runtime_9_0; postPatch = '' # for some reason these tests fail (intermittently?) with a zero timestamp @@ -103,7 +109,7 @@ buildDotnetModule (finalAttrs: { executables = [ "NexusMods.App" ]; dotnetBuildFlags = [ - # From https://github.com/Nexus-Mods/NexusMods.App/blob/v0.6.3/src/NexusMods.App/app.pupnet.conf#L38 + # From https://github.com/Nexus-Mods/NexusMods.App/blob/v0.7.0/src/NexusMods.App/app.pupnet.conf#L38 "--property:Version=${finalAttrs.version}" "--property:TieredCompilation=true" "--property:PublishReadyToRun=true" From 9daaf476b92e80b1b9f29090033c0eb10a4afd0c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 00:22:36 +0100 Subject: [PATCH 0405/1054] python312Packages.timm: 1.0.11 -> 1.0.12 Diff: https://github.com/huggingface/pytorch-image-models/compare/refs/tags/v1.0.11...v1.0.12 Changelog: https://github.com/huggingface/pytorch-image-models/blob/v1.0.12/README.md#whats-new --- pkgs/development/python-modules/timm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index a85434931992..0601406e21fc 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "timm"; - version = "1.0.11"; + version = "1.0.12"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "pytorch-image-models"; rev = "refs/tags/v${version}"; - hash = "sha256-+e4+k1Oyxf94rLsOTWfMl5YWTteXgSoecvbyxL348kg="; + hash = "sha256-Csw9Al9AHZbqfadch6JXSsjKfEj0KcLKxFbteDkcyng="; }; build-system = [ pdm-backend ]; From 78550eef9418525a157648a7feeab354f5ccb66c Mon Sep 17 00:00:00 2001 From: dish Date: Tue, 3 Dec 2024 18:30:07 -0500 Subject: [PATCH 0406/1054] webpack-cli: init at 5.1.4 --- pkgs/by-name/we/webpack-cli/package.nix | 61 +++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 pkgs/by-name/we/webpack-cli/package.nix diff --git a/pkgs/by-name/we/webpack-cli/package.nix b/pkgs/by-name/we/webpack-cli/package.nix new file mode 100644 index 000000000000..68b8a8ae80f9 --- /dev/null +++ b/pkgs/by-name/we/webpack-cli/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + gitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "webpack-cli"; + version = "5.1.4"; + + src = fetchFromGitHub { + owner = "webpack"; + repo = "webpack-cli"; + rev = "refs/tags/webpack-cli@${finalAttrs.version}"; + hash = "sha256-OjehyUw54n7/CKbDTVFCtcUp88tJCLUlBCJBQRXoyZM="; + }; + + yarnKeepDevDeps = true; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-+SntrxvFoReQXqyFqnCRCx3nftzcNioQCw6IHe8GztI="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + # Needed for executing package.json scripts + nodejs + ]; + + preInstall = '' + cp -r node_modules/* packages/webpack-cli/node_modules/ + cp yarn.lock packages/webpack-cli/yarn.lock + cd packages/webpack-cli + ''; + + postFixup = '' + mv $out/bin/webpack-cli $out/bin/webpack + ''; + + passthru.updateScript = gitUpdater { + rev-prefix = "webpack-cli@"; + }; + + meta = { + changelog = "https://github.com/webpack/webpack-cli/blob/webpack-cli%2540${finalAttrs.version}/CHANGELOG.md"; + description = "Webpack's Command Line Interface"; + homepage = "https://webpack.js.org/api/cli/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "webpack"; + }; +}) From e39392ea2ce162c29af4915543ac4fed7bd5e852 Mon Sep 17 00:00:00 2001 From: dish Date: Tue, 3 Dec 2024 18:37:58 -0500 Subject: [PATCH 0407/1054] nodePackages.webpack-cli: make alias to pkgs.webpack-cli --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 206 ------------------ 3 files changed, 1 insertion(+), 207 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index a65be6e33ae7..f901d89a527d 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -208,6 +208,7 @@ mapAliases { vue-language-server = self.vls; # added 2023-08-20 vue-cli = throw "vue-cli has been removed since upstream no longer recommends using it; consider using create-vue and the new Vite-based tooling instead."; # added 2024-07-12 inherit (pkgs) web-ext; # added 2023-08-20 + inherit (pkgs) webpack-cli; # added 2024-12-03 inherit (pkgs) wrangler; # added 2024-07-01 inherit (pkgs) write-good; # added 2023-08-20 inherit (pkgs) yalc; # added 2024-06-29 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 24a13c554103..bc32b465382e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -229,7 +229,6 @@ , "vscode-json-languageserver" , "wavedrom-cli" , "webpack" -, "webpack-cli" , "webpack-dev-server" , "copy-webpack-plugin" , "webtorrent-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index e7c23ab18931..d45955891282 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4063,15 +4063,6 @@ let sha512 = "fneVypElGUH6Be39mlRZeAu00pccTlf4oVuzf9xPJD1cdEqI8NyAiQua/EW7lZdrbMUbgyXcJmfKPefhYius3A=="; }; }; - "@discoveryjs/json-ext-0.5.7" = { - name = "_at_discoveryjs_slash_json-ext"; - packageName = "@discoveryjs/json-ext"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"; - sha512 = "dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="; - }; - }; "@edge-runtime/format-2.2.1" = { name = "_at_edge-runtime_slash_format"; packageName = "@edge-runtime/format"; @@ -12037,33 +12028,6 @@ let sha512 = "YYRBpDCBLeYJBO+sVapLRkEE/+wrjv1O03IEybkqyls3sCZqhu3ZXjJwMSMCgFEyYP2MrdZvqL/dz2RBnULTbA=="; }; }; - "@webpack-cli/configtest-2.1.1" = { - name = "_at_webpack-cli_slash_configtest"; - packageName = "@webpack-cli/configtest"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz"; - sha512 = "wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw=="; - }; - }; - "@webpack-cli/info-2.0.2" = { - name = "_at_webpack-cli_slash_info"; - packageName = "@webpack-cli/info"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz"; - sha512 = "zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A=="; - }; - }; - "@webpack-cli/serve-2.0.5" = { - name = "_at_webpack-cli_slash_serve"; - packageName = "@webpack-cli/serve"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz"; - sha512 = "lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ=="; - }; - }; "@webtorrent/http-node-1.3.0" = { name = "_at_webtorrent_slash_http-node"; packageName = "@webtorrent/http-node"; @@ -53712,15 +53676,6 @@ let sha512 = "KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg=="; }; }; - "webpack-cli-5.1.4" = { - name = "webpack-cli"; - packageName = "webpack-cli"; - version = "5.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz"; - sha512 = "pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg=="; - }; - }; "webpack-dev-middleware-5.3.4" = { name = "webpack-dev-middleware"; packageName = "webpack-dev-middleware"; @@ -53757,15 +53712,6 @@ let sha512 = "YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow=="; }; }; - "webpack-merge-5.10.0" = { - name = "webpack-merge"; - packageName = "webpack-merge"; - version = "5.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz"; - sha512 = "+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA=="; - }; - }; "webpack-sources-2.3.1" = { name = "webpack-sources"; packageName = "webpack-sources"; @@ -54063,15 +54009,6 @@ let sha512 = "b3Ni/3kKzoHfqL8OdbwHELvEdFt3jyZfjgNXzz0pDvAu7++DdaKE9iCceyzHS2lOdAidyREcUVRY4F9kWwd/Lg=="; }; }; - "wildcard-2.0.1" = { - name = "wildcard"; - packageName = "wildcard"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz"; - sha512 = "CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ=="; - }; - }; "window-size-0.2.0" = { name = "window-size"; packageName = "window-size"; @@ -83770,149 +83707,6 @@ in bypassCache = true; reconstructLock = true; }; - webpack-cli = nodeEnv.buildNodePackage { - name = "webpack-cli"; - packageName = "webpack-cli"; - version = "5.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz"; - sha512 = "pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg=="; - }; - dependencies = [ - sources."@discoveryjs/json-ext-0.5.7" - sources."@jridgewell/gen-mapping-0.3.5" - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/source-map-0.3.6" - sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.25" - sources."@types/estree-1.0.6" - sources."@types/json-schema-7.0.15" - sources."@types/node-22.5.5" - sources."@webassemblyjs/ast-1.12.1" - sources."@webassemblyjs/floating-point-hex-parser-1.11.6" - sources."@webassemblyjs/helper-api-error-1.11.6" - sources."@webassemblyjs/helper-buffer-1.12.1" - sources."@webassemblyjs/helper-numbers-1.11.6" - sources."@webassemblyjs/helper-wasm-bytecode-1.11.6" - sources."@webassemblyjs/helper-wasm-section-1.12.1" - sources."@webassemblyjs/ieee754-1.11.6" - sources."@webassemblyjs/leb128-1.11.6" - sources."@webassemblyjs/utf8-1.11.6" - sources."@webassemblyjs/wasm-edit-1.12.1" - sources."@webassemblyjs/wasm-gen-1.12.1" - sources."@webassemblyjs/wasm-opt-1.12.1" - sources."@webassemblyjs/wasm-parser-1.12.1" - sources."@webassemblyjs/wast-printer-1.12.1" - sources."@webpack-cli/configtest-2.1.1" - sources."@webpack-cli/info-2.0.2" - sources."@webpack-cli/serve-2.0.5" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" - sources."acorn-8.12.1" - sources."acorn-import-attributes-1.9.5" - sources."ajv-6.12.6" - sources."ajv-keywords-3.5.2" - sources."browserslist-4.23.3" - sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001662" - sources."chrome-trace-event-1.0.4" - sources."clone-deep-4.0.1" - sources."colorette-2.0.20" - sources."commander-10.0.1" - sources."cross-spawn-7.0.3" - sources."electron-to-chromium-1.5.26" - sources."enhanced-resolve-5.17.1" - sources."envinfo-7.14.0" - sources."es-module-lexer-1.5.4" - sources."escalade-3.2.0" - sources."eslint-scope-5.1.1" - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" - sources."events-3.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fastest-levenshtein-1.0.16" - sources."find-up-4.1.0" - sources."flat-5.0.2" - sources."function-bind-1.1.2" - sources."glob-to-regexp-0.4.1" - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."hasown-2.0.2" - sources."import-local-3.2.0" - sources."interpret-3.1.1" - sources."is-core-module-2.15.1" - sources."is-plain-object-2.0.4" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."jest-worker-27.5.1" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-0.4.1" - sources."kind-of-6.0.3" - sources."loader-runner-4.3.0" - sources."locate-path-5.0.0" - sources."merge-stream-2.0.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."neo-async-2.6.2" - sources."node-releases-2.0.18" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."picocolors-1.1.0" - sources."pkg-dir-4.2.0" - sources."punycode-2.3.1" - sources."randombytes-2.1.0" - sources."rechoir-0.8.0" - sources."resolve-1.22.8" - sources."resolve-cwd-3.0.0" - sources."resolve-from-5.0.0" - sources."safe-buffer-5.2.1" - sources."schema-utils-3.3.0" - sources."serialize-javascript-6.0.2" - sources."shallow-clone-3.0.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" - sources."supports-color-8.1.1" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."tapable-2.2.1" - (sources."terser-5.33.0" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) - sources."terser-webpack-plugin-5.3.10" - sources."undici-types-6.19.8" - sources."update-browserslist-db-1.1.0" - sources."uri-js-4.4.1" - sources."watchpack-2.4.2" - sources."webpack-5.94.0" - sources."webpack-cli-5.1.4" - sources."webpack-merge-5.10.0" - sources."webpack-sources-3.2.3" - sources."which-2.0.2" - sources."wildcard-2.0.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "CLI for webpack & friends"; - homepage = "https://github.com/webpack/webpack-cli/tree/master/packages/webpack-cli"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; From be7c21ed1b85906c8825e807aaebc48793877cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Dec 2024 16:00:41 -0800 Subject: [PATCH 0408/1054] mollysocket: 1.5.3 -> 1.5.4 Diff: https://github.com/mollyim/mollysocket/compare/1.5.3...1.5.4 Changelog: https://github.com/mollyim/mollysocket/releases/tag/1.5.4 --- pkgs/by-name/mo/mollysocket/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mollysocket/package.nix b/pkgs/by-name/mo/mollysocket/package.nix index 9199b54617d9..992d3bdfd93d 100644 --- a/pkgs/by-name/mo/mollysocket/package.nix +++ b/pkgs/by-name/mo/mollysocket/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "mollysocket"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "mollyim"; repo = "mollysocket"; rev = version; - hash = "sha256-2OWkPTbrD4oXHoB+qszVjLr0e/AUuNnuaYXZ3kOyuxg="; + hash = "sha256-kWmftkzxhVkXQ8EcGJz+Yg6o9OubIMQprwDrcKb2HWQ="; }; - cargoHash = "sha256-fVH5gzQYzW6uIBO8Fob04IiVyxHDh+Pr21rSow40qLk="; + cargoHash = "sha256-UgJI9lUbvX/Yw90fo6/voX9noWZH8XVssOR4DpquHUY="; nativeBuildInputs = [ pkg-config From abcbf25970b0d707b0e7aac60fe02b06037f278d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 4 Dec 2024 09:58:24 +1000 Subject: [PATCH 0409/1054] go_1_22: 1.22.9 -> 1.22.10 Changelog: https://go.dev/doc/devel/release#go1.22.10 --- pkgs/development/compilers/go/1.22.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index 4bb68cb2d3e8..d0f0a4e7ff68 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.22.9"; + version = "1.22.10"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-6Bo2L1Gu4hJXIrAY5GcU5qBVoZVCg0FMD5N+c3AT2yI="; + hash = "sha256-HpT9SL51DR+vtNmztt0xpunSc10zm/JGK8l7ZMpMEDc="; }; strictDeps = true; @@ -179,7 +179,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}"; + changelog = "https://go.dev/doc/devel/release#go${finalAttrs.version}"; description = "Go Programming language"; homepage = "https://go.dev/"; license = licenses.bsd3; From 739502db650007453e59781b2e6891a94d7807fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 00:11:49 +0000 Subject: [PATCH 0410/1054] python312Packages.notobuilder: 0-unstable-2024-08-03 -> 0-unstable-2024-09-25 --- pkgs/development/python-modules/notobuilder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/notobuilder/default.nix b/pkgs/development/python-modules/notobuilder/default.nix index 0dce59c8d16b..ddcba7fbccd3 100644 --- a/pkgs/development/python-modules/notobuilder/default.nix +++ b/pkgs/development/python-modules/notobuilder/default.nix @@ -21,14 +21,14 @@ buildPythonPackage { pname = "notobuilder"; - version = "0-unstable-2024-08-03"; + version = "0-unstable-2024-09-25"; pyproject = true; src = fetchFromGitHub { owner = "notofonts"; repo = "notobuilder"; - rev = "d7bcfc8e5c5ee9b273e7b1eeb2dd6d619da68c33"; - hash = "sha256-1tdHbJixd1s1grGh0enqXhp+u5TEic6/W88X/f8vagM="; + rev = "8a60f1599ce86c4b3eacb5d01c3f17162bab67d3"; + hash = "sha256-YBiDOnt2B7I/AcEfFgGrdzN/tNz/tQO0cv9N4PupPCE="; }; postPatch = '' From 1e6b74a8bdc3302bcdc5fb80643a380872394170 Mon Sep 17 00:00:00 2001 From: Travis Date: Tue, 3 Dec 2024 15:17:04 -0700 Subject: [PATCH 0411/1054] maintainers: add travgm --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b7842f942bc5..b29969e13316 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22579,6 +22579,12 @@ githubId = 2125828; name = "Alex Davies"; }; + travgm = { + email = "travis@travgm.org"; + github = "travgm"; + githubId = 99630881; + name = "Travis Montoya"; + }; travisbhartwell = { email = "nafai@travishartwell.net"; github = "travisbhartwell"; From b9be34f7cd796cae91da63208933de01232e4e11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 00:18:43 +0000 Subject: [PATCH 0412/1054] handheld-daemon-ui: 3.2.3 -> 3.3.0 --- pkgs/by-name/ha/handheld-daemon-ui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/handheld-daemon-ui/package.nix b/pkgs/by-name/ha/handheld-daemon-ui/package.nix index 00c830bd3fc6..28ebc6cb1a1e 100644 --- a/pkgs/by-name/ha/handheld-daemon-ui/package.nix +++ b/pkgs/by-name/ha/handheld-daemon-ui/package.nix @@ -5,11 +5,11 @@ }: let pname = "handheld-daemon-ui"; - version = "3.2.3"; + version = "3.3.0"; src = fetchurl { url = "https://github.com/hhd-dev/hhd-ui/releases/download/v${version}/hhd-ui.Appimage"; - hash = "sha256-VhJrOvE+BebJIAeQlwOOsPfqSrvBnJQavGT7glTrG2o="; + hash = "sha256-Fc2MwZoy1CKiWvh/Z1P0OnfkyWy4aT6I1aIY8gEf69U="; }; extractedFiles = appimageTools.extractType2 { inherit pname version src; }; in From 006cc2991878ef186be8f8e7c82d839ad18c585b Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sat, 16 Nov 2024 12:02:20 +0900 Subject: [PATCH 0413/1054] nb: 7.14.4 -> 7.14.6 Diff: https://github.com/xwmx/nb/compare/7.14.4...7.14.6 --- pkgs/by-name/nb/nb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix index 44239528ccd4..624651e1ac5d 100644 --- a/pkgs/by-name/nb/nb/package.nix +++ b/pkgs/by-name/nb/nb/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "7.14.4"; + version = "7.14.6"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - sha256 = "sha256-YqqZZnin+aybAZ2dqaxdOrVZ7dLWwnjh2iL77orqHtE="; + sha256 = "sha256-VcYE1luwNtdrOmjTDKkIAX9rmcbFyCBtnib+c9FyJuA="; }; nativeBuildInputs = [ installShellFiles ]; From 463a8461b54486b2c698258e34ee91db20e062a7 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 2 Dec 2024 17:34:23 +0900 Subject: [PATCH 0414/1054] nb: prefer `hash` rather than `sha256` in fetchFromGitHub https://github.com/NixOS/nixpkgs/pull/356336/files#r1865416515 Co-authored-by: kirillrdy --- pkgs/by-name/nb/nb/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix index 624651e1ac5d..c94a44bc7cbd 100644 --- a/pkgs/by-name/nb/nb/package.nix +++ b/pkgs/by-name/nb/nb/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "xwmx"; repo = "nb"; rev = version; - sha256 = "sha256-VcYE1luwNtdrOmjTDKkIAX9rmcbFyCBtnib+c9FyJuA="; + hash = "sha256-VcYE1luwNtdrOmjTDKkIAX9rmcbFyCBtnib+c9FyJuA="; }; nativeBuildInputs = [ installShellFiles ]; From 81c4870a68b767bf4df6138e096b8d0d8b414f67 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sat, 16 Nov 2024 02:33:09 +0900 Subject: [PATCH 0415/1054] cyme: 1.8.4 -> 1.8.5 Changelog: https://github.com/tuna-f1sh/cyme/blob/a7fdf783cb25c158d75502b95236a4cafcd22e46/CHANGELOG.md?plain=1#L3-L11 Diff: https://github.com/tuna-f1sh/cyme/compare/v1.8.4...v1.8.5 --- pkgs/by-name/cy/cyme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index 341fa8b0dfa2..329f92521f8f 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cyme"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "tuna-f1sh"; repo = "cyme"; rev = "v${version}"; - hash = "sha256-5433lq3u+s4LiC9089Ul7wGJiouQdVDoM3RT0QSiAnU="; + hash = "sha256-4lnW6p7MaAZdvyXddIoB8TuEQSCmBYOwyvOA1r2ZKxk="; }; - cargoHash = "sha256-EW4M072qWCghg4UlhjMBR6DVzKsu/foE+j4MOSiHqNk="; + cargoHash = "sha256-sg6nIIiHUXHLnvn25kKWqqa8WV86D/arl4t3EUByQBQ="; nativeBuildInputs = [ pkg-config From 47c8b8a8a4f1c568be4546dc689fa2e17cbca3fc Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 2 Dec 2024 11:38:09 +0900 Subject: [PATCH 0416/1054] gopass: format with nixfmt-rfc-style --- pkgs/tools/security/gopass/default.nix | 63 ++++++++++++++++---------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 68b794214f6e..070aa5beebc8 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,21 +1,25 @@ -{ lib -, stdenv -, makeWrapper -, buildGoModule -, fetchFromGitHub -, installShellFiles -, git -, gnupg -, xclip -, wl-clipboard -, passAlias ? false +{ + lib, + stdenv, + makeWrapper, + buildGoModule, + fetchFromGitHub, + installShellFiles, + git, + gnupg, + xclip, + wl-clipboard, + passAlias ? false, }: buildGoModule rec { pname = "gopass"; version = "1.15.14"; - nativeBuildInputs = [ installShellFiles makeWrapper ]; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; src = fetchFromGitHub { owner = "gopasspw"; @@ -28,25 +32,33 @@ buildGoModule rec { subPackages = [ "." ]; - ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=${src.rev}" + ]; wrapperPath = lib.makeBinPath ( [ git gnupg xclip - ] ++ lib.optional stdenv.hostPlatform.isLinux wl-clipboard + ] + ++ lib.optional stdenv.hostPlatform.isLinux wl-clipboard ); - postInstall = '' - installManPage gopass.1 - installShellCompletion --cmd gopass \ - --zsh zsh.completion \ - --bash bash.completion \ - --fish fish.completion - '' + lib.optionalString passAlias '' - ln -s $out/bin/gopass $out/bin/pass - ''; + postInstall = + '' + installManPage gopass.1 + installShellCompletion --cmd gopass \ + --zsh zsh.completion \ + --bash bash.completion \ + --fish fish.completion + '' + + lib.optionalString passAlias '' + ln -s $out/bin/gopass $out/bin/pass + ''; postFixup = '' wrapProgram $out/bin/gopass \ @@ -61,7 +73,10 @@ buildGoModule rec { description = "Slightly more awesome Standard Unix Password Manager for Teams. Written in Go"; homepage = "https://www.gopass.pw/"; license = licenses.mit; - maintainers = with maintainers; [ rvolosatovs sikmir ]; + maintainers = with maintainers; [ + rvolosatovs + sikmir + ]; changelog = "https://github.com/gopasspw/gopass/blob/v${version}/CHANGELOG.md"; longDescription = '' From 8780e5fb89ad77fb99532ae898e2af0b57f6c21c Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 2 Dec 2024 11:38:56 +0900 Subject: [PATCH 0417/1054] gopass: add updateScript --- pkgs/tools/security/gopass/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 070aa5beebc8..56281de02ee4 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -10,6 +10,7 @@ xclip, wl-clipboard, passAlias ? false, + nix-update-script, }: buildGoModule rec { @@ -67,6 +68,8 @@ buildGoModule rec { ''; passthru = { inherit wrapperPath; + + updateScript = nix-update-script { }; }; meta = with lib; { From 1da2983cbd4baa81f5c7f7e89bd20a9a09b38691 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 2 Dec 2024 11:41:00 +0900 Subject: [PATCH 0418/1054] gopass: add passthru.tests.version --- pkgs/tools/security/gopass/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 56281de02ee4..e88eb4eb7398 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -10,7 +10,9 @@ xclip, wl-clipboard, passAlias ? false, + testers, nix-update-script, + gopass, }: buildGoModule rec { @@ -69,6 +71,10 @@ buildGoModule rec { passthru = { inherit wrapperPath; + tests.version = testers.testVersion { + package = gopass; + }; + updateScript = nix-update-script { }; }; From 29ba792f88bcbb974b57cffd74f616583ffef981 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 00:32:14 +0000 Subject: [PATCH 0419/1054] silx: 2.1.1 -> 2.1.2 --- pkgs/by-name/si/silx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/silx/package.nix b/pkgs/by-name/si/silx/package.nix index 3fa944d5ae53..6b80d173da79 100644 --- a/pkgs/by-name/si/silx/package.nix +++ b/pkgs/by-name/si/silx/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "silx"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-LfCRWkUrqQb7zxiFTPhy/g9FWhNMXTRbhEgek4tZb5I="; + hash = "sha256-Uep/BkH3ngGDbPMVptab64SKBbOGqa0qazUoT47idqU="; }; build-system = with python3Packages; [ From 2e03f7f53b9e2e9a2485da72658cf5952bf384a8 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 2 Dec 2024 16:06:51 +0900 Subject: [PATCH 0420/1054] k9s: 0.32.6 -> 0.32.7 Release: https://github.com/derailed/k9s/releases/tag/v0.32.7 --- pkgs/by-name/k9/k9s/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix index db7c852048b0..79898bbab638 100644 --- a/pkgs/by-name/k9/k9s/package.nix +++ b/pkgs/by-name/k9/k9s/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.32.6"; + version = "0.32.7"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-jJHlFrnyvGZ0/ykmZRbSAFwzvN0j2dqddLEQoiv3oys="; + hash = "sha256-0S6FomP1WVqYl5nP0FcaElgghMcZmE0V8iLhghERF6A="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-/DVQghwfiPKLO0LFPFmHFO5jfActoEnlMuQP2i60R9o="; + vendorHash = "sha256-ENn2BpGFEpiTNZbnNVt4hv4R6NTT3GivFd3rTy3xEH8="; # TODO investigate why some config tests are failing doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); From c3cc4cc013ecf2869e1a7ee7e071d48e2c98bf4b Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 2 Dec 2024 11:42:14 +0900 Subject: [PATCH 0421/1054] gopass: 1.15.14 -> 1.15.15 Release: https://github.com/gopasspw/gopass/releases/tag/v1.15.15 --- pkgs/tools/security/gopass/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index e88eb4eb7398..c24a3536179c 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -10,6 +10,7 @@ xclip, wl-clipboard, passAlias ? false, + apple-sdk_14, testers, nix-update-script, gopass, @@ -17,21 +18,26 @@ buildGoModule rec { pname = "gopass"; - version = "1.15.14"; + version = "1.15.15"; nativeBuildInputs = [ installShellFiles makeWrapper ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + # For ScreenCaptureKit.h, see https://github.com/NixOS/nixpkgs/pull/358760#discussion_r1858327365 + apple-sdk_14 + ]; + src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass"; rev = "v${version}"; - hash = "sha256-3oXdHjW3svGfOEoikEeGm4oU9j+7IBOHw5KH7CCV/uw="; + hash = "sha256-GL0vnrNz9vcdybubYIjiK0tDH3L4lNWNo+rAAWv7d8o="; }; - vendorHash = "sha256-GeppWyIWE8kYIqhRf1iHksWksdjbIzy96rRpx+qQ3L0="; + vendorHash = "sha256-dDy7eQe/JtAsB+cPONiqUwcCsbisCLzY/5YQaH9w2Yg="; subPackages = [ "." ]; From 7c393176966921a5f51d3604c04178ea8e8873db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 00:43:16 +0000 Subject: [PATCH 0422/1054] linuxPackages.r8125: 9.013.02 -> 9.014.01 --- pkgs/os-specific/linux/r8125/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/r8125/default.nix b/pkgs/os-specific/linux/r8125/default.nix index 9b5210350bdd..ef271585efce 100644 --- a/pkgs/os-specific/linux/r8125/default.nix +++ b/pkgs/os-specific/linux/r8125/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "r8125"; # On update please verify (using `diff -r`) that the source matches the # realtek version. - version = "9.013.02"; + version = "9.014.01"; # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "louistakepillz"; repo = "r8125"; rev = version; - sha256 = "sha256-i45xKF5WVN+nNhpD6HWZHvGgxuaD/YhMHERqW8/bC5Y="; + sha256 = "sha256-vYgAOmKFQZDKrZsS3ynXB0DrT3wU0JWzNTYO6FyMG9M="; }; hardeningDisable = [ "pic" ]; From b6047c81a60f18c54faeb9e7a56a42097835b3cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Dec 2024 16:47:17 -0800 Subject: [PATCH 0423/1054] python312Packages.voip-utils: run tests --- pkgs/development/python-modules/voip-utils/default.nix | 3 --- pkgs/servers/home-assistant/default.nix | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/voip-utils/default.nix b/pkgs/development/python-modules/voip-utils/default.nix index b6c105ad9924..6cf7ebb9375d 100644 --- a/pkgs/development/python-modules/voip-utils/default.nix +++ b/pkgs/development/python-modules/voip-utils/default.nix @@ -34,9 +34,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - # no tests as of v0.1.0 - doCheck = false; - meta = { changelog = "https://github.com/home-assistant-libs/voip-utils/blob/${src.rev}/CHANGELOG.md"; description = "Voice over IP Utilities"; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 818b834349af..f1fa3e4920cc 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -360,6 +360,8 @@ let rev = "refs/tags/v${version}"; hash = "sha256-PG4L6KphH9JIZO76cCN8eClFE2CneEIExlXS+x79k3U="; }; + # tests were not implemented until version 0.2.0 + doCheck = false; }); vulcan-api = super.vulcan-api.overridePythonAttrs (oldAttrs: rec { From 1c662d56df246f5c69c595f0c781fca967b43460 Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 2 Dec 2024 21:42:23 -0500 Subject: [PATCH 0424/1054] nodePackages.stackdriver-statsd-backend: drop --- .../manual/release-notes/rl-2505.section.md | 2 ++ nixos/modules/services/monitoring/statsd.nix | 1 - pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------------ 5 files changed, 3 insertions(+), 20 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index a82932ce6626..57b6f86d4efd 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -59,6 +59,8 @@ 2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more details. +- `nodePackages.stackdriver-statsd-backend` has been removed, as the StackDriver service has been discontinued by Google, and therefore the package no longer works. + - the notmuch vim plugin now lives in a separate output of the `notmuch` package. Installing `notmuch` will not bring the notmuch vim package anymore, add `vimPlugins.notmuch-vim` to your (Neo)vim configuration if you want the diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index 814d00fadc3b..e0bd332e2418 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -87,7 +87,6 @@ in "console" "repeater" "statsd-librato-backend" - "stackdriver-statsd-backend" "statsd-influxdb-backend" ]; type = lib.types.listOf lib.types.str; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index a65be6e33ae7..79219f25a2a7 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -168,6 +168,7 @@ mapAliases { inherit (pkgs) sql-formatter; # added 2024-06-29 "@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02 ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21 + stackdriver-statsd-backend = throw "stackdriver-statsd-backend was removed because Stackdriver is now discontinued"; # added 2024-12-02 stf = throw "stf was removed because it was broken"; # added 2023-08-21 inherit (pkgs) stylelint; # added 2023-09-13 surge = pkgs.surge-cli; # Added 2023-09-08 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 24a13c554103..ff18d4e9380f 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -173,7 +173,6 @@ , "smartdc" , "socket.io" , "speed-test" -, "stackdriver-statsd-backend" , "svelte-check" , "svgo" , "tailwindcss" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index e7c23ab18931..58d3098abf0b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -79713,24 +79713,6 @@ in bypassCache = true; reconstructLock = true; }; - stackdriver-statsd-backend = nodeEnv.buildNodePackage { - name = "stackdriver-statsd-backend"; - packageName = "stackdriver-statsd-backend"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz"; - sha512 = "IqzSTHJ4EBwlhFyuWFyfecyhPEQFPzFL3/txi/VVxsMPLVt+YJm/bEkTlTPfn95/rYW1VyCfwSkdDb0HxqDwxw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Send metric data from statsd to Stackdriver"; - homepage = "https://www.stackdriver.com"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; From 986e0e650391d2b8b693e73ffef26c58f3547242 Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 2 Dec 2024 20:54:43 -0500 Subject: [PATCH 0425/1054] nodePackages.meshcommander: drop --- .../manual/release-notes/rl-2505.section.md | 2 + pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 102 ------------------ 4 files changed, 3 insertions(+), 103 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index a82932ce6626..992a6b2e72f6 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -41,6 +41,8 @@ - The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses. +- `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel. + - `kanata` was updated to v1.7.0, which introduces several breaking changes. See the release notes of [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index a65be6e33ae7..2ae6a3517482 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -134,6 +134,7 @@ mapAliases { inherit (pkgs) mathjax-node-cli; # added 2023-11-02 mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21 inherit (pkgs) mermaid-cli; # added 2023-10-01 + meshcommander = throw "meshcommander was removed because it was abandoned upstream"; # added 2024-12-02 musescore-downloader = pkgs.dl-librescore; # added 2023-08-19 inherit (pkgs) near-cli; # added 2023-09-09 neovim = pkgs.neovim-node-client; # added 2024-11-13 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 24a13c554103..129bbbe97849 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -100,7 +100,6 @@ , "graphql-language-service-cli" , "grunt-cli" , "makam" -, "meshcommander" , "gulp" , "gulp-cli" , "he" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index e7c23ab18931..050c8ac3ac6d 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -24027,15 +24027,6 @@ let sha512 = "r05VYoBL3i2pswuehoFSy+uM8NBuVaY7avp5qrYjQBDzagx2Z5A77FZqPT8/gNLF3HopWkIzaTFaC4JysWXLqg=="; }; }; - "express-ws-2.0.0" = { - name = "express-ws"; - packageName = "express-ws"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/express-ws/-/express-ws-2.0.0.tgz"; - sha512 = "Voh/dZzLoNVxd+foiLS24ch2ZBKEuSJyXjHIjE2mq5bKtII8JKUVRqhr5onD7nVXU8SCxJtn4LYKnHlypRYGOA=="; - }; - }; "ext-1.7.0" = { name = "ext"; packageName = "ext"; @@ -69216,99 +69207,6 @@ in bypassCache = true; reconstructLock = true; }; - meshcommander = nodeEnv.buildNodePackage { - name = "meshcommander"; - packageName = "meshcommander"; - version = "0.9.5-a"; - src = fetchurl { - url = "https://registry.npmjs.org/meshcommander/-/meshcommander-0.9.5-a.tgz"; - sha512 = "RneCQXwu1Nuqu69+EPHIpDkrOcMcWaacM4T8Jibk0MkcquxF2iILX5bB6joCuNHHVr1I+9fPlYQoCjN1K22deg=="; - }; - dependencies = [ - sources."accepts-1.3.8" - sources."array-flatten-1.1.1" - sources."body-parser-1.20.3" - sources."bytes-3.1.2" - sources."call-bind-1.0.7" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."cookie-0.6.0" - sources."cookie-signature-1.0.6" - sources."debug-2.6.9" - sources."define-data-property-1.1.4" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."ee-first-1.1.1" - sources."encodeurl-2.0.0" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."express-4.21.0" - sources."express-ws-2.0.0" - sources."finalhandler-1.3.1" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.4" - sources."gopd-1.0.1" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbols-1.0.3" - sources."hasown-2.0.2" - sources."http-errors-2.0.0" - sources."iconv-lite-0.4.24" - sources."inherits-2.0.4" - sources."ipaddr.js-1.9.1" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.3" - sources."methods-1.1.2" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimist-1.2.8" - sources."ms-2.0.0" - sources."negotiator-0.6.3" - sources."object-inspect-1.13.2" - sources."on-finished-2.4.1" - sources."options-0.0.6" - sources."parseurl-1.3.3" - sources."path-to-regexp-0.1.10" - sources."proxy-addr-2.0.7" - sources."qs-6.13.0" - sources."range-parser-1.2.1" - sources."raw-body-2.5.2" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - (sources."send-0.19.0" // { - dependencies = [ - sources."encodeurl-1.0.2" - sources."ms-2.1.3" - ]; - }) - sources."serve-static-1.16.2" - sources."set-function-length-1.2.2" - sources."setprototypeof-1.2.0" - sources."side-channel-1.0.6" - sources."statuses-2.0.1" - sources."toidentifier-1.0.1" - sources."type-is-1.6.18" - sources."ultron-1.0.2" - sources."unpipe-1.0.0" - sources."utils-merge-1.0.1" - sources."vary-1.1.2" - sources."ws-1.1.5" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "MeshCommander web server"; - homepage = "http://meshcommander.com"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; gulp = nodeEnv.buildNodePackage { name = "gulp"; packageName = "gulp"; From b6c8e333a5aded8b1a92d5c384e583386c900274 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 01:08:31 +0000 Subject: [PATCH 0426/1054] oauth2l: 1.3.0 -> 1.3.1 --- pkgs/by-name/oa/oauth2l/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oa/oauth2l/package.nix b/pkgs/by-name/oa/oauth2l/package.nix index c6d7070486bd..a47bece266ef 100644 --- a/pkgs/by-name/oa/oauth2l/package.nix +++ b/pkgs/by-name/oa/oauth2l/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oauth2l"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "google"; repo = "oauth2l"; rev = "v${version}"; - hash = "sha256-bL1bys/CBo/P9VfWc/FB8JHW/aBwC521V8DB1sFBIAA="; + hash = "sha256-DLZNsvM9tTfzKv6FOnsNKrDIge7yhUE7+8883E4rvQ4="; }; vendorHash = null; From a5c3dcc7605be404e6673589b23de5cff81dedd7 Mon Sep 17 00:00:00 2001 From: Geoffry Song Date: Tue, 3 Dec 2024 17:39:00 -0800 Subject: [PATCH 0427/1054] cargo-sort: revert to 1.0.9 (from 1.1.0) 1.1.0 introduced some bugs and was yanked --- pkgs/by-name/ca/cargo-sort/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-sort/package.nix b/pkgs/by-name/ca/cargo-sort/package.nix index 51994805f3dd..53f941e788d0 100644 --- a/pkgs/by-name/ca/cargo-sort/package.nix +++ b/pkgs/by-name/ca/cargo-sort/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-sort"; - version = "1.1.0"; + version = "1.0.9"; src = fetchFromGitHub { owner = "devinr528"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AUtue1xkhrhlF7PtqsCQ9rdhV0/0i85DWrp7YL9SAYk="; + sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw="; }; - cargoHash = "sha256-y6lLwk40hmFQKDU7sYz3+QQzdn5eGoEX7izmloK22dg="; + cargoHash = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU="; meta = with lib; { description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically"; From 0b8bf84eeb587a78ea105e3c424bd4f261242d3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 02:16:18 +0000 Subject: [PATCH 0428/1054] linuxPackages.vmm_clock: 0.2.0 -> 0.2.1 --- pkgs/os-specific/linux/vmm_clock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/vmm_clock/default.nix b/pkgs/os-specific/linux/vmm_clock/default.nix index 686a20ada243..870bfbe0bd6c 100644 --- a/pkgs/os-specific/linux/vmm_clock/default.nix +++ b/pkgs/os-specific/linux/vmm_clock/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vmm_clock"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "voutilad"; repo = "vmm_clock"; rev = version; - hash = "sha256-8z/N/dbkeFd40sH7jatNmSS62B88tC0jVgNljhxslOo="; + hash = "sha256-XYRxrVixvImxr2j3qxBcv1df1LvPRKqKKgegW3HqUcQ="; }; hardeningDisable = [ "pic" "format" ]; From 1ec7e4eb52f097eaf65e4c6c94bd7fdced865944 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 03:27:23 +0100 Subject: [PATCH 0429/1054] python313: 3.13.0 -> 3.13.1 https://docs.python.org/release/3.13.1/whatsnew/changelog.html --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 04b6a60ce5e4..abed1fe0a685 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -87,10 +87,10 @@ in { sourceVersion = { major = "3"; minor = "13"; - patch = "0"; + patch = "1"; suffix = ""; }; - hash = "sha256-CG3liC48sxDU3KSEV1IuLkgBjs1D2pzfgn9qB1nvsH0="; + hash = "sha256-nPlCe+6eIkLjh33Q9rZBwYU8pGHznWUDziYKWcgL8Nk="; inherit passthruFun; }; From b54f0f97eb2f34a3d3478cfc4e5e245aa1d7d0a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 03:18:06 +0000 Subject: [PATCH 0430/1054] python312Packages.aiohomeconnect: 0.6.0 -> 0.6.2 --- pkgs/development/python-modules/aiohomeconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix index 5fb81b688288..fe9776840111 100644 --- a/pkgs/development/python-modules/aiohomeconnect/default.nix +++ b/pkgs/development/python-modules/aiohomeconnect/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aiohomeconnect"; - version = "0.6.0"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiohomeconnect"; rev = "refs/tags/v${version}"; - hash = "sha256-fPjr4LygYIfSOiVU1yD6ICKkEGJMWOTRrT6oh7DBGTI="; + hash = "sha256-GW3SNJKj42WXEeHM209waCQjqi0Hy0HhG3gs0Nw2rVI="; }; pythonRelaxDeps = [ "httpx" ]; From a89cc3bf60b19f1e34262e3c7c5ad7a330947176 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 03:23:18 +0000 Subject: [PATCH 0431/1054] python312Packages.zope-exceptions: 5.1 -> 5.2 --- pkgs/development/python-modules/zope-exceptions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-exceptions/default.nix b/pkgs/development/python-modules/zope-exceptions/default.nix index 186112d1138d..2576bc4bd688 100644 --- a/pkgs/development/python-modules/zope-exceptions/default.nix +++ b/pkgs/development/python-modules/zope-exceptions/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zope-exceptions"; - version = "5.1"; + version = "5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zope.exceptions"; inherit version; - hash = "sha256-YRtMSUbDAWDbS3u9TzhhOzJoSvFn0xllCvm3O8ew6Xg="; + hash = "sha256-TLoySGeHc7usb6o641N98JqEOIG4n7noGsooLzuSsvM="; }; nativeBuildInputs = [ setuptools ]; From 0fe1d02f6037f2a290d669c9e706ed6c00641cb1 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Tue, 3 Dec 2024 19:25:26 -0800 Subject: [PATCH 0432/1054] minecraft-server: 1.21.3 -> 1.21.4 Change log: https://feedback.minecraft.net/hc/en-us/articles/32385811139085 --- pkgs/games/minecraft-servers/versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json index 39d57e02cae5..0f5a3398401e 100644 --- a/pkgs/games/minecraft-servers/versions.json +++ b/pkgs/games/minecraft-servers/versions.json @@ -1,8 +1,8 @@ { "1.21": { - "sha1": "45810d238246d90e811d896f87b14695b7fb6839", - "url": "https://piston-data.mojang.com/v1/objects/45810d238246d90e811d896f87b14695b7fb6839/server.jar", - "version": "1.21.3", + "sha1": "4707d00eb834b446575d89a61a11b5d548d8c001", + "url": "https://piston-data.mojang.com/v1/objects/4707d00eb834b446575d89a61a11b5d548d8c001/server.jar", + "version": "1.21.4", "javaVersion": 21 }, "1.20": { From 820af6cb19862e5929bc0c76b278edfc67582e3d Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Wed, 4 Dec 2024 05:29:37 +0200 Subject: [PATCH 0433/1054] aldente: 1.28.6 -> 1.29 --- pkgs/by-name/al/aldente/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/aldente/package.nix b/pkgs/by-name/al/aldente/package.nix index 56196cfbff95..91ab68e5c20a 100644 --- a/pkgs/by-name/al/aldente/package.nix +++ b/pkgs/by-name/al/aldente/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "aldente"; - version = "1.28.6"; + version = "1.29"; src = fetchurl { url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg"; - hash = "sha256-g52XHx1jK0VEgLQJL+vX16bFd8eMu0dw8Fqp4hOtVtE="; + hash = "sha256-F19DZnjnlZ7ydgNhPNUa7FqPp5/MzDcQRtksIkXgIis="; }; dontBuild = true; From 192e92d56844a401ed77011ff476f6d40864eeb5 Mon Sep 17 00:00:00 2001 From: Kaleo Date: Wed, 4 Dec 2024 11:15:29 +0800 Subject: [PATCH 0434/1054] ollama: 0.4.5 -> 0.4.7 --- pkgs/by-name/ol/ollama/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 6581a9b1b9fb..77071b9c3c3f 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -41,13 +41,13 @@ assert builtins.elem acceleration [ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.4.5"; + version = "0.4.7"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-4E3eqqJQEQYWVPFVZjnYSiXe4ZWUA0ifCRoHt7s0SL0="; + hash = "sha256-X1xGo054+MpThvZzeg/F+IBczY1wn/gTjcq+j1JztDg="; fetchSubmodules = true; }; From fa3126fe26dfa50ae18727bc3521dd9c172a8260 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 04:49:18 +0000 Subject: [PATCH 0435/1054] otb: 9.0.0 -> 9.1.0 --- pkgs/by-name/ot/otb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ot/otb/package.nix b/pkgs/by-name/ot/otb/package.nix index 920b11883b72..921e00d29e6b 100644 --- a/pkgs/by-name/ot/otb/package.nix +++ b/pkgs/by-name/ot/otb/package.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "otb"; - version = "9.0.0"; + version = "9.1.0"; src = fetchFromGitHub { owner = "orfeotoolbox"; repo = "otb"; rev = finalAttrs.version; - hash = "sha256-Ut2aimQL6Reg62iceoaM7/nRuEV8PBWtOK7KFHKp0ws="; + hash = "sha256-NRyq6WTGxtPpBHXBXLCQyq60n0cJ/575xPs7QYSziYo="; }; nativeBuildInputs = [ From e24b70c2833669e55cb92706128b44a84b4e63c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 04:49:31 +0000 Subject: [PATCH 0436/1054] mpd: 0.23.15 -> 0.23.16 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 124297a9b752..a8decc0a33ba 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -118,13 +118,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.15"; + version = "0.23.16"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-QURq7ysSsxmBOtoBlPTPWiloXQpjEdxnM0L1fLwXfpw="; + sha256 = "sha256-0To+V+4xLjymGpRSpsyE/Une5uUpCEiAg+d041guPA0="; }; buildInputs = [ From cf40653a712334796e360364ad3a8f88287f8676 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 4 Dec 2024 00:08:43 -0500 Subject: [PATCH 0437/1054] remod: init at 1.0.1 --- pkgs/by-name/re/remod/package.nix | 59 +++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 pkgs/by-name/re/remod/package.nix diff --git a/pkgs/by-name/re/remod/package.nix b/pkgs/by-name/re/remod/package.nix new file mode 100644 index 000000000000..35429a6b688f --- /dev/null +++ b/pkgs/by-name/re/remod/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "remod"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "samuela"; + repo = "remod"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-7tLxvh/pLlt3Y+PkNF0s5f/wh/wGdeDtt0dc4eQqWlw="; + }; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-94i1wduLWCGHZNoohhBfjt3i2qsWr6UznKLHXH4im+c="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + # Needed for executing package.json scripts + nodejs + ]; + + yarnBuildScript = "prepare"; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + changelog = "https://github.com/samuela/remod/releases/tag/v${finalAttrs.version}"; + description = "chmod for human beings!"; + homepage = "https://github.com/samuela/remod"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "remod"; + }; +}) From b9d879b2b99e21b2c1f5f18ef961d58545bba561 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 4 Dec 2024 13:13:25 +0800 Subject: [PATCH 0438/1054] qtcreator: 14.0.2 -> 15.0.0 --- pkgs/development/tools/qtcreator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 9956e931b064..de759bc0c87f 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "14.0.2"; + version = "15.0.0"; src = fetchurl { url = "mirror://qt/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-stL4eLtpKKjm4w2HYAvdk89ATCYZoVHGS9zcjNB4OJI="; + hash = "sha256-I7HGtHjKdgmX7N3Uxyjw2igLBpYAipvd2aEGjxbUj3I="; }; nativeBuildInputs = [ From b40ee6832e76fbef2bb3b25e503676203e3cac5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 05:17:51 +0000 Subject: [PATCH 0439/1054] python312Packages.pgspecial: 2.1.2 -> 2.1.3 --- pkgs/development/python-modules/pgspecial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index e63297219890..641416809161 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "2.1.2"; + version = "2.1.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8EGeGzt4+zpy/jtUb2eIpxIJFTLVmf51k7X27lWoj4c="; + hash = "sha256-bU0jFq/31HlU25nUw5HWwLsmVo68udFR9l2reTi2y+I="; }; build-system = [ setuptools ]; From 66e14e1b61c62f824deba0f4f912646e23d2cb9c Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 4 Dec 2024 00:20:25 -0500 Subject: [PATCH 0440/1054] nodePackages.remod-cli: remove and replace with alias to pkgs.remod --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 315 ------------------ 4 files changed, 1 insertion(+), 317 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index a65be6e33ae7..a2f56b07960e 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -159,6 +159,7 @@ mapAliases { react-tools = throw "react-tools was removed because it was deprecated"; # added 2023-09-25 readability-cli = pkgs.readability-cli; # Added 2023-06-12 inherit (pkgs) redoc-cli; # added 2023-09-12 + remod-cli = pkgs.remod; # added 2024-12-04 reveal-md = pkgs.reveal-md; # added 2023-07-31 inherit (pkgs) rtlcss; # added 2023-08-29 s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 38eb64559fd5..29b1ec824e81 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -46,7 +46,6 @@ purs-tidy = "purs-tidy"; purty = "purty"; pscid = "pscid"; - remod-cli = "remod"; vscode-json-languageserver = "vscode-json-languageserver"; webtorrent-cli = "webtorrent"; } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 24a13c554103..17e2cc00a18a 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -161,7 +161,6 @@ , "purescript-psa" , "purs-tidy" , "purty" -, "remod-cli" , "reveal.js" , "rimraf" , "rollup" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index e7c23ab18931..d36c993e3c8a 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -13963,15 +13963,6 @@ let sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; }; }; - "astral-regex-1.0.0" = { - name = "astral-regex"; - packageName = "astral-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; - sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; - }; - }; "astral-regex-2.0.0" = { name = "astral-regex"; packageName = "astral-regex"; @@ -16321,15 +16312,6 @@ let sha512 = "bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ=="; }; }; - "camelcase-keys-4.2.0" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz"; - sha512 = "Ej37YKYbFUI8QiYlvj9YHb6/Z60dZyPJW0Cs8sFilMbd2lP0bw3ylAq9yJkK4lcTA2dID5fG8LjmJYbO7kWb7Q=="; - }; - }; "camelcase-keys-6.2.2" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -16528,15 +16510,6 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; - "chalk-3.0.0" = { - name = "chalk"; - packageName = "chalk"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; - sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; - }; - }; "chalk-4.1.0" = { name = "chalk"; packageName = "chalk"; @@ -28969,15 +28942,6 @@ let sha512 = "Zfeb5ol+H+eqJWHTaGca9BovufyGeIfr4zaaBorPmJBMrJ+KBnN+kQx2ZtXdsotUTgldHmHQV44xvUWOUA7E2w=="; }; }; - "ink-2.7.1" = { - name = "ink"; - packageName = "ink"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-2.7.1.tgz"; - sha512 = "s7lJuQDJEdjqtaIWhp3KYHl6WV3J04U9zoQ6wVc+Xoa06XM27SXUY57qC5DO46xkF0CfgXMKkKNcgvSu/SAEpA=="; - }; - }; "ink-3.2.0" = { name = "ink"; packageName = "ink"; @@ -34000,15 +33964,6 @@ let sha512 = "vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg=="; }; }; - "log-update-3.4.0" = { - name = "log-update"; - packageName = "log-update"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-3.4.0.tgz"; - sha512 = "ILKe88NeMt4gmDvk/eb615U/IVn7K9KWGkoYbdatQ69Z65nj1ZzjM6fHXfcs0Uge+e+EGnMW7DY4T9yko8vWFg=="; - }; - }; "log-update-5.0.1" = { name = "log-update"; packageName = "log-update"; @@ -34505,15 +34460,6 @@ let sha512 = "7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="; }; }; - "map-obj-2.0.0" = { - name = "map-obj"; - packageName = "map-obj"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz"; - sha512 = "TzQSV2DiMYgoF5RycneKVUzIa9bQsj/B3tTgsE3dOGqlzHnGIDaC7XBE7grnA+8kZPnfqSGFe95VHc2oc0VFUQ=="; - }; - }; "map-obj-4.3.0" = { name = "map-obj"; packageName = "map-obj"; @@ -35333,15 +35279,6 @@ let sha512 = "TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA=="; }; }; - "meow-5.0.0" = { - name = "meow"; - packageName = "meow"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz"; - sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; - }; - }; "meow-8.1.2" = { name = "meow"; packageName = "meow"; @@ -36521,15 +36458,6 @@ let sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; }; }; - "minimist-options-3.0.2" = { - name = "minimist-options"; - packageName = "minimist-options"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz"; - sha512 = "FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ=="; - }; - }; "minimist-options-4.1.0" = { name = "minimist-options"; packageName = "minimist-options"; @@ -42408,15 +42336,6 @@ let sha512 = "2FPputGL+mP3jJ3UZg/Dl9YOkovB7DX0oOr+ck5QbZ5MtORtds8k/BZdn+02peDLI8/YWbmzx34k5fA+fHvCVQ=="; }; }; - "prop-types-15.8.1" = { - name = "prop-types"; - packageName = "prop-types"; - version = "15.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"; - sha512 = "oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="; - }; - }; "proper-lockfile-4.1.2" = { name = "proper-lockfile"; packageName = "proper-lockfile"; @@ -42876,15 +42795,6 @@ let sha512 = "kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="; }; }; - "quick-lru-1.1.0" = { - name = "quick-lru"; - packageName = "quick-lru"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz"; - sha512 = "tRS7sTgyxMXtLum8L65daJnHUhfDUgboRdcWW2bR9vBfrj2+O5HSMbQOJfJJjIVSPFqbBCF37FpwWXGitDc5tA=="; - }; - }; "quick-lru-4.0.1" = { name = "quick-lru"; packageName = "quick-lru"; @@ -43155,15 +43065,6 @@ let sha512 = "xVTNGQy/dAxOolunBLmVMGZ49VUUR1s8jZUiJQb+g1sI63GAv9+a5Jas9yHvdxeUgiZkU9r3gDExDorxHzOgRA=="; }; }; - "react-16.14.0" = { - name = "react"; - packageName = "react"; - version = "16.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react/-/react-16.14.0.tgz"; - sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g=="; - }; - }; "react-17.0.2" = { name = "react"; packageName = "react"; @@ -43200,15 +43101,6 @@ let sha512 = "nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew=="; }; }; - "react-is-16.13.1" = { - name = "react-is"; - packageName = "react-is"; - version = "16.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"; - sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; - }; - }; "react-is-17.0.2" = { name = "react-is"; packageName = "react-is"; @@ -43227,15 +43119,6 @@ let sha512 = "/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="; }; }; - "react-reconciler-0.24.0" = { - name = "react-reconciler"; - packageName = "react-reconciler"; - version = "0.24.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.24.0.tgz"; - sha512 = "gAGnwWkf+NOTig9oOowqid9O0HjTDC+XVGBCAmJYYJ2A2cN/O4gDdIuuUQjv8A4v6GDwVfJkagpBBLW5OW9HSw=="; - }; - }; "react-reconciler-0.26.2" = { name = "react-reconciler"; packageName = "react-reconciler"; @@ -43722,15 +43605,6 @@ let sha512 = "qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g=="; }; }; - "redent-2.0.0" = { - name = "redent"; - packageName = "redent"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz"; - sha512 = "XNwrTx77JQCEMXTeb8movBKuK75MgH0RZkujNuDKCezemx/voapl9i2gCSi8WWm8+ox5ycJi1gxF22fR7c0Ciw=="; - }; - }; "redent-3.0.0" = { name = "redent"; packageName = "redent"; @@ -45720,15 +45594,6 @@ let sha512 = "xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA=="; }; }; - "scheduler-0.18.0" = { - name = "scheduler"; - packageName = "scheduler"; - version = "0.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/scheduler/-/scheduler-0.18.0.tgz"; - sha512 = "agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ=="; - }; - }; "scheduler-0.20.2" = { name = "scheduler"; packageName = "scheduler"; @@ -48078,15 +47943,6 @@ let sha512 = "G8cBS7wxxHhwQrKU0Y8SjZJRtCzZ61bMmMCO1bWm6N6y2obT0koGK8uWYloMOaVPPr8zk7Ic995uEd4Jw504AQ=="; }; }; - "string-length-3.1.0" = { - name = "string-length"; - packageName = "string-length"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-length/-/string-length-3.1.0.tgz"; - sha512 = "Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA=="; - }; - }; "string-padding-1.0.2" = { name = "string-padding"; packageName = "string-padding"; @@ -48429,15 +48285,6 @@ let sha512 = "I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA=="; }; }; - "strip-indent-2.0.0" = { - name = "strip-indent"; - packageName = "strip-indent"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz"; - sha512 = "RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA=="; - }; - }; "strip-indent-3.0.0" = { name = "strip-indent"; packageName = "strip-indent"; @@ -50058,15 +49905,6 @@ let sha512 = "Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw=="; }; }; - "trim-newlines-2.0.0" = { - name = "trim-newlines"; - packageName = "trim-newlines"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz"; - sha512 = "MTBWv3jhVjTU7XR3IQHllbiJs8sc75a80OEhB6or/q7pLTWgQ0bMGQXXYQSrSuXe6WiKWDZ5txXY5P59a/coVA=="; - }; - }; "trim-newlines-3.0.1" = { name = "trim-newlines"; packageName = "trim-newlines"; @@ -55036,15 +54874,6 @@ let sha512 = "LqodLrnIDM3IFT+Hf/5sxBnEGECrfdC1uIbgZeJmESCSo4HoCAaKEus8MylXHAkdacGc0ye+Qa+dpkuom8uVYA=="; }; }; - "yargs-parser-10.1.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz"; - sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="; - }; - }; "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -78482,150 +78311,6 @@ in bypassCache = true; reconstructLock = true; }; - remod-cli = nodeEnv.buildNodePackage { - name = "remod-cli"; - packageName = "remod-cli"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/remod-cli/-/remod-cli-1.0.1.tgz"; - sha512 = "QxvCtwgDBTeBC9V+niO9WPrnNKVEIa0osvdKhw2JkhOjFY0PK/vcFL5jrj7di6GurLIzdweXJgTWnQz2VljdQQ=="; - }; - dependencies = [ - sources."@types/prop-types-15.7.13" - sources."@types/react-18.3.8" - sources."@types/yoga-layout-1.9.2" - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."array-find-index-1.0.2" - sources."arrify-2.0.1" - sources."astral-regex-2.0.0" - sources."auto-bind-4.0.0" - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" - sources."chalk-3.0.0" - sources."ci-info-2.0.0" - sources."cli-cursor-3.1.0" - sources."cli-truncate-2.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."csstype-3.1.3" - sources."currently-unhandled-0.4.1" - sources."decamelize-1.2.0" - (sources."decamelize-keys-1.1.1" // { - dependencies = [ - sources."map-obj-1.0.1" - ]; - }) - sources."emoji-regex-8.0.0" - sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" - sources."figures-3.2.0" - sources."find-up-2.1.0" - sources."function-bind-1.1.2" - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."hasown-2.0.2" - sources."hosted-git-info-2.8.9" - sources."indent-string-3.2.0" - sources."ink-2.7.1" - sources."is-arrayish-0.2.1" - sources."is-ci-2.0.0" - sources."is-core-module-2.15.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-plain-obj-1.1.0" - sources."js-tokens-4.0.0" - sources."json-parse-better-errors-1.0.2" - sources."load-json-file-4.0.0" - sources."locate-path-2.0.0" - sources."lodash.throttle-4.1.1" - (sources."log-update-3.4.0" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.1.1" - sources."ansi-styles-3.2.1" - sources."cli-cursor-2.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."mimic-fn-1.2.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."wrap-ansi-5.1.0" - ]; - }) - sources."loose-envify-1.4.0" - sources."loud-rejection-1.6.0" - sources."map-obj-2.0.0" - sources."meow-5.0.0" - sources."mimic-fn-2.1.0" - (sources."minimist-options-3.0.2" // { - dependencies = [ - sources."arrify-1.0.1" - ]; - }) - sources."normalize-package-data-2.5.0" - sources."object-assign-4.1.1" - sources."onetime-5.1.2" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."parse-json-4.0.0" - sources."path-exists-3.0.0" - sources."path-parse-1.0.7" - sources."path-type-3.0.0" - sources."pify-3.0.0" - sources."prop-types-15.8.1" - sources."quick-lru-1.1.0" - sources."react-16.14.0" - sources."react-is-16.13.1" - sources."react-reconciler-0.24.0" - sources."read-pkg-3.0.0" - sources."read-pkg-up-3.0.0" - sources."redent-2.0.0" - sources."resolve-1.22.8" - sources."restore-cursor-3.1.0" - sources."scheduler-0.18.0" - sources."semver-5.7.2" - sources."signal-exit-3.0.7" - sources."slice-ansi-3.0.0" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.5.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.20" - (sources."string-length-3.1.0" // { - dependencies = [ - sources."ansi-regex-4.1.1" - sources."astral-regex-1.0.0" - sources."strip-ansi-5.2.0" - ]; - }) - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."strip-bom-3.0.0" - sources."strip-indent-2.0.0" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."trim-newlines-2.0.0" - sources."type-fest-0.21.3" - sources."validate-npm-package-license-3.0.4" - sources."widest-line-3.1.0" - sources."wrap-ansi-6.2.0" - sources."yargs-parser-10.1.0" - sources."yoga-layout-prebuilt-1.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "chmod for human beings!"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; From ed6c067f2560086fa2b0b73cc7fe11617cc224c1 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 4 Dec 2024 00:31:45 -0500 Subject: [PATCH 0441/1054] doc/tauri: use tauri 2.0 dependencies & new darwin SDK pattern in example (#357148) * doc/tauri: use tauri 2.0 dependencies in example * doc/tauri: use new darwin SDK pattern in example Part of https://github.com/NixOS/nixpkgs/issues/354146 --- doc/hooks/tauri.section.md | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md index 2713515015dd..3fad872e4306 100644 --- a/doc/hooks/tauri.section.md +++ b/doc/hooks/tauri.section.md @@ -14,15 +14,13 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases. rustPlatform, fetchNpmDeps, cargo-tauri, - darwin, glib-networking, - libsoup, nodejs, npmHooks, openssl, pkg-config, - webkitgtk_4_0, - wrapGAppsHook3, + webkitgtk_4_1, + wrapGAppsHook4, }: rustPlatform.buildRustPackage rec { @@ -47,25 +45,15 @@ rustPlatform.buildRustPackage rec { # Make sure we can find our libraries pkg-config - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking # Most Tauri apps need networking - libsoup - webkitgtk_4_0 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreServices - Security - WebKit - ] - ); + webkitgtk_4_1 + ]; # Set our Tauri source directory cargoRoot = "src-tauri"; From b69b526e6df0b0abf46bb79a4ffb574f7096acb1 Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Fri, 29 Nov 2024 04:50:38 -0700 Subject: [PATCH 0442/1054] julia.withPackages: add juliaCpuTarget option --- doc/languages-frameworks/julia.section.md | 11 +++++++++++ pkgs/development/julia-modules/default.nix | 19 ++++++++++--------- pkgs/development/julia-modules/depot.nix | 19 +++++++++++++------ 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/doc/languages-frameworks/julia.section.md b/doc/languages-frameworks/julia.section.md index 235861ac528f..4e7d9d365a39 100644 --- a/doc/languages-frameworks/julia.section.md +++ b/doc/languages-frameworks/julia.section.md @@ -67,3 +67,14 @@ nix-shell -p 'julia.withPackages ["Plots"]' --run julia This normally points at a special augmented version of the Julia [General packages registry](https://github.com/JuliaRegistries/General). If you want to use a bleeding-edge version to pick up the latest package updates, you can plug in a later revision than the one in Nixpkgs. + +* `juliaCpuTarget`: Allows you to set `JULIA_CPU_TARGET` when precompiling. Has no effect if `precompile=false`. + + You may want to use this if you're building a Julia depot that will end up in a Nix cache and used on machines with + different CPUs. + + Why? Julia will detect the CPU microarchitecture of the build machine and include this information in the precompiled + `*.ji` files. Starting in 1.10 Julia became more strict about checking the CPU target compatibility, so it may reject + your precompiled files if they were compiled on a different machine. + A good option to provide wide compatibility is to set this to `"generic"`, although this may reduce performance. + You can also set a semicolon-separated list of multiple different targets. See the Julia documentation for details. diff --git a/pkgs/development/julia-modules/default.nix b/pkgs/development/julia-modules/default.nix index 737cb9345a4b..411e091e1343 100644 --- a/pkgs/development/julia-modules/default.nix +++ b/pkgs/development/julia-modules/default.nix @@ -1,13 +1,14 @@ -{ lib -, callPackage -, runCommand +{ callPackage , fetchgit , fontconfig , git +, lib , makeWrapper +, python3 +, runCommand +, system , writeText , writeTextFile -, python3 # Artifacts dependencies , fetchurl @@ -23,11 +24,12 @@ # Other overridable arguments , extraLibs ? [] -, precompile ? true -, setDefaultDepot ? true +, juliaCpuTarget ? null +, makeTransitiveDependenciesImportable ? false # Used to support symbol indexing , makeWrapperArgs ? "" , packageOverrides ? {} -, makeTransitiveDependenciesImportable ? false # Used to support symbol indexing +, precompile ? true +, setDefaultDepot ? true }: packageNames: @@ -35,7 +37,6 @@ packageNames: let util = callPackage ./util.nix {}; - # Some Julia packages require access to Python. Provide a Nixpkgs version so it # doesn't try to install its own. pythonToUse = let @@ -152,7 +153,7 @@ let # Build a Julia project and depot. The project contains Project.toml/Manifest.toml, while the # depot contains package build products (including the precompiled libraries, if precompile=true) projectAndDepot = callPackage ./depot.nix { - inherit closureYaml extraLibs overridesToml packageImplications precompile; + inherit closureYaml extraLibs juliaCpuTarget overridesToml packageImplications precompile; julia = juliaWrapped; registry = minimalRegistry; packageNames = if makeTransitiveDependenciesImportable diff --git a/pkgs/development/julia-modules/depot.nix b/pkgs/development/julia-modules/depot.nix index 017bc19acd50..b2363c63e679 100644 --- a/pkgs/development/julia-modules/depot.nix +++ b/pkgs/development/julia-modules/depot.nix @@ -9,17 +9,18 @@ , closureYaml , extraLibs +, juliaCpuTarget , overridesToml -, packageNames , packageImplications +, packageNames , precompile , registry }: runCommand "julia-depot" { - nativeBuildInputs = [curl git julia (python3.withPackages (ps: with ps; [pyyaml]))] ++ extraLibs; - inherit precompile registry; - } '' + nativeBuildInputs = [curl git julia (python3.withPackages (ps: with ps; [pyyaml]))] ++ extraLibs; + inherit precompile registry; +} ('' export HOME=$(pwd) echo "Building Julia depot and project with the following inputs" @@ -42,7 +43,9 @@ runCommand "julia-depot" { # Only precompile if configured to below export JULIA_PKG_PRECOMPILE_AUTO=0 - +'' + lib.optionalString (juliaCpuTarget != null) '' + export JULIA_CPU_TARGET="${juliaCpuTarget}" +'' + '' # Prevent a warning where Julia tries to download package server info export JULIA_PKG_SERVER="" @@ -84,6 +87,10 @@ runCommand "julia-depot" { Pkg.instantiate() if "precompile" in keys(ENV) && ENV["precompile"] != "0" && ENV["precompile"] != "" + if isdefined(Sys, :CPU_NAME) + println("Precompiling with CPU_NAME = " * Sys.CPU_NAME) + end + Pkg.precompile() end end @@ -91,4 +98,4 @@ runCommand "julia-depot" { # Remove the registry to save space Pkg.Registry.rm("General") ' -'' +'') From b810247f0aa89db4e75852c2074d98c40ef56c6b Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 4 Dec 2024 04:08:53 +0000 Subject: [PATCH 0443/1054] garnet: 1.0.39 -> 1.0.46 Changelog: https://github.com/microsoft/garnet/releases/tag/v1.0.46 Diff: https://github.com/microsoft/garnet/compare/v1.0.39...v1.0.46 --- pkgs/by-name/ga/garnet/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index e1850133807c..2107ffb9d5e4 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -8,24 +8,19 @@ buildDotnetModule rec { pname = "garnet"; - version = "1.0.39"; + version = "1.0.46"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; rev = "refs/tags/v${version}"; - hash = "sha256-2GX6iaDSYBRozHoBxtI7XrSrpYQ0Hcdr+Psn4uXRzAM="; + hash = "sha256-WXHtb4wDQxJ5n7/zbEGIrsfP0/dxV+ruYqcPFu1upho="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = - with dotnetCorePackages; - combinePackages [ - sdk_6_0 - sdk_8_0 - ]; + dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; dotnetBuildFlags = [ From 0a828d4e8fb20c9426c8b3c3f3936acf81125405 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 05:56:53 +0000 Subject: [PATCH 0444/1054] supergfxctl-plasmoid: 2.0.0 -> 2.1.1 --- pkgs/by-name/su/supergfxctl-plasmoid/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/supergfxctl-plasmoid/package.nix b/pkgs/by-name/su/supergfxctl-plasmoid/package.nix index 9141881c7a62..d66577c68a75 100644 --- a/pkgs/by-name/su/supergfxctl-plasmoid/package.nix +++ b/pkgs/by-name/su/supergfxctl-plasmoid/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "supergfxctl-plasmoid"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitLab { owner = "jhyub"; repo = "supergfxctl-plasmoid"; rev = "refs/tags/v${version}"; - hash = "sha256-m3NmbFD9tqqCyiQgMVRNtlCZy7q+rMCsWgtds1QdOrE="; + hash = "sha256-Un2uVTde18qloZoWk6bbscyvsBTIAdK1CfxYAZg1+F4="; }; nativeBuildInputs = [ From e510a2b1c994a35c8abeff08b420b2bad9f78a8e Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 4 Dec 2024 04:08:58 +0000 Subject: [PATCH 0445/1054] lock: 1.2.0 -> 1.3.0 Diff: https://github.com/konstantintutsch/Lock/compare/v1.2.0...v1.3.0 --- pkgs/by-name/lo/lock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix index a2dc9e94bbb7..c12d70d0378a 100644 --- a/pkgs/by-name/lo/lock/package.nix +++ b/pkgs/by-name/lo/lock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lock"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "konstantintutsch"; repo = "Lock"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-eBOENp6qjHtNGRCV+n2IbH0BSgGZje1aT/0iaDsZz+4="; + hash = "sha256-RDFFI7NKGs1LXNEYWgv1JBE00yjmcH4hrHebAIY85EA="; }; strictDeps = true; From 8539595cbed31a5221684b24c7814fe0666f080d Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 4 Dec 2024 04:15:01 +0000 Subject: [PATCH 0446/1054] upscaler: 1.4.0 -> 1.4.1 --- pkgs/by-name/up/upscaler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/up/upscaler/package.nix b/pkgs/by-name/up/upscaler/package.nix index c8ce29d532a3..8fc336d9b205 100644 --- a/pkgs/by-name/up/upscaler/package.nix +++ b/pkgs/by-name/up/upscaler/package.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { pname = "upscaler"; - version = "1.4.0"; + version = "1.4.1"; pyproject = false; # meson instead of pyproject @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "Upscaler"; rev = version; - hash = "sha256-Dy8tykIbK5o0XulurG+TxORZZSxfRe5Kjh6aGpsh+0Y="; + hash = "sha256-WjhefFyd1hnngD/uIvgjAI4i6AyoldDJKWocvotGw9g="; }; passthru.updateScript = gitUpdater { }; From c2e85f96e629fd4f22e23f709e6c09157bc10ccc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 4 Dec 2024 06:13:57 +0000 Subject: [PATCH 0447/1054] kubernetes-kcp.tests: fix the eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change the eval fails as: $ nix build --no-link -f. kubernetes-kcp.tests error: … while evaluating the attribute 'version' at pkgs/by-name/ku/kubernetes-kcp/package.nix:52:3: 51| 52| passthru.tests.version = testers.testVersion { | ^ 53| command = "kcp --version"; … from call site at pkgs/by-name/ku/kubernetes-kcp/package.nix:52:28: 51| 52| passthru.tests.version = testers.testVersion { | ^ 53| command = "kcp --version"; error: function 'testVersion' called without required argument 'package' at pkgs/build-support/testers/default.nix:66:5: 65| testVersion = 66| { package, | ^ 67| command ? "${package.meta.mainProgram or package.pname or package.name} --version", --- pkgs/by-name/ku/kubernetes-kcp/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ku/kubernetes-kcp/package.nix b/pkgs/by-name/ku/kubernetes-kcp/package.nix index 7a5ff9afea4b..fa73327a3c70 100644 --- a/pkgs/by-name/ku/kubernetes-kcp/package.nix +++ b/pkgs/by-name/ku/kubernetes-kcp/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, installShellFiles, testers, + kubernetes-kcp, }: buildGoModule rec { @@ -50,6 +51,7 @@ buildGoModule rec { ''; passthru.tests.version = testers.testVersion { + package = kubernetes-kcp; command = "kcp --version"; # NOTE: Once the go.mod version is pulled in, the version info here needs # to be also updated. From a676e5bcfb9dffef85a20af1478dd139ca9e223b Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 4 Dec 2024 04:17:45 +0000 Subject: [PATCH 0448/1054] television: 0.5.1 -> 0.5.3 Changelog: https://github.com/alexpasmantier/television/releases/tag/0.5.3 Diff: https://github.com/alexpasmantier/television/compare/0.5.1...0.5.3 --- pkgs/by-name/te/television/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index bc2aa1ef07f0..6e1ff57835f8 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "television"; - version = "0.5.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; rev = "refs/tags/" + version; - hash = "sha256-mbf39AcW7MYu0A6D7poX6TChJccqweBvUbzJ1Ib+ABI="; + hash = "sha256-xYfaFs0a37maeLdnlEGVsocWWym41EOZ9dsuFXc1hMY="; }; - cargoHash = "sha256-aWEqPIAcq5ZWCf0ZOYnswmj2dR0+41D1HMna0TAhxcE="; + cargoHash = "sha256-z12FeXQ2IpDZQYqnt6MPkLeW4Ul3XphSI38ikM/YizY="; passthru = { tests.version = testers.testVersion { From 2e40d6ddeb7d71f46075fee163203d3a86164133 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 4 Dec 2024 06:28:10 +0000 Subject: [PATCH 0449/1054] spot: 0.4.1 -> 0.5.0 Diff: https://github.com/xou816/spot/compare/0.4.1...0.5.0 --- pkgs/by-name/sp/spot/package.nix | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/sp/spot/package.nix b/pkgs/by-name/sp/spot/package.nix index 8415da2f07a3..8e40e70a51ad 100644 --- a/pkgs/by-name/sp/spot/package.nix +++ b/pkgs/by-name/sp/spot/package.nix @@ -1,59 +1,58 @@ { lib, stdenv, - fetchFromGitHub, - rustPlatform, - cargo, - rustc, alsa-lib, appstream-glib, blueprint-compiler, + cargo, desktop-file-utils, + fetchFromGitHub, gettext, glib, gst_all_1, gtk4, libadwaita, - libpulseaudio, libhandy, + libpulseaudio, meson, ninja, nix-update-script, openssl, pkg-config, + rustPlatform, + rustc, wrapGAppsHook4, }: stdenv.mkDerivation rec { pname = "spot"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "xou816"; repo = "spot"; - rev = version; - hash = "sha256-F875e/VZyN8mTfe9lgjtILNxMqn+66XoPCdaEUagHyU="; + rev = "refs/tags/${version}"; + hash = "sha256-7zWK0wkh53ojnoznv4T/X//JeyKJVKOrfYF0IkvciIY="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-45Rqs2/tSWoyZVjFuygR5SxldjoqpprtOKEnMqJK+p8="; + inherit pname version src; + hash = "sha256-AaRmTOgFmBi0s1zdIVHc6bLjrUopy9YuB3GJOCnbjU4="; }; nativeBuildInputs = [ - cargo - rustc appstream-glib blueprint-compiler + cargo desktop-file-utils gettext - gtk4 # for gtk-update-icon-cache glib # for glib-compile-schemas + gtk4 # for gtk-update-icon-cache meson ninja pkg-config rustPlatform.cargoSetupHook + rustc wrapGAppsHook4 ]; From 36a29f37f265093803aca2fb17e6b1fe5b78b4bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 06:57:29 +0000 Subject: [PATCH 0450/1054] python312Packages.argos-translate-files: 1.1.4 -> 1.2.0 --- .../python-modules/argos-translate-files/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/argos-translate-files/default.nix b/pkgs/development/python-modules/argos-translate-files/default.nix index 86d269ce76a2..be863989ac97 100644 --- a/pkgs/development/python-modules/argos-translate-files/default.nix +++ b/pkgs/development/python-modules/argos-translate-files/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "argos-translate-files"; - version = "1.1.4"; + version = "1.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-YSTqqd+Kv2QVlAjA0lf4IRx7rJ1DmvB0JIReBv3yZcM="; + hash = "sha256-vIwZ2jdrBXtz6gG+Zfgqq6HVfdzmQf7nLqCDaQZT4js="; }; propagatedBuildInputs = [ From c50c65c9824b601b2f679fb6cc7908ff1d305c7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 07:27:55 +0000 Subject: [PATCH 0451/1054] python312Packages.transaction: 4.0 -> 5.0 --- pkgs/development/python-modules/transaction/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index 2b3e0515894a..3a05a645464c 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "transaction"; - version = "4.0"; + version = "5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aANduRP2DRvhL2Vj0gHaqzbIPnY94ViZ/4M48m5eYvI="; + hash = "sha256-EG5714K8wMtRGfySJbDJpx38U625OL6QUiOtrvIrEXQ="; }; propagatedBuildInputs = [ From f04f58809dab6715e460973eaae2a085474c776d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 07:32:13 +0000 Subject: [PATCH 0452/1054] python312Packages.lottie: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/lottie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lottie/default.nix b/pkgs/development/python-modules/lottie/default.nix index a1ced236e8c8..91f375d664e3 100644 --- a/pkgs/development/python-modules/lottie/default.nix +++ b/pkgs/development/python-modules/lottie/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { pname = "lottie"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-oyQvi6NwUfvddQPs0WggOgjkrybxe+LsygimSvHn08E="; + hash = "sha256-If05yOaLsfBDvVxmnDxgxwqc3lkCjTW8YV3e+S9CU2o="; }; build-system = [ setuptools ]; From cbba67d309432e65213ac7bf6bf7bddfd44ec58c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 2 Dec 2024 12:19:19 +0100 Subject: [PATCH 0453/1054] bombsquad: use the wayback machine for stable links --- pkgs/by-name/bo/bombsquad/package.nix | 52 +++++++++++++++------------ 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/bo/bombsquad/package.nix b/pkgs/by-name/bo/bombsquad/package.nix index 55afb4eb444c..054f1b11d491 100644 --- a/pkgs/by-name/bo/bombsquad/package.nix +++ b/pkgs/by-name/bo/bombsquad/package.nix @@ -9,7 +9,7 @@ curl, gnugrep, libgcc, - makeWrapper, + makeBinaryWrapper, makeDesktopItem, autoPatchelfHook, copyDesktopItems, @@ -22,38 +22,44 @@ let { x86_64-linux = { name = "BombSquad_Linux_x86_64"; - hash = "sha256-aujLYzFcKaW0ff7sRdyJ6SvSQowafWVbmwycQfDQUYY="; + hash = "sha256-ICjaNZSCUbslB5pELbI4e+1zXWrZzkCkv69jLRx4dr0="; }; aarch-64-linux = { name = "BombSquad_Linux_Arm64"; - hash = "sha256-pPP7QZzToTOQtSxzF7Q3ZzlDjUjQWMBM/y79d6Yf38I="; + hash = "sha256-/m0SOQbHssk0CqZJPRLK9YKphup3dtMqkbWGzqcF0+g="; }; } .${stdenv.targetPlatform.system} or (throw "${stdenv.targetPlatform.system} is unsupported."); -in -stdenv.mkDerivation (finalAttrs: { - pname = "bombsquad"; - version = "1.7.37"; - sourceRoot = "."; - src = fetchurl { - url = "https://files.ballistica.net/bombsquad/builds/${archive.name}_${finalAttrs.version}.tar.gz"; - inherit (archive) hash; - }; bombsquadIcon = fetchurl { url = "https://files.ballistica.net/bombsquad/promo/BombSquadIcon.png"; hash = "sha256-MfOvjVmjhLejrJmdLo/goAM9DTGubnYGhlN6uF2GugA="; }; - nativeBuildInputs = [ - python312 +in +stdenv.mkDerivation (finalAttrs: { + pname = "bombsquad"; + version = "1.7.37"; + + src = fetchurl { + url = "https://web.archive.org/web/20240825230506if_/https://files.ballistica.net/bombsquad/builds/${archive.name}_${finalAttrs.version}.tar.gz"; + inherit (archive) hash; + }; + + sourceRoot = "${archive.name}_${finalAttrs.version}"; + + buildInputs = [ SDL2 + libgcc libvorbis openal - libgcc - makeWrapper + python312 + ]; + + nativeBuildInputs = [ autoPatchelfHook copyDesktopItems + makeBinaryWrapper ]; desktopItems = [ @@ -61,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { name = "bombsquad"; genericName = "bombsquad"; desktopName = "BombSquad"; + icon = "bombsquad"; exec = "bombsquad"; comment = "An explosive arcade-style party game."; @@ -71,17 +78,16 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - base=${archive.name}_${finalAttrs.version} + mkdir -p $out/bin $out/libexec $out/share/bombsquad/ba_data - install -m755 -D $base/bombsquad $out/bin/bombsquad - install -dm755 $base/ba_data $out/usr/share/bombsquad/ba_data - cp -r $base/ba_data $out/usr/share/bombsquad/ + install -Dm555 -t $out/libexec ${finalAttrs.meta.mainProgram} + cp -r ba_data $out/share/bombsquad - wrapProgram "$out/bin/bombsquad" \ + makeWrapper "$out/libexec/${finalAttrs.meta.mainProgram}" "$out/bin/${finalAttrs.meta.mainProgram}" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ - --add-flags "-d $out/usr/share/bombsquad" + --add-flags "-d $out/share/bombsquad" - install -Dm755 ${finalAttrs.bombsquadIcon} $out/usr/share/icons/hicolor/32x32/apps/bombsquad.png + install -Dm755 ${bombsquadIcon} $out/share/icons/hicolor/1024x1024/apps/bombsquad.png runHook postInstall ''; From e181443fa0ef28c7cb1972caa793ef249f430364 Mon Sep 17 00:00:00 2001 From: Arne Keller <2012gdwu+github@posteo.de> Date: Wed, 4 Dec 2024 09:21:22 +0100 Subject: [PATCH 0454/1054] ytdl-sub: relax yt-dlp dependency --- pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 7e3a59cdb392..a52d5b7557e6 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -15,6 +15,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-YMki+1rC726RtbZceoVbcpk/Gi3F81xxERQjpqLjn+A="; }; + pythonRelaxDeps = [ + "yt-dlp" + ]; + build-system = with python3Packages; [ setuptools wheel From be1689accecfb736990e9a3805e4096d5fa0b219 Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Tue, 3 Dec 2024 22:06:19 +0900 Subject: [PATCH 0455/1054] cldr-annotations: fix hash --- pkgs/by-name/cl/cldr-annotations/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cl/cldr-annotations/package.nix b/pkgs/by-name/cl/cldr-annotations/package.nix index 64c9a0793787..f393875eb390 100644 --- a/pkgs/by-name/cl/cldr-annotations/package.nix +++ b/pkgs/by-name/cl/cldr-annotations/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation rec { src = fetchzip { url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip"; stripRoot = false; - hash = "sha256-dXfbJTBlIg/+JXSrjdf8/iS4vHo7bt5YUwh+5dlsSiw="; + hash = "sha256-d8VjhE4k4QdlWNtUGcQf1jx7igBxziCwNpWx0ef4h8c="; }; installPhase = '' From bff1ad19f9dd6094aadbd3ec9a2e8b546ae6a58b Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 4 Dec 2024 16:49:53 +0800 Subject: [PATCH 0456/1054] green-pdfviewer: remove --- .../misc/green-pdfviewer/default.nix | 39 ------------- .../misc/green-pdfviewer/gdk-libs.patch | 55 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 4 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 pkgs/applications/misc/green-pdfviewer/default.nix delete mode 100644 pkgs/applications/misc/green-pdfviewer/gdk-libs.patch diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix deleted file mode 100644 index 9c3c8c95872e..000000000000 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, poppler, pkg-config, gdk-pixbuf, SDL, gtk2 }: - -stdenv.mkDerivation { - pname = "green-pdfviewer"; - version = "nightly-2014-04-22"; - - src = fetchFromGitHub { - owner = "schandinat"; - repo = "green"; - rev = "0b516aec17915d9742d8e505d2ed383a3bdcea61"; - sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ poppler gdk-pixbuf SDL gtk2 ]; - - patches = [ - ./gdk-libs.patch - ]; - - buildPhase = '' - make PREFIX=$out - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/man1 - make install PREFIX=$out MANDIR=$out/share - ''; - - meta = with lib; { - homepage = "https://github.com/schandinat/green/"; - description = "Viewer for PDF files, uses SDL and libpoppler"; - - platforms = platforms.unix; - license = licenses.gpl3; - maintainers = [ ]; - mainProgram = "green"; - }; -} diff --git a/pkgs/applications/misc/green-pdfviewer/gdk-libs.patch b/pkgs/applications/misc/green-pdfviewer/gdk-libs.patch deleted file mode 100644 index cfcab32aac99..000000000000 --- a/pkgs/applications/misc/green-pdfviewer/gdk-libs.patch +++ /dev/null @@ -1,55 +0,0 @@ -Common subdirectories: green.old/debian and green.new/debian -diff -u green.old/green.h green.new/green.h ---- green.old/green.h 2016-06-12 18:11:56.779434416 -0700 -+++ green.new/green.h 2016-06-12 18:14:38.830557379 -0700 -@@ -19,7 +19,14 @@ - - - #include --#include "glib/poppler.h" -+#include "poppler.h" -+#include "gdk-pixbuf/gdk-pixbuf.h" -+#include "gdk-pixbuf/gdk-pixbuf-core.h" -+#include "gdk-pixbuf/gdk-pixbuf-features.h" -+#include "gdk-pixbuf/gdk-pixbuf-enum-types.h" -+ -+ #define GREEN_FULLSCREEN 0x0001 -+ - - - #define GREEN_FULLSCREEN 0x0001 -diff -u green.old/Makefile green.new/Makefile ---- green.old/Makefile 2016-06-12 18:11:56.779434416 -0700 -+++ green.new/Makefile 2016-06-12 18:13:09.591974048 -0700 -@@ -17,6 +17,12 @@ - SDL_CFLAGS := $$(sdl-config --cflags) - SDL_LIBS := $$(sdl-config --libs) - -+GDKPIXBUF_CFLAGS := $$(pkg-config gdk-pixbuf-2.0 --cflags) -+GDKPIXBUF_LIBS := $$(pkg-config gdk-pixbuf-2.0 --libs) -+ -+GTK_CFLAGS := $$(pkg-config gtk+-2.0 --cflags) -+GTK_LIBS := $$(pkg-config gtk+-2.0 --libs) -+ - - all: green - -@@ -28,13 +34,14 @@ - $(INSTALL) green.1 $(MANDIR)/man1/ - - green: main.o green.o sdl.o -- $(CC) $^ $(POPPLER_LIBS) $(SDL_LIBS) -o $@ -+ $(CC) $^ $(POPPLER_LIBS) $(SDL_LIBS) $(GDKPIXBUF_LIBS) $(GTK_LIBS) -o $@ - - main.o: main.c green.h -- $(CC) $(CONFIG) $(CFLAGS) -c $< $(POPPLER_CFLAGS) -o $@ -+ $(CC) $(CONFIG) $(CFLAGS) $(GDKPIXBUF_CFLAGS) -c $< $(POPPLER_CFLAGS) -o $@ - - green.o: green.c green.h -- $(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS) -o $@ -+ $(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS) $(GDKPIXBUF_CFLAGS) -o $@ - - sdl.o: sdl.c green.h -- $(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS) $(SDL_CFLAGS) -o $@ -+ $(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS) $(SDL_CFLAGS) $(GDKPIXBUF_CFLAGS) $(GTK_CFLAGS) -o $@ -+ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 35dc2bf8a77a..34cb053b14af 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -512,6 +512,7 @@ mapAliases { graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 graylog-5_0 = throw "graylog 5.0.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.0.x to latest series."; # Added 2024-02-15 + green-pdfviewer = throw "'green-pdfviewer' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 gringo = clingo; # added 2022-11-27 grub2_full = grub2; # Added 2022-11-18 gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb7d56216dbf..0c1b1d50a1a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1860,10 +1860,6 @@ with pkgs; grc = python3Packages.callPackage ../tools/misc/grc { }; - green-pdfviewer = callPackage ../applications/misc/green-pdfviewer { - SDL = SDL_sixel; - }; - gremlin-console = callPackage ../applications/misc/gremlin-console { openjdk = openjdk11; }; From ad50609fbc7ae7106aad2c372479225a23f77df9 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 4 Dec 2024 16:53:22 +0800 Subject: [PATCH 0457/1054] crack_attack: remove https://cdimage.debian.org/mirror/gnu.org/savannah/crack-attack near 20 years. --- .../crack-attack-1.1.14-gcc43.patch | 10 ----- .../crack-attack-1.1.14-glut.patch | 10 ----- pkgs/by-name/cr/crack_attack/package.nix | 37 ------------------- pkgs/top-level/aliases.nix | 1 + 4 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-gcc43.patch delete mode 100644 pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-glut.patch delete mode 100644 pkgs/by-name/cr/crack_attack/package.nix diff --git a/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-gcc43.patch b/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-gcc43.patch deleted file mode 100644 index fb2910d128ee..000000000000 --- a/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-gcc43.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- crack-attack-1.1.14/src/Game.h -+++ crack-attack-1.1.14/src/Game.h -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #ifdef __MINGW32__ - # include diff --git a/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-glut.patch b/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-glut.patch deleted file mode 100644 index 4daea4c53a28..000000000000 --- a/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-glut.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- crack-attack-1.1.14/src/Attack.cxx -+++ crack-attack-1.1.14/src/Attack.cxx -@@ -83,6 +83,7 @@ - int height = -1, width = -1; - - player_name[0] = '\0'; -+ glutInit(&argc, argv); - parseCommandLine(argc, argv, mode, port, host_name, player_name, height, width); - run_crack_attack(mode, port, host_name, player_name, height, width); - diff --git a/pkgs/by-name/cr/crack_attack/package.nix b/pkgs/by-name/cr/crack_attack/package.nix deleted file mode 100644 index d3d347066462..000000000000 --- a/pkgs/by-name/cr/crack_attack/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, libglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }: - -stdenv.mkDerivation rec { - pname = "crack-attack"; - version = "1.1.14"; - - src = fetchurl { - url = "mirror://savannah/crack-attack/crack-attack-${version}.tar.gz"; - sha256 = "1sakj9a2q05brpd7lkqxi8q30bccycdzd96ns00s6jbxrzjlijkm"; - }; - - patches = [ - ./crack-attack-1.1.14-gcc43.patch - ./crack-attack-1.1.14-glut.patch - ]; - - configureFlags = [ - "--enable-sound=yes" - "--prefix=${placeholder "out"}" - "--datadir=${placeholder "out"}/share" - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 libglut SDL SDL_mixer libGLU libGL libXi libXmu ]; - - hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - - meta = { - description = "Fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!"; - mainProgram = "crack-attack"; - homepage = "https://www.nongnu.org/crack-attack/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 34cb053b14af..4893b277d2fc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -239,6 +239,7 @@ mapAliases { inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17 concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17 containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09 + crack_attack = throw "'crack_attack' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11 critcl = tclPackages.critcl; # Added 2024-10-02 cudaPackages_10_0 = throw "CUDA 10.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20 From 97da68eef5631b1fd383f6f71ebb5f1b63523ebd Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 4 Dec 2024 16:56:03 +0800 Subject: [PATCH 0458/1054] gtk-engine-bluecurve: remove --- .../gt/gtk-engine-bluecurve/package.nix | 22 ------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 pkgs/by-name/gt/gtk-engine-bluecurve/package.nix diff --git a/pkgs/by-name/gt/gtk-engine-bluecurve/package.nix b/pkgs/by-name/gt/gtk-engine-bluecurve/package.nix deleted file mode 100644 index 43cf8675735f..000000000000 --- a/pkgs/by-name/gt/gtk-engine-bluecurve/package.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }: - -stdenv.mkDerivation rec { - pname = "gtk-engine-bluecurve"; - version = "1.0"; - - src = fetchurl { - url = "https://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-${version}.tar.bz2"; - sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm"; - }; - - nativeBuildInputs = [ pkg-config intltool ]; - - buildInputs = [ gtk2 ]; - - meta = { - description = "Original Bluecurve engine from Red Hat's artwork package"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4893b277d2fc..a11a53667b01 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -517,6 +517,7 @@ mapAliases { gringo = clingo; # added 2022-11-27 grub2_full = grub2; # Added 2022-11-18 gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 + gtk-engine-bluecurve = "'gtk-engine-bluecurve' has been removed as it has been archived upstream."; # Added 2024-12-04 gtk2fontsel = throw "'gtk2fontsel' has been removed due to lack of maintenance upstream. GTK now has a built-in font chooser so it's no longer needed for newer apps"; # Added 2024-10-19 gtkcord4 = dissent; # Added 2024-03-10 gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 From c3c2032ecb578651d98f8f474e053f825c30ca25 Mon Sep 17 00:00:00 2001 From: Aleksana Date: Wed, 4 Dec 2024 16:58:19 +0800 Subject: [PATCH 0459/1054] pkgs/README.md: minor refactor to patch section to improve readability (#361688) --- pkgs/README.md | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/README.md b/pkgs/README.md index f907d79ef348..49c31a76ed43 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -492,7 +492,9 @@ Examples going from bad to best practices: Sometimes, changes are needed to the source to allow building a derivation in nixpkgs, or to get earlier access to an upstream fix or improvement. When using the `patches` parameter to `mkDerivation`, make sure the patch name clearly describes the reason for the patch, or add a comment. -Patches already merged upstream or published elsewhere should be retrieved using `fetchpatch`. +### Fetching patches + +In the interest of keeping our maintenance burden and the size of Nixpkgs to a minimum, patches already merged upstream or published elsewhere _should_ be retrieved using `fetchpatch`: ```nix { @@ -506,15 +508,22 @@ Patches already merged upstream or published elsewhere should be retrieved using } ``` -Otherwise, you can add a `.patch` file to the `nixpkgs` repository. -In the interest of keeping our maintenance burden and the size of nixpkgs to a minimum, only do this for patches that are unique to `nixpkgs` or that have been proposed upstream but are not merged yet, cannot be easily fetched or have a high chance to disappear in the future due to unstable or unreliable URLs. -The latter avoids link rot when the upstream abandons, squashes or rebases their change, in which case the commit may get garbage-collected. - If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`. Check [the `fetchpatch` reference](https://nixos.org/manual/nixpkgs/unstable/#fetchpatch) for details. +### Vendoring patches + +In the following cases, a `.patch` file _should_ be added to Nixpkgs repository, instead of retrieved: + +- solves problems unique to packaging in Nixpkgs +- is already proposed upstream but not merged yet +- cannot be fetched easily +- has a high chance to disappear in the future due to unstable or unreliable URLs + +The latter avoids link rot when the upstream abandons, squashes or rebases their change, in which case the commit may get garbage-collected. + ```nix { - patches = [ ./0001-changes.patch ]; + patches = [ ./0001-add-missing-include.patch ]; } ``` From 2afe5ab32998116d365cade7e1b65eb597c49805 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 4 Dec 2024 17:02:17 +0800 Subject: [PATCH 0460/1054] libmx: remove --- pkgs/by-name/li/libmx/package.nix | 64 ------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 pkgs/by-name/li/libmx/package.nix diff --git a/pkgs/by-name/li/libmx/package.nix b/pkgs/by-name/li/libmx/package.nix deleted file mode 100644 index 643c671f7792..000000000000 --- a/pkgs/by-name/li/libmx/package.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, libtool, pkg-config, automake, autoconf, intltool -, gobject-introspection, gtk2, gtk-doc -, clutter, clutter-gtk -}: - -stdenv.mkDerivation rec { - pname = "libmx"; - version = "1.4.7"; - - src = fetchFromGitHub { - owner = "clutter-project"; - repo = "mx"; - rev = version; - sha256 = "sha256-+heIPSkg3d22xsU48UOTJ9FPLXC7zLivcnabQOM9aEk="; - }; - - # remove the following superfluous checks - preConfigure = '' - substituteInPlace "autogen.sh" \ - --replace '`which intltoolize`' '"x"' \ - --replace '`which gtkdocize`' '"x"' \ - --replace '`which autoreconf`' '"x"' - ''; - - configureFlags = [ "--enable-introspection" - "--without-startup-notification" - "--without-dbus" - "--without-glade" - "--without-clutter-imcontext" - "--without-clutter-gesture" - ]; - - configureScript = "sh autogen.sh"; - - nativeBuildInputs = [ pkg-config automake autoconf intltool gobject-introspection ]; - buildInputs = [ - libtool - gtk2 gtk-doc clutter clutter-gtk - ]; - - # patch to resolve GL errors - # source : https://github.com/clutter-project/mx/pull/62 - preBuild = '' - sed -i 's/GLushort/gushort/g' mx/mx-deform-texture.c - sed -i 's/GLfloat/gfloat/g' mx/mx-texture-frame.c - ''; - - meta = with lib; { - homepage = "http://www.clutter-project.org/"; - description = "Clutter-based toolkit"; - mainProgram = "mx-create-image-cache"; - longDescription = '' - Mx is a widget toolkit using Clutter that provides a set of standard - interface elements, including buttons, progress bars, scroll bars and - others. It also implements some standard managers. One other interesting - feature is the possibility setting style properties from a CSS format - file. - ''; - license = licenses.lgpl21; - maintainers = [ ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a11a53667b01..f0a31c36a0d6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -644,6 +644,7 @@ mapAliases { libixp_hg = libixp; libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17 liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 + libmx = throw "'libmx' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14 libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 From 315788b4cbcba7cee4e9d5cb97c543b3b0866d0c Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 4 Dec 2024 17:03:15 +0800 Subject: [PATCH 0461/1054] volnoti: remove --- pkgs/by-name/vo/volnoti/package.nix | 38 ----------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/by-name/vo/volnoti/package.nix diff --git a/pkgs/by-name/vo/volnoti/package.nix b/pkgs/by-name/vo/volnoti/package.nix deleted file mode 100644 index 560b9cce3fd4..000000000000 --- a/pkgs/by-name/vo/volnoti/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, pkg-config, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg -, dbus-glib, autoreconfHook, wrapGAppsHook3 }: - -stdenv.mkDerivation { - pname = "volnoti-unstable"; - version = "2013-09-23"; - - src = fetchFromGitHub { - owner = "davidbrazdil"; - repo = "volnoti"; - rev = "4af7c8e54ecc499097121909f02ecb42a8a60d24"; - sha256 = "155lb7w563dkdkdn4752hl0zjhgnq3j4cvs9z98nb25k1xpmpki7"; - }; - - patches = [ - # Fix dbus interface headers. See - # https://github.com/davidbrazdil/volnoti/pull/10 - (fetchpatch { - url = "https://github.com/davidbrazdil/volnoti/commit/623ad8ea5c3ac8720d00a2ced4b6163aae38c119.patch"; - sha256 = "046zfdjmvhb7jrsgh04vfgi35sgy1zkrhd3bzdby3nvds1wslfam"; - }) - ]; - - nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 ]; - - buildInputs = [ - dbus gdk-pixbuf glib libX11 gtk2 dbus-glib librsvg - ]; - - meta = with lib; { - description = "Lightweight volume notification for Linux"; - homepage = "https://github.com/davidbrazdil/volnoti"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f0a31c36a0d6..a756f538ede7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1339,6 +1339,7 @@ mapAliases { virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17 vkBasalt = vkbasalt; # Added 2022-11-22 vkdt-wayland = vkdt; # Added 2024-04-19 + volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 vuze = throw "'vuze' was removed because it is unmaintained upstream and insecure (CVE-2018-13417). BiglyBT is a maintained fork."; # Added 2024-11-22 inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17 From 3834a03dee11ead822054a0c364e2af0a6966f25 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:06:24 +0100 Subject: [PATCH 0462/1054] element-desktop: 1.11.86 -> 1.11.87 https://github.com/element-hq/element-desktop/releases/tag/v1.11.87 --- .../networking/instant-messengers/element/pin.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index d8ffd2b40a77..2f12882e5ef0 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.86"; + "version" = "1.11.87"; "hashes" = { - "desktopSrcHash" = "sha256-GP5KnXL63J0076cVu0OpodlNT7Ypeso4iGrQNKq/17M="; - "desktopYarnHash" = "0bcq89nmx03h106hp875mv482d4r1xahdsimw3cs5c592zl50kx2"; - "webSrcHash" = "sha256-cqB77ffTbFLoNsGjXUOb2tdlXhSIS3X1/oDXOzOn99s="; - "webYarnHash" = "1cwj77a997lb4229ngry0b6kip1ggs82b9v126rzfgzavvwh9k1v"; + "desktopSrcHash" = "sha256-rIxuXMHQVJrbfWibpiIBmTkXKHrBqnTMiBYIP8VOIH4="; + "desktopYarnHash" = "05qs1an3mbqsfn1nmgwagp564lqvyrbkyj58z5h2cbczqbavnxxz"; + "webSrcHash" = "sha256-FcXYwYCx//fqWuUKRqTTntlT7jVBD1Heayg4T7ACHmc="; + "webYarnHash" = "0anamnfm5g4nj7wp18byi49x38aia490qfard2d34myzjgiby8v3"; }; } From 711695813d75308df891208e987604f918438f8a Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 4 Dec 2024 17:12:38 +0800 Subject: [PATCH 0463/1054] latencytop: remove --- pkgs/by-name/la/latencytop/package.nix | 33 -------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/by-name/la/latencytop/package.nix diff --git a/pkgs/by-name/la/latencytop/package.nix b/pkgs/by-name/la/latencytop/package.nix deleted file mode 100644 index bee5fa9f28a7..000000000000 --- a/pkgs/by-name/la/latencytop/package.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2, util-linux }: - -stdenv.mkDerivation rec { - pname = "latencytop"; - version = "0.5"; - - postPatch = '' - sed -i s,/usr,$out, Makefile - - # Fix #171609 - substituteInPlace fsync.c --replace /bin/mount ${util-linux}/bin/mount - ''; - - preInstall = "mkdir -p $out/sbin"; - - src = fetchurl { - urls = [ "http://latencytop.org/download/latencytop-${version}.tar.gz" - "http://dbg.download.sourcemage.org/mirror/latencytop-0.5.tar.gz" ]; - sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses glib gtk2 ]; - - meta = { - homepage = "http://latencytop.org"; - description = "Tool to show kernel reports on latencies (LATENCYTOP option)"; - mainProgram = "latencytop"; - license = lib.licenses.gpl2Only; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a756f538ede7..17eec2342880 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -616,6 +616,7 @@ mapAliases { larynx = piper-tts; # Added 2023-05-09 LASzip = laszip; # Added 2024-06-12 LASzip2 = laszip_2; # Added 2024-06-12 + latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 latinmodern-math = lmmath; leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19 ledger_agent = ledger-agent; # Added 2024-01-07 From 3a76a34b27a92774e31bd0aa1d3a15c38c5fc3ab Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 4 Dec 2024 17:14:35 +0800 Subject: [PATCH 0464/1054] rftg: remove --- pkgs/by-name/rf/rftg/package.nix | 23 ----------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 pkgs/by-name/rf/rftg/package.nix diff --git a/pkgs/by-name/rf/rftg/package.nix b/pkgs/by-name/rf/rftg/package.nix deleted file mode 100644 index 8e30b7ff9a2e..000000000000 --- a/pkgs/by-name/rf/rftg/package.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, gtk2, pkg-config }: - -stdenv.mkDerivation rec { - - pname = "rftg"; - version = "0.9.4"; - - src = fetchurl { - url = "http://keldon.net/rftg/rftg-${version}.tar.bz2"; - sha256 = "0j2y6ggpwdlvyqhirp010aix2g6aacj3kvggvpwzxhig30x9vgq8"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2.dev ]; - - meta = { - homepage = "http://keldon.net/rftg/"; - description = "Implementation of the card game Race for the Galaxy, including an AI"; - license = lib.licenses.gpl2Plus; - maintainers = [ ]; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 17eec2342880..bdc028c56c08 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1101,6 +1101,7 @@ mapAliases { retroarchBare = retroarch-bare; # Added 2024-11-23 retroarchFull = retroarch-full; # Added 2024-11-23 retroshare06 = retroshare; + rftg = throw "'rftg' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 rigsofrods = rigsofrods-bin; # Added 2023-03-22 ring-daemon = throw "'ring-daemon' has been renamed to/replaced by 'jami-daemon'"; # Converted to throw 2024-10-17 rippled = throw "rippled has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25 From 740d2fb5ada22320273c20d78b51c64c6bcae44c Mon Sep 17 00:00:00 2001 From: genga Date: Wed, 4 Dec 2024 01:39:00 +0300 Subject: [PATCH 0465/1054] wgsl-analyzer: init at 0.8.1 wgsl-analyzer: update meta --- pkgs/by-name/wg/wgsl-analyzer/package.nix | 40 +++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/wg/wgsl-analyzer/package.nix diff --git a/pkgs/by-name/wg/wgsl-analyzer/package.nix b/pkgs/by-name/wg/wgsl-analyzer/package.nix new file mode 100644 index 000000000000..f432e31bdd9f --- /dev/null +++ b/pkgs/by-name/wg/wgsl-analyzer/package.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "wgsl-analyzer"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "wgsl-analyzer"; + repo = "wgsl-analyzer"; + rev = "refs/tags/v${version}"; + hash = "sha256-bhosTihbW89vkqp1ua0C1HGLJJdCNfRde98z4+IjkOc="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-+SeVxobUh2o2xNVBgXf1AgGI6hpNkoDNzXcKfabKEVc="; + + checkFlags = [ + # Imports failures + "--skip=tests::parse_import" + "--skip=tests::parse_import_colon" + "--skip=tests::parse_string_import" + "--skip=tests::struct_recover_3" + ]; + + meta = { + description = "Language server implementation for the WGSL shading language"; + homepage = "https://github.com/wgsl-analyzer/wgsl-analyzer"; + changelog = "https://github.com/wgsl-analyzer/wgsl-analyzer/releases/tag/v${version}"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "wgsl-analyzer"; + }; +} From 3fcf45499bf12c3541447e05b6cc72f6d26050fc Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 4 Dec 2024 11:00:19 +0100 Subject: [PATCH 0466/1054] gnat-bootstrap: fix and enable strictDeps --- pkgs/development/compilers/gnat-bootstrap/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gnat-bootstrap/default.nix b/pkgs/development/compilers/gnat-bootstrap/default.nix index d59a6b4f51fb..bbf1173f1b00 100644 --- a/pkgs/development/compilers/gnat-bootstrap/default.nix +++ b/pkgs/development/compilers/gnat-bootstrap/default.nix @@ -54,16 +54,13 @@ in { nativeBuildInputs = [ dejagnu - expat gmp guile libipt mpfr - ncurses5 python3 readline sourceHighlight - xz zlib ] ++ lib.optionals stdenv.buildPlatform.isLinux [ autoPatchelfHook @@ -72,6 +69,14 @@ in { elfutils ]; + buildInputs = [ + expat + ncurses5 + xz + ]; + + strictDeps = true; + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin) '' substituteInPlace lib/gcc/${upstreamTriplet}/${gccVersion}/install-tools/mkheaders.conf \ --replace "SYSTEM_HEADER_DIR=\"/usr/include\"" "SYSTEM_HEADER_DIR=\"/include\"" From 9293bc7d55ae3faa43ca97f7bd4225ef688022fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Christ?= Date: Wed, 4 Dec 2024 11:00:43 +0100 Subject: [PATCH 0467/1054] traccar: init at 6.5 --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/monitoring/traccar.nix | 125 ++++++++++++++++++ pkgs/by-name/tr/traccar/package.nix | 43 ++++++ 4 files changed, 171 insertions(+) create mode 100644 nixos/modules/services/monitoring/traccar.nix create mode 100644 pkgs/by-name/tr/traccar/package.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index a82932ce6626..6f1ec85a83b3 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -16,6 +16,8 @@ - [Omnom](https://github.com/asciimoo/omnom), a webpage bookmarking and snapshotting service. Available as [services.omnom](options.html#opt-services.omnom.enable). +- [Traccar](https://www.traccar.org/), a modern GPS Tracking Platform. Available as [services.traccar](#opt-services.traccar.enable). + - [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](#opt-services.amazon-cloudwatch-agent.enable). - [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](#opt-services.agorakit.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3b31c12df77a..eaff9dc318df 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -947,6 +947,7 @@ ./services/monitoring/telegraf.nix ./services/monitoring/thanos.nix ./services/monitoring/todesk.nix + ./services/monitoring/traccar.nix ./services/monitoring/tremor-rs.nix ./services/monitoring/tuptime.nix ./services/monitoring/unpoller.nix diff --git a/nixos/modules/services/monitoring/traccar.nix b/nixos/modules/services/monitoring/traccar.nix new file mode 100644 index 000000000000..4a2370b51cd2 --- /dev/null +++ b/nixos/modules/services/monitoring/traccar.nix @@ -0,0 +1,125 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.traccar; + stateDirectory = "/var/lib/traccar"; + configFilePath = "${stateDirectory}/config.xml"; + expandCamelCase = lib.replaceStrings lib.upperChars (map (s: ".${s}") lib.lowerChars); + mkConfigEntry = key: value: "${value}"; + mkConfig = + configurationOptions: + pkgs.writeText "traccar.xml" '' + + + + ${builtins.concatStringsSep "\n" (lib.mapAttrsToList mkConfigEntry configurationOptions)} + + ''; + + defaultConfig = { + databaseDriver = "org.h2.Driver"; + databasePassword = ""; + databaseUrl = "jdbc:h2:${stateDirectory}/traccar"; + databaseUser = "sa"; + loggerConsole = "true"; + mediaPath = "${stateDirectory}/media"; + templatesRoot = "${stateDirectory}/templates"; + }; +in +{ + options.services.traccar = { + enable = lib.mkEnableOption "Traccar, an open source GPS tracking system"; + settings = lib.mkOption { + apply = lib.recursiveUpdate defaultConfig; + default = defaultConfig; + description = '' + {file}`config.xml` configuration as a Nix attribute set. + Attribute names are translated from camelCase to dot-separated strings. For instance: + {option}`mailSmtpPort = "25"` + would result in the following configuration property: + `25` + Configuration options should match those described in + [Traccar - Configuration File](https://www.traccar.org/configuration-file/). + Secret tokens should be specified using {option}`environmentFile` + instead of this world-readable attribute set. + ''; + }; + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + File containing environment variables to substitute in the configuration before starting Traccar. + + Can be used for storing the secrets without making them available in the world-readable Nix store. + + For example, you can set {option}`services.traccar.settings.databasePassword = "$TRACCAR_DB_PASSWORD"` + and then specify `TRACCAR_DB_PASSWORD=""` in the environment file. + This value will get substituted in the configuration file. + ''; + }; + }; + + config = + let + configuration = mkConfig cfg.settings; + in + lib.mkIf cfg.enable { + systemd.services.traccar = { + enable = true; + description = "Traccar"; + + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + + preStart = '' + # Copy new templates into our state directory. + cp -a --update=none ${pkgs.traccar}/templates ${stateDirectory} + test -f '${configFilePath}' && rm -f '${configFilePath}' + + # Substitute the configFile from Envvars read from EnvironmentFile + old_umask=$(umask) + umask 0177 + ${lib.getExe pkgs.envsubst} \ + -i ${configuration} \ + -o ${configFilePath} + umask $old_umask + ''; + + serviceConfig = { + DynamicUser = true; + EnvironmentFile = cfg.environmentFile; + ExecStart = "${lib.getExe pkgs.traccar} ${configFilePath}"; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + Restart = "on-failure"; + RestartSec = 10; + RestrictRealtime = true; + RestrictSUIDSGID = true; + StateDirectory = "traccar"; + SuccessExitStatus = 143; + Type = "simple"; + # Set the working directory to traccar's package. + # Traccar only searches for the DB migrations relative to it's WorkingDirectory and nothing worked to + # work around this. To avoid copying the migrations over to the state directory, we use the package as + # WorkingDirectory. + WorkingDirectory = "${pkgs.traccar}"; + }; + }; + }; +} diff --git a/pkgs/by-name/tr/traccar/package.nix b/pkgs/by-name/tr/traccar/package.nix new file mode 100644 index 000000000000..590f65fddadc --- /dev/null +++ b/pkgs/by-name/tr/traccar/package.nix @@ -0,0 +1,43 @@ +{ + fetchzip, + lib, + pkgs, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation rec { + pname = "traccar"; + version = "6.5"; + nativeBuildInputs = [ pkgs.makeWrapper ]; + + src = fetchzip { + stripRoot = false; + url = "https://github.com/traccar/traccar/releases/download/v${version}/traccar-other-${version}.zip"; + hash = "sha256-XCG3G24oe/qR6LiMJASb9STOnyTCtw+2HigaPawcQvU="; + }; + + installPhase = '' + runHook preInstall + + for dir in lib schema templates web ; do + mkdir -p $out/$dir + cp -a $dir $out + done + + mkdir -p $out/share/traccar + install -Dm644 tracker-server.jar $out + + makeWrapper ${pkgs.openjdk}/bin/java $out/bin/traccar \ + --add-flags "-jar $out/tracker-server.jar" + + runHook postInstall + ''; + + meta = with lib; { + description = "Open source GPS tracking system"; + homepage = "https://www.traccar.org/"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.asl20; + mainProgram = "traccar"; + maintainers = with maintainers; [ frederictobiasc ]; + }; +} From 6791b9d2496311e7723871fff024fee4a99c999d Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Fri, 4 Oct 2024 03:51:41 +0200 Subject: [PATCH 0468/1054] zepp-simulator: init at 2.0.2 --- .../zepp-simulator/0001-force_qemu_x11.patch | 13 ++ pkgs/by-name/ze/zepp-simulator/package.nix | 176 ++++++++++++++++++ 2 files changed, 189 insertions(+) create mode 100644 pkgs/by-name/ze/zepp-simulator/0001-force_qemu_x11.patch create mode 100644 pkgs/by-name/ze/zepp-simulator/package.nix diff --git a/pkgs/by-name/ze/zepp-simulator/0001-force_qemu_x11.patch b/pkgs/by-name/ze/zepp-simulator/0001-force_qemu_x11.patch new file mode 100644 index 000000000000..f9bd47bf8514 --- /dev/null +++ b/pkgs/by-name/ze/zepp-simulator/0001-force_qemu_x11.patch @@ -0,0 +1,13 @@ +diff --git a/opt/simulator/resources/firmware/start_qemu.sh b/opt/simulator/resources/firmware/start_qemu.sh +index cfdad8b..64fba99 100644 +--- a/opt/simulator/resources/firmware/start_qemu.sh ++++ b/opt/simulator/resources/firmware/start_qemu.sh +@@ -75,6 +75,8 @@ fi + host_os=$(uname -s) + echo "Host OS type : \"$(uname -v)\"." + if [ "$host_os" = "Linux" ]; then ++ export GDK_BACKEND=x11 ++ + qemu_bin="qemu_linux/qemu-system-arm" + check_file_exists "$qemu_bin" + diff --git a/pkgs/by-name/ze/zepp-simulator/package.nix b/pkgs/by-name/ze/zepp-simulator/package.nix new file mode 100644 index 000000000000..ee8dc262c87b --- /dev/null +++ b/pkgs/by-name/ze/zepp-simulator/package.nix @@ -0,0 +1,176 @@ +{ + stdenv, + lib, + fetchurl, + makeWrapper, + copyDesktopItems, + autoPatchelfHook, + + # Upstream is officialy built with Electron 18 + # (but it works with latest Electron with minor changes, see HACK below) + electron, + asar, + dpkg, + + # qemu deps + # (it's not possible to de-vendor the qemu binary since it relies on proprietary cpu extensions) + glib, + libgcc, + libcxx, + zlib, + libepoxy, + libpng, + libaio, + xorg, + libvterm, + vte, + gsasl, + gtk3, + cairo, + gdk-pixbuf, + numactl, + cyrus_sasl, + SDL2, + # aarch64-only? + dtc, + capstone_4, + libjpeg8, + mesa, + curlWithGnuTls, +}: + +let + # CDN links for 2.0.2: + # MacOS: https://upload-cdn.zepp.com/zepp-applet-and-wechat-applet/20240927/ecb6ca54f4dc97a2f91e53358bbb532d.dmg + # Windows: https://upload-cdn.zepp.com/zepp-applet-and-wechat-applet/20240927/9db7ae1c60c26836a447a71a6fb25b3b.exe + # Linux ARM64: https://upload-cdn.zepp.com/zepp-applet-and-wechat-applet/20240927/02ec69e6a2f3b744d964fd7ba4f40fc3.deb + # Linux AMD64: https://upload-cdn.zepp.com/zepp-applet-and-wechat-applet/20240927/3e688d423cd0cd31a8a589b8325a309e.deb + srcs = { + x86_64-linux = { + url = "https://upload-cdn.zepp.com/zepp-applet-and-wechat-applet/20240927/3e688d423cd0cd31a8a589b8325a309e.deb"; + sha256 = "sha256-ZHqaEL8FoSnRtuqGWpTyJka7D0dHtRADZthq8DG2k24="; + }; + aarch64-linux = { + url = "https://upload-cdn.zepp.com/zepp-applet-and-wechat-applet/20240927/02ec69e6a2f3b744d964fd7ba4f40fc3.deb"; + sha256 = "sha256-J5Y4wLiFOM9D2MIMiRyUtHIZ19rt65ktVCOMZQQwBCI="; + }; + }; + +in + +stdenv.mkDerivation { + pname = "zepp-simulator"; + version = "2.0.2"; + + src = fetchurl srcs.${stdenv.hostPlatform.system}; + + patches = [ + # Fix for qemu input grab not working with NIXOS_OZONE_WL=1 + ./0001-force_qemu_x11.patch + ]; + + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + makeWrapper + dpkg + asar + ]; + + buildInputs = + [ + # QEMU deps (runtime): + glib + libgcc + libcxx + zlib + libepoxy + libpng + libaio + xorg.libX11 + libvterm + vte + gsasl + numactl + cyrus_sasl + gtk3 + cairo + gdk-pixbuf + SDL2 + ] + ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + libjpeg8 + dtc + capstone_4 + mesa + curlWithGnuTls + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + # Create output file strucure + mkdir -p $out/{bin,opt,share} + cp -r opt/simulator $out/opt + cp -r usr/share/* $out/share + + # Patch desktop file executable path + substituteInPlace $out/share/applications/simulator.desktop \ + --replace-fail '/opt/simulator/simulator' 'simulator' + + # Remove unnecessary files + rm -rf \ + $out/usr/share/applications/simulator.desktop \ + $out/opt/simulator/*.so \ + $out/opt/simulator/libvulkan.so.1 \ + $out/opt/simulator/swiftshader \ + $out/opt/simulator/simulator \ + $out/opt/simulator/resources/firmware/setup_for_linux.sh + + # Use system electron + makeWrapper ${lib.getExe electron} $out/bin/simulator \ + --add-flags "--no-sandbox" \ + --add-flags $out/opt/simulator/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set-default NODE_ENV production \ + --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ + --set-default ELECTRON_IS_DEV 0 \ + --set-default ELECTRON_DISABLE_SECURITY_WARNINGS 1 \ + --inherit-argv0; + + # HACK: disable sandbox introduced in Electron 20 + asar extract $out/opt/simulator/resources/app.asar app_unpacked + rm $out/opt/simulator/resources/app.asar + sed -i \ + 's|contextIsolation: false,|contextIsolation: false, sandbox: false,|g' \ + app_unpacked/build/electron/process/side-service.js + asar pack app_unpacked $out/opt/simulator/resources/app.asar + rm -rf app_unpacked + + runHook postInstall + ''; + + # HACK: Replace libsasl2.so.ls with libsasl2.so.3 + postFixup = '' + patchelf \ + --replace-needed libsasl2.so.2 libsasl2.so.3 \ + $out/opt/simulator/resources/firmware/qemu_linux/qemu-system-arm + chmod +x $out/opt/simulator/resources/firmware/qemu_linux/qemu-system-arm + ''; + + meta = { + description = "Zepp OS Simulator"; + homepage = "https://developer.zepp.com/os/home"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + # TODO Darwin + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + maintainers = with lib.maintainers; [ griffi-gh ]; + mainProgram = "simulator"; + }; +} From 07e283f2b1e4b137be13af7fd38ad5c357a3f716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Christ?= Date: Wed, 4 Dec 2024 11:06:49 +0100 Subject: [PATCH 0469/1054] modules/avahi: Enable IPv6 by default Avahi's default for `use-ipv6` is yes as well. I see no reason why we should do this differently. --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ nixos/modules/services/networking/avahi-daemon.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 39849d5d64c2..2d6c8a87b839 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -77,6 +77,8 @@ - Cinnamon has been updated to 6.4. +- `services.avahi.ipv6` now defaults to true. + - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries. diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 73fc210728d8..47b707f213f0 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -91,7 +91,7 @@ in ipv6 = lib.mkOption { type = lib.types.bool; - default = false; + default = true; description = "Whether to use IPv6."; }; From a128993b4373fc2231ebd1190989bc8a42272dc4 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Tue, 3 Dec 2024 11:04:14 +0100 Subject: [PATCH 0470/1054] ocamlformat_0_27_0: init --- pkgs/development/ocaml-modules/ocamlformat/generic.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/generic.nix index d9dfd6dc1b1e..6e6f39630239 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/generic.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/generic.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, version ? "0.26.2", astring, base, camlp-streams, cmdliner_1_0 +{ lib, fetchurl, version ? "0.27.0", astring, base, camlp-streams, cmdliner_1_0 , cmdliner_1_1, csexp, dune-build-info, either, fix, fpath, menhirLib, menhirSdk , ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf , janeStreet_0_15, ... }: @@ -26,6 +26,7 @@ rec { "0.26.0" = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30="; "0.26.1" = "sha256-2gBuQn8VuexhL7gI1EZZm9m3w+4lq+s9VVdHpw10xtc="; "0.26.2" = "sha256-Lk9Za/eqNnqET+g7oPawvxSyplF53cCCNj/peT0DdcU="; + "0.27.0" = "sha256-3b9ITAdtCPmUAO6Et5DsIx9cj8vV0zJKZADVOI6EbRU="; }."${version}"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ea6186120b2..f7c3a0a6b7b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6787,7 +6787,7 @@ with pkgs; inherit (ocamlPackages) ocamlformat # latest version - ocamlformat_0_26_2; + ocamlformat_0_26_2 ocamlformat_0_27_0; inherit (ocamlPackages) odig; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 35cb14aff535..5691515d8ba5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1339,6 +1339,7 @@ let ocamlformat_0_26_0 = ocamlformat.override { version = "0.26.0"; }; ocamlformat_0_26_1 = ocamlformat.override { version = "0.26.1"; }; ocamlformat_0_26_2 = ocamlformat.override { version = "0.26.2"; }; + ocamlformat_0_27_0 = ocamlformat.override { version = "0.27.0"; }; ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix {}; From 15562307c850e374ebc339dd13823a8d39253e66 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 11:55:25 +0100 Subject: [PATCH 0471/1054] ripasso-cursive: format --- pkgs/tools/security/ripasso/cursive.nix | 53 +++++++++++++------------ 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index fe216b91ff91..21641754374b 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -1,18 +1,19 @@ -{ stdenv -, lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, python3 -, openssl -, libgpg-error -, gpgme -, xorg -, nettle -, clang -, AppKit -, Security -, installShellFiles +{ + stdenv, + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + python3, + openssl, + libgpg-error, + gpgme, + xorg, + nettle, + clang, + AppKit, + Security, + installShellFiles, }: rustPlatform.buildRustPackage rec { @@ -43,16 +44,18 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = [ - openssl - libgpg-error - gpgme - xorg.libxcb - nettle - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Security - ]; + buildInputs = + [ + openssl + libgpg-error + gpgme + xorg.libxcb + nettle + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + AppKit + Security + ]; preCheck = '' export HOME=$TMPDIR From 7376feb6bb2312d952e80ec5c996218d0c382476 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 11:56:23 +0100 Subject: [PATCH 0472/1054] ripasso-cursive: move to by-name --- .../ri/ripasso-cursive}/fix-tests.patch | 0 .../ri/ripasso-cursive/package.nix} | 22 ++++++------------- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 7 insertions(+), 19 deletions(-) rename pkgs/{tools/security/ripasso => by-name/ri/ripasso-cursive}/fix-tests.patch (100%) rename pkgs/{tools/security/ripasso/cursive.nix => by-name/ri/ripasso-cursive/package.nix} (83%) diff --git a/pkgs/tools/security/ripasso/fix-tests.patch b/pkgs/by-name/ri/ripasso-cursive/fix-tests.patch similarity index 100% rename from pkgs/tools/security/ripasso/fix-tests.patch rename to pkgs/by-name/ri/ripasso-cursive/fix-tests.patch diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix similarity index 83% rename from pkgs/tools/security/ripasso/cursive.nix rename to pkgs/by-name/ri/ripasso-cursive/package.nix index 21641754374b..a595a724de2b 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -1,5 +1,4 @@ { - stdenv, lib, rustPlatform, fetchFromGitHub, @@ -11,8 +10,6 @@ xorg, nettle, clang, - AppKit, - Security, installShellFiles, }: @@ -44,18 +41,13 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - [ - openssl - libgpg-error - gpgme - xorg.libxcb - nettle - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Security - ]; + buildInputs = [ + openssl + libgpg-error + gpgme + xorg.libxcb + nettle + ]; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7c3a0a6b7b0..8926c2fe0980 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2696,10 +2696,6 @@ with pkgs; razergenie = libsForQt5.callPackage ../applications/misc/razergenie { }; - ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix { - inherit (darwin.apple_sdk.frameworks) AppKit Security; - }; - roundcube = callPackage ../servers/roundcube { }; roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { }); From 1a2282008d5ae22857f5967e5c64d78a2aa0aea1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 11:58:22 +0100 Subject: [PATCH 0473/1054] ripasso-cursive: remove unneeded clang dependency --- pkgs/by-name/ri/ripasso-cursive/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index a595a724de2b..73627babc845 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -9,7 +9,6 @@ gpgme, xorg, nettle, - clang, installShellFiles, }: @@ -37,7 +36,6 @@ rustPlatform.buildRustPackage rec { gpgme python3 installShellFiles - clang rustPlatform.bindgenHook ]; From 4c0bd04c5dffc4678be5bb722d38068c0e4d2032 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Tue, 3 Dec 2024 01:51:14 -0500 Subject: [PATCH 0474/1054] ironbar: 0.16.0 -> 0.16.1 --- pkgs/by-name/ir/ironbar/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix index 7a16167d7d79..c10e8ce9d678 100644 --- a/pkgs/by-name/ir/ironbar/package.nix +++ b/pkgs/by-name/ir/ironbar/package.nix @@ -12,6 +12,7 @@ gtk-layer-shell, adwaita-icon-theme, libxkbcommon, + libdbusmenu-gtk3, openssl, pkg-config, hicolor-icon-theme, @@ -29,16 +30,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ironbar"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "ironbar"; rev = "v${version}"; - hash = "sha256-bvg7U7asuTONZgINQO8wSM2QjXAybvV7j5Ex/g6IDok="; + hash = "sha256-UtBO1XaghmzKv9qfhfoLi4ke+mf+Mtgh4f4UpCeEVDg="; }; - cargoHash = "sha256-Hlucn83Uf1XydRY4SYso+fJ5EvH2hOGmCFYuKgCeSuE="; + cargoHash = "sha256-PIesf/wqz8jrc7WbPBvku4MOTAbNq6m4VhYSKoStvY8="; buildInputs = [ @@ -55,7 +56,8 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals (hasFeature "http") [ openssl ] ++ lib.optionals (hasFeature "volume") [ libpulseaudio ] - ++ lib.optionals (hasFeature "cairo") [ luajit ]; + ++ lib.optionals (hasFeature "cairo") [ luajit ] + ++ lib.optionals (hasFeature "tray") [ libdbusmenu-gtk3 ]; nativeBuildInputs = [ pkg-config From 5e4c353d890bcac99028a545d0fe92340b5f7afe Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Wed, 4 Dec 2024 03:05:52 -0800 Subject: [PATCH 0475/1054] xeus-cling: use locally available logos to remove fragile wikimedia dependency --- .../editors/jupyter-kernels/xeus-cling/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix index b4f37ffd5fa2..751c3db697ee 100644 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix @@ -72,14 +72,8 @@ let "-f" "{connection_file}" ]; language = "cpp"; - logo32 = fetchurl { - url = "https://upload.wikimedia.org/wikipedia/commons/thumb/1/18/ISO_C%2B%2B_Logo.svg/32px-ISO_C%2B%2B_Logo.svg.png"; - hash = "sha256-+TKtwXybKw4oAHfgOsDxvL4ucItPguF76HJHdFTd3s0="; - }; - logo64 = fetchurl { - url = "https://upload.wikimedia.org/wikipedia/commons/thumb/1/18/ISO_C%2B%2B_Logo.svg/64px-ISO_C%2B%2B_Logo.svg.png"; - hash = "sha256-7SjOcSaSPUHIKnjBxMdn+KSjviL69IXhX7eJsacYeGE="; - }; + logo32 = "${xeus-cling-unwrapped}/share/jupyter/kernels/xcpp17/logo-32x32.png"; + logo64 = "${xeus-cling-unwrapped}/share/jupyter/kernels/xcpp17/logo-64x64.png"; }; in From 9a5c7f9e10adfc48e9ca356b673541c03e95d119 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 17:15:43 +0000 Subject: [PATCH 0476/1054] python312Packages.nlpcloud: 1.1.46 -> 1.1.47 --- pkgs/development/python-modules/nlpcloud/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nlpcloud/default.nix b/pkgs/development/python-modules/nlpcloud/default.nix index f9e16e828652..e8dfdb7b116a 100644 --- a/pkgs/development/python-modules/nlpcloud/default.nix +++ b/pkgs/development/python-modules/nlpcloud/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + setuptools, requests, }: buildPythonPackage rec { pname = "nlpcloud"; - version = "1.1.46"; - format = "setuptools"; + version = "1.1.47"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-NmNu1Rf6mN+Q8FdpeNYQ508ksqkIV7oOp8CrlDN1qPU="; + hash = "sha256-zj6hurPEzNlbrD6trq+zQHBNg4lJMGw+XHV51rBa9Mk="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # upstream has no tests doCheck = false; From 0303357796f4affa00d5e726a5753789750bd561 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Wed, 4 Dec 2024 12:24:14 +0100 Subject: [PATCH 0477/1054] checkov: use default python (3.12) --- pkgs/development/tools/analysis/checkov/default.nix | 1 + pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 51c7c85358cd..d54887e622df 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -92,6 +92,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ aioresponses + distutils mock pytest-asyncio pytest-mock diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7c3a0a6b7b0..61fea7de76e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -282,9 +282,7 @@ with pkgs; chef-cli = callPackage ../tools/misc/chef-cli { }; - checkov = callPackage ../development/tools/analysis/checkov { - python3 = python311; - }; + checkov = callPackage ../development/tools/analysis/checkov { }; clang-uml = callPackage ../by-name/cl/clang-uml/package.nix { stdenv = clangStdenv; From 9cdb9a69987984af967beae0c120c71f2c4bc1b4 Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Tue, 9 Jul 2024 19:59:35 +0200 Subject: [PATCH 0478/1054] python312Packages.beancount-plugin-utils: init at 0.0.4 --- .../beancount-plugin-utils/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/beancount-plugin-utils/default.nix diff --git a/pkgs/development/python-modules/beancount-plugin-utils/default.nix b/pkgs/development/python-modules/beancount-plugin-utils/default.nix new file mode 100644 index 000000000000..01fb3178182c --- /dev/null +++ b/pkgs/development/python-modules/beancount-plugin-utils/default.nix @@ -0,0 +1,44 @@ +{ + lib, + beancount, + buildPythonPackage, + fetchFromGitHub, + pytest-bdd, + pytestCheckHook, + regex, + setuptools, +}: + +buildPythonPackage rec { + pname = "beancount-plugin-utils"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Akuukis"; + repo = "beancount_plugin_utils"; + rev = "v${version}"; + hash = "sha256-oyfL2K/sS4zZ7cq1P36h0dTcW1m5GUyQ9+IyZGfpb2E="; + }; + + build-system = [ setuptools ]; + + dependencies = [ beancount ]; + + nativeCheckInputs = [ + pytest-bdd + pytestCheckHook + regex + ]; + + pytestFlagsArray = [ "--fixtures tests/" ]; + + pythonImportsCheck = [ "beancount" ]; + + meta = with lib; { + homepage = "https://github.com/Akuukis/beancount_plugin_utils"; + description = "Utils for beancount plugin writers - BeancountError, mark, metaset, etc"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ alapshin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e97f3474650c..88e9be70043a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1559,6 +1559,8 @@ self: super: with self; { beancount-docverif = callPackage ../development/python-modules/beancount-docverif { }; + beancount-plugin-utils = callPackage ../development/python-modules/beancount-plugin-utils { }; + beanhub-cli = callPackage ../development/python-modules/beanhub-cli { }; beanhub-extract = callPackage ../development/python-modules/beanhub-extract { }; From f0fa6364de59cde2e6a13131fd9916c2a46ba65f Mon Sep 17 00:00:00 2001 From: Talha Can Havadar Date: Tue, 5 Nov 2024 15:47:22 +0100 Subject: [PATCH 0479/1054] python3Packages.adafruit-board-toolkit: init at 1.1.1 Apply suggestions from code review Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- .../adafruit-board-toolkit/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/adafruit-board-toolkit/default.nix diff --git a/pkgs/development/python-modules/adafruit-board-toolkit/default.nix b/pkgs/development/python-modules/adafruit-board-toolkit/default.nix new file mode 100644 index 000000000000..a719881b9d13 --- /dev/null +++ b/pkgs/development/python-modules/adafruit-board-toolkit/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + # build-system + setuptools-scm, + # dependencies + pyserial, +}: + +buildPythonPackage rec { + pname = "adafruit-board-toolkit"; + version = "1.1.1"; + pyproject = true; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-k8TwmztGnCqS6F5ZrXSBnefZzc2kvuUqYxGAejRAdsI="; + }; + + # Project has not published tests yet + doCheck = false; + + build-system = [ + setuptools-scm + ]; + + dependencies = [ + pyserial + ]; + pythonImportsCheck = [ "adafruit_board_toolkit" ]; + meta = { + description = "CircuitPython board identification and information"; + homepage = "https://github.com/adafruit/Adafruit_Board_Toolkit"; + changelog = "https://github.com/adafruit/Adafruit_Board_Toolkit/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ talhaHavadar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6582ff759efb..2455540b3061 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -55,6 +55,8 @@ self: super: with self; { adafruit-io = callPackage ../development/python-modules/adafruit-io { }; + adafruit-board-toolkit = callPackage ../development/python-modules/adafruit-board-toolkit { }; + adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { }; adafruit-pureio = callPackage ../development/python-modules/adafruit-pureio { }; From 26befe6e6ec704a838fe524da6ee8711c539ddea Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Wed, 4 Dec 2024 20:03:48 +0800 Subject: [PATCH 0480/1054] workflows/eval: add eval summary to commit statuses --- .github/workflows/eval.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index f291e288c434..bd7b311675ed 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -246,6 +246,7 @@ jobs: if: needs.process.outputs.baseRunId permissions: pull-requests: write + statuses: write steps: - name: Download process result uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 @@ -285,3 +286,23 @@ jobs: GH_TOKEN: ${{ github.token }} REPOSITORY: ${{ github.repository }} NUMBER: ${{ github.event.number }} + + - name: Add eval summary to commit statuses + if: ${{ github.event_name == 'pull_request_target' }} + run: | + description=$(jq -r ' + "Package: added " + (.attrdiff.added | length | tostring) + + ", removed " + (.attrdiff.removed | length | tostring) + + ", changed " + (.attrdiff.changed | length | tostring) + + ", Rebuild: linux " + (.rebuildCountByKernel.linux | tostring) + + ", darwin " + (.rebuildCountByKernel.darwin | tostring) + ' Date: Wed, 4 Dec 2024 13:07:05 +0100 Subject: [PATCH 0481/1054] python312Packages.cyipopt: add numpy to build-system --- pkgs/development/python-modules/cyipopt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/cyipopt/default.nix b/pkgs/development/python-modules/cyipopt/default.nix index f549e065d9fd..bb20a06d77c4 100644 --- a/pkgs/development/python-modules/cyipopt/default.nix +++ b/pkgs/development/python-modules/cyipopt/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { build-system = [ cython + numpy setuptools ]; From 09824817661da151d26de886f392a6fd68a8a5b0 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 10 Nov 2024 20:23:21 +0300 Subject: [PATCH 0482/1054] nixos/samba: add convenient option to enable usershares --- .../services/network-filesystems/samba.nix | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index e661d3ff33bf..c0d12586dec8 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -101,6 +101,19 @@ in }; }; + usershares = { + enable = lib.mkEnableOption "user-configurable Samba shares"; + group = lib.mkOption { + type = lib.types.str; + default = "samba"; + description = '' + Name of the group members of which will be allowed to create usershares. + + The group will be created automatically. + ''; + }; + }; + nsswins = lib.mkEnableOption '' WINS NSS (Name Service Switch) plug-in. @@ -308,5 +321,22 @@ in restartTriggers = [ configFile ]; }; }) + + (lib.mkIf (cfg.enable && cfg.usershares.enable) { + users.groups.${cfg.usershares.group} = {}; + + systemd.tmpfiles.settings."50-samba-usershares"."/var/lib/samba/usershares".d = { + user = "root"; + group = cfg.usershares.group; + mode = "1775"; # sticky so users can't delete others' shares + }; + + # set some reasonable defaults + services.samba.settings.global = lib.mkDefault { + "usershare path" = "/var/lib/samba/usershares"; + "usershare max shares" = 100; # high enough to be considered ~unlimited + "usershare allow guests" = true; + }; + }) ]; } From cf6c2d61741d4ab17e1713ef61aa3dcb49211eeb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 13:21:31 +0100 Subject: [PATCH 0483/1054] python312Packages.ray: 2.39.0 -> 2.40.0 Changelog: https://github.com/ray-project/ray/releases/tag/ray-2.40.0 --- .../python-modules/ray/binary-hashes.nix | 11 -------- .../python-modules/ray/default.nix | 26 ++++++++++--------- 2 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/python-modules/ray/binary-hashes.nix diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix deleted file mode 100644 index 6afd032a2006..000000000000 --- a/pkgs/development/python-modules/ray/binary-hashes.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - cp310 = { - hash = "sha256-Ypj7mBzQ+oYH8ZF96yeSWrit1IxgulvQ9s9A1MxdrOQ="; - }; - cp311 = { - hash = "sha256-Ia7hJ64anPYZMAGrQdJVG8yBMxujtxltAA8W0Q8VxwU="; - }; - cp312 = { - hash = "sha256-AWkw5rp0uRtAEXpksk97//SKangPI9KwZKej9DvE4aI="; - }; -} diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index e193d25e2f1c..7e72996bd9dd 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -64,7 +64,7 @@ let pname = "ray"; - version = "2.39.0"; + version = "2.40.0"; in buildPythonPackage rec { inherit pname version; @@ -75,18 +75,20 @@ buildPythonPackage rec { src = let pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}"; - binary-hash = (import ./binary-hashes.nix)."${pyShortVersion}" or { }; + binary-hashes = { + cp310 = "sha256-9uqxHchJD4jnjgaqZFkFslnN4foDsV6EJhVcR4K6C74="; + cp311 = "sha256-cXEcvywVYhP9SbD5zJMYCnukJBEAcKNL3qPcCVJ/Md8="; + cp312 = "sha256-Z0dVgU9WkjBsVUytvCQBWvgj3AUW40ve8kzKydemVuM="; + }; in - fetchPypi ( - { - inherit pname version format; - dist = pyShortVersion; - python = pyShortVersion; - abi = pyShortVersion; - platform = "manylinux2014_x86_64"; - } - // binary-hash - ); + fetchPypi { + inherit pname version format; + dist = pyShortVersion; + python = pyShortVersion; + abi = pyShortVersion; + platform = "manylinux2014_x86_64"; + hash = binary-hashes.${pyShortVersion}; + }; nativeBuildInputs = [ autoPatchelfHook From a6225bbc173ace9179b7afbac20e03c51e1282a6 Mon Sep 17 00:00:00 2001 From: Kovacsics Robert Date: Fri, 6 Sep 2024 15:32:37 +0100 Subject: [PATCH 0484/1054] stm32cubemx: Pass arguments to Java jar This allows for opening files from the command line, giving other arguments (e.g. `-q`) to run scripts. --- pkgs/by-name/st/stm32cubemx/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix index 5bca483b1af1..6b63680c2e3b 100644 --- a/pkgs/by-name/st/stm32cubemx/package.nix +++ b/pkgs/by-name/st/stm32cubemx/package.nix @@ -45,7 +45,7 @@ let cat << EOF > $out/bin/${pname} #!${stdenvNoCC.shell} - ${jdk17}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX + ${jdk17}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX "\$@" EOF chmod +x $out/bin/${pname} From 3e1260861f43c44d2238b2c52d2458be267c268a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 12:39:04 +0000 Subject: [PATCH 0485/1054] clusternet: 0.17.1 -> 0.17.2 --- pkgs/by-name/cl/clusternet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clusternet/package.nix b/pkgs/by-name/cl/clusternet/package.nix index 8e574e575a73..9f4c57527ebd 100644 --- a/pkgs/by-name/cl/clusternet/package.nix +++ b/pkgs/by-name/cl/clusternet/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "clusternet"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "clusternet"; repo = "clusternet"; rev = "refs/tags/v${version}"; - hash = "sha256-ZjFybox6BeezDj+Jvb6MRfaTRozpXGUIG1n1GDVS4aM="; + hash = "sha256-6JZdFHMbdFm2uTlMbbi0y4rcVkbUZ6gSeK57v6MiL7M="; }; vendorHash = "sha256-hY4bgQXwKjL4UT3omDYuxy9xN9XOr00mMvGssKOSsG4="; From 351f10f88d73ba7f330ed029dc195ae1e7a4d024 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 00:32:56 +0100 Subject: [PATCH 0486/1054] gpu-viewer: 3.08 -> 3.10 Diff: https://github.com/arunsivaramanneo/gpu-viewer/compare/refs/tags/v3.08...v3.10 Changelog: https://github.com/arunsivaramanneo/GPU-Viewer/releases/tag/v3.10 --- pkgs/by-name/gp/gpu-viewer/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gp/gpu-viewer/package.nix b/pkgs/by-name/gp/gpu-viewer/package.nix index 7e3420a68396..79c26a10bf64 100644 --- a/pkgs/by-name/gp/gpu-viewer/package.nix +++ b/pkgs/by-name/gp/gpu-viewer/package.nix @@ -29,15 +29,14 @@ python3Packages.buildPythonApplication rec { pname = "gpu-viewer"; - version = "3.08"; - - format = "other"; + version = "3.10"; + pyproject = false; src = fetchFromGitHub { owner = "arunsivaramanneo"; repo = "gpu-viewer"; rev = "refs/tags/v${version}"; - hash = "sha256-P1zA/sjE4w2pdRDtJ8pGi4Rf8o4EmiRo6j17BRNu0IA="; + hash = "sha256-0rbg3T9OXnSZ5+2cjgfNitAv1LgdO0N90wWJifzHcsg="; }; nativeBuildInputs = [ From 11e3270b19fbbec68096f671c4e442f54d4494f4 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 4 Dec 2024 20:45:44 +0800 Subject: [PATCH 0487/1054] wordbook: unstable-2022-11-02 -> 0.4.0 --- pkgs/by-name/wo/wordbook/package.nix | 49 +++++++++++++--------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/wo/wordbook/package.nix b/pkgs/by-name/wo/wordbook/package.nix index 314ae208f9d5..870a3d762986 100644 --- a/pkgs/by-name/wo/wordbook/package.nix +++ b/pkgs/by-name/wo/wordbook/package.nix @@ -1,30 +1,28 @@ -{ lib -, fetchFromGitHub -, python3 -, meson -, ninja -, pkg-config -, glib -, gtk4 -, libadwaita -, librsvg -, espeak-ng -, gobject-introspection -, wrapGAppsHook4 -, appstream-glib -, desktop-file-utils +{ + lib, + fetchFromGitHub, + python3, + meson, + ninja, + pkg-config, + libadwaita, + espeak-ng, + gobject-introspection, + wrapGAppsHook4, + appstream-glib, + desktop-file-utils, }: python3.pkgs.buildPythonApplication rec { pname = "wordbook"; - version = "unstable-2022-11-02"; - format = "other"; + version = "0.4.0"; + pyproject = false; # Built with meson src = fetchFromGitHub { owner = "fushinari"; repo = "Wordbook"; - rev = "2d79e9e9ef21ba4b54d0b46c764a1481a06f0f1b"; - hash = "sha256-ktusZEQ7m8P0kiH09r3XC6q9bQCWVCn543IMLKmULDo="; + rev = "refs/tags/${version}"; + hash = "sha256-oiAXSDJJtlV6EIHzi+jFv+Ym1XHCMLx9DN1YRiXZNzc="; }; nativeBuildInputs = [ @@ -38,13 +36,10 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = [ - glib - gtk4 - librsvg libadwaita ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ pygobject3 wn ]; @@ -59,12 +54,12 @@ python3.pkgs.buildPythonApplication rec { ) ''; - meta = with lib; { + meta = { description = "Offline English-English dictionary application built for GNOME"; mainProgram = "wordbook"; homepage = "https://github.com/fushinari/Wordbook"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ zendo ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ zendo ]; }; } From 32d9748602625aa7595a460905dd2258b6843c2f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 11:59:37 +0100 Subject: [PATCH 0488/1054] ripasso-cursive: cosmetic changes --- pkgs/by-name/ri/ripasso-cursive/package.nix | 34 ++++++++++++--------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index 73627babc845..fa75bd01726f 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -2,14 +2,18 @@ lib, rustPlatform, fetchFromGitHub, + + # nativeBuildInputs + gpgme, + installShellFiles, pkg-config, python3, - openssl, + + # buildInputs libgpg-error, - gpgme, - xorg, nettle, - installShellFiles, + openssl, + xorg, }: rustPlatform.buildRustPackage rec { @@ -19,7 +23,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "cortex"; repo = "ripasso"; - rev = "release-${version}"; + rev = "refs/tags/release-${version}"; hash = "sha256-j98X/+UTea4lCtFfMpClnfcKlvxm4DpOujLc0xc3VUY="; }; @@ -32,35 +36,35 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p ripasso-cursive" ]; nativeBuildInputs = [ - pkg-config gpgme - python3 installShellFiles + pkg-config + python3 rustPlatform.bindgenHook ]; buildInputs = [ - openssl - libgpg-error gpgme - xorg.libxcb + libgpg-error nettle + openssl + xorg.libxcb ]; preCheck = '' - export HOME=$TMPDIR + export HOME=$(mktemp -d) ''; postInstall = '' installManPage target/man-page/cursive/ripasso-cursive.1 ''; - meta = with lib; { + meta = { description = "Simple password manager written in Rust"; mainProgram = "ripasso-cursive"; homepage = "https://github.com/cortex/ripasso"; - license = licenses.gpl3; - maintainers = with maintainers; [ sgo ]; - platforms = platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ sgo ]; + platforms = lib.platforms.unix; }; } From bba37efe584e545396a4e56fa6a32a32691af254 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 13:30:08 +0100 Subject: [PATCH 0489/1054] ripasso-cursive: add update script --- pkgs/by-name/ri/ripasso-cursive/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index fa75bd01726f..151a909de23d 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -14,6 +14,8 @@ nettle, openssl, xorg, + + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -59,6 +61,10 @@ rustPlatform.buildRustPackage rec { installManPage target/man-page/cursive/ripasso-cursive.1 ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Simple password manager written in Rust"; mainProgram = "ripasso-cursive"; From 62478f38fd577fabb111526268fc1287c9885428 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 28 Nov 2024 11:48:25 +0100 Subject: [PATCH 0490/1054] python312Packages.mtcnn: 0.1.1 -> 1.0.0 Diff: https://github.com/ipazc/mtcnn/compare/3208d443a8f01d317c65d7c97a03bc0a6143c41d...v1.0.0 Changelog: https://github.com/ipazc/mtcnn/releases/tag/v1.0.0 --- .../python-modules/mtcnn/default.nix | 53 ++++++++++--------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/mtcnn/default.nix b/pkgs/development/python-modules/mtcnn/default.nix index a82f386c6e5d..1aa067411c6f 100644 --- a/pkgs/development/python-modules/mtcnn/default.nix +++ b/pkgs/development/python-modules/mtcnn/default.nix @@ -2,50 +2,55 @@ lib, buildPythonPackage, fetchFromGitHub, - opencv-python, - pytestCheckHook, - pythonOlder, + + # build-system setuptools, - tensorflow, + + # dependencies + joblib, + keras, + lz4, + pythonAtLeast, + distutils, + + # tests + pytestCheckHook, }: -buildPythonPackage { +buildPythonPackage rec { pname = "mtcnn"; - version = "0.1.1"; + version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "ipazc"; repo = "mtcnn"; - # No tags / releases; using commit: https://github.com/ipazc/mtcnn/commit/3208d443a8f01d317c65d7c97a03bc0a6143c41d - rev = "3208d443a8f01d317c65d7c97a03bc0a6143c41d"; - hash = "sha256-GXUrLJ5XD6V2hT/gjyYSuh/CMMw2xIXKBsYFvQmbLYs="; + rev = "refs/tags/v${version}"; + hash = "sha256-gp+jfa1arD3PpJpuRFKIUznV0Lyjt3DPn/HHUviDXhk="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "setup, setuptools" "setup, find_packages"\ - --replace-fail "setuptools.find_packages" "find_packages"\ - --replace-fail "keras>=2.0.0" ""\ - --replace-fail "tests_require=['nose']," "" - ''; - build-system = [ setuptools ]; - dependencies = [ - opencv-python - tensorflow - ]; + dependencies = + [ + joblib + lz4 + ] + ++ lib.optionals (pythonAtLeast "3.12") [ + distutils + ]; pythonImportsCheck = [ "mtcnn" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + keras + pytestCheckHook + ]; meta = { description = "MTCNN face detection implementation for TensorFlow"; homepage = "https://github.com/ipazc/mtcnn"; + changelog = "https://github.com/ipazc/mtcnn/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ derdennisop ]; }; From cc67534b921a5ece0d88b31e73721ef80ad51fbc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 2 Dec 2024 18:36:34 +0100 Subject: [PATCH 0491/1054] python312Packages.retinaface: fix build --- .../python-modules/retinaface/default.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/retinaface/default.nix b/pkgs/development/python-modules/retinaface/default.nix index f727d3f31158..457ea634d3c5 100644 --- a/pkgs/development/python-modules/retinaface/default.nix +++ b/pkgs/development/python-modules/retinaface/default.nix @@ -2,14 +2,21 @@ lib, buildPythonPackage, fetchFromGitHub, - gdown, - numpy, - opencv4, - pillow, - pytestCheckHook, - pythonOlder, + + # build-system setuptools, + + # dependencies + gdown, + keras, + numpy, + opencv-python, + pillow, tensorflow, + tf-keras, + + # tests + pytestCheckHook, }: buildPythonPackage rec { @@ -17,8 +24,6 @@ buildPythonPackage rec { version = "0.0.17"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "serengil"; repo = "retinaface"; @@ -26,13 +31,6 @@ buildPythonPackage rec { hash = "sha256-0s1CSGlK2bF1F2V/IuG2ZqD7CkNfHGvp1M5C3zDnuKs="; }; - postPatch = '' - # prevent collisions - substituteInPlace setup.py \ - --replace-fail "data_files=[(\"\", [\"README.md\", \"requirements.txt\", \"package_info.json\"])]," "" \ - --replace-fail "install_requires=requirements," "" - ''; - # requires internet connection disabledTestPaths = [ "tests/test_actions.py" @@ -44,10 +42,12 @@ buildPythonPackage rec { dependencies = [ gdown + keras numpy - opencv4 + opencv-python pillow tensorflow + tf-keras ]; nativeCheckInputs = [ pytestCheckHook ]; From 592aa95398ed5248c8d4c25f4a1212bd1fecad12 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Thu, 7 Nov 2024 21:13:41 +0100 Subject: [PATCH 0492/1054] mise: 2024.10.8 -> 2024.11.37 --- pkgs/by-name/mi/mise/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 8adb9516b089..967b5d12f283 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2024.10.8"; + version = "2024.11.37"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-58y7jx7gmWlccezZXP5hSzrvnq8hlZ1QakF+FMgbwcc="; + hash = "sha256-9hBBEuSjE1WMmjb+UfA2rroMwzb2cuZ3TzVRZfvwvvI="; }; - cargoHash = "sha256-m2Eiqyh/rGgwRgRArs3fPWoqzi1EidZd5i66yi4SuFo="; + cargoHash = "sha256-PP1alyUmsqGjzUGnx1M8QYNBqELwil7NtH+W706PD2s="; nativeBuildInputs = [ installShellFiles @@ -50,8 +50,7 @@ rustPlatform.buildRustPackage rec { ./src/cli/generate/snapshots/*.snap substituteInPlace ./src/test.rs \ - --replace-fail '/usr/bin/env bash' '${lib.getExe bash}' \ - --replace-fail '"git"' '"${lib.getExe git}"' + --replace-fail '/usr/bin/env bash' '${lib.getExe bash}' substituteInPlace ./src/git.rs \ --replace-fail '"git"' '"${lib.getExe git}"' From d6263281b5aac7234067548e65b3052fa0676680 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 10 Nov 2024 21:09:37 +0300 Subject: [PATCH 0493/1054] kdePackages.kdenetwork-filesharing: hardcode runtime Samba dependencies, add NixOS specific hint Fixes #355008 --- .../gear/kdenetwork-filesharing/default.nix | 22 +++++- .../dependency-paths.patch | 71 +++++++++++++++++++ .../kdenetwork-filesharing/samba-hint.patch | 35 +++++++++ .../kdenetwork-filesharing/smbd-path.patch | 14 ---- 4 files changed, 127 insertions(+), 15 deletions(-) create mode 100644 pkgs/kde/gear/kdenetwork-filesharing/dependency-paths.patch create mode 100644 pkgs/kde/gear/kdenetwork-filesharing/samba-hint.patch delete mode 100644 pkgs/kde/gear/kdenetwork-filesharing/smbd-path.patch diff --git a/pkgs/kde/gear/kdenetwork-filesharing/default.nix b/pkgs/kde/gear/kdenetwork-filesharing/default.nix index 35292d554ef6..86089c92ced1 100644 --- a/pkgs/kde/gear/kdenetwork-filesharing/default.nix +++ b/pkgs/kde/gear/kdenetwork-filesharing/default.nix @@ -1,14 +1,34 @@ { + lib, mkKdeDerivation, + substituteAll, + samba, + shadow, qtdeclarative, }: mkKdeDerivation { pname = "kdenetwork-filesharing"; - patches = [ ./smbd-path.patch ]; + patches = [ + (substituteAll { + src = ./dependency-paths.patch; + inherit samba; + usermod = lib.getExe' shadow "usermod"; + }) + + # Provide a better looking and more NixOS specific Samba hint + # Proposed upstream: https://invent.kde.org/network/kdenetwork-filesharing/-/merge_requests/56 + ./samba-hint.patch + ]; extraBuildInputs = [ qtdeclarative ]; # We can't actually install samba via PackageKit, so let's not confuse users any more than we have to extraCmakeFlags = [ "-DSAMBA_INSTALL=OFF" ]; + + # Hardcoded as QStrings, which are UTF-16 so Nix can't pick these up automatically + postFixup = '' + mkdir -p $out/nix-support + echo "${samba} ${shadow}" > $out/nix-support/depends + ''; } diff --git a/pkgs/kde/gear/kdenetwork-filesharing/dependency-paths.patch b/pkgs/kde/gear/kdenetwork-filesharing/dependency-paths.patch new file mode 100644 index 000000000000..f5716e663162 --- /dev/null +++ b/pkgs/kde/gear/kdenetwork-filesharing/dependency-paths.patch @@ -0,0 +1,71 @@ +diff --git a/samba/filepropertiesplugin/authhelper.cpp b/samba/filepropertiesplugin/authhelper.cpp +index 6cbbd90..ae1d696 100644 +--- a/samba/filepropertiesplugin/authhelper.cpp ++++ b/samba/filepropertiesplugin/authhelper.cpp +@@ -49,7 +49,7 @@ ActionReply AuthHelper::isuserknown(const QVariantMap &args) + } + + QProcess p; +- const auto program = QStringLiteral("pdbedit"); ++ const auto program = QStringLiteral("@samba@/bin/pdbedit"); + const auto arguments = QStringList({QStringLiteral("--debuglevel=0"), QStringLiteral("--user"), username }); + p.setProgram(program); + p.setArguments(arguments); +@@ -88,7 +88,7 @@ ActionReply AuthHelper::createuser(const QVariantMap &args) + } + + QProcess p; +- p.setProgram(QStringLiteral("smbpasswd")); ++ p.setProgram(QStringLiteral("@samba@/bin/smbpasswd")); + p.setArguments({ + QStringLiteral("-L"), /* local mode */ + QStringLiteral("-s"), /* read from stdin */ +@@ -152,7 +152,7 @@ ActionReply AuthHelper::addtogroup(const QVariantMap &args) + QStringLiteral("-m"), + QStringLiteral("{%1}").arg(user.value()) }); + #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD) +- p.setProgram(QStringLiteral("/usr/sbin/usermod")); ++ p.setProgram(QStringLiteral("@usermod@")); + p.setArguments({ + QStringLiteral("--append"), + QStringLiteral("--groups"), +diff --git a/samba/filepropertiesplugin/groupmanager.cpp b/samba/filepropertiesplugin/groupmanager.cpp +index a2ba851..d54f6ce 100644 +--- a/samba/filepropertiesplugin/groupmanager.cpp ++++ b/samba/filepropertiesplugin/groupmanager.cpp +@@ -18,7 +18,7 @@ GroupManager::GroupManager(QObject *parent) + { + metaObject()->invokeMethod(this, [this] { + auto proc = new QProcess; +- proc->setProgram(QStringLiteral("testparm")); ++ proc->setProgram(QStringLiteral("@samba@/bin/testparm")); + proc->setArguments({QStringLiteral("--debuglevel=0"), + QStringLiteral("--suppress-prompt"), + QStringLiteral("--verbose"), +diff --git a/samba/filepropertiesplugin/sambausershareplugin.cpp b/samba/filepropertiesplugin/sambausershareplugin.cpp +index 4f6642e..86ea121 100644 +--- a/samba/filepropertiesplugin/sambausershareplugin.cpp ++++ b/samba/filepropertiesplugin/sambausershareplugin.cpp +@@ -112,7 +112,8 @@ SambaUserSharePlugin::SambaUserSharePlugin(QObject *parent) + bool SambaUserSharePlugin::isSambaInstalled() + { + return QFile::exists(QStringLiteral("/usr/sbin/smbd")) +- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd")); ++ || QFile::exists(QStringLiteral("/usr/local/sbin/smbd")) ++ || QFile::exists(QStringLiteral("/run/current-system/sw/bin/smbd")); + } + + void SambaUserSharePlugin::showSambaStatus() +diff --git a/samba/filepropertiesplugin/usermanager.cpp b/samba/filepropertiesplugin/usermanager.cpp +index 29238ce..ff20fcb 100644 +--- a/samba/filepropertiesplugin/usermanager.cpp ++++ b/samba/filepropertiesplugin/usermanager.cpp +@@ -138,7 +138,7 @@ bool UserManager::canManageSamba() const + void UserManager::load() + { + auto proc = new QProcess(this); +- proc->setProgram(QStringLiteral("testparm")); ++ proc->setProgram(QStringLiteral("@samba@/bin/testparm")); + proc->setArguments({ + QStringLiteral("--debuglevel=0"), + QStringLiteral("--suppress-prompt"), diff --git a/pkgs/kde/gear/kdenetwork-filesharing/samba-hint.patch b/pkgs/kde/gear/kdenetwork-filesharing/samba-hint.patch new file mode 100644 index 000000000000..0849639fc49f --- /dev/null +++ b/pkgs/kde/gear/kdenetwork-filesharing/samba-hint.patch @@ -0,0 +1,35 @@ +diff --git a/samba/filepropertiesplugin/qml/MissingSambaPage.qml b/samba/filepropertiesplugin/qml/MissingSambaPage.qml +index 327c4a7..9e2eba7 100644 +--- a/samba/filepropertiesplugin/qml/MissingSambaPage.qml ++++ b/samba/filepropertiesplugin/qml/MissingSambaPage.qml +@@ -6,20 +6,17 @@ + import QtQuick 2.12 + import QtQuick.Controls 2.5 as QQC2 + import QtQuick.Layouts 1.14 +-import org.kde.kirigami 2.4 as Kirigami +-import org.kde.filesharing.samba 1.0 as Samba ++import org.kde.kirigami as Kirigami + + // When built without packagekit we cannot do auto-installation. +-ColumnLayout { +- QQC2.Label { +- Layout.alignment: Qt.AlignHCenter +- Layout.fillWidth: true +- text: xi18nc("@info", "The Samba file sharing service must be installed before folders can be shared.") +- explanation: i18n("Because this distro does not include PackageKit, we cannot show you a nice \"Install it\" button, and you will have to use your package manager to install the samba server package manually.") +- wrapMode: Text.Wrap +- } +- Item { +- Layout.alignment: Qt.AlignHCenter +- Layout.fillHeight: true // space everything up ++Item { ++ Kirigami.PlaceholderMessage { ++ anchors.centerIn: parent ++ width: parent.width - (Kirigami.Units.largeSpacing * 4) ++ ++ icon.name: "dialog-error" ++ ++ text: xi18nc("@info", "File sharing service unavailable") ++ explanation: i18n("Please enable the `services.samba.enable` and `services.samba.usershares.enable` options in your NixOS configuration.") + } + } diff --git a/pkgs/kde/gear/kdenetwork-filesharing/smbd-path.patch b/pkgs/kde/gear/kdenetwork-filesharing/smbd-path.patch deleted file mode 100644 index e6e4e73333a7..000000000000 --- a/pkgs/kde/gear/kdenetwork-filesharing/smbd-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/samba/filepropertiesplugin/sambausershareplugin.cpp b/samba/filepropertiesplugin/sambausershareplugin.cpp -index d5c8d77..11c45d4 100644 ---- a/samba/filepropertiesplugin/sambausershareplugin.cpp -+++ b/samba/filepropertiesplugin/sambausershareplugin.cpp -@@ -112,7 +112,8 @@ SambaUserSharePlugin::SambaUserSharePlugin(QObject *parent) - bool SambaUserSharePlugin::isSambaInstalled() - { - return QFile::exists(QStringLiteral("/usr/sbin/smbd")) -- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd")); -+ || QFile::exists(QStringLiteral("/usr/local/sbin/smbd")) -+ || QFile::exists(QStringLiteral("/run/current-system/sw/bin/smbd")); - } - - void SambaUserSharePlugin::showSambaStatus() From dfc303201701ea221b8b3183dcc997a67f4ae0b6 Mon Sep 17 00:00:00 2001 From: weriomat Date: Tue, 3 Dec 2024 19:55:39 +0100 Subject: [PATCH 0494/1054] pingvin-share: 1.4.0 -> 1.6.1 --- pkgs/servers/pingvin-share/backend.nix | 2 +- pkgs/servers/pingvin-share/default.nix | 4 ++-- pkgs/servers/pingvin-share/frontend.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/pingvin-share/backend.nix b/pkgs/servers/pingvin-share/backend.nix index 25e49179db47..390540ea6e12 100644 --- a/pkgs/servers/pingvin-share/backend.nix +++ b/pkgs/servers/pingvin-share/backend.nix @@ -31,7 +31,7 @@ buildNpmPackage { prisma ]; - npmDepsHash = "sha256-IeryDlBFG+fu0FyqlNujkF+O+YwfQm0hoMMvp/vN0IQ="; + npmDepsHash = "sha256-2q+3NgXkpqdljW/AnBU44002arMc0K/Rl15eqr+oa9E="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/pingvin-share/default.nix index cea79820fef5..ddf32bcadfe9 100644 --- a/pkgs/servers/pingvin-share/default.nix +++ b/pkgs/servers/pingvin-share/default.nix @@ -5,12 +5,12 @@ }: let - version = "1.4.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "stonith404"; repo = "pingvin-share"; rev = "v${version}"; - hash = "sha256-5tu81kB9UDui2/n5KJLRug4IHeDihuv8+HWeo0saqAM="; + hash = "sha256-uoOkr5awBa7MQA4tNUzFp7we5zVnBpjX6V6fNcTI84o="; }; in diff --git a/pkgs/servers/pingvin-share/frontend.nix b/pkgs/servers/pingvin-share/frontend.nix index 3f23adb167e4..1b1a5bd51aeb 100644 --- a/pkgs/servers/pingvin-share/frontend.nix +++ b/pkgs/servers/pingvin-share/frontend.nix @@ -23,7 +23,7 @@ buildNpmPackage { buildInputs = [ vips ]; nativeBuildInputs = [ pkg-config ]; - npmDepsHash = "sha256-G9UzA/laXEiU101ehFwhi0i6PAeErNWqmb1fu4W+cII="; + npmDepsHash = "sha256-TC3I3suUJTCmKykitpf2vvO6aGUSoYWOnB3jFwV2W/4="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; From 0fb5a2b45c4b09f586dd62e46b6b99dab7b9fdf0 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Wed, 4 Dec 2024 21:18:25 +0800 Subject: [PATCH 0495/1054] clash-rs: 0.7.1 -> 0.7.3 --- pkgs/by-name/cl/clash-rs/package.nix | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index b9900f4a081c..cfec62f8a8c7 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -7,18 +7,18 @@ }: rustPlatform.buildRustPackage rec { pname = "clash-rs"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "Watfaq"; repo = "clash-rs"; rev = "refs/tags/v${version}"; - hash = "sha256-H76ErJQ+qKC3mt3IzNCPldAwlj7NnYUcLzUuOYykxnE="; + hash = "sha256-SJ3NhLiDA0iRgq9pKB/CeltPE2ewbY+z1NBQriebNi0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-yU5ioAuCJRuYKNOdd381W07Ua+c2me+wHFOMukTVVqM="; + cargoHash = "sha256-XZd3dah6c0jg5en/7fHAXz8iSb7AMJPvPZViXHTdEbw="; env = { PROTOC = "${protobuf}/bin/protoc"; @@ -26,26 +26,28 @@ rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; }; - doInstallCheck = true; - - dontCargoCheck = true; # test failed - - versionCheckProgramArg = "--version"; - - nativeInstallCheckInputs = [ versionCheckHook ]; - buildFeatures = [ "shadowsocks" "tuic" "onion" ]; + doCheck = false; # test failed + + doInstallCheck = true; + + versionCheckProgramArg = "--version"; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + meta = { description = "Custom protocol, rule based network proxy software"; homepage = "https://github.com/Watfaq/clash-rs"; mainProgram = "clash-rs"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aucub ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } From ffc48e4c5186ad746e893cc86af749a597494781 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 13:19:09 +0000 Subject: [PATCH 0496/1054] python312Packages.heudiconv: 1.2.0 -> 1.3.2 --- pkgs/development/python-modules/heudiconv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix index eb4596e89bd8..6d19a460fde1 100644 --- a/pkgs/development/python-modules/heudiconv/default.nix +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "heudiconv"; - version = "1.2.0"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-qrDYl6hB8BPJz3VKl7jklDaAafsCf1M+3VgFbnGxCTU="; + hash = "sha256-z7HaouhNuFX16RSY4gsF8gQJIJfmSiBVUANwMM113ds="; }; postPatch = '' From dda17ad20cc35c65b1147f16bae76f0dc3c5c5da Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 3 Dec 2024 15:07:30 +0000 Subject: [PATCH 0497/1054] kanidm: support multiple versions, 1.4 and 1.3 --- pkgs/by-name/ka/kanidm/1_3.nix | 15 +++ pkgs/by-name/ka/kanidm/1_4.nix | 5 + pkgs/by-name/ka/kanidm/generic.nix | 148 +++++++++++++++++++++++++++++ pkgs/by-name/ka/kanidm/package.nix | 134 +------------------------- pkgs/top-level/all-packages.nix | 11 ++- 5 files changed, 179 insertions(+), 134 deletions(-) create mode 100644 pkgs/by-name/ka/kanidm/1_3.nix create mode 100644 pkgs/by-name/ka/kanidm/1_4.nix create mode 100644 pkgs/by-name/ka/kanidm/generic.nix diff --git a/pkgs/by-name/ka/kanidm/1_3.nix b/pkgs/by-name/ka/kanidm/1_3.nix new file mode 100644 index 000000000000..e9d7b1cd8211 --- /dev/null +++ b/pkgs/by-name/ka/kanidm/1_3.nix @@ -0,0 +1,15 @@ +import ./generic.nix { + version = "1.3.3"; + hash = "sha256-W5G7osV4du6w/BfyY9YrDzorcLNizRsoz70RMfO2AbY="; + cargoHash = "sha256-gJrzOK6vPPBgsQFkKrbMql00XSfKGjgpZhYJLTURxoI="; + extraMeta = { + knownVulnerabilities = [ + '' + kanidm 1.3.x has reached EOL as of 2024-12-01. + + Please upgrade by verifying `kanidmd domain upgrade-check` and setting `services.kanidm.package = pkgs.kanidm_1_4;` + See upgrade guide at https://kanidm.github.io/kanidm/master/server_updates.html + '' + ]; + }; +} diff --git a/pkgs/by-name/ka/kanidm/1_4.nix b/pkgs/by-name/ka/kanidm/1_4.nix new file mode 100644 index 000000000000..f0820e203a74 --- /dev/null +++ b/pkgs/by-name/ka/kanidm/1_4.nix @@ -0,0 +1,5 @@ +import ./generic.nix { + version = "1.4.4"; + hash = "sha256-AXgq9ohnSeQvq1IIhxMhe+FhX6/hyvRsJCI4VaiN/MQ="; + cargoHash = "sha256-/PsQ9yqyhSub1Qg2A3wOsgucq4rM0CU4uA8tEOJhtAU="; +} diff --git a/pkgs/by-name/ka/kanidm/generic.nix b/pkgs/by-name/ka/kanidm/generic.nix new file mode 100644 index 000000000000..5c56898aae55 --- /dev/null +++ b/pkgs/by-name/ka/kanidm/generic.nix @@ -0,0 +1,148 @@ +{ + version, + hash, + cargoHash, + extraMeta ? { }, +}: + +{ + stdenv, + lib, + formats, + nixosTests, + rustPlatform, + fetchFromGitHub, + installShellFiles, + nix-update-script, + pkg-config, + udev, + openssl, + sqlite, + pam, + bashInteractive, + rust-jemalloc-sys, + kanidm, + # If this is enabled, kanidm will be built with two patches allowing both + # oauth2 basic secrets and admin credentials to be provisioned. + # This is NOT officially supported (and will likely never be), + # see https://github.com/kanidm/kanidm/issues/1747. + # Please report any provisioning-related errors to + # https://github.com/oddlama/kanidm-provision/issues/ instead. + enableSecretProvisioning ? false, +}: + +let + arch = if stdenv.hostPlatform.isx86_64 then "x86_64" else "generic"; +in +rustPlatform.buildRustPackage rec { + pname = "kanidm"; + inherit version cargoHash; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "refs/tags/v${version}"; + inherit hash; + }; + + KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; + + patches = lib.optionals enableSecretProvisioning [ + ./patches/oauth2-basic-secret-modify.patch + ./patches/recover-account.patch + ]; + + postPatch = + let + format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml"; + profile = { + admin_bind_path = "/run/kanidmd/sock"; + cpu_flags = if stdenv.hostPlatform.isx86_64 then "x86_64_legacy" else "none"; + default_config_path = "/etc/kanidm/server.toml"; + default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash"; + htmx_ui_pkg_path = "@htmx_ui_pkg_path@"; + }; + in + '' + cp ${format profile} libs/profiles/${KANIDM_BUILD_PROFILE}.toml + substituteInPlace libs/profiles/${KANIDM_BUILD_PROFILE}.toml \ + --replace-fail '@htmx_ui_pkg_path@' "$out/ui/hpkg" + ''; + + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + buildInputs = [ + udev + openssl + sqlite + pam + rust-jemalloc-sys + ]; + + # The UI needs to be in place before the tests are run. + postBuild = '' + mkdir -p $out/ui + cp -r server/core/static $out/ui/hpkg + ''; + + # Upstream runs with the Rust equivalent of -Werror, + # which breaks when we upgrade to new Rust before them. + # Just allow warnings. It's fine, really. + env.RUSTFLAGS = "--cap-lints warn"; + + # Not sure what pathological case it hits when compiling tests with LTO, + # but disabling it takes the total `cargo check` time from 40 minutes to + # around 5 on a 16-core machine. + cargoTestFlags = [ + "--config" + ''profile.release.lto="off"'' + ]; + + preFixup = '' + installShellCompletion \ + --bash $releaseDir/build/completions/*.bash \ + --zsh $releaseDir/build/completions/_* + + # PAM and NSS need fix library names + mv $out/lib/libnss_kanidm.so $out/lib/libnss_kanidm.so.2 + mv $out/lib/libpam_kanidm.so $out/lib/pam_kanidm.so + ''; + + passthru = { + tests = { + inherit (nixosTests) kanidm kanidm-provisioning; + }; + + updateScript = nix-update-script { + # avoid spurious releases and tags such as "debs" + extraArgs = [ + "-vr" + "v(.*)" + ]; + }; + + inherit enableSecretProvisioning; + withSecretProvisioning = kanidm.override { enableSecretProvisioning = true; }; + }; + + # can take over 4 hours on 2 cores and needs 16GB+ RAM + requiredSystemFeatures = [ "big-parallel" ]; + + meta = + with lib; + { + changelog = "https://github.com/kanidm/kanidm/releases/tag/v${version}"; + description = "Simple, secure and fast identity management platform"; + homepage = "https://github.com/kanidm/kanidm"; + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = with maintainers; [ + adamcstephens + Flakebi + ]; + } + // extraMeta; +} diff --git a/pkgs/by-name/ka/kanidm/package.nix b/pkgs/by-name/ka/kanidm/package.nix index 8d7afc8663eb..a7bf92b6be6d 100644 --- a/pkgs/by-name/ka/kanidm/package.nix +++ b/pkgs/by-name/ka/kanidm/package.nix @@ -1,133 +1 @@ -{ stdenv -, lib -, formats -, nixosTests -, rustPlatform -, fetchFromGitHub -, installShellFiles -, nix-update-script -, pkg-config -, udev -, openssl -, sqlite -, pam -, bashInteractive -, rust-jemalloc-sys -, kanidm -# If this is enabled, kanidm will be built with two patches allowing both -# oauth2 basic secrets and admin credentials to be provisioned. -# This is NOT officially supported (and will likely never be), -# see https://github.com/kanidm/kanidm/issues/1747. -# Please report any provisioning-related errors to -# https://github.com/oddlama/kanidm-provision/issues/ instead. -, enableSecretProvisioning ? false -}: - -let - arch = if stdenv.hostPlatform.isx86_64 then "x86_64" else "generic"; -in -rustPlatform.buildRustPackage rec { - pname = "kanidm"; - version = "1.4.4"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-AXgq9ohnSeQvq1IIhxMhe+FhX6/hyvRsJCI4VaiN/MQ="; - }; - - cargoHash = "sha256-/PsQ9yqyhSub1Qg2A3wOsgucq4rM0CU4uA8tEOJhtAU="; - - KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; - - patches = lib.optionals enableSecretProvisioning [ - ./patches/oauth2-basic-secret-modify.patch - ./patches/recover-account.patch - ]; - - postPatch = - let - format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml"; - profile = { - admin_bind_path = "/run/kanidmd/sock"; - cpu_flags = if stdenv.hostPlatform.isx86_64 then "x86_64_legacy" else "none"; - default_config_path = "/etc/kanidm/server.toml"; - default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash"; - htmx_ui_pkg_path = "@htmx_ui_pkg_path@"; - }; - in - '' - cp ${format profile} libs/profiles/${KANIDM_BUILD_PROFILE}.toml - substituteInPlace libs/profiles/${KANIDM_BUILD_PROFILE}.toml \ - --replace-fail '@htmx_ui_pkg_path@' "$out/ui/hpkg" - ''; - - nativeBuildInputs = [ - pkg-config - installShellFiles - ]; - - buildInputs = [ - udev - openssl - sqlite - pam - rust-jemalloc-sys - ]; - - # The UI needs to be in place before the tests are run. - postBuild = '' - mkdir -p $out/ui - cp -r server/core/static $out/ui/hpkg - ''; - - # Upstream runs with the Rust equivalent of -Werror, - # which breaks when we upgrade to new Rust before them. - # Just allow warnings. It's fine, really. - env.RUSTFLAGS = "--cap-lints warn"; - - # Not sure what pathological case it hits when compiling tests with LTO, - # but disabling it takes the total `cargo check` time from 40 minutes to - # around 5 on a 16-core machine. - cargoTestFlags = ["--config" ''profile.release.lto="off"'']; - - preFixup = '' - installShellCompletion \ - --bash $releaseDir/build/completions/*.bash \ - --zsh $releaseDir/build/completions/_* - - # PAM and NSS need fix library names - mv $out/lib/libnss_kanidm.so $out/lib/libnss_kanidm.so.2 - mv $out/lib/libpam_kanidm.so $out/lib/pam_kanidm.so - ''; - - passthru = { - tests = { - inherit (nixosTests) kanidm kanidm-provisioning; - }; - - updateScript = nix-update-script { - # avoid spurious releases and tags such as "debs" - extraArgs = [ - "-vr" - "v(.*)" - ]; - }; - - inherit enableSecretProvisioning; - withSecretProvisioning = kanidm.override { enableSecretProvisioning = true; }; - }; - - # can take over 4 hours on 2 cores and needs 16GB+ RAM - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - changelog = "https://github.com/kanidm/kanidm/releases/tag/v${version}"; - description = "Simple, secure and fast identity management platform"; - homepage = "https://github.com/kanidm/kanidm"; - license = licenses.mpl20; - platforms = platforms.linux; - maintainers = with maintainers; [ adamcstephens Flakebi ]; - }; -} +import ./1_4.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02fe78d397cc..bac140ad2ae1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11694,7 +11694,16 @@ with pkgs; jitsi-videobridge = callPackage ../servers/jitsi-videobridge { }; - kanidmWithSecretProvisioning = callPackage ../by-name/ka/kanidm/package.nix { + kanidm_1_3 = callPackage ../by-name/ka/kanidm/1_3.nix { }; + kanidm_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix { }; + + kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_4; + + kanidmWithSecretProvisioning_1_3 = callPackage ../by-name/ka/kanidm/1_3.nix { + enableSecretProvisioning = true; + }; + + kanidmWithSecretProvisioning_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix { enableSecretProvisioning = true; }; From 90840cdb052d76d53fe9cdfbf3741db67f04ae9a Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 3 Dec 2024 15:33:05 +0000 Subject: [PATCH 0498/1054] nixos/kanidm: set default package version based on stateVersion --- nixos/modules/services/security/kanidm.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index ab85eed34eea..a54471c0b956 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -231,7 +231,10 @@ in enableServer = mkEnableOption "the Kanidm server"; enablePam = mkEnableOption "the Kanidm PAM and NSS integration"; - package = mkPackageOption pkgs "kanidm" { }; + package = mkPackageOption pkgs "kanidm" { + example = "kanidm_1_4"; + extraDescription = "If not set will receive a specific version based on stateVersion. Set to `pkgs.kanidm` to always receive the latest version, with the understanding that this could introduce breaking changes."; + }; serverSettings = mkOption { type = types.submodule { @@ -811,6 +814,16 @@ in ) ); + services.kanidm.package = + let + pkg = + if lib.versionAtLeast config.system.stateVersion "24.11" then + pkgs.kanidm_1_4 + else + lib.warn "No default kanidm package found for stateVersion = '${config.system.stateVersion}'. Using unpinned version. Consider setting `services.kanidm.package = pkgs.kanidm_1_x` to avoid upgrades introducing breaking changes." pkgs.kanidm; + in + lib.mkDefault pkg; + environment.systemPackages = mkIf cfg.enableClient [ cfg.package ]; systemd.tmpfiles.settings."10-kanidm" = { From efab2bbe79c1aed8a0492ce5a1b7a57fb4a44378 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 3 Dec 2024 16:13:13 +0000 Subject: [PATCH 0499/1054] kandim: fix update script and limit to main package --- pkgs/by-name/ka/kanidm/generic.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kanidm/generic.nix b/pkgs/by-name/ka/kanidm/generic.nix index 5c56898aae55..5bbf2a135eab 100644 --- a/pkgs/by-name/ka/kanidm/generic.nix +++ b/pkgs/by-name/ka/kanidm/generic.nix @@ -116,13 +116,17 @@ rustPlatform.buildRustPackage rec { inherit (nixosTests) kanidm kanidm-provisioning; }; - updateScript = nix-update-script { + updateScript = lib.optionals (!enableSecretProvisioning) (nix-update-script { # avoid spurious releases and tags such as "debs" extraArgs = [ "-vr" "v(.*)" + "--override-filename" + "pkgs/by-name/ka/kanidm/${ + builtins.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor kanidm.version) + }.nix" ]; - }; + }); inherit enableSecretProvisioning; withSecretProvisioning = kanidm.override { enableSecretProvisioning = true; }; From cf49f728a07c6ed15f89096e7ad2b3e2d06fccb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 13:38:32 +0000 Subject: [PATCH 0500/1054] python312Packages.oauthenticator: 17.1.0 -> 17.2.0 --- pkgs/development/python-modules/oauthenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 95d9a582587a..ec3a2607fd6e 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "17.1.0"; + version = "17.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2RWsrS+W09AY9wWvvM/pYzsM0xzqcwWZYSv4BCsegiw="; + hash = "sha256-YovSUu5o4dJ2wO1hXEe6Hc0Mf7hIH24DefBi5JV3H6c="; }; build-system = [ setuptools ]; From 161a56994befd4659fdbd8710e80c80f9a8375bf Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 14:20:51 +0100 Subject: [PATCH 0501/1054] python312Packages.toggl-cli: 2.4.4 -> 3.0.2 --- .../python-modules/toggl-cli/default.nix | 87 ++++++++++--------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 5c0cd5a17b1c..2798c8544e0f 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,45 +1,45 @@ { lib, + stdenv, buildPythonPackage, - click, - click-completion, - factory-boy, - faker, - fetchPypi, - inquirer, - notify-py, + fetchFromGitHub, + + # build-system pbr, - pendulum, - prettytable, - pytest-mock, - pytestCheckHook, - pytest-cov-stub, - pythonOlder, - requests, setuptools, twine, + + # dependencies + click, + click-completion, + inquirer, + notify-py, + pendulum, + prettytable, + requests, validate-email, + + # tests + factory-boy, + pytest-cov-stub, + pytest-mock, + pytestCheckHook, + versionCheckHook, }: buildPythonPackage rec { pname = "toggl-cli"; - version = "2.4.4"; + version = "3.0.2"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "togglCli"; - inherit version; - hash = "sha256-P4pv6LMPIWXD04IQw01yo3z3voeV4OmsBOCSJgcrZ6g="; + src = fetchFromGitHub { + owner = "AuHau"; + repo = "toggl-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-RYOnlZxg3TZQO5JpmWlnUdL2hNFu4bjkdGU4c2ysqpA="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace-fail "==" ">=" - substituteInPlace pytest.ini \ - --replace-fail ' -m "not premium"' "" - ''; + env.PBR_VERSION = version; build-system = [ pbr @@ -47,6 +47,8 @@ buildPythonPackage rec { twine ]; + pythonRelaxDeps = true; + dependencies = [ click click-completion @@ -56,42 +58,41 @@ buildPythonPackage rec { pendulum prettytable requests + setuptools validate-email ]; nativeCheckInputs = [ - pytestCheckHook + factory-boy pytest-cov-stub pytest-mock - faker - factory-boy + pytestCheckHook + versionCheckHook ]; - - preCheck = '' - export TOGGL_API_TOKEN=your_api_token - export TOGGL_PASSWORD=toggl_password - export TOGGL_USERNAME=user@example.com - ''; + versionCheckProgram = "${placeholder "out"}/bin/toggl"; + versionCheckProgramArg = [ "--version" ]; disabledTests = [ "integration" "premium" - "test_basic_usage" "test_now" "test_parsing" "test_type_check" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + # PermissionError: [Errno 1] Operation not permitted: '/etc/localtime' + "tests/unit/cli/test_types.py" + ]; + pythonImportsCheck = [ "toggl" ]; - # updates to a bogus tag - passthru.skipBulkUpdate = true; - - meta = with lib; { + meta = { description = "Command line tool and set of Python wrapper classes for interacting with toggl's API"; homepage = "https://toggl.uhlir.dev/"; - license = licenses.mit; - maintainers = with maintainers; [ mmahut ]; + changelog = "https://github.com/AuHau/toggl-cli/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mmahut ]; mainProgram = "toggl"; }; } From 0f64286316d4cf0edd7ac84c89c7d778f6d918cd Mon Sep 17 00:00:00 2001 From: stanleyj-edsn Date: Wed, 4 Dec 2024 10:30:06 +0100 Subject: [PATCH 0502/1054] nixos/exwm: rename emacsWithPackages Fix error: 'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages' Fix: #361706 --- nixos/modules/services/x11/window-managers/exwm.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix index 406b6be5b92c..923a554b2d96 100644 --- a/nixos/modules/services/x11/window-managers/exwm.nix +++ b/nixos/modules/services/x11/window-managers/exwm.nix @@ -12,7 +12,8 @@ let ''} ''; packages = epkgs: cfg.extraPackages epkgs ++ [ epkgs.exwm ]; - exwm-emacs = pkgs.emacsWithPackages packages; + exwm-emacs = pkgs.emacs.pkgs.withPackages packages; + in { From 62ecaec63a3e9e5040c871fdbbe76db8ddb1c123 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Wed, 4 Dec 2024 14:58:29 +0100 Subject: [PATCH 0503/1054] coqPackages.mathcomp-analysis: 1.5.0 -> 1.7.0 (#361371) * coqPackages.mathcomp-infotheo: 0.7.3 -> 0.7.5 * coqPackages.mathcomp-analysis: 1.5.0 -> 1.7.0 --- pkgs/development/coq-modules/mathcomp-analysis/default.nix | 3 ++- pkgs/development/coq-modules/mathcomp-infotheo/default.nix | 6 ++++-- pkgs/development/coq-modules/ssprove/default.nix | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 58c51c150e37..5949fead8b1d 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -9,6 +9,7 @@ let repo = "analysis"; owner = "math-comp"; + release."1.7.0".sha256 = "sha256-GgsMIHqLkWsPm2VyOPeZdOulkN00IoBz++qA6yE9raQ="; release."1.5.0".sha256 = "sha256-EWogrkr5TC5F9HjQJwO3bl4P8mij8U7thUGJNNI+k88="; release."1.4.0".sha256 = "sha256-eDggeuEU0fMK7D5FbxvLkbAgpLw5lwL/Rl0eLXAnJeg="; release."1.2.0".sha256 = "sha256-w6BivDM4dF4Iv4rUTy++2feweNtMAJxgGExPfYGhXxo="; @@ -34,7 +35,7 @@ let defaultVersion = let inherit (lib.versions) range; in lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.19" "8.20") (range "2.1.0" "2.2.0") ]; out = "1.5.0"; } + { cases = [ (range "8.19" "8.20") (range "2.1.0" "2.2.0") ]; out = "1.7.0"; } { cases = [ (range "8.17" "8.20") (range "2.0.0" "2.2.0") ]; out = "1.1.0"; } { cases = [ (range "8.17" "8.19") (range "1.17.0" "1.19.0") ]; out = "0.7.0"; } { cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.7"; } diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix index ba42a24720c6..48ad46d91770 100644 --- a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix +++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix @@ -1,4 +1,4 @@ -{ coq, mkCoqDerivation, mathcomp-analysis, mathcomp-algebra-tactics, interval, lib, version ? null }: +{ coq, mkCoqDerivation, mathcomp-analysis, mathcomp-analysis-stdlib, mathcomp-algebra-tactics, interval, lib, version ? null }: (mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; @@ -7,6 +7,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [ + { cases = [ (range "8.19" "8.20") (isGe "1.7") ]; out = "0.7.5"; } { cases = [ (range "8.18" "8.20") (isGe "1.5") ]; out = "0.7.3"; } { cases = [ (range "8.18" "8.19") (isGe "1.2") ]; out = "0.7.2"; } { cases = [ (range "8.17" "8.19") (isGe "1.0") ]; out = "0.7.1"; } @@ -14,6 +15,7 @@ { cases = [ (range "8.17" "8.18") (range "0.6.0" "0.6.7") ]; out = "0.5.2"; } { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.5") ]; out = "0.5.1"; } ] null; + release."0.7.5".sha256 = "sha256-pzPo+Acjx3vlyqOkSZQ8uT2BDLSTfbAnRm39e+/CqE0="; release."0.7.3".sha256 = "sha256-7+qPtE1KfDmo9ZsQtWMzoR2MYnFpTjFHK/yZYVm+GxA="; release."0.7.2".sha256 = "sha256-dekrdVmuTcqXXmKhIb831EKtMhbPrXHJZhzmGb9rdRo="; release."0.7.1".sha256 = "sha256-/4Elb35SmscG6EjEcHYDo+AmWrpBUlygZL0WhaD+fcY="; @@ -21,7 +23,7 @@ release."0.5.1".sha256 = "sha256-yBBl5l+V+dggsg5KM59Yo9CULKog/xxE8vrW+ZRnX7Y="; release."0.5.2".sha256 = "sha256-8WAnAV53c0pMTdwj8XcUDUkLZbpUgIQbEOgOb63uHQA="; - propagatedBuildInputs = [ mathcomp-analysis ]; + propagatedBuildInputs = [ mathcomp-analysis-stdlib ]; meta = with lib; { description = "Coq formalization of information theory and linear error-correcting codes"; diff --git a/pkgs/development/coq-modules/ssprove/default.nix b/pkgs/development/coq-modules/ssprove/default.nix index 79cf9a8fa534..08f4400b98c2 100644 --- a/pkgs/development/coq-modules/ssprove/default.nix +++ b/pkgs/development/coq-modules/ssprove/default.nix @@ -2,6 +2,7 @@ , equations , mathcomp-ssreflect , mathcomp-analysis +, mathcomp-experimental-reals , extructures , deriving }: @@ -33,6 +34,7 @@ propagatedBuildInputs = [equations mathcomp-ssreflect mathcomp-analysis + mathcomp-experimental-reals extructures deriving]; From dd9c90a7305ed80e7a165e73edc867994b8ef596 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:02:08 +0100 Subject: [PATCH 0504/1054] checkov: 3.2.327 -> 3.2.328 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.327...3.2.328 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.328 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 51c7c85358cd..d65ac33b96f2 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.327"; + version = "3.2.328"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-a69X8V6bN+cPpHlV+E2CjQTBlqqISy1qBm7K/okHx4M="; + hash = "sha256-1eQvzrYuScOLDb5ZoXN4EyUzYiOZ3LysDSQRdXBL2Iw="; }; patches = [ ./flake8-compat-5.x.patch ]; From b0ee9e616d8fda45a9673e59ad4332598ee482c6 Mon Sep 17 00:00:00 2001 From: hand7s <117505144+s0me1newithhand7s@users.noreply.github.com> Date: Wed, 4 Dec 2024 07:23:42 +0000 Subject: [PATCH 0505/1054] zapret: 67 -> 69.5 zapret: 67 -> 69.5 Co-authored-by: Nishimara --- pkgs/by-name/za/zapret/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index 470f65d1b267..63d4e4f47e7c 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + nix-update-script, libcap, zlib, @@ -15,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zapret"; - version = "67"; + version = "69.5"; src = fetchFromGitHub { owner = "bol-van"; repo = "zapret"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-4TgM0NkvVvdSEJ01SULu+GqpfqokTTErHAt3QkxkLIs="; + hash = "sha256-3wFNXtx9Yt40ahlikHbQWh2fUtJZrCNkqgJF1C+fsDo="; }; buildInputs = [ libcap zlib libnetfilter_queue libnfnetlink ]; @@ -73,9 +74,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "DPI bypass multi platform"; homepage = "https://github.com/bol-van/zapret"; + changelog = "https://github.com/bol-van/zapret/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ nishimara ]; mainProgram = "zapret"; From d1d84c06853c2af6851addaa40dd30ec1cdc7395 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:03:01 +0100 Subject: [PATCH 0506/1054] python312Packages.bc-detect-secrets: 1.5.28 -> 1.5.32 Diff: https://github.com/bridgecrewio/detect-secrets/compare/refs/tags/1.5.28...1.5.32 --- pkgs/development/python-modules/bc-detect-secrets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index f69b24ae22f7..ec8170eb2ac1 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.5.28"; + version = "1.5.32"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-lj99lcvrbBTfOu87D6LhG7Kos8SIH06tHlTuM6t1kaE="; + hash = "sha256-xZOoEpsYPtqeJoEuq7qsBl7TNvJYzUsI7H39P5qWHXk="; }; build-system = [ setuptools ]; From 4874736329f1fabd0c2817b6eed2a3c802f5bc6e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 4 Dec 2024 09:06:30 -0500 Subject: [PATCH 0507/1054] python312Packages.zope-exceptions: modernize, add nickcao to maintainers --- .../zope-exceptions/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/zope-exceptions/default.nix b/pkgs/development/python-modules/zope-exceptions/default.nix index 2576bc4bd688..e95bf9d05aea 100644 --- a/pkgs/development/python-modules/zope-exceptions/default.nix +++ b/pkgs/development/python-modules/zope-exceptions/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, setuptools, zope-interface, @@ -12,28 +12,34 @@ buildPythonPackage rec { version = "5.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "zope.exceptions"; - inherit version; - hash = "sha256-TLoySGeHc7usb6o641N98JqEOIG4n7noGsooLzuSsvM="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.exceptions"; + rev = "refs/tags/${version}"; + hash = "sha256-jbzUUB6ifTfxiGEiyAmsDoDLyRVuZPgIsN8mCNJkv4Q="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ zope-interface ]; + dependencies = [ + setuptools + zope-interface + ]; # circular deps doCheck = false; pythonImportsCheck = [ "zope.exceptions" ]; - meta = with lib; { + meta = { description = "Exception interfaces and implementations"; homepage = "https://pypi.python.org/pypi/zope.exceptions"; changelog = "https://github.com/zopefoundation/zope.exceptions/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; - maintainers = [ ]; + license = lib.licenses.zpl21; + maintainers = with lib.maintainers; [ nickcao ]; }; } From 2179c422dc306f6def76faa364c4a199beaaed5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:06:57 +0100 Subject: [PATCH 0508/1054] python312Packages.git-filter-repo: 2.45.0 -> 2.47.0 Changelog: https://github.com/newren/git-filter-repo/releases/tag/v2.47.0 --- pkgs/development/python-modules/git-filter-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/git-filter-repo/default.nix b/pkgs/development/python-modules/git-filter-repo/default.nix index af9b80ad38b6..a6dc430685f5 100644 --- a/pkgs/development/python-modules/git-filter-repo/default.nix +++ b/pkgs/development/python-modules/git-filter-repo/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "git-filter-repo"; - version = "2.45.0"; + version = "2.47.0"; docs_version = "71d71d4be238628bf9cb9b27be79b8bb824ed1a9"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "git_filter_repo"; inherit version; - hash = "sha256-L6gP+NpUOCpuGJvBUi3Jhu56UqvL6eKBkvc8D2yLXqk="; + hash = "sha256-QRsn5ooIDAemnCM8tSbbwthIsJpy8QR39ERN0IIs8pA="; }; docs = fetchFromGitHub { From d1ce1b77200bedfdc55c97aa563b5a955a2cea28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:08:16 +0100 Subject: [PATCH 0509/1054] python312Packages.mypy-boto3-athena: 1.35.44 -> 1.35.74 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 14e9da40f374..203045bb0b82 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -142,8 +142,8 @@ rec { "sha256-l5hKmbwel2Z5BvQbuKXRsfusKU28laF5mVDDPW+Ij0g="; mypy-boto3-athena = - buildMypyBoto3Package "athena" "1.35.44" - "sha256-2eDPfyD3gm+kOyVUOn83aAAEPO+IzTahq3CPkaICqJI="; + buildMypyBoto3Package "athena" "1.35.74" + "sha256-SWeOTAay7+inOejWohrQPD5ALm1kjMPizsR5yp/I95c="; mypy-boto3-auditmanager = buildMypyBoto3Package "auditmanager" "1.35.0" From f1b481d546713c7f0566749712b902e995ab69d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:08:26 +0100 Subject: [PATCH 0510/1054] python312Packages.mypy-boto3-cloudwatch: 1.35.63 -> 1.35.74 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 203045bb0b82..ae6107a1045e 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -258,8 +258,8 @@ rec { "sha256-YGz59Mf6cNqNAJmdI0YQF9dzzUY6Mwi7fgzsDwMWv3w="; mypy-boto3-cloudwatch = - buildMypyBoto3Package "cloudwatch" "1.35.63" - "sha256-sJ3dI0JUFD+V+hnsRh+4w45cz8VXjG+ZUbTPkdu/QOE="; + buildMypyBoto3Package "cloudwatch" "1.35.74" + "sha256-7yfx7/8EFJ4SYRoht/+TXU/LmnINxjJM8YC99cx/WzI="; mypy-boto3-codeartifact = buildMypyBoto3Package "codeartifact" "1.35.31" From 804c5eff20bff2e2ee3f46cafe5f9f8ccb318a23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:08:40 +0100 Subject: [PATCH 0511/1054] python312Packages.mypy-boto3-dynamodb: 1.35.60 -> 1.35.74 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index ae6107a1045e..8d65f63d4add 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -434,8 +434,8 @@ rec { "sha256-OgK+ZM7wn7Elp6xzb1YnZtYP+eARgsP+BIYkQb+E4YE="; mypy-boto3-dynamodb = - buildMypyBoto3Package "dynamodb" "1.35.60" - "sha256-kurDXEnp8/8jpK1t7l3FTkEODEmpi02TSTxwAOvnRWg="; + buildMypyBoto3Package "dynamodb" "1.35.74" + "sha256-qBXQRLj19LowjqMRSRZWX72TL8ryGPjQKIsoQEFfnEY="; mypy-boto3-dynamodbstreams = buildMypyBoto3Package "dynamodbstreams" "1.35.0" From 89c43e9a6b3a0735d30836439e410370552b673d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:08:51 +0100 Subject: [PATCH 0512/1054] python312Packages.mypy-boto3-glue: 1.35.65 -> 1.35.74 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 8d65f63d4add..98a260c02779 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -574,8 +574,8 @@ rec { "sha256-RJEZBr3yU/lGEainrpidLsdYBvVOPMq3cIaIpsTAziQ="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.35.65" - "sha256-FnVW/E8XSVLq9k4vwWpF71V/33yoW8HSJcWh6SeBg0I="; + buildMypyBoto3Package "glue" "1.35.74" + "sha256-Hgqsz+kwzH6i0Q+9dDkUVYuYBxe6X/5R7P5ZtbIBfvs="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.35.0" From 44eec4746ce7f071c340284146eb05d54b8c7b50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:09:06 +0100 Subject: [PATCH 0513/1054] python312Packages.mypy-boto3-lakeformation: 1.35.55 -> 1.35.74 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 98a260c02779..0d55493b6e06 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -766,8 +766,8 @@ rec { "sha256-oGpeVJ4uuNUAIsZwc2k0QKLtzLSHC+ULM1f3Pcm+ZPk="; mypy-boto3-lakeformation = - buildMypyBoto3Package "lakeformation" "1.35.55" - "sha256-QuVCDfj8bAtFhEnrsGqDYHFbl6awqAjLDjeJn5Rq0IM="; + buildMypyBoto3Package "lakeformation" "1.35.74" + "sha256-9EOkF4dnzZRTuwh1DdOxVv1GQKl3gkiSVfZklwNU1xc="; mypy-boto3-lambda = buildMypyBoto3Package "lambda" "1.35.68" From 32326673bd9f2e45b75ae1ac9abcd6c47020dd83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:09:30 +0100 Subject: [PATCH 0514/1054] python312Packages.mypy-boto3-quicksight: 1.35.68 -> 1.35.74 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 0d55493b6e06..511f5ffe7093 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1074,8 +1074,8 @@ rec { "sha256-mtpp+ro3b7tOrN4TrWr8BjLzaPo264ty8Sng6wtciMs="; mypy-boto3-quicksight = - buildMypyBoto3Package "quicksight" "1.35.68" - "sha256-bSIoIBGcXEnnjpUXkrm8NK+wiULLuBwvrvpOXsiDOvo="; + buildMypyBoto3Package "quicksight" "1.35.74" + "sha256-FyADa4l2ZWrc/nADSQ2rPhVNklgJHXsaNpC1dIADSSs="; mypy-boto3-ram = buildMypyBoto3Package "ram" "1.35.0" From 38d9aee2a55c793f767b3f00dd2d875f0d187833 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:09:32 +0100 Subject: [PATCH 0515/1054] python312Packages.mypy-boto3-redshift: 1.35.61 -> 1.35.74 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 511f5ffe7093..9608c45e3733 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1094,8 +1094,8 @@ rec { "sha256-wYdJOvvjN2biCMEBeFD87mqomOitaGQdiiB6b5Yiji4="; mypy-boto3-redshift = - buildMypyBoto3Package "redshift" "1.35.61" - "sha256-Z0Q/jd9A3CkKUjHcUTNgwMysosL/q4/PHC8uz42DAHQ="; + buildMypyBoto3Package "redshift" "1.35.74" + "sha256-o2WegSdOLShXqAMNLc2IMciRRBZb60OlcYmIwSWq9Cs="; mypy-boto3-redshift-data = buildMypyBoto3Package "redshift-data" "1.35.51" From af78af7b5532ed4b989ffd8e4630885738cf87d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:09:34 +0100 Subject: [PATCH 0516/1054] python312Packages.mypy-boto3-redshift-serverless: 1.35.52 -> 1.35.74 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 9608c45e3733..434500f2b700 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1102,8 +1102,8 @@ rec { "sha256-wCF9VqKH8GBgmKHsJZfAbNefu/zLw2piSJpuOaQ4nMo="; mypy-boto3-redshift-serverless = - buildMypyBoto3Package "redshift-serverless" "1.35.52" - "sha256-/7yPEPa19Vyhfsb/WBrSXid/VlOwdaqu2SugU4GccDI="; + buildMypyBoto3Package "redshift-serverless" "1.35.74" + "sha256-fxEje2HyutoB7Js++GxMnfqEhceCr2CWfbPpGrY2IM0="; mypy-boto3-rekognition = buildMypyBoto3Package "rekognition" "1.35.0" From 82bbde758e4af122968c020e5693a254f67d65d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:09:39 +0100 Subject: [PATCH 0517/1054] python312Packages.mypy-boto3-s3: 1.35.72 -> 1.35.74 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 434500f2b700..5fca22eca00b 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1162,8 +1162,8 @@ rec { "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.35.72" - "sha256-Vx5lnB01VJnV5QcPM+YToeJR5vXSpX1TXF6u9S67aoY="; + buildMypyBoto3Package "s3" "1.35.74" + "sha256-HmYmu4JNqjFaFLVif0aEbV5T9Wq8SYDNtm49S0lQyCo="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.35.73" From e51dba85caef3d1bcb9dc1a0914c30dde23678e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:14:26 +0100 Subject: [PATCH 0518/1054] python312Packages.types-awscrt: 0.23.1 -> 0.23.3 Changelog: https://github.com/youtype/types-awscrt/releases/tag/0.23.3 --- pkgs/development/python-modules/types-awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index ff987b2deb25..c1f4dd5c1661 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.23.1"; + version = "0.23.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-ogtCXauyWLw9B6Xn3lA/2VWN0VQtct55bnTkAsbUk7I="; + hash = "sha256-BDwK4P5dJyYYKUy+rxw0mmVKn3wAEhvmTSdIaTOsSiY="; }; build-system = [ setuptools ]; From 95f9644af62d13335fa999ab030cc4e5774a48e8 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Tue, 26 Nov 2024 18:25:44 +0100 Subject: [PATCH 0519/1054] blendfarm: update to net8, apply upstream fixes Signed-off-by: Florian Brandes --- pkgs/by-name/bl/blendfarm/deps.nix | 133 +--------------- .../fix-nixos-crashing-on-runtime.patch | 143 ++++++++++++++++++ .../by-name/bl/blendfarm/fix-references.patch | 14 ++ pkgs/by-name/bl/blendfarm/net8.patch | 39 +++++ pkgs/by-name/bl/blendfarm/package.nix | 18 ++- .../blendfarm/rename-evee-to-eevee_next.patch | 36 +++++ 6 files changed, 253 insertions(+), 130 deletions(-) create mode 100644 pkgs/by-name/bl/blendfarm/fix-nixos-crashing-on-runtime.patch create mode 100644 pkgs/by-name/bl/blendfarm/fix-references.patch create mode 100644 pkgs/by-name/bl/blendfarm/net8.patch create mode 100644 pkgs/by-name/bl/blendfarm/rename-evee-to-eevee_next.patch diff --git a/pkgs/by-name/bl/blendfarm/deps.nix b/pkgs/by-name/bl/blendfarm/deps.nix index f68333b5d09c..e5b2a8963b28 100644 --- a/pkgs/by-name/bl/blendfarm/deps.nix +++ b/pkgs/by-name/bl/blendfarm/deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "Avalonia"; version = "0.10.15"; hash = "sha256-YZCHjRkQ3b4sFQz/WcS68yWtHHDdjkcjmMup259JLgs="; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; hash = "sha256-ahDcJNCqlNniItcat7owREQ0hfIwMWFNhnDu89lAVRI="; }) @@ -8,63 +11,23 @@ (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.15"; hash = "sha256-EDz78nCxmdPyGRHMtGT7q37K6Gigh7+8ZZmIr7VVlnY="; }) (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.15"; hash = "sha256-nPv8iPGBCOVBMKjeTw8xjHk6ZcGDsdGIPIwvpCiSqtM="; }) (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.15"; hash = "sha256-ahqoRw/htLvmyl+bpmpr7kAiV8hlm1BCFWs0hWIKDYg="; }) - (fetchNuGet { pname = "coverlet.collector"; version = "1.2.0"; hash = "sha256-ai492Ynh/rPj/i4nVEsvXMx3W68guiWJVxD3EdNscD0="; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; hash = "sha256-dtvXNjVSU1WZ4kFsT6VV56R8iGMPHtdM09dfeejnttw="; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; hash = "sha256-Vyy8zgtqw1uLJTbWNTS+wt/7yNuO4qzYU5a91Sf1ApA="; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; hash = "sha256-YqGYQttBmNRCmkSS+JRfqTsPnuMdKxkYU9ctS5mKFV0="; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; hash = "sha256-QAwWpNc03Vh2RSqIW0xE/rmQCvl/IWs87QREqZNXMtk="; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; hash = "sha256-J9exQ3FxRHMF8tHTc4zhjYGQ6eBYb4ZKwWhzk2L0uuQ="; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; hash = "sha256-6I/8HtwvEK0JLgRcSrCzCtUfMylj88s5JNcl9ZDoLb8="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.29"; hash = "sha256-Mo/zwurMwqJSeWZAzpfmLFeTMTCZNXY+zySA8RdPZXw="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.29"; hash = "sha256-MDba6TI+nnDG1Nzb4219DEXOlxxh2c1zGRzdehhVMww="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.29"; hash = "sha256-JASXP49jpQQd4GDL7C7JS4zgRjbsvE2B+T0eyTPr0S8="; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; hash = "sha256-bpJjcJSUSZH0GeOXoZI12xUQOf2SRtxG7sZV0dWS5TI="; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.5.0"; hash = "sha256-rpZmS5Yn9f2lrUu+88AjrOcLMd9oFLJoctx7TOznIBg="; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.5.0"; hash = "sha256-2C0hHFcV2TrQGEbYYybhxzVMumqEcRnQd7WWyP5exaU="; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.29"; hash = "sha256-lLZZKK4j/5tMg97mF0NaYtBvpIW4AzgVP+wJuidlPw8="; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.29"; hash = "sha256-m9JOmgZ9/XrMeZRQ1IUnbofyKuGwbaJwFMSff3+mA04="; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.29"; hash = "sha256-jiWkCOXH8Te9m5SecvCCMwVVdAALnPZb9EF2QpptZT8="; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.29"; hash = "sha256-txfm2BBeE30sLJXcF4Ik8JLXzwCglO2Lqnjbp9mxYq4="; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.29"; hash = "sha256-wdgAt0uE13QYyWTITtrJ0mdEcGAKhH+3RVYAQTK/HkI="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.1"; hash = "sha256-ByV7aEFjGR4L4Tudg4KaJ96lnzr7RhOxzWGE0p5XFRY="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.5.0"; hash = "sha256-3Fq3c9Fz48815JNZPTytXCw0U4GtPQ7se4w7kF2QBwo="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.5.0"; hash = "sha256-u+wgYjfZ49GF+H8U6SmcTJp07M9r9lYKFElhaozWmyE="; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; hash = "sha256-WFqy842DMQG4W1H2ewXWflfBJ+lQf/LwP0KI4OfY0zo="; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; hash = "sha256-mGUKg+bmB5sE/DCwsTwCsbe00MCwpgxsVW3nCtQiSmo="; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.1.0"; hash = "sha256-nx2sj648hXUtrlOGGHi8diWETAifjWkGC9mSaaVHO7w="; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.1.0"; hash = "sha256-F7T4EhgnYnld6sm2tNQaevoUbKbgQ8ogGyVx6g8kTFU="; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; hash = "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI="; }) (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.1.0"; hash = "sha256-FZC+BNSzSkN3rObLJJAqwW/vNnJ+PiwdvNNufuISWVY="; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) - (fetchNuGet { pname = "runtime.linux-x64.CoreCompat.System.Drawing"; version = "1.0.0-beta009"; hash = "sha256-x0YbFnqFOll95baAWuVhEx8egxDN4poucOQh1bt0YLk="; }) (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.CoreCompat.System.Drawing"; version = "5.8.64"; hash = "sha256-F7qsAOHGlOdt7K3pGJyz+bsQmehOwoBEiaxN7CIqq9Q="; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; hash = "sha256-1Q50COfWkU4/y9eBWj0jPDp3qvy19vRCZnDKQthrhUU="; }) (fetchNuGet { pname = "SharpCompress"; version = "0.26.0"; hash = "sha256-BcdSBd4Hv1zg1YGpfgKGG37DcxeWpW+sW0EScpF7ng0="; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.0"; hash = "sha256-0YpAxE+MyEydxBSmI9zqqqSII2Qvp2gz9pVUcf1/DnM="; }) @@ -76,110 +39,24 @@ (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; hash = "sha256-OH8aBCNQPR0QQWg3cUytuYW49JET+wF8poDYR6gXklc="; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0"; hash = "sha256-dxdvAJOIw55u0Dd9NOyNYfE2XAg3Jv89J54TtTKJtow="; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; hash = "sha256-m24HrDOUXn6s+HJqMs3eQb2Q5lqTTZp+cvEeEtpSoMw="; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) - (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; hash = "sha256-gx3IHPvPNRmwpLwtswu12U/ow4f/7OPAeHxyMxw5qyU="; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) - (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; hash = "sha256-xpxwaXsRcgso8Gj0cqY4+Hvvz6vZkmEMh5/J204j3M8="; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; hash = "sha256-DLYGJraIfSj0Zmpi2H5Am2AsZ+kP5UVGdjakqj9Q2E4="; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.0"; hash = "sha256-8PgFBZ3Agd+UI9IMxr4fRIW8IA1hqCl15nqlLTJETzk="; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.0.1"; hash = "sha256-MjVaZHx8DUFnVUxOEEaU9GxF6EyEXbcuI1V7yRXEp0w="; }) (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; hash = "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; hash = "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; hash = "sha256-FTjQeMuvqnKxpoVsVh/OlQ21NMaZiFtOdv7VdZ+Iv3Y="; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; hash = "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; hash = "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.7.1"; hash = "sha256-OUA8ttAKGgqD5KUwtnO2OewBF/tJI0nO3YcunK5qMPg="; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "5.0.0"; hash = "sha256-IYctBEelnDQbDTPJh0yfFRucAQvPkXaymmswWYx/l5A="; }) (fetchNuGet { pname = "System.Text.Json"; version = "5.0.0"; hash = "sha256-epL8glCZZnsgW+dcmVtsYX0uZ08Jvhkzri9j81Gg774="; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; hash = "sha256-w332WVsJrdAOnlSUtgvatSTtnoC81C3LG6J2ip42fW8="; }) ] diff --git a/pkgs/by-name/bl/blendfarm/fix-nixos-crashing-on-runtime.patch b/pkgs/by-name/bl/blendfarm/fix-nixos-crashing-on-runtime.patch new file mode 100644 index 000000000000..0504c7f1307e --- /dev/null +++ b/pkgs/by-name/bl/blendfarm/fix-nixos-crashing-on-runtime.patch @@ -0,0 +1,143 @@ +From aecfb0a69f9e418158d4a09ec955e0c3f4d8f062 Mon Sep 17 00:00:00 2001 +From: Lyze <11274700+lyze237@users.noreply.github.com> +Date: Fri, 20 Sep 2024 19:48:58 +0200 +Subject: [PATCH] Fix nixos crashing + +--- + .../LogicReinc.BlendFarm.Client.csproj | 2 +- + LogicReinc.BlendFarm.Client/RenderTask.cs | 1 + + LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs | 1 + + LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs | 1 + + LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs | 1 + + .../runtimeconfig.template.json | 10 ++++++++++ + LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj | 2 -- + LogicReinc.BlendFarm/nuget.config | 11 ----------- + LogicReinc.BlendFarm/runtimeconfig.template.json | 10 ++++++++++ + 9 files changed, 25 insertions(+), 14 deletions(-) + create mode 100644 LogicReinc.BlendFarm.Client/runtimeconfig.template.json + delete mode 100644 LogicReinc.BlendFarm/nuget.config + create mode 100644 LogicReinc.BlendFarm/runtimeconfig.template.json + +diff --git a/LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj b/LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj +index d534ea7..698e8d6 100644 +--- a/LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj ++++ b/LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj +@@ -8,7 +8,7 @@ + + + +- ++ + + + +diff --git a/LogicReinc.BlendFarm.Client/RenderTask.cs b/LogicReinc.BlendFarm.Client/RenderTask.cs +index 9cc67dd..5ba3086 100644 +--- a/LogicReinc.BlendFarm.Client/RenderTask.cs ++++ b/LogicReinc.BlendFarm.Client/RenderTask.cs +@@ -13,6 +13,7 @@ + using System.Text; + using System.Threading; + using System.Threading.Tasks; ++using ImageConverter = LogicReinc.BlendFarm.Client.ImageTypes.ImageConverter; + + namespace LogicReinc.BlendFarm.Shared + { +diff --git a/LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs b/LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs +index 310fa20..d84dbea 100644 +--- a/LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs ++++ b/LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs +@@ -5,6 +5,7 @@ + using System.Drawing; + using System.Linq; + using System.Text; ++using ImageConverter = LogicReinc.BlendFarm.Client.ImageTypes.ImageConverter; + + namespace LogicReinc.BlendFarm.Client.Tasks + { +diff --git a/LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs b/LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs +index 6ed55dd..bf1eb14 100644 +--- a/LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs ++++ b/LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs +@@ -8,6 +8,7 @@ + using System.Linq; + using System.Text; + using System.Threading.Tasks; ++using ImageConverter = LogicReinc.BlendFarm.Client.ImageTypes.ImageConverter; + + namespace LogicReinc.BlendFarm.Client.Tasks + { +diff --git a/LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs b/LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs +index 7edcb92..5483d8f 100644 +--- a/LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs ++++ b/LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs +@@ -9,6 +9,7 @@ + using System.Text; + using System.Threading; + using System.Threading.Tasks; ++using ImageConverter = LogicReinc.BlendFarm.Client.ImageTypes.ImageConverter; + + namespace LogicReinc.BlendFarm.Client.Tasks + { +diff --git a/LogicReinc.BlendFarm.Client/runtimeconfig.template.json b/LogicReinc.BlendFarm.Client/runtimeconfig.template.json +new file mode 100644 +index 0000000..738771b +--- /dev/null ++++ b/LogicReinc.BlendFarm.Client/runtimeconfig.template.json +@@ -0,0 +1,10 @@ ++{ ++ "properties": { ++ "runtimeOptions": { ++ "System.Drawing.EnableUnixSupport": true ++ } ++ }, ++ "configProperties": { ++ "System.Drawing.EnableUnixSupport": true ++ } ++} +diff --git a/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj b/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj +index 97aa471..7e7096c 100644 +--- a/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj ++++ b/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj +@@ -60,8 +60,6 @@ + + + +- +- + + + +diff --git a/LogicReinc.BlendFarm/nuget.config b/LogicReinc.BlendFarm/nuget.config +deleted file mode 100644 +index 6c273ab..0000000 +--- a/LogicReinc.BlendFarm/nuget.config ++++ /dev/null +@@ -1,11 +0,0 @@ +- +- +- +- +- +- +- +- +- +diff --git a/LogicReinc.BlendFarm/runtimeconfig.template.json b/LogicReinc.BlendFarm/runtimeconfig.template.json +new file mode 100644 +index 0000000..738771b +--- /dev/null ++++ b/LogicReinc.BlendFarm/runtimeconfig.template.json +@@ -0,0 +1,10 @@ ++{ ++ "properties": { ++ "runtimeOptions": { ++ "System.Drawing.EnableUnixSupport": true ++ } ++ }, ++ "configProperties": { ++ "System.Drawing.EnableUnixSupport": true ++ } ++} diff --git a/pkgs/by-name/bl/blendfarm/fix-references.patch b/pkgs/by-name/bl/blendfarm/fix-references.patch new file mode 100644 index 000000000000..4071fbe16b8d --- /dev/null +++ b/pkgs/by-name/bl/blendfarm/fix-references.patch @@ -0,0 +1,14 @@ +diff --git a/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj b/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj +index 97aa471..3eaa259 100644 +--- a/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj ++++ b/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj +@@ -9,6 +9,9 @@ + false + icon.png + ++ ++ false ++ + + + diff --git a/pkgs/by-name/bl/blendfarm/net8.patch b/pkgs/by-name/bl/blendfarm/net8.patch new file mode 100644 index 000000000000..d2b8d6269953 --- /dev/null +++ b/pkgs/by-name/bl/blendfarm/net8.patch @@ -0,0 +1,39 @@ +diff --git a/LogicReinc.BlendFarm.Server/LogicReinc.BlendFarm.Server.csproj b/LogicReinc.BlendFarm.Server/LogicReinc.BlendFarm.Server.csproj +index 9bd2039..720bcb0 100644 +--- a/LogicReinc.BlendFarm.Server/LogicReinc.BlendFarm.Server.csproj ++++ b/LogicReinc.BlendFarm.Server/LogicReinc.BlendFarm.Server.csproj +@@ -2,7 +2,7 @@ + + + Exe +- net6.0 ++ net8.0 + win-x64;linux-x64;osx-x64 + + +diff --git a/LogicReinc.BlendFarm.Tests/LogicReinc.BlendFarm.Tests.csproj b/LogicReinc.BlendFarm.Tests/LogicReinc.BlendFarm.Tests.csproj +index 5a00198..839f2d7 100644 +--- a/LogicReinc.BlendFarm.Tests/LogicReinc.BlendFarm.Tests.csproj ++++ b/LogicReinc.BlendFarm.Tests/LogicReinc.BlendFarm.Tests.csproj +@@ -1,7 +1,7 @@ + + + +- net6.0 ++ net8.0 + + false + +diff --git a/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj b/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj +index 97aa471..5a01eb8 100644 +--- a/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj ++++ b/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj +@@ -1,7 +1,7 @@ + + + Exe +- net6.0 ++ net8.0 + render.ico + win-x64;linux-x64;osx-x64 + diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix index 26b00115c2a2..4ef3b2154ff0 100644 --- a/pkgs/by-name/bl/blendfarm/package.nix +++ b/pkgs/by-name/bl/blendfarm/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, buildDotnetModule, dotnetCorePackages, xz, @@ -54,6 +55,19 @@ buildDotnetModule rec { hash = "sha256-2w2tdl5n0IFTuthY97NYMeyRe2r72jaKFfoNSjWQMM4="; }; + patches = [ + # https://github.com/LogicReinc/LogicReinc.BlendFarm/pull/121 + ./fix-nixos-crashing-on-runtime.patch + # https://github.com/LogicReinc/LogicReinc.BlendFarm/pull/122 + ./rename-evee-to-eevee_next.patch + # Fixes the error with net8 update: + # "The referenced project is a non self-contained executable. + # A non self-contained executable cannot be referenced by a self-contained executable" + ./fix-references.patch + # Update project files to net8 + ./net8.patch + ]; + nativeBuildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] @@ -86,8 +100,8 @@ buildDotnetModule rec { "liblzma.so.5" ]; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; projectFile = [ "LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj" diff --git a/pkgs/by-name/bl/blendfarm/rename-evee-to-eevee_next.patch b/pkgs/by-name/bl/blendfarm/rename-evee-to-eevee_next.patch new file mode 100644 index 000000000000..7b649a7a4661 --- /dev/null +++ b/pkgs/by-name/bl/blendfarm/rename-evee-to-eevee_next.patch @@ -0,0 +1,36 @@ +From 6276136de0fc567d3a2cc2ecff6effc27688d1a4 Mon Sep 17 00:00:00 2001 +From: Lyze <11274700+lyze237@users.noreply.github.com> +Date: Fri, 20 Sep 2024 20:04:13 +0200 +Subject: [PATCH] Fix eevee getting renamed to eevee_next + +--- + LogicReinc.BlendFarm.Server/render.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/LogicReinc.BlendFarm.Server/render.py b/LogicReinc.BlendFarm.Server/render.py +index dcff178..f0cf304 100644 +--- a/LogicReinc.BlendFarm.Server/render.py ++++ b/LogicReinc.BlendFarm.Server/render.py +@@ -19,6 +19,7 @@ + from multiprocessing import cpu_count + + isPre3 = bpy.app.version < (3,0,0); ++isPreEeveeRename = bpy.app.version < (4, 2, 0); + + if(isPre3): + print('Detected Blender >= 3.0.0\n'); +@@ -218,8 +219,12 @@ def renderWithSettings(renderSettings, id, path): + scn.render.fps = fps; + + if(engine == 1): #Eevee +- print("Using EEVEE"); +- scn.render.engine = "BLENDER_EEVEE"; ++ if(isPreEeveeRename): ++ print("Using EEVEE"); ++ scn.render.engine = "BLENDER_EEVEE"; ++ else: ++ print("Using EEVEE_NEXT"); ++ scn.render.engine = "BLENDER_EEVEE_NEXT"; + else: + scn.render.engine = "CYCLES"; + From 443c03154fca4c8fda80394947f73d634fabe7be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:17:06 +0100 Subject: [PATCH 0520/1054] python312Packages.vt-py: 0.18.4 -> 0.19.0 Changelog: https://github.com/VirusTotal/vt-py/releases/tag//0.19.0 --- pkgs/development/python-modules/vt-py/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index c0f593de627f..f81ce1d07dfc 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -1,5 +1,6 @@ { lib, + aiofiles, aiohttp, buildPythonPackage, fetchFromGitHub, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.18.4"; + version = "0.19.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "vt-py"; rev = "refs/tags/${version}"; - hash = "sha256-pMljLoJBSLq1UxXn+iOeiebWgVfdxW8uzdXPsZtANuw="; + hash = "sha256-r6pEtq/GQzVY+gRzY2KZfSQEyp4ZoFRLBd8tlXp/aM8="; }; postPatch = '' @@ -35,7 +36,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ aiohttp ]; + dependencies = [ + aiofiles + aiohttp + ]; nativeCheckInputs = [ flask From 178f5f70becc76eedf8b432d6ba2f1ce3e96d3e0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 13:54:32 +0100 Subject: [PATCH 0521/1054] ripasso-cursive: skip failing test on darwin --- pkgs/by-name/ri/ripasso-cursive/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index 151a909de23d..62d3ba3cac83 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, @@ -57,6 +58,13 @@ rustPlatform.buildRustPackage rec { export HOME=$(mktemp -d) ''; + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + # Fails in the darwin sandbox with: + # Attempted to create a NULL object. + # event loop thread panicked + "--skip=pass::pass_tests::test_add_recipient_not_in_key_ring" + ]; + postInstall = '' installManPage target/man-page/cursive/ripasso-cursive.1 ''; From 79a1daab1471e4e0ab1585808cb6f65c95b07e32 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:26:35 +0100 Subject: [PATCH 0522/1054] trivy: 0.57.1 -> 0.58.0 Diff: https://github.com/aquasecurity/trivy/compare/refs/tags/v0.57.1...v0.58.0 Changelog: https://github.com/aquasecurity/trivy/releases/tag/v0.58.0 --- pkgs/by-name/tr/trivy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix index e4aa3377dcdf..6e61aa5cde00 100644 --- a/pkgs/by-name/tr/trivy/package.nix +++ b/pkgs/by-name/tr/trivy/package.nix @@ -11,19 +11,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.57.1"; + version = "0.58.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-ivxMH/oyLBGIDNraSAPFcD78S1AJ5O8OvLb2UYwZnAc="; + hash = "sha256-V2xlvjja6183as4IJB8w+EZO6oQfB3qiOWP/DxlGVKg="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-TEjV9Cr5oXNMvzFpRDQ9MxgbZMJnq++eU/xJi2/piF8="; + vendorHash = "sha256-U+iQiC8sr2UmSOAR5+YSEN54NR0RSWysnTmERr67wHQ="; subPackages = [ "cmd/trivy" ]; From 360cf296dc89a1a54ac5edc270debb1b3c2e1d2f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 4 Dec 2024 09:29:06 -0500 Subject: [PATCH 0523/1054] python312Packages.transaction: modernize, add nickcao to maintainers --- .../python-modules/transaction/default.nix | 39 +++++++++++++------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index 3a05a645464c..35c19daedc08 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -1,36 +1,51 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, + setuptools, zope-interface, - mock, + pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "transaction"; version = "5.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-EG5714K8wMtRGfySJbDJpx38U625OL6QUiOtrvIrEXQ="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "transaction"; + rev = "refs/tags/${version}"; + hash = "sha256-8yvA2dvB69+EqsAa+hc93rgg6D64lcajl6JgFabhjwY="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" "setuptools" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ zope-interface - mock + ]; + + nativeCheckInputs = [ + pytestCheckHook ]; pythonImportsCheck = [ "transaction" ]; - meta = with lib; { + meta = { description = "Transaction management"; homepage = "https://transaction.readthedocs.io/"; changelog = "https://github.com/zopefoundation/transaction/blob/${version}/CHANGES.rst"; - license = licenses.zpl20; - maintainers = [ ]; + license = lib.licenses.zpl21; + maintainers = with lib.maintainers; [ nickcao ]; }; } From 73877ce1aac336af947f1e9006c3ce05f96e9879 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:32:26 +0100 Subject: [PATCH 0524/1054] trufflehog: 3.84.1 -> 3.84.2 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.84.1...v3.84.2 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.84.2 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index b268cfd0207d..f60ae664d02b 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.84.1"; + version = "3.84.2"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-wwNef5cP9f+kSHkCFYaB5y6sMqVPRqijnzj4gzU2J/E="; + hash = "sha256-NpWXjZstFpl0oZhzMnCFt7IFyWfpJybGaeyOSxjVPWY="; }; - vendorHash = "sha256-awfnzRN6px+DnCU2/8bN1gX4JFJOXgAwsDSlHNb22oU="; + vendorHash = "sha256-s4oks1OP9qN/2JMN6TI36mBWvGXE2HnDHFAMCRFVB1w="; proxyVendor = true; From 578e4012fdb384ce042333487556b05e48d2f9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 4 Dec 2024 15:38:37 +0100 Subject: [PATCH 0525/1054] nixos/locate: update hardening from upstream --- nixos/modules/misc/locate.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 4692ed15a956..0d731dfbaebc 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -278,11 +278,23 @@ in PRUNE_BIND_MOUNTS = if cfg.pruneBindMounts then "yes" else "no"; }; serviceConfig = { + CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_CHOWN"; Nice = 19; IOSchedulingClass = "idle"; + IPAddressDeny = "any"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; PrivateTmp = "yes"; + PrivateDevices = true; PrivateNetwork = "yes"; - NoNewPrivileges = "yes"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + RestrictAddressFamilies = "AF_UNIX"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; ReadOnlyPaths = "/"; # Use dirOf cfg.output because mlocate creates temporary files next to # the actual database. We could specify and create them as well, @@ -290,6 +302,8 @@ in # NOTE: If /var/cache does not exist, this leads to the misleading error message: # update-locatedb.service: Failed at step NAMESPACE spawning …/update-locatedb-start: No such file or directory ReadWritePaths = dirOf cfg.output; + SystemCallArchitectures = "native"; + SystemCallFilter = "@system-service @chown"; }; }; From f85ff70f0a56d1d1d4115376dbc14f4de90ca7fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:42:51 +0100 Subject: [PATCH 0526/1054] trufflehog: migrate to versionCheckHook --- pkgs/tools/security/trufflehog/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index f60ae664d02b..af0e142cc316 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -2,8 +2,7 @@ lib, fetchFromGitHub, buildGoModule, - testers, - trufflehog, + versionCheckHook, }: buildGoModule rec { @@ -21,6 +20,8 @@ buildGoModule rec { proxyVendor = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + ldflags = [ "-s" "-w" @@ -34,9 +35,9 @@ buildGoModule rec { rm $out/bin/{generate,snifftest} ''; - passthru = { - tests.version = testers.testVersion { package = trufflehog; }; - }; + doInstallCheck = true; + + versionCheckProgramArg = [ "--version" ]; meta = with lib; { description = "Find credentials all over the place"; From b66069df877c80ba505445e5842149ed414f75e7 Mon Sep 17 00:00:00 2001 From: w <105697122+wjjunyor@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:47:12 -0400 Subject: [PATCH 0527/1054] nixos/invoiceplane: fix sites option description (#316699) --- nixos/modules/services/web-apps/invoiceplane.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/invoiceplane.nix b/nixos/modules/services/web-apps/invoiceplane.nix index b60dbe3f7bc3..3b0a17730664 100644 --- a/nixos/modules/services/web-apps/invoiceplane.nix +++ b/nixos/modules/services/web-apps/invoiceplane.nix @@ -226,7 +226,7 @@ in options.sites = mkOption { type = types.attrsOf (types.submodule siteOpts); default = {}; - description = "Specification of one or more WordPress sites to serve"; + description = "Specification of one or more InvoicePlane sites to serve"; }; options.webserver = mkOption { From e77ace0bd3783cf076d5f50747f10aa916aa16d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 14:48:52 +0000 Subject: [PATCH 0528/1054] python312Packages.rpy2: 3.5.16 -> 3.5.17 --- pkgs/development/python-modules/rpy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 582e35508502..d97bcc995a6d 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -26,14 +26,14 @@ }: buildPythonPackage rec { - version = "3.5.16"; + version = "3.5.17"; format = "setuptools"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - hash = "sha256-g34vdFg2WKXEwzl2GnP5Q08z75ztPjDGTadWIWXCgBs="; + hash = "sha256-2/8Iww89eRYZImI4WKWztoo/uo7hdH1q9BvEumjz1YI="; }; patches = [ From 966ee2be2f107e2c47e42d110de56ec376a3fef5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 15:50:32 +0100 Subject: [PATCH 0529/1054] git-lfs: format --- .../version-management/git-lfs/default.nix | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 22ee1a17f218..eb6b52c2809a 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,4 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, asciidoctor, installShellFiles, git, testers, git-lfs, stdenv }: +{ + lib, + buildGoModule, + fetchFromGitHub, + asciidoctor, + installShellFiles, + git, + testers, + git-lfs, + stdenv, +}: buildGoModule rec { pname = "git-lfs"; @@ -13,7 +23,10 @@ buildGoModule rec { vendorHash = "sha256-JT0r/hs7ZRtsYh4aXy+v8BjwiLvRJ10e4yRirqmWVW0="; - nativeBuildInputs = [ asciidoctor installShellFiles ]; + nativeBuildInputs = [ + asciidoctor + installShellFiles + ]; ldflags = [ "-s" @@ -37,14 +50,16 @@ buildGoModule rec { unset subPackages ''; - postInstall = '' - installManPage man/man*/* - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd git-lfs \ - --bash <($out/bin/git-lfs completion bash) \ - --fish <($out/bin/git-lfs completion fish) \ - --zsh <($out/bin/git-lfs completion zsh) - ''; + postInstall = + '' + installManPage man/man*/* + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd git-lfs \ + --bash <($out/bin/git-lfs completion bash) \ + --fish <($out/bin/git-lfs completion fish) \ + --zsh <($out/bin/git-lfs completion zsh) + ''; passthru.tests.version = testers.testVersion { package = git-lfs; From 381e652552f5ed8c80364d413dd1f69ba236d7ab Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 15:53:23 +0100 Subject: [PATCH 0530/1054] git-lfs: move to by-name --- .../git-lfs/default.nix => by-name/gi/git-lfs/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/version-management/git-lfs/default.nix => by-name/gi/git-lfs/package.nix} (100%) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/by-name/gi/git-lfs/package.nix similarity index 100% rename from pkgs/applications/version-management/git-lfs/default.nix rename to pkgs/by-name/gi/git-lfs/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ecb5f048666..b03480b0e3c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1243,8 +1243,6 @@ with pkgs; git-imerge = python3Packages.callPackage ../applications/version-management/git-imerge { }; - git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { }); - git-machete = python3Packages.callPackage ../applications/version-management/git-machete { }; git-ps-rs = callPackage ../development/tools/git-ps-rs { From 534b77f8580eb3270c05291deb150c7d7db0324d Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Wed, 4 Dec 2024 22:33:37 +0800 Subject: [PATCH 0531/1054] nixos/victoriametrics: the prometheusConfig option isn't null by default --- .../services/databases/victoriametrics.nix | 2 +- nixos/modules/services/monitoring/vmagent.nix | 2 +- nixos/tests/victoriametrics/default.nix | 1 + .../external-promscrape-config.nix | 82 +++++++++++++++++++ 4 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 nixos/tests/victoriametrics/external-promscrape-config.nix diff --git a/nixos/modules/services/databases/victoriametrics.nix b/nixos/modules/services/databases/victoriametrics.nix index 075e6a68fc3f..ba7464ade56c 100644 --- a/nixos/modules/services/databases/victoriametrics.nix +++ b/nixos/modules/services/databases/victoriametrics.nix @@ -139,7 +139,7 @@ in serviceConfig = { ExecStart = lib.escapeShellArgs ( startCLIList - ++ lib.optionals (cfg.prometheusConfig != null) [ "-promscrape.config=${prometheusConfigYml}" ] + ++ lib.optionals (cfg.prometheusConfig != {}) [ "-promscrape.config=${prometheusConfigYml}" ] ); DynamicUser = true; diff --git a/nixos/modules/services/monitoring/vmagent.nix b/nixos/modules/services/monitoring/vmagent.nix index af6cdf3fbf54..42585942e2d4 100644 --- a/nixos/modules/services/monitoring/vmagent.nix +++ b/nixos/modules/services/monitoring/vmagent.nix @@ -115,7 +115,7 @@ in { CacheDirectory = "vmagent"; ExecStart = lib.escapeShellArgs ( startCLIList - ++ lib.optionals (cfg.prometheusConfig != null) ["-promscrape.config=${prometheusConfigYml}"] + ++ lib.optionals (cfg.prometheusConfig != {}) ["-promscrape.config=${prometheusConfigYml}"] ); LoadCredential = lib.optional (cfg.remoteWrite.basicAuthPasswordFile != null) [ "remote_write_basic_auth_password:${cfg.remoteWrite.basicAuthPasswordFile}" diff --git a/nixos/tests/victoriametrics/default.nix b/nixos/tests/victoriametrics/default.nix index a86d9ee60a9e..8f7a4d15b663 100644 --- a/nixos/tests/victoriametrics/default.nix +++ b/nixos/tests/victoriametrics/default.nix @@ -7,4 +7,5 @@ { remote-write = import ./remote-write.nix { inherit system pkgs; }; vmalert = import ./vmalert.nix { inherit system pkgs; }; + external-promscrape-config = import ./external-promscrape-config.nix { inherit system pkgs; }; } diff --git a/nixos/tests/victoriametrics/external-promscrape-config.nix b/nixos/tests/victoriametrics/external-promscrape-config.nix new file mode 100644 index 000000000000..3173223b79bd --- /dev/null +++ b/nixos/tests/victoriametrics/external-promscrape-config.nix @@ -0,0 +1,82 @@ +import ../make-test-python.nix ( + { + lib, + pkgs, + ... + }: + let + nodeExporterPort = 9100; + promscrapeConfig = { + global = { + scrape_interval = "2s"; + }; + scrape_configs = [ + { + job_name = "node"; + static_configs = [ + { + targets = [ + "node:${toString nodeExporterPort}" + ]; + } + ]; + } + ]; + }; + settingsFormat = pkgs.formats.yaml { }; + promscrapeConfigYaml = settingsFormat.generate "prometheusConfig.yaml" promscrapeConfig; + in + { + name = "victoriametrics-external-promscrape-config"; + meta = with pkgs.lib.maintainers; { + maintainers = [ + ryan4yin + ]; + }; + + nodes = { + victoriametrics = + { + config, + pkgs, + ... + }: + { + environment.systemPackages = [ pkgs.jq ]; + networking.firewall.allowedTCPPorts = [ 8428 ]; + services.victoriametrics = { + enable = true; + extraOptions = [ + "-promscrape.config=${toString promscrapeConfigYaml}" + ]; + }; + }; + + node = + { ... }: + { + services.prometheus.exporters.node = { + enable = true; + openFirewall = true; + }; + }; + }; + + testScript = '' + node.wait_for_unit("prometheus-node-exporter") + node.wait_for_open_port(${toString nodeExporterPort}) + + victoriametrics.wait_for_unit("victoriametrics") + victoriametrics.wait_for_open_port(8428) + + + promscrape_config = victoriametrics.succeed("journalctl -u victoriametrics -o cat | grep 'promscrape.config'") + assert '${toString promscrapeConfigYaml}' in promscrape_config + + victoriametrics.wait_until_succeeds( + "curl -sf 'http://localhost:8428/api/v1/query?query=node_exporter_build_info\{instance=\"node:9100\"\}' | " + + "jq '.data.result[0].value[1]' | grep '\"1\"'" + ) + ''; + } +) From 719b30aeb3c06744480f754f7ad5109d1de46c08 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 15:55:15 +0100 Subject: [PATCH 0532/1054] git-lfs: minor improvements --- pkgs/by-name/gi/git-lfs/package.nix | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/gi/git-lfs/package.nix b/pkgs/by-name/gi/git-lfs/package.nix index eb6b52c2809a..7b2e8381155e 100644 --- a/pkgs/by-name/gi/git-lfs/package.nix +++ b/pkgs/by-name/gi/git-lfs/package.nix @@ -1,13 +1,13 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, asciidoctor, installShellFiles, git, - testers, - git-lfs, - stdenv, + versionCheckHook, + nix-update-script, }: buildGoModule rec { @@ -17,7 +17,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "git-lfs"; repo = "git-lfs"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-PpNdbvtDAZDT43yyEkUvnhfUTAMM+mYImb3dVbAVPic="; }; @@ -61,16 +61,22 @@ buildGoModule rec { --zsh <($out/bin/git-lfs completion zsh) ''; - passthru.tests.version = testers.testVersion { - package = git-lfs; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; changelog = "https://github.com/git-lfs/git-lfs/raw/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ twey ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ twey ]; mainProgram = "git-lfs"; }; } From abc9f76d7fefdf8de191ccf047b38e4be77b919a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 4 Dec 2024 23:25:51 +0800 Subject: [PATCH 0533/1054] xed-editor: 3.6.7 -> 3.6.9 https://github.com/linuxmint/xed/compare/3.6.7...3.6.9 --- pkgs/by-name/xe/xed-editor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xe/xed-editor/package.nix b/pkgs/by-name/xe/xed-editor/package.nix index 94646ba66547..2a2093f7da85 100644 --- a/pkgs/by-name/xe/xed-editor/package.nix +++ b/pkgs/by-name/xe/xed-editor/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.6.7"; + version = "3.6.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - hash = "sha256-hQy06+/8rJIvHK7uKyMsIMH0qAZgza/2l/hOHDMOgo4="; + hash = "sha256-QPP7LWAiyKt7YBX88qlLS7PucQODH/c/j5WAbO9SF6k="; }; patches = [ From 3d7b61b55180d284aa23b16a31ff9f531028e5cf Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 4 Dec 2024 15:32:56 +0000 Subject: [PATCH 0534/1054] mate.mate-notification-daemon: 1.28.1 -> 1.28.3 https://github.com/mate-desktop/mate-notification-daemon/compare/v1.28.1...v1.28.3 --- pkgs/desktops/mate/mate-notification-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index eeb65991b605..ed3773873a11 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "mate-notification-daemon"; - version = "1.28.1"; + version = "1.28.3"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-//71U76hW+z/XtQNZOGMI9O2ScRZnMHrHoL3BTOFOzQ="; + hash = "sha256-4Azssf+fdbnMwmRFWORDQ7gJQe20A3fdgQDtOSKt9BM="; }; nativeBuildInputs = [ From cfe7fefd67b481a53e6f8400ce18d0973eaee4ca Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Wed, 4 Dec 2024 15:55:13 +0100 Subject: [PATCH 0535/1054] dependency-track: 4.12.1 -> 4.12.2 Diff: https://github.com/DependencyTrack/dependency-track/compare/4.12.1...4.12.2 --- pkgs/by-name/de/dependency-track/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix index 02d143803b0c..5bbc036f77c5 100644 --- a/pkgs/by-name/de/dependency-track/package.nix +++ b/pkgs/by-name/de/dependency-track/package.nix @@ -11,7 +11,7 @@ nixosTests, }: let - version = "4.12.1"; + version = "4.12.2"; frontend = buildNpmPackage { pname = "dependency-track-frontend"; @@ -41,7 +41,7 @@ maven.buildMavenPackage rec { owner = "DependencyTrack"; repo = "dependency-track"; rev = version; - hash = "sha256-Gx7tGkibSu+v4gGKC61EFwUsdruMh0t2gTnnNazjqco="; + hash = "sha256-wn4HnOFhV02oq66LwBIOVzU+ehXemCuzOWcDASG/47c="; }; patches = [ @@ -56,7 +56,7 @@ maven.buildMavenPackage rec { ''; mvnJdk = jre_headless; - mvnHash = "sha256-4QtWvsIFiS4d55y45tj3RLE4YYdXLrqpzqS7mOqRWYw="; + mvnHash = "sha256-x1/b8LoXyGxCQiu7QB60XSpiufTk/y4492mOraFnRKY="; manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ]; buildOffline = true; From 09f7986029c04ce50e67818ada9f2fca1c21e1c4 Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 19 Nov 2024 23:02:22 +0100 Subject: [PATCH 0536/1054] plasticity: 24.2.4 -> 24.2.6 --- pkgs/by-name/pl/plasticity/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index cc17a083f913..405adfba9e2a 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -33,11 +33,11 @@ }: stdenv.mkDerivation rec { pname = "plasticity"; - version = "24.2.4"; + version = "24.2.6"; src = fetchurl { url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm"; - hash = "sha256-Pwe1CqprRXqTN93ys247TGrkd0LGKuwrfGmupIN40uU="; + hash = "sha256-MEw7pmaDPOxhjeIHWumCxwESZri3gdXULIc7kRh9/BM="; }; passthru.updateScript = ./update.sh; From eb7910a7e7e88824adf71630570ae1dca0170cf5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 15:48:43 +0000 Subject: [PATCH 0537/1054] python312Packages.types-aiobotocore: 2.15.2 -> 2.15.2.post3 --- pkgs/development/python-modules/types-aiobotocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index 75215f8a8ee3..eb1dc1c3858e 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,13 +364,13 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.15.2"; + version = "2.15.2.post3"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit version; - hash = "sha256-Y+akVszDPiyjUKrliM/bu5S97PNTPmqFePc2xbK4Vgc="; + hash = "sha256-Q/7wqPWvo4nwJVh0va051T8EbjeyMKWVRIBbADIyBjs="; }; build-system = [ setuptools ]; From 4847bcf397de30ac0c407b1fc4508ff94b2fc231 Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 4 Dec 2024 16:51:25 +0100 Subject: [PATCH 0538/1054] plasticity: format --- pkgs/by-name/pl/plasticity/package.nix | 96 ++++++++++++++------------ 1 file changed, 51 insertions(+), 45 deletions(-) diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index 405adfba9e2a..7318880e6849 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -1,37 +1,38 @@ -{ alsa-lib -, at-spi2-atk -, autoPatchelfHook -, cairo -, cups -, dbus -, desktop-file-utils -, expat -, fetchurl -, gdk-pixbuf -, gtk3 -, gvfs -, hicolor-icon-theme -, lib -, libdrm -, libglvnd -, libnotify -, libsForQt5 -, libxkbcommon -, mesa -, nspr -, nss -, openssl -, pango -, rpmextract -, stdenv -, systemd -, trash-cli -, vulkan-loader -, wrapGAppsHook3 -, xdg-utils -, xorg +{ + alsa-lib, + at-spi2-atk, + autoPatchelfHook, + cairo, + cups, + dbus, + desktop-file-utils, + expat, + fetchurl, + gdk-pixbuf, + gtk3, + gvfs, + hicolor-icon-theme, + lib, + libdrm, + libglvnd, + libnotify, + libsForQt5, + libxkbcommon, + mesa, + nspr, + nss, + openssl, + pango, + rpmextract, + stdenv, + systemd, + trash-cli, + vulkan-loader, + wrapGAppsHook3, + xdg-utils, + xorg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "plasticity"; version = "24.2.6"; @@ -42,7 +43,12 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; - nativeBuildInputs = [ wrapGAppsHook3 autoPatchelfHook rpmextract mesa ]; + nativeBuildInputs = [ + wrapGAppsHook3 + autoPatchelfHook + rpmextract + mesa + ]; buildInputs = [ alsa-lib @@ -72,7 +78,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ systemd libglvnd - vulkan-loader #may help with nvidia users + vulkan-loader # may help with nvidia users xorg.libX11 xorg.libxcb xorg.libXcomposite @@ -96,19 +102,19 @@ stdenv.mkDerivation rec { "TD_DbEntities.tx" "TD_DbIO.tx" "WipeOut.tx" - ]; + ]; -installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir $out - cd $out - rpmextract $src - mv $out/usr/* $out - rm -r $out/usr + mkdir $out + cd $out + rpmextract $src + mv $out/usr/* $out + rm -r $out/usr - runHook postInstall -''; + runHook postInstall + ''; #--use-gl=egl for it to use hardware rendering it seems. Otherwise there are terrible framerates postInstall = '' From d181f08a12e6f89a5429c8e193c4416d52570834 Mon Sep 17 00:00:00 2001 From: MattKang <2027430+MattKang@users.noreply.github.com> Date: Sun, 1 Dec 2024 22:45:19 -0500 Subject: [PATCH 0539/1054] hyprlandPlugins.hyprscroller: 0-unstable-2024-11-23 -> 0-unstable-2024-11-29 --- .../hyprwm/hyprland-plugins/hyprscroller.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix index 438f3bc989e7..d5029e20ed8b 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix @@ -9,13 +9,13 @@ mkHyprlandPlugin hyprland { pluginName = "hyprscroller"; - version = "0-unstable-2024-11-23"; + version = "0-unstable-2024-11-29"; src = fetchFromGitHub { owner = "dawsers"; repo = "hyprscroller"; - rev = "f1e09fd86d0fff30aff0b9ca2e429c7331bab5ac"; - hash = "sha256-5j7IqHKiXfmaq193ltGX4/150NA1YWNXNB1GIFwEfuc="; + rev = "50a87a8a7dc56494a5b71e95182ef4b907d71448"; + hash = "sha256-4Gzj0HWovu0hzzw+2zEXne7vDmP6yIK2GmtURB1EZxQ="; }; nativeBuildInputs = [ cmake ]; From 208c833f31d0d9ecb1678d7b2dcf23fcdb851695 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 16:04:09 +0000 Subject: [PATCH 0540/1054] python312Packages.gradio-pdf: 0.0.17 -> 0.0.19 --- pkgs/development/python-modules/gradio-pdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gradio-pdf/default.nix b/pkgs/development/python-modules/gradio-pdf/default.nix index d35698c9f77e..0bcfd0586459 100644 --- a/pkgs/development/python-modules/gradio-pdf/default.nix +++ b/pkgs/development/python-modules/gradio-pdf/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "gradio-pdf"; - version = "0.0.17"; + version = "0.0.19"; pyproject = true; src = fetchPypi { pname = "gradio_pdf"; inherit version; - hash = "sha256-LoVcwE7eGcK5Nc6qKTnrnI+rNlsDbekhKUP+Fzq2SQ8="; + hash = "sha256-UVHNyKU2cl/0HZqntnyBOFmgeIJ6UjJejEqKqFIPdoo="; }; build-system = [ From cc006aed5e75d43ca4b463f679fa2594764f553b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 16:19:04 +0100 Subject: [PATCH 0541/1054] git-lfs: disable network tests on darwin --- pkgs/by-name/gi/git-lfs/package.nix | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/pkgs/by-name/gi/git-lfs/package.nix b/pkgs/by-name/gi/git-lfs/package.nix index 7b2e8381155e..da5fa88179cc 100644 --- a/pkgs/by-name/gi/git-lfs/package.nix +++ b/pkgs/by-name/gi/git-lfs/package.nix @@ -50,6 +50,37 @@ buildGoModule rec { unset subPackages ''; + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin ( + let + # Fail in the sandbox with network-related errors. + # Enabling __darwinAllowLocalNetworking is not enough. + skippedTests = [ + "TestAPIBatch" + "TestAPIBatchOnlyBasic" + "TestAuthErrWithBody" + "TestAuthErrWithoutBody" + "TestCertFromSSLCAInfoConfig" + "TestCertFromSSLCAInfoEnv" + "TestCertFromSSLCAInfoEnvWithSchannelBackend" + "TestCertFromSSLCAPathConfig" + "TestCertFromSSLCAPathEnv" + "TestClientRedirect" + "TestClientRedirectReauthenticate" + "TestDoAPIRequestWithAuth" + "TestDoWithAuthApprove" + "TestDoWithAuthNoRetry" + "TestDoWithAuthReject" + "TestFatalWithBody" + "TestFatalWithoutBody" + "TestHttp2" + "TestHttpVersion" + "TestWithNonFatal500WithBody" + "TestWithNonFatal500WithoutBody" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ] + ); + postInstall = '' installManPage man/man*/* @@ -71,6 +102,8 @@ buildGoModule rec { updateScript = nix-update-script { }; }; + __darwinAllowLocalNetworking = true; + meta = { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; From 797444df0ffc6292dd56ae6a88abec97043377e8 Mon Sep 17 00:00:00 2001 From: Jess Date: Thu, 5 Dec 2024 05:28:36 +1300 Subject: [PATCH 0542/1054] nixos/aesmd: fix incorrect `mkRemovedOptionModule` option path --- nixos/modules/services/security/aesmd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/aesmd.nix b/nixos/modules/services/security/aesmd.nix index 1fb440a965e4..4da5c00752d5 100644 --- a/nixos/modules/services/security/aesmd.nix +++ b/nixos/modules/services/security/aesmd.nix @@ -21,7 +21,7 @@ let in { imports = [ - (mkRemovedOptionModule [ "debug" ] '' + (mkRemovedOptionModule [ "services" "aesmd" "debug" ] '' Enable debug mode by overriding the aesmd package directly: services.aesmd.package = pkgs.sgx-psw.override { debug = true; }; From 9b58cf4d574192d5e205db3c98f6e1ce9d80c018 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Thu, 21 Nov 2024 19:17:13 +0100 Subject: [PATCH 0543/1054] roslyn-ls: 4.12.0-3.24470.4 -> 4.13.0-3.24577.4 Removed EOL SDK 7 + removed direct dependencies on EOL SDK 6 --- pkgs/by-name/ro/roslyn-ls/deps.nix | 46 ++++++++++++++------------- pkgs/by-name/ro/roslyn-ls/package.nix | 31 ++++++++++-------- 2 files changed, 42 insertions(+), 35 deletions(-) diff --git a/pkgs/by-name/ro/roslyn-ls/deps.nix b/pkgs/by-name/ro/roslyn-ls/deps.nix index 0237907c28be..68dc8ec76057 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.nix +++ b/pkgs/by-name/ro/roslyn-ls/deps.nix @@ -6,23 +6,25 @@ (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/humanizer.core/2.14.1/humanizer.core.2.14.1.nupkg"; }) (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "8.1.1.7464"; hash = "sha256-71/e9zuQIfqRXOiWxZkUFW/tMAj63nE8tg/sR7bGzuM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/icsharpcode.decompiler/8.1.1.7464/icsharpcode.decompiler.8.1.1.7464.nupkg"; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; hash = "sha256-+vMXyEbfutY5WOFuFnNF24uLcKJTTdntVrVlSJH4yjI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack/2.5.108/messagepack.2.5.108.nupkg"; }) + (fetchNuGet { pname = "MessagePack"; version = "2.5.124"; hash = "sha256-3ZUXCiDKpD82W+prJ5yLFm/gmztNsm8W0NPRs74bgrw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack/2.5.124/messagepack.2.5.124.nupkg"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; hash = "sha256-u3Qu8UftNIz3oIzQUMa7Z0G6VzmDLcAnAeNQ3lB3YVk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.108/messagepack.annotations.2.5.108.nupkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace"; version = "9.0.0-preview.24366.2"; hash = "sha256-SUZfSiONzmTwDQsaTd7VTkE6IrzSu80giAPwrjvuY7M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/9.0.0-preview.24366.2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.9.0.0-preview.24366.2.nupkg"; }) + (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.124"; hash = "sha256-4zgAUW6py8CA2hMGUUrHr7Q6vKeRBqOCmcKgAR9fRGg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.124/messagepack.annotations.2.5.124.nupkg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace"; version = "9.0.0-preview.24555.12"; hash = "sha256-SMOU22F2xZkFM6KRRETeRR79BuVccALMGH+zcgyqq4M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/9.0.0-preview.24555.12/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.9.0.0-preview.24555.12.nupkg"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; hash = "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/8.0.0/microsoft.bcl.asyncinterfaces.8.0.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build"; version = "17.10.4"; hash = "sha256-yaElGdmgcELCXR5fIe5/ingMx2qS/PM3tZGTPNHHjXo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.10.4/microsoft.build.17.10.4.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build"; version = "17.12.0-preview-24426-07"; hash = "sha256-OHQd2npzibOaNSR2sq3NrKKtAALOmnIARmFoBaXiJ0k="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build/17.12.0-preview-24426-07/microsoft.build.17.12.0-preview-24426-07.nupkg"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.4"; hash = "sha256-LHtjk4vxeVSLzAKAcG8BN+S20d2sUR2DAOsSXLNIy5U="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build/17.3.4/microsoft.build.17.3.4.nupkg"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.7.2"; hash = "sha256-k35nFdPxC8t0zAltVSmAJtsepp/ubNIjPOsJ6k8jSqM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.7.2/microsoft.build.17.7.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.10.4"; hash = "sha256-J9N2VDoyd2P0e4PLhI3XsYsiyE0vKSIerhglV0FW+Bk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.10.4/microsoft.build.framework.17.10.4.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.12.0-preview-24426-07"; hash = "sha256-p5JNAp442gjiu14gfM4eF477iT9Ttac8ALHXISbsecs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.framework/17.12.0-preview-24426-07/microsoft.build.framework.17.12.0-preview-24426-07.nupkg"; }) (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.3.4"; hash = "sha256-p2JG7pMBGfDVP6sOzBOqOkImZmwotlGvfS+8BjjVYf8="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.framework/17.3.4/microsoft.build.framework.17.3.4.nupkg"; }) (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.7.2"; hash = "sha256-fNWmVQYFTJDveAGmxEdNqJRAczV6+Ep8RA8clKBJFqw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.7.2/microsoft.build.framework.17.7.2.nupkg"; }) (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.6.10"; hash = "sha256-hOFFiQiCNkkDqt0Ad/4Y/sggj4t0zWXmfGjE+I/cqqM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.locator/1.6.10/microsoft.build.locator.1.6.10.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.10.4"; hash = "sha256-paqlEbSdV5euFvWQ4khlIcsTxIGQ1/YpoM/XXDQSPBY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.10.4/microsoft.build.tasks.core.17.10.4.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.12.0-preview-24426-07"; hash = "sha256-2igOkxetlTeRv2Xq5wVcQXU7hxdP43yMJq3aK6vndoI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.tasks.core/17.12.0-preview-24426-07/microsoft.build.tasks.core.17.12.0-preview-24426-07.nupkg"; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.3.4"; hash = "sha256-0RA95pD6zHBf1lgYyrrAuEuNeGwuCgGxNdhEJ0cJUCs="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.tasks.core/17.3.4/microsoft.build.tasks.core.17.3.4.nupkg"; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.7.2"; hash = "sha256-OrV/qWgZHzGlNUmaSfX5wDBcmg1aQeF3/OUHpSH+uZU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.7.2/microsoft.build.tasks.core.17.7.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.10.4"; hash = "sha256-eHEObY1YqK/+hOJmUzSu7u/dKp/OX5qQOWk07rEUReQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.10.4/microsoft.build.utilities.core.17.10.4.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.12.0-preview-24426-07"; hash = "sha256-np372GONmrZJ8ppPxjZrvtofA5gTnUf2n/Pn9f02ilo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.utilities.core/17.12.0-preview-24426-07/microsoft.build.utilities.core.17.12.0-preview-24426-07.nupkg"; }) (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.4"; hash = "sha256-SfZxr5xDANnDnC1HCUgho2H9MnF6n51cM47Rrf07fWw="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.utilities.core/17.3.4/microsoft.build.utilities.core.17.3.4.nupkg"; }) (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.7.2"; hash = "sha256-oatF0KfuP1nb4+OLNKg2/R/ZLO4EiACaO5leaxMEY4A="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.7.2/microsoft.build.utilities.core.17.7.2.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; hash = "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.3.4/microsoft.codeanalysis.analyzers.3.3.4.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.11.0"; hash = "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.11.0/microsoft.codeanalysis.analyzers.3.11.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; hash = "sha256-nzFs+H0FFEgZzjl/bcmWyQQVKS2PncS6kMYHOqrxXSw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzerutilities/3.3.0/microsoft.codeanalysis.analyzerutilities.3.3.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.11.0-beta1.24081.1"; hash = "sha256-5UN//A8oc2w+UoxAwWmXWRXykQD+2mpa1hbJrAfh2Lg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.bannedapianalyzers.3.11.0-beta1.24081.1.nupkg"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.1.0"; hash = "sha256-g3RLyeHfdOOF6H89VLJi06/k8/eJ6j2dgNYZ/MBdfNU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/4.1.0/microsoft.codeanalysis.common.4.1.0.nupkg"; }) @@ -32,13 +34,14 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.PublicApiAnalyzers"; version = "3.11.0-beta1.24081.1"; hash = "sha256-nXx0MSYXVzdr0jcNo9aZLocZU1ywN+n/vdD2kYBh5TI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.publicapianalyzers.3.11.0-beta1.24081.1.nupkg"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "2.0.0"; hash = "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader/2.0.0/microsoft.diasymreader.2.0.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "9.0.0-beta.24459.6"; hash = "sha256-XuqUYxeGP0Wj9ExlKuOc3OwpVGAlDxrJ7Mip2IiT35c="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.24459.6/microsoft.dotnet.arcade.sdk.9.0.0-beta.24459.6.nupkg"; }) + (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "9.0.0-beta.24572.2"; hash = "sha256-dTYFN1KH3grxcf/On6GLW5WdFliq91Y37DeWDCwiryM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.24572.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.24572.2.nupkg"; }) (fetchNuGet { pname = "Microsoft.DotNet.XliffTasks"; version = "9.0.0-beta.24076.5"; hash = "sha256-5cREL85PwcDwo4yyc2Eh908HQ/Cm36w9uZSIvVELZH0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.24076.5/microsoft.dotnet.xlifftasks.9.0.0-beta.24076.5.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration/8.0.0/microsoft.extensions.configuration.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.abstractions/8.0.0/microsoft.extensions.configuration.abstractions.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; hash = "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.binder/8.0.0/microsoft.extensions.configuration.binder.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection/8.0.0/microsoft.extensions.dependencyinjection.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection.abstractions/8.0.0/microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; hash = "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.filesystemglobbing/8.0.0/microsoft.extensions.filesystemglobbing.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging/8.0.0/microsoft.extensions.logging.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.abstractions/8.0.0/microsoft.extensions.logging.abstractions.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; hash = "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.configuration/8.0.0/microsoft.extensions.logging.configuration.8.0.0.nupkg"; }) @@ -48,34 +51,33 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options.configurationextensions/8.0.0/microsoft.extensions.options.configurationextensions.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.primitives/8.0.0/microsoft.extensions.primitives.8.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.1"; hash = "sha256-IaATAy1M/MEBTid0mQiTrHj4aTwo2POCtckxSbLc3lU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.io.redist/6.0.1/microsoft.io.redist.6.0.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.10.4"; hash = "sha256-nXY7YaIx6sXn7aMqpF4bW4d2J5U1KNb9sXqRSd8MpOc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.10.4/microsoft.net.stringtools.17.10.4.nupkg"; }) - (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.4"; hash = "sha256-xLPrrL8iS3gNMIa/C/Wv0fBfHIehUHeQ4Y+F+gbqkhk="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.net.stringtools/17.3.4/microsoft.net.stringtools.17.3.4.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.12.0-preview-24426-07"; hash = "sha256-yoReTrCOhI6ud3v6fLGi5ivS0RuBDhDWw/giD9+bYOk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.stringtools/17.12.0-preview-24426-07/microsoft.net.stringtools.17.12.0-preview-24426-07.nupkg"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; hash = "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.4.0/microsoft.net.stringtools.17.4.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.6.3"; hash = "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.6.3/microsoft.net.stringtools.17.6.3.nupkg"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.7.2"; hash = "sha256-hQE07TCgcQuyu9ZHVq2gPDb0+xe8ECJUdrgh17bJP4o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.7.2/microsoft.net.stringtools.17.7.2.nupkg"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; hash = "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.3/microsoft.netcore.targets.1.1.3.nupkg"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; hash = "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.3/microsoft.netframework.referenceassemblies.1.0.3.nupkg"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.3"; hash = "sha256-/6ClVwo5+RE5kWTQWB/93vmbXj37ql8iDlziKWm89Xw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.3/microsoft.netframework.referenceassemblies.net472.1.0.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.ServiceHub.Analyzers"; version = "4.5.31"; hash = "sha256-lf2FS26yjXAxLIht8qeQp4YXWGuVbu2xzoOyxQOOLV8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.servicehub.analyzers/4.5.31/microsoft.servicehub.analyzers.4.5.31.nupkg"; }) + (fetchNuGet { pname = "Microsoft.ServiceHub.Analyzers"; version = "4.7.32-beta"; hash = "sha256-vYKNtk5BauoAwUt2g+0GodmRZ9JWHWfFIBrcOPFHuyQ="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.analyzers/4.7.32-beta/microsoft.servicehub.analyzers.4.7.32-beta.nupkg"; }) (fetchNuGet { pname = "Microsoft.ServiceHub.Client"; version = "4.2.1017"; hash = "sha256-Achfy4EpZfcIOf02P8onWJH1cte+rP9ZAy94Gf4MVCA="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.servicehub.client/4.2.1017/microsoft.servicehub.client.4.2.1017.nupkg"; }) - (fetchNuGet { pname = "Microsoft.ServiceHub.Framework"; version = "4.5.31"; hash = "sha256-KHFz3F+cgK6dWqHW33ihCQXaTUg/v+LFwW0v+PG596E="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.servicehub.framework/4.5.31/microsoft.servicehub.framework.4.5.31.nupkg"; }) + (fetchNuGet { pname = "Microsoft.ServiceHub.Framework"; version = "4.7.32-beta"; hash = "sha256-QGtg9LL8FRRjDiMn5sJYPn1gliSzzxokyMVsa1uvDfs="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.7.32-beta/microsoft.servicehub.framework.4.7.32-beta.nupkg"; }) (fetchNuGet { pname = "Microsoft.ServiceHub.Resources"; version = "4.2.1017"; hash = "sha256-6nq1jsXLThMritNI1CZj5Batfo/0W0Pt2iLY72yZGNw="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.servicehub.resources/4.2.1017/microsoft.servicehub.resources.4.2.1017.nupkg"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; hash = "sha256-M8Ct2u3RaTxWip0XBLPtL2xeGsYz1rjKgfsV++nZDPg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.testplatform.objectmodel/17.5.0/microsoft.testplatform.objectmodel.17.5.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.5.0"; hash = "sha256-rVgeXl/F8jqXJhQcrm2tV6jvsYHA6UF+5crLVr4GZBA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.testplatform.translationlayer/17.5.0/microsoft.testplatform.translationlayer.17.5.0.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Composition"; version = "17.10.37"; hash = "sha256-Lq0XlMb7eqfMsu+NsptjCZReU3vRH5+JGvPU1VbuyEY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.composition/17.10.37/microsoft.visualstudio.composition.17.10.37.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Composition.Analyzers"; version = "17.10.37"; hash = "sha256-pckf7uZKhMSLxGHtrR2P3qdeNTtEDjAJGvagQ0Oocww="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.composition.analyzers/17.10.37/microsoft.visualstudio.composition.analyzers.17.10.37.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Composition"; version = "17.12.17-preview"; hash = "sha256-RxakGlbjWXC28F50Z5Ayez5gVsmCeyPqOKw3aBCKrDc="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.composition/17.12.17-preview/microsoft.visualstudio.composition.17.12.17-preview.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Composition.Analyzers"; version = "17.12.17-preview"; hash = "sha256-tZ7SmS9wq1f7FJMLo+c5YRdeAoJ7ZHemhgtXiTTzqIU="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.composition.analyzers/17.12.17-preview/microsoft.visualstudio.composition.analyzers.17.12.17-preview.nupkg"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.RemoteControl"; version = "16.3.52"; hash = "sha256-J/egIc9ovDi1MUrnyKnpadECQqAB1WUUyrbxINv4zRE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.remotecontrol/16.3.52/microsoft.visualstudio.remotecontrol.16.3.52.nupkg"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "3.2.2146"; hash = "sha256-ic5h0cmHIaowJfItTLXLnmFhIg4NhaoMoWVAFMHKdzQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Telemetry"; version = "17.11.8"; hash = "sha256-w6VeYf5feF1HGpz8g7u7ytEXH3Ve8LLkG+SM4uNpDj4="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.11.8/microsoft.visualstudio.telemetry.17.11.8.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.11.20"; hash = "sha256-yuNMLu4qKQpHcYHP2JN45u/dY8wvGHGaFFuHKizupcE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading/17.11.20/microsoft.visualstudio.threading.17.11.20.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.11.20"; hash = "sha256-mHYVKapahjHlrzeJ6JpQAtugg+Ub3IzesYSJ+UTybAU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.11.20/microsoft.visualstudio.threading.analyzers.17.11.20.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Telemetry"; version = "17.12.32"; hash = "sha256-HkAQyMovZEABmgcaaSo/DOyRbx+pyVOZGxEm7GEKd2E="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.12.32/microsoft.visualstudio.telemetry.17.12.32.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.12.13-preview"; hash = "sha256-StuzZma2nOXFJ5Al9AZZPo0kM4FrTgHYz2ji+zKgtlM="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading/17.12.13-preview/microsoft.visualstudio.threading.17.12.13-preview.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.12.13-preview"; hash = "sha256-wrCnLYNSujq8fcpmjm/yTTY7uVOPAjpJA+1X8ujuVbA="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.12.13-preview/microsoft.visualstudio.threading.analyzers.17.12.13-preview.nupkg"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Utilities.Internal"; version = "16.3.73"; hash = "sha256-zwk4jWuCw2ANhG00TnwT9JE7n/h2EQkYKeq6o966ilo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.utilities.internal/16.3.73/microsoft.visualstudio.utilities.internal.16.3.73.nupkg"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; hash = "sha256-Lkjp9Ove4+CFP06x/toYpJEiAinuTfn/o+oh0fW3pGM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.6.11/microsoft.visualstudio.validation.17.6.11.nupkg"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.8.8"; hash = "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.8.8/microsoft.visualstudio.validation.17.8.8.nupkg"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/5.0.0/microsoft.win32.registry.5.0.0.nupkg"; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.69"; hash = "sha256-a0hXKhR7dv6Vm4rlUOD2ffBKG49CC3wzXLCHeTz1ms4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/nerdbank.streams/2.10.69/nerdbank.streams.2.10.69.nupkg"; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.11.79"; hash = "sha256-1bzibVcSH8LJMR8Nb6Q0q/7fieTgxRnVY4C1RvRbrrI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/nerdbank.streams/2.11.79/nerdbank.streams.2.11.79.nupkg"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; hash = "sha256-Pp7fRylai8JrE1O+9TGfIEJrAOmnWTJRLWE+qJBahK0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.0/netstandard.library.2.0.0.nupkg"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/13.0.3/newtonsoft.json.13.0.3.nupkg"; }) @@ -129,12 +131,12 @@ (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.0"; hash = "sha256-XsObwf7Fza9G1JCZvQ+SqMqQUdZNU3WcJYYp3cqfc8U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.lib.e_sqlite3/2.1.0/sqlitepclraw.lib.e_sqlite3.2.1.0.nupkg"; }) (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.1.0"; hash = "sha256-2JLlOroGdfziGi+VpgBjtm9IHofG976T+9lZb+fQRok="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.provider.dynamic_cdecl/2.1.0/sqlitepclraw.provider.dynamic_cdecl.2.1.0.nupkg"; }) (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.0"; hash = "sha256-VkGdCCECj+0oaha/QsyfF9CQoaurC/KO2RHR2GaI77w="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.provider.e_sqlite3/2.1.0/sqlitepclraw.provider.e_sqlite3.2.1.0.nupkg"; }) - (fetchNuGet { pname = "StreamJsonRpc"; version = "2.18.48"; hash = "sha256-/vjpwKMFoJfSf+uKEjmWzW/HdIfDGMLb7el91ni6gFQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/streamjsonrpc/2.18.48/streamjsonrpc.2.18.48.nupkg"; }) + (fetchNuGet { pname = "StreamJsonRpc"; version = "2.20.8-beta"; hash = "sha256-cELu//Ad7sAITbq/i5ISi4g1Mvf9mUIYT6vDTukUjQY="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/streamjsonrpc/2.20.8-beta/streamjsonrpc.2.20.8-beta.nupkg"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; }) (fetchNuGet { pname = "System.CodeDom"; version = "7.0.0"; hash = "sha256-7IPt39cY+0j0ZcRr/J45xPtEjnSXdUJ/5ai3ebaYQiE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/7.0.0/system.codedom.7.0.0.nupkg"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/8.0.0/system.collections.immutable.8.0.0.nupkg"; }) - (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.24324.3"; hash = "sha256-YjxPnyDiCahE9Ip+un1uoXpW6+pXBCRQNL0juRLZJDE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-beta4.24324.3/system.commandline.2.0.0-beta4.24324.3.nupkg"; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.24528.1"; hash = "sha256-C1CMTF8ejnnk9h6Yih8ajWeNiQK6czWZTgBSEhGZNGQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-beta4.24528.1/system.commandline.2.0.0-beta4.24528.1.nupkg"; }) (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "8.0.0"; hash = "sha256-MnKdjE/qIvAmEeRc3gOn5uJhT0TI3UnUJPjj3TLHFQo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.componentmodel.composition/8.0.0/system.componentmodel.composition.8.0.0.nupkg"; }) (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; hash = "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition/8.0.0/system.composition.8.0.0.nupkg"; }) (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "8.0.0"; hash = "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.attributedmodel/8.0.0/system.composition.attributedmodel.8.0.0.nupkg"; }) @@ -145,7 +147,7 @@ (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0"; hash = "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.configuration.configurationmanager/8.0.0/system.configuration.configurationmanager.8.0.0.nupkg"; }) (fetchNuGet { pname = "System.Data.DataSetExtensions"; version = "4.5.0"; hash = "sha256-qppO0L8BpI7cgaStqBhn6YJYFjFdSwpXlRih0XFsaT4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.data.datasetextensions/4.5.0/system.data.datasetextensions.4.5.0.nupkg"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/8.0.0/system.diagnostics.diagnosticsource.8.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.1"; hash = "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/8.0.1/system.diagnostics.diagnosticsource.8.0.1.nupkg"; }) (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; hash = "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.eventlog/8.0.0/system.diagnostics.eventlog.8.0.0.nupkg"; }) (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "7.0.0"; hash = "sha256-t+l5WgfxivrZhWKjr0rpqtCcNXyRgytsGgWf/BIv5PU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.performancecounter/7.0.0/system.diagnostics.performancecounter.7.0.0.nupkg"; }) (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; hash = "sha256-Rzo24qXhuJDDgrGNHr2eQRHhwLmsYmWDqAg/P5fOlzw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.process/4.3.0/system.diagnostics.process.4.3.0.nupkg"; }) @@ -171,7 +173,6 @@ (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.7.0"; hash = "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.7.0/system.reflection.emit.ilgeneration.4.7.0.nupkg"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; hash = "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.7.0/system.reflection.emit.lightweight.4.7.0.nupkg"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "8.0.0"; hash = "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/8.0.0/system.reflection.metadata.8.0.0.nupkg"; }) - (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; hash = "sha256-82aeU8c4rnYPLL3ba1ho1fxfpYQt5qrSK5e6ES+OTsY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadataloadcontext/6.0.0/system.reflection.metadataloadcontext.6.0.0.nupkg"; }) (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "7.0.0"; hash = "sha256-VYl6SFD130K9Aw4eJH16ApJ9Sau4Xu0dcxEip2veuTI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadataloadcontext/7.0.0/system.reflection.metadataloadcontext.7.0.0.nupkg"; }) (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "8.0.0"; hash = "sha256-jS5XPZiHjY2CJFnLSxL6U7lMrU3ZknvB4EOgMbG0LEo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadataloadcontext/8.0.0/system.reflection.metadataloadcontext.8.0.0.nupkg"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; }) @@ -188,6 +189,7 @@ (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "7.0.1"; hash = "sha256-CH8+JVC8LyCSW75/6ZQ7ecMbSOAE1c16z4dG8JTp01w="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.xml/7.0.1/system.security.cryptography.xml.7.0.1.nupkg"; }) (fetchNuGet { pname = "System.Security.Permissions"; version = "8.0.0"; hash = "sha256-+YUPY+3HnTmfPLZzr+5qEk0RqalCbFZBgLXee1yCH1M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/8.0.0/system.security.permissions.8.0.0.nupkg"; }) (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.3.0/system.security.principal.windows.4.3.0.nupkg"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/5.0.0/system.security.principal.windows.5.0.0.nupkg"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; hash = "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/7.0.0/system.text.encoding.codepages.7.0.0.nupkg"; }) diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 31dd4eed276f..e5652b654bb8 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -12,12 +12,20 @@ let pname = "roslyn-ls"; dotnet-sdk = with dotnetCorePackages; - combinePackages [ - sdk_6_0 - sdk_7_0 - sdk_8_0 - sdk_9_0 - ]; + sdk_9_0 + // { + inherit + (combinePackages [ + sdk_9_0 + sdk_8_0 + # NOTE: we should be able to remove net6.0 after upstream removes from here: + # https://github.com/dotnet/roslyn/blob/6cc106c0eaa9b0ae070dba3138a23aeab9b50c13/eng/targets/TargetFrameworks.props#L20 + sdk_6_0 + ]) + packages + targetPackages + ; + }; # need sdk on runtime as well dotnet-runtime = dotnetCorePackages.sdk_9_0; rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system; @@ -27,18 +35,18 @@ in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.49.25"; + vsVersion = "2.59.14"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-1amL+K6gf7qJtODxyBtaswhJSLbMrl2LqpmLAArNpW0="; + hash = "sha256-tzBIqXBtPGupBBvHTFO93w6f5qCgllWY420xtjf9o3g="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "4.12.0-3.24470.4"; + version = "4.13.0-3.24577.4"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.nix; @@ -52,12 +60,9 @@ buildDotnetModule rec { ''; dotnetFlags = [ + "-p:TargetRid=${rid}" # this removes the Microsoft.WindowsDesktop.App.Ref dependency "-p:EnableWindowsTargeting=false" - # see this comment: https://github.com/NixOS/nixpkgs/pull/318497#issuecomment-2256096471 - # we can remove below line after https://github.com/dotnet/roslyn/issues/73439 is fixed - "-p:UsingToolMicrosoftNetCompilers=false" - "-p:TargetRid=${rid}" ]; # two problems solved here: From 3c8a1553fb53be2be75da881c8cab71d1d17d0ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 16:42:39 +0000 Subject: [PATCH 0544/1054] tgt: 1.0.93 -> 1.0.94 --- pkgs/by-name/tg/tgt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tg/tgt/package.nix b/pkgs/by-name/tg/tgt/package.nix index 647bc18e27b2..1fcec8922048 100644 --- a/pkgs/by-name/tg/tgt/package.nix +++ b/pkgs/by-name/tg/tgt/package.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.93"; + version = "1.0.94"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - hash = "sha256-0Yfah8VxmbBe1J1OMhG6kyHlGBBAed8F9uStjMs6S2E="; + hash = "sha256-4zPTAdAXO8Km8a50ST3mdHW3RlKD1pmLACeFOY48lv0="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; From b8fe6def7873a3f0d7a9125e8e974fbd98c7725f Mon Sep 17 00:00:00 2001 From: Gurjaka Date: Sun, 17 Nov 2024 16:20:42 +0400 Subject: [PATCH 0545/1054] python312Packages.qtile-bonsai: init at 0.4.0 --- .../python-modules/qtile-bonsai/default.nix | 70 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/development/python-modules/qtile-bonsai/default.nix diff --git a/pkgs/development/python-modules/qtile-bonsai/default.nix b/pkgs/development/python-modules/qtile-bonsai/default.nix new file mode 100644 index 000000000000..0edd0eadd776 --- /dev/null +++ b/pkgs/development/python-modules/qtile-bonsai/default.nix @@ -0,0 +1,70 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cairocffi, + cffi, + strenum, + psutil, + xcffib, + pdm-backend, + pyside6, + pyvirtualdisplay, + pytestCheckHook, + qtile, +}: + +buildPythonPackage rec { + pname = "qtile-bonsai"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aravinda0"; + repo = "qtile-bonsai"; + rev = "refs/tags/v${version}"; + hash = "sha256-IWy/YEVdZc+UgIKl75ZpOkOIvpS5hCX0ihQenUOuJHo="; + }; + + build-system = [ + pdm-backend + ]; + + dependencies = [ + strenum + psutil + ]; + + nativeCheckInputs = [ + pyside6 + pyvirtualdisplay + (cairocffi.override { withXcffib = true; }) + cffi + xcffib + qtile + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTestPaths = [ + # Needs a running DBUS + "tests/integration/test_layout.py" + "tests/integration/test_widget.py" + ]; + + pythonImportCheck = [ "qtile_bonsai" ]; + + meta = { + changelog = "https://github.com/aravinda0/qtile-bonsai/releases/tag/${version}"; + homepage = "https://github.com/aravinda0/qtile-bonsai"; + description = "Flexible layout for the qtile tiling window manager"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + gurjaka + sigmanificient + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80cf4c5e1fee..4e73e58f29b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13497,6 +13497,8 @@ self: super: with self; { }; qtile-extras = callPackage ../development/python-modules/qtile-extras { }; + qtile-bonsai = callPackage ../development/python-modules/qtile-bonsai { }; + qtpy = callPackage ../development/python-modules/qtpy { }; quadprog = callPackage ../development/python-modules/quadprog { }; From ad02718eab7c48093522ac80db95093da78a99ec Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 18:06:49 +0100 Subject: [PATCH 0546/1054] python312Packages.torchsnapshot: skip failing test and enable on python 3.12 --- .../python-modules/torchsnapshot/default.nix | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/torchsnapshot/default.nix b/pkgs/development/python-modules/torchsnapshot/default.nix index c28ce3f55e71..0c055f1089c1 100644 --- a/pkgs/development/python-modules/torchsnapshot/default.nix +++ b/pkgs/development/python-modules/torchsnapshot/default.nix @@ -1,10 +1,12 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system setuptools, - wheel, + + # dependencies aiofiles, aiohttp, importlib-metadata, @@ -13,10 +15,10 @@ pyyaml, torch, typing-extensions, + + # tests pytest-asyncio, pytestCheckHook, - pythonAtLeast, - stdenv, }: buildPythonPackage rec { @@ -24,8 +26,6 @@ buildPythonPackage rec { version = "0.1.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "pytorch"; repo = "torchsnapshot"; @@ -35,7 +35,6 @@ buildPythonPackage rec { build-system = [ setuptools - wheel ]; dependencies = [ @@ -56,16 +55,21 @@ buildPythonPackage rec { pytestCheckHook ]; - meta = with lib; { + disabledTests = [ + # torch.distributed.elastic.multiprocessing.errors.ChildFailedError: + # AssertionError: "Socket Timeout" does not match "wait timeout after 5000ms + "test_linear_barrier_timeout" + ]; + + meta = { description = "Performant, memory-efficient checkpointing library for PyTorch applications, designed with large, complex distributed workloads in mind"; homepage = "https://github.com/pytorch/torchsnapshot/"; changelog = "https://github.com/pytorch/torchsnapshot/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ GaetanLepage ]; - broken = - # https://github.com/pytorch/torchsnapshot/issues/175 - pythonAtLeast "3.12" + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; + badPlatforms = [ # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package - || stdenv.hostPlatform.isDarwin; + lib.systems.inspect.patterns.isDarwin + ]; }; } From 8439c49361f43801512a8a5e37dac4b23abdfa8d Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 4 Dec 2024 17:11:21 +0100 Subject: [PATCH 0547/1054] sage: 10.5.rc0 -> 10.5 --- pkgs/by-name/sa/sage/sage-src.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix index 7b06e7f850c7..1ccc6b8eb587 100644 --- a/pkgs/by-name/sa/sage/sage-src.nix +++ b/pkgs/by-name/sa/sage/sage-src.nix @@ -11,14 +11,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "10.5.rc0"; + version = "10.5"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - hash = "sha256-qjgEgyPOpT/g7D8YNhkqO1EHGNftZnuR5ucLNZBa9Sg="; + hash = "sha256-OiGMc3KyHWnjVWXJ/KiqEQS1skM9nPLYcoMK9kw4718="; }; # contains essential files (e.g., setup.cfg) generated by the bootstrap script. @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { configure-src = fetchurl { # the hash below is the tagged commit's _parent_. it can also be found by looking for # the "configure" asset at https://github.com/sagemath/sage/releases/tag/${version} - url = "mirror://sageupstream/configure/configure-d9c38a7c581e6ed54fbe420122b8bba488b16074.tar.gz"; - hash = "sha256-y1EpsuYK9wloptjeiTew+TZaIUZ2K/NKCbSteojFa4s="; + url = "mirror://sageupstream/configure/configure-f6ad0ecf1f4a269f5954d5487336b13f70624594.tar.gz"; + hash = "sha256-VANtZDUhjOHap9XVEuG/1003E+1XRdXEnuH15hIqJd4="; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -57,6 +57,13 @@ stdenv.mkDerivation rec { # compile libs/gap/element.pyx with -O1 # a more conservative version of https://github.com/sagemath/sage/pull/37951 ./patches/gap-element-crash.patch + + # https://github.com/sagemath/sage/pull/38940, positively reviewed, to land in 10.6.beta0 + (fetchpatch { + name = "simplicial-sets-flaky-test.patch"; + url = "https://github.com/sagemath/sage/commit/1830861c5130d30b891e8c643308e1ceb91ce2b5.diff"; + hash = "sha256-6MbZ+eJPFBEtnJsJX0MgO2AykPXSeuya0W0adiIH+KE="; + }) ]; # Patches needed because of package updates. We could just pin the versions of From 8fb6a2e74df334879b97864ade46c91c02e42a35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 17:08:46 +0000 Subject: [PATCH 0548/1054] python312Packages.pulsectl: 24.8.0 -> 24.11.0 --- pkgs/development/python-modules/pulsectl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 756826b4500a..51132de4d5f6 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "24.8.0"; + version = "24.11.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-sFFQbQ1z08xDV879PeF7uFnX7PAE6ZSw98+oeFG8cVY="; + hash = "sha256-C6MnRdPxmNVlevGffuPrAHr1qGowbsPNRa9C52eCDQ0="; }; patches = [ From 9f609517c8343ffb711ebe928805e8fbfcc1ecc7 Mon Sep 17 00:00:00 2001 From: Overloader Date: Tue, 3 Dec 2024 21:38:22 +0100 Subject: [PATCH 0549/1054] cargo-shuttle: 0.47.0 -> 0.49.0 https://github.com/shuttle-hq/shuttle/releases/tag/v0.49.0 --- pkgs/by-name/ca/cargo-shuttle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix index b4baf09ac91a..500e02ef0acb 100644 --- a/pkgs/by-name/ca/cargo-shuttle/package.nix +++ b/pkgs/by-name/ca/cargo-shuttle/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.47.0"; + version = "0.49.0"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-AJ+7IUxi5SRRWw0EHh9JmQHkdQU3Mhd1Nmo1peEG2zg="; + hash = "sha256-97AiRgTPzkNsnxMTF0zleHVR6QYLyRlhguh2nz+duUM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RqPVFovDaD2rW31HyETJfQ0qVwFxoGEvqkIgag3H6KU="; + cargoHash = "sha256-eHmNGIcSXzFdfEHKKr0R+igtZbm8bPRFg2uhzJwKDhk="; nativeBuildInputs = [ pkg-config ]; From 2b6766253ec69951ca59833addaaea99c3b5869c Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Thu, 5 Dec 2024 01:16:55 +0800 Subject: [PATCH 0550/1054] mpvScripts.modernz: init at 0.2.1 (#360681) --- .../video/mpv/scripts/modernz.nix | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/applications/video/mpv/scripts/modernz.nix diff --git a/pkgs/applications/video/mpv/scripts/modernz.nix b/pkgs/applications/video/mpv/scripts/modernz.nix new file mode 100644 index 000000000000..d8488dd5f7c6 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/modernz.nix @@ -0,0 +1,40 @@ +{ + lib, + buildLua, + fetchFromGitHub, + makeFontsConf, + nix-update-script, +}: +buildLua (finalAttrs: { + pname = "modernx"; + version = "0.2.1"; + + scriptPath = "modernz.lua"; + src = fetchFromGitHub { + owner = "Samillion"; + repo = "ModernZ"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Zk7AC8p14ejsIXwDXladOlQ6jm4NUiU4PxPi5ssBVx8="; + }; + + postInstall = '' + install -Dt $out/share/fonts *.ttf + ''; + + passthru.extraWrapperArgs = [ + "--set" + "FONTCONFIG_FILE" + (toString (makeFontsConf { + fontDirectories = [ "${finalAttrs.finalPackage}/share/fonts" ]; + })) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Sleek and modern OSC for mpv designed to enhance functionality by adding more features, all while preserving the core standards of mpv's OSC"; + homepage = "https://github.com/Samillion/ModernZ"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ Guanran928 ]; + }; +}) From a4113d92a27bd283016a2c85eaea057fa5356902 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 4 Dec 2024 18:48:54 +0100 Subject: [PATCH 0551/1054] wget: fix and enable strictDeps --- pkgs/by-name/wg/wget/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wg/wget/package.nix b/pkgs/by-name/wg/wget/package.nix index 3bf64898b6f4..69eebc4f1d41 100644 --- a/pkgs/by-name/wg/wget/package.nix +++ b/pkgs/by-name/wg/wget/package.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { perlPackages.perl ]; + strictDeps = true; + configureFlags = [ (lib.withFeatureAs withOpenssl "ssl" "openssl") @@ -101,7 +103,8 @@ stdenv.mkDerivation rec { sed -i 's/^exit/exit 77 #/' $f done ''; - checkInputs = + + nativeCheckInputs = [ perlPackages.HTTPDaemon python3 From e2ba83ddf72a990388efa5e358b011866842c6db Mon Sep 17 00:00:00 2001 From: Nick Dichev Date: Wed, 4 Dec 2024 09:50:51 -0800 Subject: [PATCH 0552/1054] supabase-cli: 1.210.1 -> 2.0.0 --- pkgs/by-name/su/supabase-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 5366355042f6..ed98096778ed 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.210.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-QQfuoM+CQIvQarEkfKlca8RBZkreesyjrrfSxrpUlCg="; + hash = "sha256-+5mcbI3pu9pahmUQnx8i2wctX/jF/CPTVaHJoH+Go4M="; }; - vendorHash = "sha256-akNozQxElu+/BA5tDXRUPlMrQ2DBm2i713ZrQbwC4I0="; + vendorHash = "sha256-nBUV8oeoZc7N8FqEbx2Cjw4XsZW3JShv3/H58qk8JEo="; ldflags = [ "-s" From e3ba3b3354fa837e22cec5622481b53e3251a498 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 17:55:46 +0000 Subject: [PATCH 0553/1054] python312Packages.django-leaflet: 0.30.1 -> 0.31.0 --- pkgs/development/python-modules/django-leaflet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-leaflet/default.nix b/pkgs/development/python-modules/django-leaflet/default.nix index 628cae9403d2..17c1362591d4 100644 --- a/pkgs/development/python-modules/django-leaflet/default.nix +++ b/pkgs/development/python-modules/django-leaflet/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-leaflet"; - version = "0.30.1"; + version = "0.31.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "django_leaflet"; inherit version; - hash = "sha256-jsG2RcUe0Zob9GAZVKSIr8iPPubqqsh679uhUioNR0Y="; + hash = "sha256-+yt1+Er/YNQFhlkwDzGnEVVMZdEout5fqAiGN/sHUfc="; }; build-system = [ setuptools ]; From 296eae7ffffde78cc6e30edd0f62d97b19a4048f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 18:04:03 +0000 Subject: [PATCH 0554/1054] lombok: 1.18.34 -> 1.18.36 --- pkgs/by-name/lo/lombok/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/lombok/package.nix b/pkgs/by-name/lo/lombok/package.nix index 87d5f02230e8..636a5252feb0 100644 --- a/pkgs/by-name/lo/lombok/package.nix +++ b/pkgs/by-name/lo/lombok/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lombok"; - version = "1.18.34"; + version = "1.18.36"; src = fetchurl { url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-wn1rKv9WJB0bB/y8xrGDcJ5rQyyA9zdO6x2CPobUuBo="; + sha256 = "sha256-c7awW2otNltwC6sI0w+U3p0zZJC8Cszlthgf70jL8Y4="; }; nativeBuildInputs = [ makeWrapper ]; From 92df50f4d045a9e1ae98642934bcf2b1c7fa5f56 Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 4 Dec 2024 20:16:43 +0200 Subject: [PATCH 0555/1054] nixos/tests/networking: fix flaky scripted.dhcpSimple test The underlying issue is unknown, but starting the router first and then the client makes the test not flaky. --- nixos/tests/networking/networkd-and-scripted.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/tests/networking/networkd-and-scripted.nix b/nixos/tests/networking/networkd-and-scripted.nix index be73e543e284..96347b0fdf2e 100644 --- a/nixos/tests/networking/networkd-and-scripted.nix +++ b/nixos/tests/networking/networkd-and-scripted.nix @@ -120,12 +120,13 @@ let }; }; testScript = '' - start_all() - - client.wait_for_unit("network.target") + router.start() router.systemctl("start network-online.target") router.wait_for_unit("network-online.target") + client.start() + client.wait_for_unit("network.target") + with subtest("Wait until we have an ip address on each interface"): client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q '192.168.1'") client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q 'fd00:1234:5678:1:'") From 00bcf5cb457368df62bd1448e6f34b3c8f9792ff Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 4 Dec 2024 19:22:06 +0100 Subject: [PATCH 0556/1054] python3Packages.django_5: 5.1.3 -> 5.1.4 Fixes CVE-2024-53907 and CVE-2024-53908. Changes: https://docs.djangoproject.com/en/dev/releases/5.1.4/ --- pkgs/development/python-modules/django/5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 456cae7155a9..01393258dbef 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { pname = "django"; - version = "5.1.3"; + version = "5.1.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -52,7 +52,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-TqOVe+QkwNx/SpI/6X/AQaqLHk3LDSupoRl3RKL6kac="; + hash = "sha256-rE/aErydql5UjS/IiLpDtA3YOsAa+0uRyo40RsjCGLc="; }; patches = From d637b85e25894c4039026967e7105c82d32ceab1 Mon Sep 17 00:00:00 2001 From: 34j <55338215+34j@users.noreply.github.com> Date: Thu, 5 Dec 2024 03:36:22 +0900 Subject: [PATCH 0557/1054] treewide: replace `--enable-wayland-ime` with `--enable-wayland-ime=true` for the arguments to properly work (#361341) --- pkgs/applications/audio/plexamp/default.nix | 2 +- pkgs/applications/audio/youtube-music/default.nix | 2 +- pkgs/applications/editors/vscode/generic.nix | 2 +- pkgs/applications/graphics/drawio/default.nix | 2 +- pkgs/applications/misc/1password-gui/linux.nix | 2 +- pkgs/applications/misc/whalebird/default.nix | 2 +- pkgs/applications/misc/zettlr/generic.nix | 2 +- pkgs/applications/networking/browsers/chromium/default.nix | 2 +- pkgs/applications/networking/browsers/vivaldi/default.nix | 2 +- .../networking/instant-messengers/discord/linux.nix | 2 +- .../networking/instant-messengers/element/element-desktop.nix | 2 +- .../networking/instant-messengers/franz/generic.nix | 2 +- .../networking/instant-messengers/slack/default.nix | 2 +- pkgs/applications/office/micropad/default.nix | 2 +- pkgs/applications/office/morgen/default.nix | 2 +- pkgs/applications/science/math/geogebra/geogebra6.nix | 2 +- pkgs/applications/virtualization/podman-desktop/default.nix | 2 +- pkgs/by-name/af/affine/package.nix | 2 +- pkgs/by-name/al/altair/package.nix | 2 +- pkgs/by-name/an/anytype/package.nix | 2 +- pkgs/by-name/ba/bazecor/package.nix | 2 +- pkgs/by-name/be/beekeeper-studio/package.nix | 2 +- pkgs/by-name/be/beeper/package.nix | 2 +- pkgs/by-name/bi/bitwarden-desktop/package.nix | 2 +- pkgs/by-name/bl/blockbench/package.nix | 2 +- pkgs/by-name/br/brave/make-brave.nix | 2 +- pkgs/by-name/br/bruno/package.nix | 2 +- pkgs/by-name/ca/caprine/package.nix | 2 +- pkgs/by-name/ch/chatzone-desktop/package.nix | 2 +- pkgs/by-name/ci/cider-2/package.nix | 2 +- pkgs/by-name/ci/cider/package.nix | 2 +- pkgs/by-name/co/code-cursor/package.nix | 2 +- pkgs/by-name/de/deltachat-desktop/package.nix | 2 +- pkgs/by-name/eq/equibop/package.nix | 2 +- pkgs/by-name/fe/feishin/package.nix | 2 +- pkgs/by-name/fi/figma-linux/package.nix | 2 +- pkgs/by-name/fo/follow/package.nix | 2 +- pkgs/by-name/fr/framesh/package.nix | 2 +- pkgs/by-name/fr/freetube/package.nix | 2 +- pkgs/by-name/gf/gfn-electron/package.nix | 2 +- pkgs/by-name/gi/github-desktop/package.nix | 2 +- pkgs/by-name/gi/gitify/package.nix | 2 +- pkgs/by-name/gi/gitkraken/package.nix | 2 +- pkgs/by-name/go/goofcord/package.nix | 2 +- pkgs/by-name/go/google-chrome/package.nix | 2 +- pkgs/by-name/ht/httptoolkit/package.nix | 2 +- pkgs/by-name/it/itch/package.nix | 2 +- pkgs/by-name/ji/jitsi-meet-electron/package.nix | 2 +- pkgs/by-name/jo/joplin-desktop/package.nix | 2 +- pkgs/by-name/ka/kando/package.nix | 2 +- pkgs/by-name/ko/koodo-reader/package.nix | 2 +- pkgs/by-name/ku/kuro/package.nix | 2 +- pkgs/by-name/le/ledger-live-desktop/package.nix | 2 +- pkgs/by-name/le/legcord/package.nix | 2 +- pkgs/by-name/le/lens/linux.nix | 2 +- pkgs/by-name/lo/logseq/package.nix | 2 +- pkgs/by-name/lu/lunar-client/package.nix | 2 +- pkgs/by-name/lx/lx-music-desktop/package.nix | 2 +- pkgs/by-name/ma/mattermost-desktop/package.nix | 2 +- pkgs/by-name/mi/microsoft-edge/package.nix | 2 +- pkgs/by-name/mq/mqtt-explorer/package.nix | 2 +- pkgs/by-name/mu/muffon/package.nix | 2 +- pkgs/by-name/mu/mullvad-vpn/package.nix | 2 +- pkgs/by-name/mu/multiviewer-for-f1/package.nix | 2 +- pkgs/by-name/ob/obsidian/package.nix | 2 +- pkgs/by-name/pa/passky-desktop/package.nix | 2 +- pkgs/by-name/po/postman/linux.nix | 2 +- pkgs/by-name/pr/proton-pass/package.nix | 2 +- pkgs/by-name/pr/protonmail-desktop/package.nix | 2 +- pkgs/by-name/qq/qq/package.nix | 2 +- pkgs/by-name/r2/r2modman/package.nix | 2 +- pkgs/by-name/re/redact/package.nix | 2 +- pkgs/by-name/re/redisinsight/package.nix | 2 +- pkgs/by-name/re/revolt-desktop/package.nix | 2 +- pkgs/by-name/ri/ride/package.nix | 2 +- pkgs/by-name/se/session-desktop/package.nix | 2 +- pkgs/by-name/si/signal-desktop/generic.nix | 2 +- pkgs/by-name/si/siyuan/package.nix | 2 +- pkgs/by-name/sp/spotify/linux.nix | 2 +- pkgs/by-name/te/teams-for-linux/package.nix | 2 +- pkgs/by-name/te/tetrio-desktop/package.nix | 2 +- pkgs/by-name/ti/tidal-hifi/package.nix | 2 +- pkgs/by-name/uh/uhk-agent/package.nix | 2 +- pkgs/by-name/up/upscayl/package.nix | 2 +- pkgs/by-name/ve/vesktop/package.nix | 2 +- pkgs/by-name/wa/wavebox/package.nix | 2 +- pkgs/by-name/we/webcord/package.nix | 2 +- pkgs/by-name/wi/wire-desktop/package.nix | 2 +- pkgs/by-name/wo/wootility/package.nix | 2 +- pkgs/by-name/yt/ytmdesktop/package.nix | 2 +- pkgs/by-name/zu/zulip/package.nix | 2 +- pkgs/development/tools/nwjs/default.nix | 2 +- pkgs/games/heroic/default.nix | 2 +- pkgs/tools/security/bitwarden-directory-connector/default.nix | 2 +- pkgs/tools/security/keybase/gui.nix | 2 +- 95 files changed, 95 insertions(+), 95 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 0dbe7c515f7f..b11a35c25dc5 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -25,7 +25,7 @@ appimageTools.wrapType2 { --replace 'Exec=AppRun' 'Exec=${pname}' source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/plexamp" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" ''; passthru.updateScript = ./update-plexamp.sh; diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index faca81bfe9a7..c6543cc5ef7d 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' makeWrapper ${electron}/bin/electron $out/bin/youtube-music \ --add-flags $out/share/lib/youtube-music/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 84b9c5d70103..fbe7658d8e4d 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -212,7 +212,7 @@ in "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libdbusmenu ]}"} # Add gio to PATH so that moving files to the trash works when not using a desktop environment --prefix PATH : ${glib.bin}/bin - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" --add-flags ${lib.escapeShellArg commandLineArgs} ) ''; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 3e094bbf6229..2963624aaae1 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { makeWrapper '${electron}/bin/electron' "$out/bin/drawio" \ --add-flags "$out/share/lib/drawio/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 '' + '' diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix index 2bad0a25656d..925c3d9137ff 100644 --- a/pkgs/applications/misc/1password-gui/linux.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -151,6 +151,6 @@ stdenv.mkDerivation { # See: https://github.com/NixOS/nixpkgs/pull/232718#issuecomment-1582123406 # Remove this comment when upstream fixes: # https://1password.community/discussion/comment/624011/#Comment_624011 - #--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + #--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" ''; } diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index a99d4c047ceb..794ae86e0cfc 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { makeWrapper "${electron}/bin/electron" "$out/bin/whalebird" \ --add-flags "$out/opt/Whalebird/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" runHook postInstall ''; diff --git a/pkgs/applications/misc/zettlr/generic.nix b/pkgs/applications/misc/zettlr/generic.nix index ab23bf9e4831..76c4cf9c7463 100644 --- a/pkgs/applications/misc/zettlr/generic.nix +++ b/pkgs/applications/misc/zettlr/generic.nix @@ -30,7 +30,7 @@ appimageTools.wrapType2 rec { extraInstallCommands = '' wrapProgram $out/bin/zettlr \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png substituteInPlace $out/share/applications/Zettlr.desktop \ diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index cc2e5b0003f8..4f0255210d31 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -124,7 +124,7 @@ in stdenv.mkDerivation { mkdir -p "$out/bin" makeWrapper "${browserBinary}" "$out/bin/chromium" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} ed -v -s "$out/bin/chromium" << EOF diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index bd3e7b71679e..0571fc2d5784 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -110,7 +110,7 @@ in stdenv.mkDerivation rec { done wrapProgram "$out/bin/vivaldi" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default FONTCONFIG_FILE "${fontconfig.out}/etc/fonts/fonts.conf" \ --set-default FONTCONFIG_PATH "${fontconfig.out}/etc/fonts" \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index ef38b4c23852..6afa1f058935 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -168,7 +168,7 @@ stdenv.mkDerivation rec { wrapProgramShell $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ ${lib.strings.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \ diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index ed98829d6486..2a7d91790909 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ --add-flags "$out/share/element/electron" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 4949707b42ef..807e96332de0 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -89,7 +89,7 @@ in stdenv.mkDerivation (rec { wrapProgramShell $out/opt/${name}/${pname} \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \ --suffix PATH : ${xdg-utils}/bin \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ "''${gappsWrapperArgs[@]}" ''; } // cleanedArgs) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 34b61e994970..46ef41e1ddd6 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -174,7 +174,7 @@ let makeWrapper $out/lib/slack/slack $out/bin/slack \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ --suffix PATH : ${lib.makeBinPath [xdg-utils]} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true}}" # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ diff --git a/pkgs/applications/office/micropad/default.nix b/pkgs/applications/office/micropad/default.nix index 7319d8ee547c..0d06ca5e8afe 100644 --- a/pkgs/applications/office/micropad/default.nix +++ b/pkgs/applications/office/micropad/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { # executable wrapper makeWrapper '${electron}/bin/electron' "$out/bin/micropad" \ --add-flags "$out/share/micropad" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" runHook postInstall ''; diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 88fd18abde0d..9e8adcd27044 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { --replace '/opt/Morgen' $out/bin makeWrapper ${electron}/bin/electron $out/bin/morgen \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime}} $out/opt/Morgen/resources/app.asar" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true}} $out/opt/Morgen/resources/app.asar" runHook postInstall ''; diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 38c549cffb85..3f9b349401b1 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -63,7 +63,7 @@ let cp -r GeoGebra-linux-x64/{resources,locales} "$out/" makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra \ --add-flags "$out/resources/app" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index fc313496014d..8cab09d6a860 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper '${electron}/bin/electron' "$out/bin/podman-desktop" \ --add-flags "$out/share/lib/podman-desktop/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 '' + '' diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 53b527ff9077..f66da1181d10 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation ( makeWrapper "${electron}/bin/electron" $out/bin/affine \ --inherit-argv0 \ --add-flags $out/lib/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} ''; desktopItems = [ diff --git a/pkgs/by-name/al/altair/package.nix b/pkgs/by-name/al/altair/package.nix index ff47a033a994..6d64409335bb 100644 --- a/pkgs/by-name/al/altair/package.nix +++ b/pkgs/by-name/al/altair/package.nix @@ -18,7 +18,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 8d1f59cf747a..e63528037651 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -18,7 +18,7 @@ in appimageTools.wrapType2 { extraInstallCommands = '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} install -m 444 -D ${appimageContents}/anytype.desktop -t $out/share/applications substituteInPlace $out/share/applications/anytype.desktop \ diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index ecb0ccfe0de7..173acc6d3b46 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -41,7 +41,7 @@ appimageTools.wrapAppImage { extraInstallCommands = '' wrapProgram $out/bin/bazecor \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications install -m 444 -D ${src}/bazecor.png -t $out/share/pixmaps diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index 004607f4e94a..5b633f12bcd4 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -33,7 +33,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/ install -Dm444 ${appimageContents}/${pname}.png -t $out/share/pixmaps/ substituteInPlace $out/share/applications/${pname}.desktop \ diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index d7abefeba49f..a71dfe1b3083 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation rec { substituteInPlace $out/share/applications/${pname}.desktop --replace "AppRun" "${pname}" wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}} --no-update" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update" runHook postInstall ''; diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index c44f73e11599..8c6a0ee69d2e 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -161,7 +161,7 @@ in buildNpmPackage rec { makeWrapper '${lib.getExe electron}' "$out/bin/bitwarden" \ --add-flags $out/opt/Bitwarden/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index 4aa7bc18a831..8895019cf59c 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -71,7 +71,7 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/blockbench \ --add-flags $out/share/blockbench/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index 11f77869d0a4..0321d609efff 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -262,7 +262,7 @@ stdenv.mkDerivation { } ${ optionalString (enableFeatures != [ ]) '' - --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+,WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+,WaylandWindowDecorations --enable-wayland-ime=true}}" '' } ${ diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index b4750534d43d..2e3591d8e8ef 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -153,7 +153,7 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/bruno \ --add-flags $out/opt/bruno/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix index c9a11ecc919c..9d89f45435ee 100644 --- a/pkgs/by-name/ca/caprine/package.nix +++ b/pkgs/by-name/ca/caprine/package.nix @@ -46,7 +46,7 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/caprine \ --add-flags $out/share/caprine/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/ch/chatzone-desktop/package.nix b/pkgs/by-name/ch/chatzone-desktop/package.nix index 93c412f560bb..06e2fdb90c23 100644 --- a/pkgs/by-name/ch/chatzone-desktop/package.nix +++ b/pkgs/by-name/ch/chatzone-desktop/package.nix @@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation { cp -r ${appimageContents}/usr/share/icons $out/share wrapProgram $out/bin/chatzone-desktop \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" runHook postInstall ''; diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix index b8140e1a05c8..6db18df4cbed 100644 --- a/pkgs/by-name/ci/cider-2/package.nix +++ b/pkgs/by-name/ci/cider-2/package.nix @@ -27,7 +27,7 @@ appimageTools.wrapType2 rec { in '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags "--no-sandbox --disable-gpu-sandbox" # Cider 2 does not start up properly without these from my preliminary testing install -m 444 -D ${contents}/cider.desktop $out/share/applications/${pname}.desktop diff --git a/pkgs/by-name/ci/cider/package.nix b/pkgs/by-name/ci/cider/package.nix index 94e21715ed9c..9941cbe79b5d 100644 --- a/pkgs/by-name/ci/cider/package.nix +++ b/pkgs/by-name/ci/cider/package.nix @@ -15,7 +15,7 @@ appimageTools.wrapType2 rec { let contents = appimageTools.extract { inherit pname version src; }; in '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 3b1a62852430..2ff381e098a0 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation { substituteInPlace $out/share/applications/cursor.desktop --replace-fail "AppRun" "cursor" wrapProgram $out/bin/cursor \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}} --no-update" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update" runHook postInstall ''; diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index b51cff362f06..3ccaf9d89c0c 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe electron} $out/bin/${finalAttrs.meta.mainProgram} \ --add-flags $out/opt/DeltaChat/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 runHook postInstall diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix index 9d7d5378e604..dffa1bab8f71 100644 --- a/pkgs/by-name/eq/equibop/package.nix +++ b/pkgs/by-name/eq/equibop/package.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { --add-flags $out/opt/Equibop/resources/app.asar \ ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" ''; desktopItems = makeDesktopItem { diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index a313997c0428..dd6cd95f1837 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -115,7 +115,7 @@ buildNpmPackage { # https://github.com/electron/electron/issues/35153#issuecomment-1202718531 makeWrapper ${lib.getExe electron} $out/bin/feishin \ --add-flags $out/share/feishin/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set ELECTRON_FORCE_IS_PACKAGED=1 \ --inherit-argv0 diff --git a/pkgs/by-name/fi/figma-linux/package.nix b/pkgs/by-name/fi/figma-linux/package.nix index 54a1125c29d4..2b11d1680398 100644 --- a/pkgs/by-name/fi/figma-linux/package.nix +++ b/pkgs/by-name/fi/figma-linux/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { wrapProgramShell $out/bin/figma-linux \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime=true}}" runHook postInstall ''; diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix index e59bc1015a07..9add047a1c98 100644 --- a/pkgs/by-name/fo/follow/package.nix +++ b/pkgs/by-name/fo/follow/package.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { --inherit-argv0 \ --add-flags --disable-gpu-compositing \ --add-flags $out/share/follow \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -m 444 -D "${desktopItem}/share/applications/"* \ -t $out/share/applications/ diff --git a/pkgs/by-name/fr/framesh/package.nix b/pkgs/by-name/fr/framesh/package.nix index ae29660ff347..2ec358bc06e5 100644 --- a/pkgs/by-name/fr/framesh/package.nix +++ b/pkgs/by-name/fr/framesh/package.nix @@ -21,7 +21,7 @@ appimageTools.wrapType2 { install -m 444 -D ${appimageContents}/frame.png \ $out/share/icons/hicolor/512x512/apps/frame.png wrapProgram "$out/bin/${pname}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" substituteInPlace $out/share/applications/frame.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index cc00bc2077b3..7a6341ef9e0a 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime=true}}" ''; meta = { diff --git a/pkgs/by-name/gf/gfn-electron/package.nix b/pkgs/by-name/gf/gfn-electron/package.nix index 3e2ceb67b2eb..1cb031cb354e 100644 --- a/pkgs/by-name/gf/gfn-electron/package.nix +++ b/pkgs/by-name/gf/gfn-electron/package.nix @@ -60,7 +60,7 @@ buildNpmPackage { postFixup = '' makeWrapper $out/dist/geforcenow-electron $out/bin/geforcenow-electron \ --add-flags "--no-sandbox --disable-gpu-sandbox" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" substituteInPlace $out/share/applications/com.github.hmlendea.geforcenow-electron.desktop \ --replace-fail "/opt/geforcenow-electron/geforcenow-electron" "geforcenow-electron" \ diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix index 2d1868e254b8..455147398429 100644 --- a/pkgs/by-name/gi/github-desktop/package.nix +++ b/pkgs/by-name/gi/github-desktop/package.nix @@ -83,7 +83,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime=true}}" --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]} ) ''; diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index f9fa4126eb50..f1e785d870c3 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe electron} $out/bin/gitify \ --add-flags $out/share/gitify/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 '' } diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix index 3f462f132934..c27d97233522 100644 --- a/pkgs/by-name/gi/gitkraken/package.nix +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -191,7 +191,7 @@ let ''; preFixup = '' - gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}") + gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}") ''; postFixup = '' diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index 44adb2b678fe..45287af656f1 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { makeShellWrapper "${lib.getExe electron}" "$out/bin/goofcord" \ --add-flags "$out/share/lib/goofcord/resources/app.asar" \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 487c6745079b..264895de9a7a 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -248,7 +248,7 @@ let --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ --set CHROME_WRAPPER "google-chrome-$dist" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ --add-flags ${lib.escapeShellArg commandLineArgs} diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix index ef050b87b9e5..e3c54203330c 100644 --- a/pkgs/by-name/ht/httptoolkit/package.nix +++ b/pkgs/by-name/ht/httptoolkit/package.nix @@ -62,7 +62,7 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/httptoolkit \ --add-flags $out/share/httptoolkit/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/it/itch/package.nix b/pkgs/by-name/it/itch/package.nix index e6d0d939c269..c4ecd6f50950 100644 --- a/pkgs/by-name/it/itch/package.nix +++ b/pkgs/by-name/it/itch/package.nix @@ -91,7 +91,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper ${steam-run}/bin/steam-run $out/bin/itch \ --add-flags ${electron}/bin/electron \ --add-flags $out/share/itch/resources/app \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set BROTH_USE_LOCAL butler,itch-setup \ --prefix PATH : ${butler}:${itch-setup} ''; diff --git a/pkgs/by-name/ji/jitsi-meet-electron/package.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix index f3350f1b29d8..87102604f5eb 100644 --- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix +++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix @@ -90,7 +90,7 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/jitsi-meet-electron \ --add-flags $out/share/jitsi-meet-electron/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index f5d81acc08d5..557be27e277c 100644 --- a/pkgs/by-name/jo/joplin-desktop/package.nix +++ b/pkgs/by-name/jo/joplin-desktop/package.nix @@ -52,7 +52,7 @@ let extraInstallCommands = '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications install -Dm444 ${appimageContents}/@joplinapp-desktop.png -t $out/share/pixmaps substituteInPlace $out/share/applications/@joplinapp-desktop.desktop \ diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix index 0a63064db81e..1e192b973a42 100644 --- a/pkgs/by-name/ka/kando/package.nix +++ b/pkgs/by-name/ka/kando/package.nix @@ -111,7 +111,7 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/kando \ --add-flags $out/share/kando/resources/app \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/ko/koodo-reader/package.nix b/pkgs/by-name/ko/koodo-reader/package.nix index b66d8f13e0d7..4faa7b681604 100644 --- a/pkgs/by-name/ko/koodo-reader/package.nix +++ b/pkgs/by-name/ko/koodo-reader/package.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { makeShellWrapper ${lib.getExe electron} $out/bin/koodo-reader \ --add-flags $out/share/lib/koodo-reader/resources/app.asar \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 ''; diff --git a/pkgs/by-name/ku/kuro/package.nix b/pkgs/by-name/ku/kuro/package.nix index ca0986e3c7a0..2f233bb0045b 100644 --- a/pkgs/by-name/ku/kuro/package.nix +++ b/pkgs/by-name/ku/kuro/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { # executable wrapper makeWrapper '${electron}/bin/electron' "$out/bin/kuro" \ --add-flags "$out/share/lib/kuro/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 runHook postInstall diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index c6697584e326..22191d32471f 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -25,7 +25,7 @@ appimageTools.wrapType2 rec { install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png wrapProgram "$out/bin/${pname}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" substituteInPlace $out/share/applications/ledger-live-desktop.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index 3812b17923d2..11ff8a188488 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { makeShellWrapper "${lib.getExe electron_32}" "$out/bin/legcord" \ --add-flags "$out/share/lib/legcord/resources/app.asar" \ "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/le/lens/linux.nix b/pkgs/by-name/le/lens/linux.nix index d1dbf197bd51..dd50775682bd 100644 --- a/pkgs/by-name/le/lens/linux.nix +++ b/pkgs/by-name/le/lens/linux.nix @@ -14,7 +14,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/${pname}.png \ $out/share/icons/hicolor/512x512/apps/${pname}.png diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index 048d4119a47d..892b1dc33beb 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -84,7 +84,7 @@ in makeWrapper ${electron_27}/bin/electron $out/bin/logseq \ --set "LOCAL_GIT_DIRECTORY" ${git} \ --add-flags $out/share/logseq/resources/app \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index b92d76fbb5e8..379796b135f0 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -19,7 +19,7 @@ appimageTools.wrapType2 rec { let contents = appimageTools.extract { inherit pname version src; }; in '' wrapProgram $out/bin/lunarclient \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -Dm444 ${contents}/lunarclient.desktop -t $out/share/applications/ install -Dm444 ${contents}/lunarclient.png -t $out/share/pixmaps/ substituteInPlace $out/share/applications/lunarclient.desktop \ diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index 05c56827edce..956e7bc8125f 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { makeWrapper ${electron_30}/bin/electron $out/bin/lx-music-desktop \ --add-flags $out/opt/lx-music-desktop/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ ''; diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix index 7a95092811d4..68ce8cfaebd7 100644 --- a/pkgs/by-name/ma/mattermost-desktop/package.nix +++ b/pkgs/by-name/ma/mattermost-desktop/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { makeWrapper '${lib.getExe electron}' $out/bin/${pname} \ --set-default ELECTRON_IS_DEV 0 \ --add-flags $out/share/${pname}/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" runHook postInstall ''; diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 27b68f66fcb7..cd3af906cb1b 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -250,7 +250,7 @@ stdenv.mkDerivation (finalAttrs: { --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ --set CHROME_WRAPPER "microsoft-edge-$dist" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ --add-flags ${lib.escapeShellArg commandLineArgs} diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix index 59e8ebe74b38..0d8e05f9b4b0 100644 --- a/pkgs/by-name/mq/mqtt-explorer/package.nix +++ b/pkgs/by-name/mq/mqtt-explorer/package.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { makeWrapper '${electron}/bin/electron' "$out/bin/mqtt-explorer" \ --add-flags "$out/share/mqtt-explorer/app/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/mu/muffon/package.nix b/pkgs/by-name/mu/muffon/package.nix index 7c86a6d6de1a..5546b291ec43 100644 --- a/pkgs/by-name/mu/muffon/package.nix +++ b/pkgs/by-name/mu/muffon/package.nix @@ -21,7 +21,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' wrapProgram $out/bin/muffon \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -m 444 -D ${appimageContents}/muffon.desktop -t $out/share/applications substituteInPlace $out/share/applications/muffon.desktop \ --replace-fail 'Exec=AppRun' 'Exec=muffon' diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix index 82e107c66663..c97925b2a71b 100644 --- a/pkgs/by-name/mu/mullvad-vpn/package.nix +++ b/pkgs/by-name/mu/mullvad-vpn/package.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation { --set-default MULLVAD_RESOURCE_DIR "$out/share/mullvad/resources" wrapProgram $out/bin/mullvad-gui \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime=true}}" sed -i "s|Exec.*$|Exec=$out/bin/mullvad-vpn $U|" $out/share/applications/mullvad-vpn.desktop diff --git a/pkgs/by-name/mu/multiviewer-for-f1/package.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix index 5885f5f1e799..408dc0530e17 100644 --- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix +++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix @@ -84,7 +84,7 @@ stdenvNoCC.mkDerivation rec { mv -t $out/share usr/share/* usr/lib/multiviewer-for-f1 makeWrapper "$out/share/multiviewer-for-f1/MultiViewer for F1" $out/bin/multiviewer-for-f1 \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libudev0-shim ]}:\"$out/share/Multiviewer for F1\"" runHook postInstall diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index fe6a4c4833a6..07f1fa66767a 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -53,7 +53,7 @@ let mkdir -p $out/bin makeWrapper ${electron}/bin/electron $out/bin/obsidian \ --add-flags $out/share/obsidian/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} install -m 444 -D resources/app.asar $out/share/obsidian/app.asar install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar diff --git a/pkgs/by-name/pa/passky-desktop/package.nix b/pkgs/by-name/pa/passky-desktop/package.nix index 48a51b4ac8da..b1030b5ae8ee 100644 --- a/pkgs/by-name/pa/passky-desktop/package.nix +++ b/pkgs/by-name/pa/passky-desktop/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { mkdir "$out/share/applications" makeWrapper ${electron}/bin/electron "$out/bin/passky" \ --add-flags "$out/share/passky/electron/" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" runHook postInstall ''; diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix index 34e631e2241e..fe15275bfb7d 100644 --- a/pkgs/by-name/po/postman/linux.nix +++ b/pkgs/by-name/po/postman/linux.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime=true}}" mkdir -p $out/share/icons/hicolor/128x128/apps ln -s $out/share/postman/resources/app/assets/icon.png $out/share/icons/postman.png diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index 2ef7500aca8d..598bf37a6435 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { preFixup = '' makeWrapper ${lib.getExe electron} $out/bin/proton-pass \ --add-flags $out/share/proton-pass/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index 645b7f7e34c5..35656cc84bf8 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${lib.getExe electron} $out/bin/${mainProgram} \ --add-flags $out/share/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix index 66321e3b4dc4..62360e05dc41 100644 --- a/pkgs/by-name/qq/qq/package.nix +++ b/pkgs/by-name/qq/qq/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation { libuuid ] }" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ "''${gappsWrapperArgs[@]}" diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix index 54c1448e4a31..71792c115b5c 100644 --- a/pkgs/by-name/r2/r2modman/package.nix +++ b/pkgs/by-name/r2/r2modman/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper '${lib.getExe electron}' "$out/bin/r2modman" \ --inherit-argv0 \ --add-flags "$out/share/r2modman" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" runHook postInstall ''; diff --git a/pkgs/by-name/re/redact/package.nix b/pkgs/by-name/re/redact/package.nix index 28987aa91d12..f635684222a7 100644 --- a/pkgs/by-name/re/redact/package.nix +++ b/pkgs/by-name/re/redact/package.nix @@ -21,7 +21,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -Dm444 ${appimageContents}/redact.desktop -t $out/share/applications install -Dm444 ${appimageContents}/redact.png -t $out/share/icons/hicolor/512x512/apps/redact.png substituteInPlace $out/share/applications/redact.desktop \ diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix index be2f639e2c80..2c2f4bd345b6 100644 --- a/pkgs/by-name/re/redisinsight/package.nix +++ b/pkgs/by-name/re/redisinsight/package.nix @@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper '${electron}/bin/electron' "$out/bin/redisinsight" \ --add-flags "$out/share/redisinsight/app/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --inherit-argv0 diff --git a/pkgs/by-name/re/revolt-desktop/package.nix b/pkgs/by-name/re/revolt-desktop/package.nix index d4cd6c298bd2..c996610308bf 100644 --- a/pkgs/by-name/re/revolt-desktop/package.nix +++ b/pkgs/by-name/re/revolt-desktop/package.nix @@ -60,7 +60,7 @@ postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/revolt-desktop \ --add-flags $out/share/revolt-desktop/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" ''; } else diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix index 31691bc7cdb7..f8e6746c925c 100644 --- a/pkgs/by-name/ri/ride/package.nix +++ b/pkgs/by-name/ri/ride/package.nix @@ -108,7 +108,7 @@ buildNpmPackage rec { cp -r locales resources{,.pak} $out/share/ride makeShellWrapper ${lib.getExe electron} $out/bin/ride \ --add-flags $out/share/ride/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 ''} diff --git a/pkgs/by-name/se/session-desktop/package.nix b/pkgs/by-name/se/session-desktop/package.nix index 49a981d403ca..b9f31b07837c 100644 --- a/pkgs/by-name/se/session-desktop/package.nix +++ b/pkgs/by-name/se/session-desktop/package.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation { cp -r bin $out/bin wrapProgram $out/bin/session-desktop \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" runHook postInstall ''; diff --git a/pkgs/by-name/si/signal-desktop/generic.nix b/pkgs/by-name/si/signal-desktop/generic.nix index 22794ab1c561..e9826312bb47 100644 --- a/pkgs/by-name/si/signal-desktop/generic.nix +++ b/pkgs/by-name/si/signal-desktop/generic.nix @@ -234,7 +234,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 88731e72d337..544de347498c 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { --chdir $out/share/siyuan/resources \ --add-flags $out/share/siyuan/resources/app \ --set ELECTRON_FORCE_IS_PACKAGED 1 \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --inherit-argv0 install -Dm644 src/assets/icon.svg $out/share/icons/hicolor/scalable/apps/siyuan.svg diff --git a/pkgs/by-name/sp/spotify/linux.nix b/pkgs/by-name/sp/spotify/linux.nix index 5d638876d2da..a2b7c1eb50e3 100644 --- a/pkgs/by-name/sp/spotify/linux.nix +++ b/pkgs/by-name/sp/spotify/linux.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation { ''} \ --prefix LD_LIBRARY_PATH : "$librarypath" \ --prefix PATH : "${zenity}/bin" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime=true}}" runHook postFixup ''; diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index 17f93c7ca963..93adae3b2abf 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -80,7 +80,7 @@ buildNpmPackage rec { ] } \ --add-flags "$out/share/teams-for-linux/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications diff --git a/pkgs/by-name/te/tetrio-desktop/package.nix b/pkgs/by-name/te/tetrio-desktop/package.nix index e42eed4589c1..ad945a5bddcf 100644 --- a/pkgs/by-name/te/tetrio-desktop/package.nix +++ b/pkgs/by-name/te/tetrio-desktop/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' makeShellWrapper '${lib.getExe electron}' $out/bin/tetrio \ --prefix LD_LIBRARY_PATH : ${addDriverRunpath.driverLink}/lib \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags $out/share/TETR.IO/app.asar ''; diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix index 15e2cf2a3a6c..fdbc237affb3 100644 --- a/pkgs/by-name/ti/tidal-hifi/package.nix +++ b/pkgs/by-name/ti/tidal-hifi/package.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ "''${gappsWrapperArgs[@]}" substituteInPlace $out/share/applications/tidal-hifi.desktop \ --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" diff --git a/pkgs/by-name/uh/uhk-agent/package.nix b/pkgs/by-name/uh/uhk-agent/package.nix index fa86e0e44e36..11e4e692ac17 100644 --- a/pkgs/by-name/uh/uhk-agent/package.nix +++ b/pkgs/by-name/uh/uhk-agent/package.nix @@ -61,7 +61,7 @@ stdenvNoCC.mkDerivation { makeWrapper "${electron}/bin/electron" "$out/bin/${pname}" \ --add-flags "$out/opt/${pname}/app.asar.unpacked" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/by-name/up/upscayl/package.nix b/pkgs/by-name/up/upscayl/package.nix index eb48ac50a56b..d19f3b4b6a9d 100644 --- a/pkgs/by-name/up/upscayl/package.nix +++ b/pkgs/by-name/up/upscayl/package.nix @@ -40,7 +40,7 @@ appimageTools.wrapType2 { --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" ''; meta = with lib; { diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 02b11d55baa3..6a2108e67573 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: { --add-flags $out/opt/Vesktop/resources/app.asar \ ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper $out/Applications/Vesktop.app/Contents/MacOS/Vesktop $out/bin/vesktop diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix index 01b0f0eb7205..e670b0b299d8 100644 --- a/pkgs/by-name/wa/wavebox/package.nix +++ b/pkgs/by-name/wa/wavebox/package.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation (finalAttrs: { --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ --set CHROME_WRAPPER "wavebox" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} for elf in $out/share/wavebox.io/wavebox/{wavebox,chrome-sandbox,chrome_crashpad_handler}; do diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix index 8c376b19fe65..2066f697c248 100644 --- a/pkgs/by-name/we/webcord/package.nix +++ b/pkgs/by-name/we/webcord/package.nix @@ -55,7 +55,7 @@ buildNpmPackage rec { # Add xdg-utils to path via suffix, per PR #181171 makeWrapper '${lib.getExe electron}' $out/bin/webcord \ --suffix PATH : "${binPath}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags $out/lib/node_modules/webcord/ runHook postInstall diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix index 1f0c5f95c6ad..4959b6fdd2ee 100644 --- a/pkgs/by-name/wi/wire-desktop/package.nix +++ b/pkgs/by-name/wi/wire-desktop/package.nix @@ -130,7 +130,7 @@ let ]; preFixup = '' - gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}") + gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}") ''; postFixup = '' diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix index 3c1b3af0743f..9e70efb9b428 100644 --- a/pkgs/by-name/wo/wootility/package.nix +++ b/pkgs/by-name/wo/wootility/package.nix @@ -22,7 +22,7 @@ appimageTools.wrapType2 { let contents = appimageTools.extract { inherit pname version src; }; in '' wrapProgram $out/bin/wootility \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" install -Dm444 ${contents}/wootility-lekker.desktop -t $out/share/applications install -Dm444 ${contents}/wootility-lekker.png -t $out/share/pixmaps diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix index a402502ca1b2..b1df83104aa2 100644 --- a/pkgs/by-name/yt/ytmdesktop/package.nix +++ b/pkgs/by-name/yt/ytmdesktop/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe electron_33} $out/bin/ytmdesktop \ --add-flags $out/lib/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook preFixup diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix index 6b6ffb4b0e85..453a0caa999c 100644 --- a/pkgs/by-name/zu/zulip/package.nix +++ b/pkgs/by-name/zu/zulip/package.nix @@ -20,7 +20,7 @@ let in appimageTools.wrapType2 { inherit pname version src; - runScript = "appimage-exec.sh -w ${appimageContents} -- \${NIXOS_OZONE_WL:+\${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime}}"; + runScript = "appimage-exec.sh -w ${appimageContents} -- \${NIXOS_OZONE_WL:+\${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}"; extraInstallCommands = '' install -m 444 -D ${appimageContents}/zulip.desktop $out/share/applications/zulip.desktop diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 240b1e067fc2..b2e70731acc4 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation { preFixup = '' gappsWrapperArgs+=( - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" ) ''; diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index ad68279740d6..9f47e84a034c 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { --inherit-argv0 \ --add-flags --disable-gpu-compositing \ --add-flags $out/share/heroic \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" substituteInPlace "$out/share/heroic/flatpak/com.heroicgameslauncher.hgl.desktop" \ --replace-fail "Exec=heroic-run" "Exec=heroic" diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix index b7dc6f512597..cd214e83f4bf 100644 --- a/pkgs/tools/security/bitwarden-directory-connector/default.nix +++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix @@ -75,7 +75,7 @@ in { makeWrapper ${lib.getExe electron} $out/bin/bitwarden-directory-connector \ --add-flags $out/share/bitwarden-directory-connector/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 6dfc50d2608b..c80d28c2f863 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { checkFailed fi - exec $out/share/keybase/Keybase \''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}} "\$@" + exec $out/share/keybase/Keybase \''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} "\$@" EOF chmod +x $out/bin/keybase-gui From c82bf95274382eab4aa72a9d03a13fc0514ac9ac Mon Sep 17 00:00:00 2001 From: stanleyj-edsn Date: Wed, 4 Dec 2024 10:35:46 +0100 Subject: [PATCH 0558/1054] nixos/exwm: remove option enableDefaultConfig The default configuration was removed from upstream, see https://github.com/emacs-exwm/exwm/issues/57 Fix: #319541 Co-authored-by: Lin Jian --- .../services/x11/window-managers/exwm.nix | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix index 923a554b2d96..1c08ef93f9b6 100644 --- a/nixos/modules/services/x11/window-managers/exwm.nix +++ b/nixos/modules/services/x11/window-managers/exwm.nix @@ -6,17 +6,17 @@ let cfg = config.services.xserver.windowManager.exwm; loadScript = pkgs.writeText "emacs-exwm-load" '' ${cfg.loadScript} - ${optionalString cfg.enableDefaultConfig '' - (require 'exwm-config) - (exwm-config-default) - ''} ''; packages = epkgs: cfg.extraPackages epkgs ++ [ epkgs.exwm ]; exwm-emacs = pkgs.emacs.pkgs.withPackages packages; - in - { + + imports = [ + (mkRemovedOptionModule [ "services" "xserver" "windowManager" "exwm" "enableDefaultConfig" ] + "The upstream EXWM project no longer provides a default configuration, instead copy (parts of) exwm-config.el to your local config.") + ]; + options = { services.xserver.windowManager.exwm = { enable = mkEnableOption "exwm"; @@ -29,15 +29,9 @@ in ''; description = '' Emacs lisp code to be run after loading the user's init - file. If enableDefaultConfig is true, this will be run - before loading the default config. + file. ''; }; - enableDefaultConfig = mkOption { - default = true; - type = lib.types.bool; - description = "Enable an uncustomised exwm configuration."; - }; extraPackages = mkOption { type = types.functionTo (types.listOf types.package); default = epkgs: []; From f33d23dfbfc6822f48e7ce04faf6f3d083b8a86d Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Wed, 4 Dec 2024 19:56:09 +0100 Subject: [PATCH 0559/1054] protonmail-desktop: 1.0.6 -> 1.5.1 --- .../by-name/pr/protonmail-desktop/package.nix | 81 +++++++------------ 1 file changed, 30 insertions(+), 51 deletions(-) diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index 35656cc84bf8..574ed875d6f2 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -1,80 +1,58 @@ { + asar, lib, stdenv, fetchurl, makeWrapper, dpkg, electron, - unzip, }: - let mainProgram = "proton-mail"; - srcHashes = { - # Upstream info: It's intended to stay like this in further releases - # https://github.com/NixOS/nixpkgs/pull/326152#discussion_r1679558135 - universal-darwin = "sha256-6b+CNCvrkIA1CvSohSJZq/veZZNsA3lyhVv5SsBlJlw="; - x86_64-linux = "sha256-v8ufnQQEqTT5cr7fq8Fozje/NDlBzaCeKIzE6yU/biE="; - }; + version = "1.5.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "protonmail-desktop"; - # Upstream info: "v"-prefix got dropped - version = "1.0.6"; + inherit version; src = fetchurl { - url = - if stdenv.hostPlatform.isDarwin then - "https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/Proton.Mail-darwin-universal-${version}.zip" - else - "https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/proton-mail_${version}_amd64.deb"; - sha256 = - { - x86_64-linux = srcHashes.x86_64-linux; - x86_64-darwin = srcHashes.universal-darwin; - aarch64-darwin = srcHashes.universal-darwin; - } - .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); + url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb"; + sha256 = "sha256-PkxJUzSmSeIf/WjXCj5Pne5DHrXnTRib1IqHtbe3lNA="; }; - sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "."; - dontConfigure = true; dontBuild = true; - nativeBuildInputs = - [ - makeWrapper - ] - ++ lib.optional stdenv.hostPlatform.isLinux dpkg ++ lib.optional stdenv.hostPlatform.isDarwin unzip; + nativeBuildInputs = [ + dpkg + makeWrapper + asar + ]; - installPhase = - let - darwin = '' - mkdir -p $out/{Applications,bin} - cp -r "Proton Mail.app" $out/Applications/ - makeWrapper $out/Applications/"Proton Mail.app"/Contents/MacOS/Proton\ Mail $out/bin/protonmail-desktop - ''; - linux = '' - runHook preInstall - mkdir -p $out - cp -r usr/share/ $out/ - cp -r usr/lib/proton-mail/resources/app.asar $out/share/ - ''; + # Rebuild the ASAR archive, hardcoding the resourcesPath + preInstall = '' + asar extract usr/lib/proton-mail/resources/app.asar tmp + rm usr/lib/proton-mail/resources/app.asar + substituteInPlace tmp/.webpack/main/index.js \ + --replace-fail "process.resourcesPath" "'$out/share/proton-mail'" + asar pack tmp/ usr/lib/proton-mail/resources/app.asar + rm -fr tmp + ''; - in - '' - runHook preInstall + installPhase = '' + runHook preInstall - ${if stdenv.hostPlatform.isDarwin then darwin else linux} + mkdir -p $out/share/proton-mail + cp -r usr/share/ $out/ + cp -r usr/lib/proton-mail/resources/* $out/share/proton-mail/ - runHook postInstall - ''; + runHook postInstall + ''; preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${lib.getExe electron} $out/bin/${mainProgram} \ - --add-flags $out/share/app.asar \ + --add-flags $out/share/proton-mail/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ @@ -85,7 +63,7 @@ stdenv.mkDerivation rec { meta = { description = "Desktop application for Mail and Calendar, made with Electron"; - homepage = "https://github.com/ProtonMail/inbox-desktop"; + homepage = "https://github.com/ProtonMail/WebClients"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ rsniezek @@ -98,6 +76,7 @@ stdenv.mkDerivation rec { "aarch64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + inherit mainProgram; }; } From a5afdaefb95a91080d68c2da8b1ca7b43f61b796 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sun, 17 Nov 2024 16:31:56 +0100 Subject: [PATCH 0560/1054] protonmail-desktop: fix update-script --- pkgs/by-name/pr/protonmail-desktop/update.sh | 26 +++----------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/pr/protonmail-desktop/update.sh b/pkgs/by-name/pr/protonmail-desktop/update.sh index 4b1a10f17738..bd197203b8bc 100755 --- a/pkgs/by-name/pr/protonmail-desktop/update.sh +++ b/pkgs/by-name/pr/protonmail-desktop/update.sh @@ -5,25 +5,7 @@ set -eu -o pipefail -latestVersion=$(curl https://api.github.com/repos/ProtonMail/inbox-desktop/releases/latest | jq -r '.tag_name') - -declare -A platforms -platforms[x86_64-linux]="amd64" -platforms[x86_64-darwin]="universal" - -for platform in "${!platforms[@]}" -do - arch=${platforms[$platform]} - os=$(echo "$platform" | cut -d "-" -f2) - - if [[ "$os" == "linux" ]]; then - downloadUrl="https://github.com/ProtonMail/inbox-desktop/releases/download/${latestVersion}/proton-mail_${latestVersion}_${arch}.deb" - else - downloadUrl="https://github.com/ProtonMail/inbox-desktop/releases/download/${latestVersion}/Proton.Mail-${os}-${arch}-${latestVersion}.zip" - fi - echo "$downloadUrl" - - latestSha=$(nix store prefetch-file "$downloadUrl" --json | jq -r '.hash') - - update-source-version "protonmail-desktop" "$latestVersion" "$latestSha" --system="$platform" --ignore-same-version --file=./pkgs/by-name/pr/protonmail-desktop/package.nix -done +latestVersion=$(curl https://proton.me/download/mail/linux/version.json | jq -r 'first(.Releases[])|.Version') +downloadUrl="https://proton.me/download/mail/linux/${latestVersion}/ProtonMail-desktop-beta.deb" +latestSha=$(nix store prefetch-file "$downloadUrl" --json | jq -r '.hash') +update-source-version "protonmail-desktop" "$latestVersion" "$latestSha" --ignore-same-version --file=./pkgs/by-name/pr/protonmail-desktop/package.nix From 330b851e0bc1690ea4ef60eb51c871ace8194d24 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 3 Dec 2024 10:32:48 +0100 Subject: [PATCH 0561/1054] protonmail-desktop: drop darwin-support temporary (https://github.com/NixOS/nixpkgs/pull/356737) --- pkgs/by-name/pr/protonmail-desktop/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index 574ed875d6f2..70ec5ecc1707 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -72,8 +72,6 @@ stdenv.mkDerivation { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" - "aarch64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; From 97c81d554d8bd747c70f093e3145205c25eee1dd Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 4 Dec 2024 12:55:48 -0600 Subject: [PATCH 0562/1054] caprine: add updateScript easier to call update command for me --- pkgs/by-name/ca/caprine/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix index 9d89f45435ee..1440c3b5977b 100644 --- a/pkgs/by-name/ca/caprine/package.nix +++ b/pkgs/by-name/ca/caprine/package.nix @@ -6,6 +6,7 @@ makeDesktopItem, copyDesktopItems, electron, + nix-update-script, }: buildNpmPackage rec { @@ -79,6 +80,8 @@ buildNpmPackage rec { }) ]; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/sindresorhus/caprine/releases/tag/${src.rev}"; description = "Elegant Facebook Messenger desktop app"; From b8396a883cac8dd22a41cf19780c7ddbed17c9a5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 4 Dec 2024 12:52:18 -0600 Subject: [PATCH 0563/1054] caprine: 2.60.1 -> 2.60.3 --- pkgs/by-name/ca/caprine/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix index 1440c3b5977b..7efa27ec3aaa 100644 --- a/pkgs/by-name/ca/caprine/package.nix +++ b/pkgs/by-name/ca/caprine/package.nix @@ -11,18 +11,18 @@ buildNpmPackage rec { pname = "caprine"; - version = "2.60.1"; + version = "2.60.3"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "caprine"; rev = "v${version}"; - hash = "sha256-y4W295i7FhgJC3SlwSr801fLOGJY1WF136bbkkBUvyw="; + hash = "sha256-yfCilJ62m7nKe8B+4puwAbNgr2g1P7HaKIhFINdv0/k="; }; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - npmDepsHash = "sha256-JHaUc2p+wHsqWtls8xquHK9qnypuCrR0AQMGxcrTsC0="; + npmDepsHash = "sha256-hNOAplCSXrO4NZqDTkmhf0oZVeGRUHr2Y/Qdx2RIV9c="; nativeBuildInputs = [ copyDesktopItems ]; From b188947db956257e5e43da1bc244e89990cc425c Mon Sep 17 00:00:00 2001 From: Arne Keller <2012gdwu+github@posteo.de> Date: Wed, 4 Dec 2024 20:02:30 +0100 Subject: [PATCH 0564/1054] mixxx: fix source hash (#361718) Upstream must have sneakily replaced the tagged version. --- pkgs/applications/audio/mixxx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index f788f62ad02d..33dddd20cfc4 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -63,7 +63,7 @@ mkDerivation rec { owner = "mixxxdj"; repo = "mixxx"; rev = version; - hash = "sha256-foY4K1rSth0GUjM1xpctI3fpavVjGoPMnRN2tT4Lsqg="; + hash = "sha256-YfpFRLosIIND+HnZN+76ZY0dQqEJaFkWZS84gZOCdfc="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ]; From 22928ab87333643defb6d8681631944d835adfea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 19:13:28 +0000 Subject: [PATCH 0565/1054] screenfetch: 3.9.1 -> 3.9.9 --- pkgs/by-name/sc/screenfetch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/screenfetch/package.nix b/pkgs/by-name/sc/screenfetch/package.nix index c4eb669875d6..0be861492826 100644 --- a/pkgs/by-name/sc/screenfetch/package.nix +++ b/pkgs/by-name/sc/screenfetch/package.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { pname = "screenfetch"; - version = "3.9.1"; + version = "3.9.9"; src = fetchFromGitHub { owner = "KittyKatt"; repo = "screenFetch"; rev = "v${version}"; - sha256 = "04l8aqr474pb115nagn9f6y48jw92n1qfszgw7dbhgl4mpn95lcr"; + sha256 = "sha256-UNZMCLXhH4wDV0/fGWsB+KAi6aJVuPs6zpWXIQAqnjo="; }; nativeBuildInputs = [ makeWrapper ]; From 624f1f34f93d49af20b96aefb66ece3e50833664 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 4 Dec 2024 13:24:42 -0600 Subject: [PATCH 0566/1054] caprine: disable autoUpdate functionality We can't auto update so just disable that functionality. --- .../ca/caprine/001-disable-auto-update.patch | 39 +++++++++++++++++++ pkgs/by-name/ca/caprine/package.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/by-name/ca/caprine/001-disable-auto-update.patch diff --git a/pkgs/by-name/ca/caprine/001-disable-auto-update.patch b/pkgs/by-name/ca/caprine/001-disable-auto-update.patch new file mode 100644 index 000000000000..f26fc35690c0 --- /dev/null +++ b/pkgs/by-name/ca/caprine/001-disable-auto-update.patch @@ -0,0 +1,39 @@ +From 5da393e32336534222c77659ff138a4e512e6a1f Mon Sep 17 00:00:00 2001 +From: Austin Horstman +Date: Wed, 4 Dec 2024 13:23:15 -0600 +Subject: [PATCH] Disable autoUpdate + +--- + source/index.ts | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/source/index.ts b/source/index.ts +index b8511949a..205c513fe 100644 +--- a/source/index.ts ++++ b/source/index.ts +@@ -14,7 +14,6 @@ import { + nativeTheme, + } from 'electron'; + import {ipcMain as ipc} from 'electron-better-ipc'; +-import {autoUpdater} from 'electron-updater'; + import electronDl from 'electron-dl'; + import electronContextMenu from 'electron-context-menu'; + import electronLocalshortcut from 'electron-localshortcut'; +@@ -65,17 +64,6 @@ if (!config.get('hardwareAcceleration')) { + app.disableHardwareAcceleration(); + } + +-if (!is.development && config.get('autoUpdate')) { +- (async () => { +- const FOUR_HOURS = 1000 * 60 * 60 * 4; +- setInterval(async () => { +- await autoUpdater.checkForUpdatesAndNotify(); +- }, FOUR_HOURS); +- +- await autoUpdater.checkForUpdatesAndNotify(); +- })(); +-} +- + let mainWindow: BrowserWindow; + let isQuitting = false; + let previousMessageCount = 0; diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix index 7efa27ec3aaa..17d78ba28d9b 100644 --- a/pkgs/by-name/ca/caprine/package.nix +++ b/pkgs/by-name/ca/caprine/package.nix @@ -38,6 +38,8 @@ buildNpmPackage rec { -c.electronVersion=${electron.version} ''; + patches = [ ./001-disable-auto-update.patch ]; + installPhase = '' runHook preInstall From b5a6aeb5df0e0bbfc505c9f9a9760bd08f98acc8 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 3 Dec 2024 22:15:15 +0530 Subject: [PATCH 0567/1054] ci: init get-merge-commit workflow Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- .github/workflows/get-merge-commit.yml | 43 ++++++++++++++++++++++++++ ci/README.md | 29 +++++------------ 2 files changed, 51 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/get-merge-commit.yml diff --git a/.github/workflows/get-merge-commit.yml b/.github/workflows/get-merge-commit.yml new file mode 100644 index 000000000000..63154d73ed9d --- /dev/null +++ b/.github/workflows/get-merge-commit.yml @@ -0,0 +1,43 @@ +name: Get merge commit + +on: + workflow_call: + outputs: + mergedSha: + description: "The merge commit SHA" + value: ${{ jobs.resolve-merge-commit.outputs.mergedSha }} + +# We need a token to query the API, but it doesn't need any special permissions +permissions: {} + +jobs: + resolve-merge-commit: + runs-on: ubuntu-latest + outputs: + mergedSha: ${{ steps.merged.outputs.mergedSha }} + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + path: base + sparse-checkout: ci + - name: Check if the PR can be merged and get the test merge commit + id: merged + env: + GH_TOKEN: ${{ github.token }} + GH_EVENT: ${{ github.event_name }} + run: | + case "$GH_EVENT" in + push) + echo "mergedSha=${{ github.sha }}" >> "$GITHUB_OUTPUT" + ;; + pull_request_target) + if mergedSha=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then + echo "Checking the merge commit $mergedSha" + echo "mergedSha=$mergedSha" >> "$GITHUB_OUTPUT" + else + # Skipping so that no notifications are sent + echo "Skipping the rest..." + fi + ;; + esac + rm -rf base diff --git a/ci/README.md b/ci/README.md index 11b53c6095e6..7aa49eb82c70 100644 --- a/ci/README.md +++ b/ci/README.md @@ -58,7 +58,7 @@ Exit codes: ### Usage -This script can be used in GitHub Actions workflows as follows: +This script is implemented as a reusable GitHub Actions workflow, and can be used as follows: ```yaml on: pull_request_target @@ -67,32 +67,19 @@ on: pull_request_target permissions: {} jobs: + get-merge-commit: + # use the relative path of the get-merge-commit workflow yaml here + uses: ./.github/workflows/get-merge-commit.yml + build: name: Build runs-on: ubuntu-latest + needs: get-merge-commit steps: - # Important: Because of `pull_request_target`, this doesn't check out the PR, - # but rather the base branch of the PR, which is needed so we don't run untrusted code - - uses: actions/checkout@ - with: - path: base - sparse-checkout: ci - - name: Resolving the merge commit - env: - GH_TOKEN: ${{ github.token }} - run: | - if mergedSha=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then - echo "Checking the merge commit $mergedSha" - echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" - else - # Skipping so that no notifications are sent - echo "Skipping the rest..." - fi - rm -rf base - uses: actions/checkout@ # Add this to _all_ subsequent steps to skip them - if: env.mergedSha + if: needs.get-merge-commit.outputs.mergedSha with: - ref: ${{ env.mergedSha }} + ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - ... ``` From 5ddb63fe13c213a7cd1e0866186cbed933fbfbc1 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 3 Dec 2024 22:39:54 +0530 Subject: [PATCH 0568/1054] ci/eval: use the get-merge-commit workflow --- .github/workflows/eval.yml | 46 +++++++++----------------------------- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index f291e288c434..fe3262295e2e 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -16,53 +16,29 @@ permissions: contents: read jobs: + get-merge-commit: + uses: ./.github/workflows/get-merge-commit.yml + attrs: name: Attributes runs-on: ubuntu-latest + needs: get-merge-commit outputs: - mergedSha: ${{ steps.merged.outputs.mergedSha }} + mergedSha: ${{ needs.get-merge-commit.outputs.mergedSha }} baseSha: ${{ steps.baseSha.outputs.baseSha }} systems: ${{ steps.systems.outputs.systems }} steps: - # Important: Because of `pull_request_target`, this doesn't check out the PR, - # but rather the base branch of the PR, which is needed so we don't run untrusted code - - name: Check out the ci directory of the base branch - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - path: base - sparse-checkout: ci - - name: Check if the PR can be merged and get the test merge commit - id: merged - env: - GH_TOKEN: ${{ github.token }} - GH_EVENT: ${{ github.event_name }} - run: | - case "$GH_EVENT" in - push) - echo "mergedSha=${{ github.sha }}" >> "$GITHUB_OUTPUT" - ;; - pull_request_target) - if mergedSha=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then - echo "Checking the merge commit $mergedSha" - echo "mergedSha=$mergedSha" >> "$GITHUB_OUTPUT" - else - # Skipping so that no notifications are sent - echo "Skipping the rest..." - fi - ;; - esac - rm -rf base - name: Check out the PR at the test merge commit uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 # Add this to _all_ subsequent steps to skip them - if: steps.merged.outputs.mergedSha + if: needs.get-merge-commit.outputs.mergedSha with: - ref: ${{ steps.merged.outputs.mergedSha }} + ref: ${{ needs.get-merge-commit.outputs.mergedSha }} fetch-depth: 2 path: nixpkgs - name: Determine base commit - if: github.event_name == 'pull_request_target' && steps.merged.outputs.mergedSha + if: github.event_name == 'pull_request_target' && needs.get-merge-commit.outputs.mergedSha id: baseSha run: | baseSha=$(git -C nixpkgs rev-parse HEAD^1) @@ -70,18 +46,18 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 - if: steps.merged.outputs.mergedSha + if: needs.get-merge-commit.outputs.mergedSha - name: Evaluate the list of all attributes and get the systems matrix id: systems - if: steps.merged.outputs.mergedSha + if: needs.get-merge-commit.outputs.mergedSha run: | nix-build nixpkgs/ci -A eval.attrpathsSuperset echo "systems=$(> "$GITHUB_OUTPUT" - name: Upload the list of all attributes uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 - if: steps.merged.outputs.mergedSha + if: needs.get-merge-commit.outputs.mergedSha with: name: paths path: result/* From 52acf63da445e81198a77b07591d02ce62826f6c Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 3 Dec 2024 23:07:28 +0530 Subject: [PATCH 0569/1054] ci/nixpkgs-vet: use the get-merge-commit workflow --- .github/workflows/nixpkgs-vet.yml | 32 ++++++++++--------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml index a7eb1b0eedae..6d39efc3e26a 100644 --- a/.github/workflows/nixpkgs-vet.yml +++ b/.github/workflows/nixpkgs-vet.yml @@ -19,46 +19,34 @@ permissions: {} # There is a feature request for suppressing notifications on concurrency-canceled runs: https://github.com/orgs/community/discussions/13015 jobs: + get-merge-commit: + uses: ./.github/workflows/get-merge-commit.yml + check: name: nixpkgs-vet # This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases. runs-on: ubuntu-latest # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long. timeout-minutes: 10 + needs: get-merge-commit steps: - # This checks out the base branch because of pull_request_target - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - path: base - sparse-checkout: ci - - name: Resolving the merge commit - env: - GH_TOKEN: ${{ github.token }} - run: | - if mergedSha=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then - echo "Checking the merge commit $mergedSha" - echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" - else - echo "Skipping the rest..." - fi - rm -rf base - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - if: env.mergedSha + if: needs.get-merge-commit.outputs.mergedSha with: # pull_request_target checks out the base branch by default - ref: ${{ env.mergedSha }} + ref: ${{ needs.get-merge-commit.outputs.mergedSha }} # Fetches the merge commit and its parents fetch-depth: 2 - name: Checking out base branch - if: env.mergedSha + if: needs.get-merge-commit.outputs.mergedSha run: | base=$(mktemp -d) git worktree add "$base" "$(git rev-parse HEAD^1)" echo "base=$base" >> "$GITHUB_ENV" - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 - if: env.mergedSha + if: needs.get-merge-commit.outputs.mergedSha - name: Fetching the pinned tool - if: env.mergedSha + if: needs.get-merge-commit.outputs.mergedSha # Update the pinned version using ci/nixpkgs-vet/update-pinned-tool.sh run: | # The pinned version of the tooling to use. @@ -71,7 +59,7 @@ jobs: # Adds a result symlink as a GC root. nix-store --realise "$toolPath" --add-root result - name: Running nixpkgs-vet - if: env.mergedSha + if: needs.get-merge-commit.outputs.mergedSha env: # Force terminal colors to be enabled. The library that `nixpkgs-vet` uses respects https://bixense.com/clicolors/ CLICOLOR_FORCE: 1 From 4831293112076b1483ce8d80952e0657a7915a92 Mon Sep 17 00:00:00 2001 From: Victor Nova Date: Mon, 2 Dec 2024 12:12:50 -0800 Subject: [PATCH 0570/1054] dotnet-ef: init at 9.0.0 - the core tool of .NET Entity Framework --- pkgs/by-name/do/dotnet-ef/package.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 pkgs/by-name/do/dotnet-ef/package.nix diff --git a/pkgs/by-name/do/dotnet-ef/package.nix b/pkgs/by-name/do/dotnet-ef/package.nix new file mode 100644 index 000000000000..06bb8ebab33a --- /dev/null +++ b/pkgs/by-name/do/dotnet-ef/package.nix @@ -0,0 +1,22 @@ +{ buildDotnetGlobalTool, lib }: + +buildDotnetGlobalTool { + pname = "dotnet-ef"; + version = "9.0.0"; + + nugetHash = "sha256-/Ru/H2WXX/SCqF2s0M1DJkaw+6Nikm+ccrveqiOXggA="; + + meta = { + description = "The Entity Framework Core tools help with design-time development tasks."; + longDescription = '' + The Entity Framework Core tools help with design-time development tasks. + They're primarily used to manage Migrations and to scaffold a DbContext and entity types by reverse engineering the schema of a database. + ''; + downloadPage = "https://www.nuget.org/packages/dotnet-ef"; + homepage = "https://learn.microsoft.com/en-us/ef/core/cli/dotnet"; + changelog = "https://learn.microsoft.com/en-us/ef/core/what-is-new/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lostmsu ]; + mainProgram = "dotnet-ef"; + }; +} From 093a8945a9cd1e8cdeffd8938186c6947aadf5ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 19:51:36 +0000 Subject: [PATCH 0571/1054] python312Packages.comicon: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/comicon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/comicon/default.nix b/pkgs/development/python-modules/comicon/default.nix index 78ecc0715c81..1aaf781d3b9a 100644 --- a/pkgs/development/python-modules/comicon/default.nix +++ b/pkgs/development/python-modules/comicon/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "comicon"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "potatoeggy"; repo = "comicon"; rev = "refs/tags/v${version}"; - hash = "sha256-oiEzZRgyG/RQCo2zSTqwlOhkwz76lSImR0ZtSlIUp4Y="; + hash = "sha256-FvAgcpYvUTTE24jJB2ZxSNcNjAIyUBa3BaysjWXurtg="; }; nativeBuildInputs = [ From c561fb91a7c6861dddf613f93d5e781c2cadaf12 Mon Sep 17 00:00:00 2001 From: Ivy Fan-Chiang Date: Wed, 4 Dec 2024 14:48:01 -0500 Subject: [PATCH 0572/1054] detect-it-easy: add aarch64-linux --- pkgs/by-name/de/detect-it-easy/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/de/detect-it-easy/package.nix b/pkgs/by-name/de/detect-it-easy/package.nix index 105529041352..df1eeece456a 100644 --- a/pkgs/by-name/de/detect-it-easy/package.nix +++ b/pkgs/by-name/de/detect-it-easy/package.nix @@ -62,7 +62,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/horsicq/Detect-It-Easy"; changelog = "https://github.com/horsicq/Detect-It-Easy/blob/master/changelog.txt"; maintainers = with lib.maintainers; [ ivyfanchiang ]; - platforms = [ "x86_64-linux" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; license = lib.licenses.mit; }; }) From a67591e4a88d9974aa384f57a290a6dbc395d7ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 4 Dec 2024 19:56:59 +0100 Subject: [PATCH 0573/1054] famistudio: nixfmt --- .../audio/famistudio/build-native-wrapper.nix | 97 ++++++---- .../applications/audio/famistudio/default.nix | 177 +++++++++++------- 2 files changed, 166 insertions(+), 108 deletions(-) diff --git a/pkgs/applications/audio/famistudio/build-native-wrapper.nix b/pkgs/applications/audio/famistudio/build-native-wrapper.nix index ddee5bf5712d..6d986ff520d9 100644 --- a/pkgs/applications/audio/famistudio/build-native-wrapper.nix +++ b/pkgs/applications/audio/famistudio/build-native-wrapper.nix @@ -1,54 +1,69 @@ -{ depname -, version -, src -, sourceRoot -, stdenv -, lib -, patches ? [] -, extraPostPatch ? "" -, buildInputs ? [] +{ + depname, + version, + src, + sourceRoot, + stdenv, + lib, + patches ? [ ], + extraPostPatch ? "", + buildInputs ? [ ], }: let - rebuildscriptName = if stdenv.hostPlatform.isLinux then - "build_linux" - else if stdenv.hostPlatform.isDarwin then - "build_macos" - else throw "Don't know how to rebuild FamiStudio's vendored ${depname} for ${stdenv.hostPlatform.system}"; + rebuildscriptName = + if stdenv.hostPlatform.isLinux then + "build_linux" + else if stdenv.hostPlatform.isDarwin then + "build_macos" + else + throw "Don't know how to rebuild FamiStudio's vendored ${depname} for ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { pname = "famistudio-nativedep-${depname}"; - inherit version src sourceRoot patches buildInputs; + inherit + version + src + sourceRoot + patches + buildInputs + ; - postPatch = let - libnameBase = lib.optionalString stdenv.hostPlatform.isLinux "lib" + depname; - in '' - # Use one name for build script, eases with patching - mv ${rebuildscriptName}.sh build.sh + postPatch = + let + libnameBase = lib.optionalString stdenv.hostPlatform.isLinux "lib" + depname; + in + '' + # Use one name for build script, eases with patching + mv ${rebuildscriptName}.sh build.sh - # Scripts use hardcoded compilers and try to copy built libraries into FamiStudio's build tree - # Not all scripts use the same compiler, so don't fail on replacing that - substituteInPlace build.sh \ - --replace-fail '../../FamiStudio/' "$out/lib/" \ - --replace-quiet 'g++' "$CXX" + # Scripts use hardcoded compilers and try to copy built libraries into FamiStudio's build tree + # Not all scripts use the same compiler, so don't fail on replacing that + substituteInPlace build.sh \ + --replace-fail '../../FamiStudio/' "$out/lib/" \ + --replace-quiet 'g++' "$CXX" - # Replacing gcc via sed, would break -static-libgcc otherwise - sed -i -e "s/^gcc/$CC/g" build.sh - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Darwin rebuild scripts try to make a universal2 dylib - # - build dylib for non-hostPlatform - # - copy built library into special directory for later packaging script - # - join two dylibs together into a universal2 dylib - # Remove everything we don't need - sed -ri \ - -e '/-target ${if stdenv.hostPlatform.isx86_64 then "arm64" else "x86_64"}/d' \ - -e '/..\/..\/Setup/d' \ - build.sh + # Replacing gcc via sed, would break -static-libgcc otherwise + sed -i -e "s/^gcc/$CC/g" build.sh + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Darwin rebuild scripts try to make a universal2 dylib + # - build dylib for non-hostPlatform + # - copy built library into special directory for later packaging script + # - join two dylibs together into a universal2 dylib + # Remove everything we don't need + sed -ri \ + -e '/-target ${if stdenv.hostPlatform.isx86_64 then "arm64" else "x86_64"}/d' \ + -e '/..\/..\/Setup/d' \ + build.sh - # Replace joining multi-arch dylibs with copying dylib for target arch - substituteInPlace build.sh \ - --replace-fail 'lipo -create -output ${libnameBase}.dylib' 'cp ${libnameBase}_${if stdenv.hostPlatform.isx86_64 then "x86_64" else "arm64"}.dylib ${libnameBase}.dylib #' - '' + extraPostPatch; + # Replace joining multi-arch dylibs with copying dylib for target arch + substituteInPlace build.sh \ + --replace-fail 'lipo -create -output ${libnameBase}.dylib' 'cp ${libnameBase}_${ + if stdenv.hostPlatform.isx86_64 then "x86_64" else "arm64" + }.dylib ${libnameBase}.dylib #' + '' + + extraPostPatch; dontConfigure = true; dontInstall = true; # rebuild script automatically installs diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index 4e13d1aa0a5f..3cc85abfa054 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -1,25 +1,28 @@ -{ stdenv -, lib -, buildDotnetModule -, dotnetCorePackages -, callPackage -, fetchFromGitHub -, ffmpeg -, glfw -, libglvnd -, libogg -, libvorbis -, openal -, portaudio -, rtmidi +{ + stdenv, + lib, + buildDotnetModule, + dotnetCorePackages, + callPackage, + fetchFromGitHub, + ffmpeg, + glfw, + libglvnd, + libogg, + libvorbis, + openal, + portaudio, + rtmidi, }: let - csprojName = if stdenv.hostPlatform.isLinux then - "FamiStudio.Linux" - else if stdenv.hostPlatform.isDarwin then - "FamiStudio.Mac" - else throw "Don't know how to build FamiStudio for ${stdenv.hostPlatform.system}"; + csprojName = + if stdenv.hostPlatform.isLinux then + "FamiStudio.Linux" + else if stdenv.hostPlatform.isDarwin then + "FamiStudio.Mac" + else + throw "Don't know how to build FamiStudio for ${stdenv.hostPlatform.system}"; in buildDotnetModule rec { pname = "famistudio"; @@ -32,57 +35,97 @@ buildDotnetModule rec { hash = "sha256-WYy/6cWQg3Ayok/eAdnvlWAvdcuhy/sdlWOVvaYcPkc="; }; - postPatch = let - libname = library: "${library}${stdenv.hostPlatform.extensions.sharedLibrary}"; - buildNativeWrapper = args: callPackage ./build-native-wrapper.nix (args // { - inherit version src; - sourceRoot = "${src.name}/ThirdParty/${args.depname}"; - }); - nativeWrapperToReplaceFormat = args: let - libPrefix = lib.optionalString stdenv.hostPlatform.isLinux "lib"; - in { - package = buildNativeWrapper args; - expectedName = "${libPrefix}${args.depname}"; - ourName = "${libPrefix}${args.depname}"; - }; - librariesToReplace = [ - # Unmodified native libraries that we can fully substitute - { package = glfw; expectedName = "libglfw"; ourName = "libglfw"; } - { package = rtmidi; expectedName = "librtmidi"; ourName = "librtmidi"; } - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - { package = openal; expectedName = "libopenal32"; ourName = "libopenal"; } - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - { package = portaudio; expectedName = "libportaudio.2"; ourName = "libportaudio.2"; } - ] ++ [ - # Native libraries, with extra code for the C# wrapping - (nativeWrapperToReplaceFormat { depname = "GifDec"; }) - (nativeWrapperToReplaceFormat { depname = "NesSndEmu"; }) - (nativeWrapperToReplaceFormat { depname = "NotSoFatso"; extraPostPatch = '' - # C++17 does not allow register storage class specifier - substituteInPlace build.sh \ - --replace-fail "$CXX" "$CXX -std=c++14" - ''; }) - (nativeWrapperToReplaceFormat { depname = "ShineMp3"; }) - (nativeWrapperToReplaceFormat { depname = "Stb"; }) - (nativeWrapperToReplaceFormat { depname = "Vorbis"; buildInputs = [ libogg libvorbis ]; }) - ]; - libraryReplaceArgs = lib.strings.concatMapStringsSep " " - (library: "--replace-fail '${libname library.expectedName}' '${lib.getLib library.package}/lib/${libname library.ourName}'") - librariesToReplace; - in '' - # Don't use any prebuilt libraries - rm FamiStudio/*.{dll,dylib,so*} + postPatch = + let + libname = library: "${library}${stdenv.hostPlatform.extensions.sharedLibrary}"; + buildNativeWrapper = + args: + callPackage ./build-native-wrapper.nix ( + args + // { + inherit version src; + sourceRoot = "${src.name}/ThirdParty/${args.depname}"; + } + ); + nativeWrapperToReplaceFormat = + args: + let + libPrefix = lib.optionalString stdenv.hostPlatform.isLinux "lib"; + in + { + package = buildNativeWrapper args; + expectedName = "${libPrefix}${args.depname}"; + ourName = "${libPrefix}${args.depname}"; + }; + librariesToReplace = + [ + # Unmodified native libraries that we can fully substitute + { + package = glfw; + expectedName = "libglfw"; + ourName = "libglfw"; + } + { + package = rtmidi; + expectedName = "librtmidi"; + ourName = "librtmidi"; + } + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + { + package = openal; + expectedName = "libopenal32"; + ourName = "libopenal"; + } + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + { + package = portaudio; + expectedName = "libportaudio.2"; + ourName = "libportaudio.2"; + } + ] + ++ [ + # Native libraries, with extra code for the C# wrapping + (nativeWrapperToReplaceFormat { depname = "GifDec"; }) + (nativeWrapperToReplaceFormat { depname = "NesSndEmu"; }) + (nativeWrapperToReplaceFormat { + depname = "NotSoFatso"; + extraPostPatch = '' + # C++17 does not allow register storage class specifier + substituteInPlace build.sh \ + --replace-fail "$CXX" "$CXX -std=c++14" + ''; + }) + (nativeWrapperToReplaceFormat { depname = "ShineMp3"; }) + (nativeWrapperToReplaceFormat { depname = "Stb"; }) + (nativeWrapperToReplaceFormat { + depname = "Vorbis"; + buildInputs = [ + libogg + libvorbis + ]; + }) + ]; + libraryReplaceArgs = lib.strings.concatMapStringsSep " " ( + library: + "--replace-fail '${libname library.expectedName}' '${lib.getLib library.package}/lib/${libname library.ourName}'" + ) librariesToReplace; + in + '' + # Don't use any prebuilt libraries + rm FamiStudio/*.{dll,dylib,so*} - # Replace copying of vendored prebuilt native libraries with copying of our native libraries - substituteInPlace ${projectFile} ${libraryReplaceArgs} + # Replace copying of vendored prebuilt native libraries with copying of our native libraries + substituteInPlace ${projectFile} ${libraryReplaceArgs} - # Un-hardcode target platform if set - sed -i -e '/PlatformTarget/d' ${projectFile} + # Un-hardcode target platform if set + sed -i -e '/PlatformTarget/d' ${projectFile} - # Don't require a special name to be preserved, our OpenAL isn't 32-bit - substituteInPlace FamiStudio/Source/AudioStreams/OpenALStream.cs \ - --replace-fail 'libopenal32' 'libopenal' - ''; + # Don't require a special name to be preserved, our OpenAL isn't 32-bit + substituteInPlace FamiStudio/Source/AudioStreams/OpenALStream.cs \ + --replace-fail 'libopenal32' 'libopenal' + ''; projectFile = "FamiStudio/${csprojName}.csproj"; nugetDeps = ./deps.nix; From b44f29245d180d7133cc45c510e566b6f89a27b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 4 Dec 2024 20:56:52 +0100 Subject: [PATCH 0574/1054] famistudio: migrate to by-name --- .../audio => by-name/fa}/famistudio/build-native-wrapper.nix | 0 pkgs/{applications/audio => by-name/fa}/famistudio/deps.nix | 0 .../default.nix => by-name/fa/famistudio/package.nix} | 0 pkgs/{applications/audio => by-name/fa}/famistudio/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{applications/audio => by-name/fa}/famistudio/build-native-wrapper.nix (100%) rename pkgs/{applications/audio => by-name/fa}/famistudio/deps.nix (100%) rename pkgs/{applications/audio/famistudio/default.nix => by-name/fa/famistudio/package.nix} (100%) rename pkgs/{applications/audio => by-name/fa}/famistudio/update.sh (100%) diff --git a/pkgs/applications/audio/famistudio/build-native-wrapper.nix b/pkgs/by-name/fa/famistudio/build-native-wrapper.nix similarity index 100% rename from pkgs/applications/audio/famistudio/build-native-wrapper.nix rename to pkgs/by-name/fa/famistudio/build-native-wrapper.nix diff --git a/pkgs/applications/audio/famistudio/deps.nix b/pkgs/by-name/fa/famistudio/deps.nix similarity index 100% rename from pkgs/applications/audio/famistudio/deps.nix rename to pkgs/by-name/fa/famistudio/deps.nix diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/by-name/fa/famistudio/package.nix similarity index 100% rename from pkgs/applications/audio/famistudio/default.nix rename to pkgs/by-name/fa/famistudio/package.nix diff --git a/pkgs/applications/audio/famistudio/update.sh b/pkgs/by-name/fa/famistudio/update.sh similarity index 100% rename from pkgs/applications/audio/famistudio/update.sh rename to pkgs/by-name/fa/famistudio/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb4126e3f906..ad2e6cbc8ee4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13691,8 +13691,6 @@ with pkgs; evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; }; - famistudio = darwin.apple_sdk_11_0.callPackage ../applications/audio/famistudio { }; - fdr = libsForQt5.callPackage ../applications/science/programming/fdr { }; fetchmail = callPackage ../applications/misc/fetchmail { }; From 52643c64cdceadb3e9bb317e6033469586c66ec4 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 4 Dec 2024 20:13:08 +0000 Subject: [PATCH 0575/1054] nixos/unl0kr: add a `package` option --- nixos/modules/system/boot/unl0kr.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/unl0kr.nix b/nixos/modules/system/boot/unl0kr.nix index 30cf3ff8105e..35dbaa030cb9 100644 --- a/nixos/modules/system/boot/unl0kr.nix +++ b/nixos/modules/system/boot/unl0kr.nix @@ -15,6 +15,8 @@ in description = ''Whether to enable the unl0kr on-screen keyboard in initrd to unlock LUKS.''; }; + package = lib.mkPackageOption pkgs "unl0kr" { }; + allowVendorDrivers = lib.mkEnableOption "load optional drivers" // { description = ''Whether to load additional drivers for certain vendors (I.E: Wacom, Intel, etc.)''; }; @@ -85,7 +87,7 @@ in libinput xkeyboard_config "${config.boot.initrd.systemd.package}/lib/systemd/systemd-reply-password" - "${pkgs.unl0kr}/bin/unl0kr" + (lib.getExe' cfg.package "unl0kr") ]; services = { unl0kr-ask-password = { @@ -112,7 +114,7 @@ in do for file in `ls $DIR/ask.*`; do socket="$(cat "$file" | ${pkgs.gnugrep}/bin/grep "Socket=" | cut -d= -f2)" - ${pkgs.unl0kr}/bin/unl0kr -v -C "/etc/unl0kr.conf" | ${config.boot.initrd.systemd.package}/lib/systemd/systemd-reply-password 1 "$socket" + ${lib.getExe' cfg.package "unl0kr"} -v -C "/etc/unl0kr.conf" | ${config.boot.initrd.systemd.package}/lib/systemd/systemd-reply-password 1 "$socket" done done ''; From 73363329ba9e7c4f9f950ba34d24df48cc05cb31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 4 Dec 2024 21:13:13 +0100 Subject: [PATCH 0576/1054] famistudio: .NET 7 -> 8 --- pkgs/by-name/fa/famistudio/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix index 3cc85abfa054..8df5b3065ca3 100644 --- a/pkgs/by-name/fa/famistudio/package.nix +++ b/pkgs/by-name/fa/famistudio/package.nix @@ -129,8 +129,9 @@ buildDotnetModule rec { projectFile = "FamiStudio/${csprojName}.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnetFlags = [ "-p:TargetFramework=net8.0" ]; runtimeDeps = lib.optionals stdenv.hostPlatform.isLinux [ libglvnd From 6498028369ccd77451363e6a2b1dc6ba29c43bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 4 Dec 2024 21:14:15 +0100 Subject: [PATCH 0577/1054] famistudio: remove `with lib;` --- pkgs/by-name/fa/famistudio/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix index 8df5b3065ca3..ff169cd2741e 100644 --- a/pkgs/by-name/fa/famistudio/package.nix +++ b/pkgs/by-name/fa/famistudio/package.nix @@ -154,16 +154,18 @@ buildDotnetModule rec { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { homepage = "https://famistudio.org/"; description = "NES Music Editor"; longDescription = '' FamiStudio is very simple music editor for the Nintendo Entertainment System or Famicom. It is targeted at both chiptune artists and NES homebrewers. ''; - license = licenses.mit; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + OPNA2608 + ]; + platforms = lib.platforms.unix; mainProgram = "FamiStudio"; }; } From 1538a54cb06a25c296bda62c7b7e134ff2fccd79 Mon Sep 17 00:00:00 2001 From: Joshua Campbell Date: Wed, 4 Dec 2024 12:10:05 -0800 Subject: [PATCH 0578/1054] obs-studio-plugins.obs-ndi: fix deprecation errors Deprecated functions `void QDateTime::setTimeSpec(Qt::TimeSpec)` and `void QCheckBox::stateChanged(int)` errors disabled. --- pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix index a2c1300520dc..e7b2784fff6e 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_QT=ON" ]; + env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + dontWrapQtApps = true; meta = with lib; { From 2df2c8b25a8346e3d47551679e6021a11d264d08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 20:16:49 +0000 Subject: [PATCH 0579/1054] prometheus-nginx-exporter: 1.3.0 -> 1.4.0 --- pkgs/servers/monitoring/prometheus/nginx-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 6a5c9e0ae8cc..0f279e0c3397 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nginx_exporter"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "nginxinc"; repo = "nginx-prometheus-exporter"; rev = "v${version}"; - sha256 = "sha256-TcQXYZsr3hjE93GfeBt8AJLuQQA7UM+wv1SmCnqON+M="; + sha256 = "sha256-aA6wQjTVkyEx+f1xBdrvN05NGqnJkgLVwrNLSh5+Ll0="; }; - vendorHash = "sha256-qmyqAbwQYgUFFQwCLakQGta2XMGCbCOvCB93S8/TWIs="; + vendorHash = "sha256-ua3Cm1VXRs3M58vJ/fEt7SH+ZYegt0WjOGRV/iU8qZk="; ldflags = let t = "github.com/prometheus/common/version"; in [ "-s" From 0b7ca90aa9f8aef4c12261d10869396df20fde50 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 5 Jul 2024 19:02:06 +0000 Subject: [PATCH 0580/1054] =?UTF-8?q?python3Packages.pynput:=201.7.6=20?= =?UTF-8?q?=E2=86=92=201.7.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/pynput/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index 56a06a1bd47d..5f7ee6f9d481 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "pynput"; - version = "1.7.6"; - format = "pyproject"; + version = "1.7.7"; + pyproject = true; src = fetchFromGitHub { owner = "moses-palmer"; repo = "pynput"; rev = "refs/tags/v${version}"; - hash = "sha256-gRq4LS9NvPL98N0Jk09Z0GfoHS09o3zM284BEWS+NW4="; + hash = "sha256-6PwfFU1f/osEamSX9kxpOl2wDnrQk5qq1kHi2BgSHes="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; @@ -37,7 +37,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'sphinx >=1.3.1'" "" + --replace-fail "'sphinx >=1.3.1'," "" \ + --replace-fail "'twine >=4.0']" "]" ''; nativeBuildInputs = [ From 20d4eb3bc6059ed3824c7e6be82b287915fd89b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 20:28:39 +0000 Subject: [PATCH 0581/1054] python312Packages.reproject: 0.14.0 -> 0.14.1 --- pkgs/development/python-modules/reproject/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 48fec33e8cd1..928bee69e3f6 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "reproject"; - version = "0.14.0"; + version = "0.14.1"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-3TxPd2CEmKWDlE1nC2GnXBUASe/DNgZnS1GJoRo5u8A="; + hash = "sha256-U8jqJ5uLVX8zoeQwr14FPNdHACRA4HK65q2TAtRr5Xk="; }; postPatch = '' From 05130d5666f88f02d275ea41625a81f770c1ce75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 20:30:42 +0000 Subject: [PATCH 0582/1054] hck: 0.10.1 -> 0.11.0 --- pkgs/by-name/hc/hck/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hc/hck/package.nix b/pkgs/by-name/hc/hck/package.nix index 00adbdc6288b..bf3c023c7865 100644 --- a/pkgs/by-name/hc/hck/package.nix +++ b/pkgs/by-name/hc/hck/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - hash = "sha256-7a+gNnxr/OiM5MynOxOQ3hAprog7eAAZnMvi+5/gMzg="; + hash = "sha256-ZzmInCx75IjNQBQmattc7JZwtD6zGYCQ4eTgDFz2L00="; }; - cargoHash = "sha256-rGKD09YV+QqzZ1n6gYerjbpTr+4KJ5UzynDDRw5rnP0="; + cargoHash = "sha256-BPLhdbC5XFsRfvObaEa4nmYWCN1FxbJzmgZK1JpBcLQ="; nativeBuildInputs = [ cmake ]; From 56da44bfe91704cfda4d4146aa8bcd7e86be29db Mon Sep 17 00:00:00 2001 From: Travis Date: Tue, 3 Dec 2024 15:24:42 -0700 Subject: [PATCH 0583/1054] dclock: init at 0.1.0 --- pkgs/by-name/dc/dclock/package.nix | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/dc/dclock/package.nix diff --git a/pkgs/by-name/dc/dclock/package.nix b/pkgs/by-name/dc/dclock/package.nix new file mode 100644 index 000000000000..8e5f277cfdfe --- /dev/null +++ b/pkgs/by-name/dc/dclock/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + haskellPackages, +}: + +haskellPackages.mkDerivation { + pname = "dclock"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "travgm"; + repo = "dclock"; + rev = "main"; + sha256 = "sha256-IJsbEg1dFiyIJSlVWy8x+tsa49YxLK8mNkJESFyUQoU="; + }; + + isLibrary = false; + isExecutable = true; + jailbreak = true; + doCheck = false; + + executableHaskellDepends = with haskellPackages; [ + base + QuickCheck + ansi-terminal + hspec + hspec-discover + lens + machines + optparse-applicative + text + time + process + ]; + + description = "Decimal clock that breaks your day into a 1000 decimal minutes"; + homepage = "https://github.com/travgm/dclock"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ travgm ]; + mainProgram = "dclock"; +} From b9829aec83ea9e7f1e165b980b980259686d68df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 20:37:10 +0000 Subject: [PATCH 0584/1054] highfive-mpi: 2.10.0 -> 2.10.1 --- pkgs/by-name/hi/highfive/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hi/highfive/package.nix b/pkgs/by-name/hi/highfive/package.nix index 5ee46c698fe9..3af2fc92cc10 100644 --- a/pkgs/by-name/hi/highfive/package.nix +++ b/pkgs/by-name/hi/highfive/package.nix @@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "BlueBrain"; repo = "HighFive"; rev = "v${version}"; - sha256 = "sha256-0ACT899G+CCc08UFsSC8SnUEZR2mrpQbqXW9FklRAjU="; + sha256 = "sha256-Nv+nbel/xGlGTB8sKF0EM1xwz/ZEri5uGB7ma6Ba6fo="; }; nativeBuildInputs = [ cmake ]; From 6db3c2f63358afbecb4ebe839b20538b8dc79f73 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 4 Dec 2024 20:48:20 +0000 Subject: [PATCH 0585/1054] forgejo.updateScript: fix the regex escape --- pkgs/by-name/fo/forgejo/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 798546554376..18bc5790cb4b 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -153,7 +153,7 @@ buildGoModule rec { updateScript = nix-update-script { extraArgs = nixUpdateExtraArgs ++ [ "--version-regex" - "v(${lib.versions.major version}\.[0-9.]+)" + "v(${lib.versions.major version}\\.[0-9.]+)" ]; }; }; From cb3de3579d9b1c0a7934dc0f96e33cde2bccad40 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 4 Dec 2024 22:06:27 +0100 Subject: [PATCH 0586/1054] nixfmt-rfc-style: 2024-11-26 -> 2024-12-04 Final polish: https://github.com/NixOS/nixfmt/pull/269 --- pkgs/by-name/ni/nixfmt-rfc-style/date.txt | 2 +- pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt index 3dad4f57ae5d..f10b48d26d34 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt +++ b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt @@ -1 +1 @@ -2024-11-26 +2024-12-04 diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix index 8383170af553..80ed05f6a11e 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix +++ b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix @@ -9,8 +9,8 @@ mkDerivation { pname = "nixfmt"; version = "0.6.0"; src = fetchzip { - url = "https://github.com/nixos/nixfmt/archive/cb92834560306868e4020dd643f09482587c6e7a.tar.gz"; - sha256 = "0fg2mdjny6i90bivw5d4wxl522azmcmikcak2ffgrq69qhjv21f6"; + url = "https://github.com/nixos/nixfmt/archive/a4639036723e510d8331124c80d9ca14dd7aba02.tar.gz"; + sha256 = "0zpkljcvfnwn1ik5cgvq396xkpp053k4lh62a24c4g434n2vz0rj"; }; isLibrary = true; isExecutable = true; From a0ee21ff9dc8f22b2e92c7a88c59eecad2282be7 Mon Sep 17 00:00:00 2001 From: Victor Nova Date: Wed, 4 Dec 2024 13:08:13 -0800 Subject: [PATCH 0587/1054] mailspring: 1.13.3 -> 1.14.0 --- pkgs/by-name/ma/mailspring/darwin.nix | 2 +- pkgs/by-name/ma/mailspring/linux.nix | 2 +- pkgs/by-name/ma/mailspring/package.nix | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ma/mailspring/darwin.nix b/pkgs/by-name/ma/mailspring/darwin.nix index e0166e361fe9..09283f450b3c 100644 --- a/pkgs/by-name/ma/mailspring/darwin.nix +++ b/pkgs/by-name/ma/mailspring/darwin.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/Mailspring-AppleSilicon.zip"; - hash = "sha256-LYv3643oj58WR+4IE4XmJmCgD9S2AXNbPwW5W0QCuGI="; + hash = "sha256-5f0jtQPwwnkFNCtw0Kf2AaLbIHoOtTAc9+z000gTuBo="; }; dontUnpack = true; diff --git a/pkgs/by-name/ma/mailspring/linux.nix b/pkgs/by-name/ma/mailspring/linux.nix index 47fe6697f48e..00860378b37e 100644 --- a/pkgs/by-name/ma/mailspring/linux.nix +++ b/pkgs/by-name/ma/mailspring/linux.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/mailspring-${finalAttrs.version}-amd64.deb"; - hash = "sha256-2F5k8zRRI6x1EQ0k8wvIq1Q3Lnrn2ROp/Mq+H7Vqzlc="; + hash = "sha256-ZpmL6d0QkHKKxn+KF1OEDeAb1bFp9uohBobCvblE+L8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/mailspring/package.nix b/pkgs/by-name/ma/mailspring/package.nix index 9624b1b9aa0b..da2c78e79333 100644 --- a/pkgs/by-name/ma/mailspring/package.nix +++ b/pkgs/by-name/ma/mailspring/package.nix @@ -4,21 +4,21 @@ }: let pname = "mailspring"; - version = "1.13.3"; + version = "1.14.0"; - meta = with lib; { + meta = { description = "Beautiful, fast and maintained fork of Nylas Mail by one of the original authors"; downloadPage = "https://github.com/Foundry376/Mailspring"; homepage = "https://getmailspring.com"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' Mailspring is an open-source mail client forked from Nylas Mail and built with Electron. Mailspring's sync engine runs locally, but its source is not open. ''; mainProgram = "mailspring"; - maintainers = with maintainers; [ toschmidt ]; + maintainers = with lib.maintainers; [ toschmidt ]; platforms = [ "x86_64-linux" "aarch64-darwin" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; linux = callPackage ./linux.nix { inherit pname version meta; }; From 14d9dc1b8c3844e34b7c1a335addeb2bbdbb636c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 4 Dec 2024 13:27:41 -0800 Subject: [PATCH 0588/1054] python312Packages.recurring-ical-events: 3.3.3 -> 3.3.4 Diff: https://github.com/niccokunzmann/python-recurring-ical-events/compare/refs/tags/v3.3.3...v3.3.4 Changelog: https://github.com/niccokunzmann/python-recurring-ical-events/blob/refs/tags/v3.3.4/README.rst#changelog --- .../python-modules/recurring-ical-events/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index e4e27e15c306..e1224411885e 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "3.3.3"; + version = "3.3.4"; disabled = pythonOlder "3.8"; @@ -26,13 +26,11 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "refs/tags/v${version}"; - hash = "sha256-gEatTTpRiqtDAn+JtoJuVHPYKmEkc5saw3hy4ZYZfX8="; + hash = "sha256-3KlmJJmak3X9adUlcmclnCv9D1Ddr+woFokrinZBYoE="; }; build-system = [ setuptools ]; - pythonRelaxDeps = [ "x-wr-timezone" ]; - dependencies = [ icalendar python-dateutil From 8fe87559a9040cba66cbacfc60f6f1b1fc84cf1c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 1 Dec 2024 18:27:19 +0100 Subject: [PATCH 0589/1054] nixos/lib: Add disablePackageByName We do this in multiple DE modules and the behaviour was not consistent. --- nixos/lib/utils.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 82bbfae0178b..a0518660a511 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -343,6 +343,25 @@ utils = rec { in filter (x: !(elem (getName x) namesToRemove)) packages; + /* Returns false if a package with the same name as the `package` is present in `packagesToDisable`. + + Type: + disablePackageByName :: package -> [package] -> bool + + Example: + disablePackageByName file-roller [ file-roller totem ] + => false + + Example: + disablePackageByName nautilus [ file-roller totem ] + => true + */ + disablePackageByName = package: packagesToDisable: + let + namesToDisable = map getName packagesToDisable; + in + !elem (getName package) namesToDisable; + systemdUtils = { lib = import ./systemd-lib.nix { inherit lib config pkgs utils; }; unitOptions = import ./systemd-unit-options.nix { inherit lib systemdUtils; }; From e221971ee79cf529ebe60a4f1a09d29f037f6d24 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 1 Dec 2024 18:51:09 +0100 Subject: [PATCH 0590/1054] nixos/budgie: Switch notExcluded to disablePackageByName MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, this check was inconsistent with `removePackagesByName` – the latter compares the packages using their names. --- nixos/modules/services/x11/desktop-managers/budgie.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 42a828bcbcbc..a4cd957a95dc 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -44,7 +44,7 @@ let enableSshSocket = config.services.openssh.startWhenNeeded; }; - notExcluded = pkg: (!(lib.elem pkg config.environment.budgie.excludePackages)); + notExcluded = pkg: utils.disablePackageByName pkg config.environment.budgie.excludePackages; in { meta.maintainers = lib.teams.budgie.members; From c4ed78b5a09727ffce5f57ca82290eecbf7d96a5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 1 Dec 2024 18:51:22 +0100 Subject: [PATCH 0591/1054] nixos/pantheon: Switch notExcluded to disablePackageByName MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, this check was inconsistent with `removePackagesByName` – the latter compares the packages using their names. --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 1ab898d35bc2..2b707f61da08 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -12,7 +12,7 @@ let extraGSettingsOverrides = cfg.extraGSettingsOverrides; }; - notExcluded = pkg: (!(lib.elem pkg config.environment.pantheon.excludePackages)); + notExcluded = pkg: utils.disablePackageByName pkg config.environment.pantheon.excludePackages; in { From 162f4339ef33f8b1bec9de8e652c455e81e3f4d1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 1 Dec 2024 18:29:53 +0100 Subject: [PATCH 0592/1054] nixos/gnome: Switch notExcluded to disablePackageByName For consistency with other DEs. --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 8b043f109a36..34b705b6288d 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -58,7 +58,7 @@ let enableGnomePanel = true; } ++ cfg.flashback.customSessions; - notExcluded = pkg: mkDefault (!(lib.elem (lib.getName pkg) (map lib.getName config.environment.gnome.excludePackages))); + notExcluded = pkg: mkDefault (utils.disablePackageByName pkg config.environment.gnome.excludePackages); in From ccf9d87fe681599ee5df3220c37927bc6ce10e7e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 1 Dec 2024 18:30:17 +0100 Subject: [PATCH 0593/1054] nixos/cinnamon: Switch notExcluded to disablePackageByName For consistency with other DEs. --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 040e9ce6775a..420346d1a7e8 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -12,7 +12,7 @@ let extraGSettingsOverrides = cfg.extraGSettingsOverrides; }; - notExcluded = pkg: (!(lib.elem (lib.getName pkg) (map lib.getName config.environment.cinnamon.excludePackages))); + notExcluded = pkg: utils.disablePackageByName pkg config.environment.cinnamon.excludePackages; in { From 609cc0dfead621fcc5a3ce0dc114fb919c4d0197 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 4 Dec 2024 21:43:15 +0000 Subject: [PATCH 0594/1054] alt-tab-macos: 7.4.0 -> 7.7.0 Changelog: https://github.com/lwouis/alt-tab-macos/releases/tag/v7.7.0 Diff: https://github.com/lwouis/alt-tab-macos/compare/v7.4.0...v7.7.0 --- pkgs/by-name/al/alt-tab-macos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix index be15824d3616..2f0468d9822c 100644 --- a/pkgs/by-name/al/alt-tab-macos/package.nix +++ b/pkgs/by-name/al/alt-tab-macos/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alt-tab-macos"; - version = "7.4.0"; + version = "7.7.0"; src = fetchurl { url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; - hash = "sha256-uCernCv52gZUxyn9LxsZGxd33z0y0YoEHEZ4mf4Ve4Y="; + hash = "sha256-ASFlOYOy1uAKPJyrohFmdCD0JwJybJahpaRTiz9rFUk="; }; sourceRoot = "."; From bb0c302eaee043c5bf0968b85bd190fcd8ae12a9 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 4 Dec 2024 21:47:38 +0000 Subject: [PATCH 0595/1054] stats: 2.11.18 -> 2.11.19 Changelog: https://github.com/exelban/stats/releases/tag/v2.11.19 Diff: https://github.com/exelban/stats/compare/v2.11.18...v2.11.19 --- pkgs/by-name/st/stats/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 5c1a821795f9..533e2a4922f4 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.11.18"; + version = "2.11.19"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-xEU897PE8LniQJijp83oSbHllck3pyediMqz/bzgFyE="; + hash = "sha256-aJ9b8/mWZmYPbS9Er6sMoMAIS7G0AoPT/7gnEx7SsGw="; }; sourceRoot = "."; From 4657c1608956fc5465d88c0d424708cd2a72ee07 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 4 Dec 2024 23:55:33 +0200 Subject: [PATCH 0596/1054] soundsource: refactor meta --- pkgs/by-name/so/soundsource/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/so/soundsource/package.nix b/pkgs/by-name/so/soundsource/package.nix index 567ca85864e8..9fffbf0b80e8 100644 --- a/pkgs/by-name/so/soundsource/package.nix +++ b/pkgs/by-name/so/soundsource/package.nix @@ -25,15 +25,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { + changelog = "https://rogueamoeba.com/support/releasenotes/?product=SoundSource"; description = "Sound controller for macOS"; homepage = "https://rogueamoeba.com/soundsource"; - license = licenses.unfree; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ emilytrau donteatoreo ]; - platforms = platforms.darwin; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) From 4c0350d9d096a470eaa33a5022df0db6c5a388a1 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 4 Dec 2024 23:55:58 +0200 Subject: [PATCH 0597/1054] soundsource: quote paths --- pkgs/by-name/so/soundsource/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/soundsource/package.nix b/pkgs/by-name/so/soundsource/package.nix index 9fffbf0b80e8..4fd0a8014e07 100644 --- a/pkgs/by-name/so/soundsource/package.nix +++ b/pkgs/by-name/so/soundsource/package.nix @@ -19,8 +19,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/Applications - unzip -d $out/Applications $src + mkdir -p "$out/Applications" + unzip -d "$out/Applications" $src runHook postInstall ''; From 0d336e398fb360f13aab0d9c9d256a5c5116f730 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 4 Dec 2024 23:58:31 +0200 Subject: [PATCH 0598/1054] soundsource: 5.7.3 -> 5.7.4 --- pkgs/by-name/so/soundsource/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/soundsource/package.nix b/pkgs/by-name/so/soundsource/package.nix index 4fd0a8014e07..a3c3ee528546 100644 --- a/pkgs/by-name/so/soundsource/package.nix +++ b/pkgs/by-name/so/soundsource/package.nix @@ -6,12 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "soundsource"; - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "https://web.archive.org/web/20241112212337/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; - sha256 = "sha256-Eup7oiq8vVn2MqxJxE/Z2LtDMdluczHusRJ9uoW3X84="; + url = "https://web.archive.org/web/20241204215222/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; + hash = "sha256-zDIlhwczwXVPOV90EKF9pjO2CKlOEeFsqx17nIXaElw="; }; + dontUnpack = true; nativeBuildInputs = [ unzip ]; From 853e29c9540167e046d088b7bcaa4e009bd7ec40 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 4 Dec 2024 22:04:15 +0000 Subject: [PATCH 0599/1054] raycast: 1.86.0 -> 1.87.2 Changelog: https://www.raycast.com/changelog/1-87-0 --- pkgs/by-name/ra/raycast/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index a963e4451c0c..fde6c41cc061 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.86.0"; + version = "1.87.2"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-UvMPRLCaGgunpVwoF0Nbz+7Gma7zQP+nMMh5Cvqn0MA="; + hash = "sha256-w4jrtrKCATUsFkMVsGee88pYiL1bahHaSy9emCh2GJE="; }; dontPatch = true; From 140ab9e66d38faf06bb5f83c2470768d57237e7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 22:17:15 +0000 Subject: [PATCH 0600/1054] python312Packages.pyathena: 3.9.0 -> 3.10.0 --- pkgs/development/python-modules/pyathena/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 0245c7b47ce8..58ea74488def 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.9.0"; + version = "3.10.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-SxHUnfAyVcVW4R9j0ONGzCXqGWdaeseP/QU3vNhMtI8="; + hash = "sha256-paFTmhPGr2qz1CK425tbSHEbexcl+lqmgoL6RZmfC2o="; }; build-system = [ hatchling ]; From 67a56f27f2ac90a289ff9182b9ea3d4ea50bd53f Mon Sep 17 00:00:00 2001 From: Gavin John Date: Wed, 4 Dec 2024 14:53:21 -0800 Subject: [PATCH 0601/1054] doc/build-helpers/testers: Fix command renamed to script (#352713) --- doc/build-helpers/testers.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md index 5c1b704655cf..4ad133d260b6 100644 --- a/doc/build-helpers/testers.chapter.md +++ b/doc/build-helpers/testers.chapter.md @@ -364,7 +364,7 @@ including `nativeBuildInputs` to specify dependencies available to the `script`. ```nix testers.runCommand { name = "access-the-internet"; - command = '' + script = '' curl -o /dev/null https://example.com touch $out ''; From b2e88ebdded3aa501289e991b804a361b86fdde3 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Thu, 5 Dec 2024 00:06:22 +0100 Subject: [PATCH 0602/1054] opentx: add meta.mainProgram --- pkgs/applications/misc/opentx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 0634c03e7bd7..52d53c44cf3a 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -42,6 +42,7 @@ mkDerivation rec { firmware to the radio, backing up model settings, editing settings and running radio simulators. ''; + mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion version)); homepage = "https://www.open-tx.org/"; license = licenses.gpl2Only; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; From f4e7a058383d3032da7113eb8d0cbea8d61006de Mon Sep 17 00:00:00 2001 From: wucke13 Date: Thu, 5 Dec 2024 00:07:46 +0100 Subject: [PATCH 0603/1054] edgetx: add meta.mainProgram --- pkgs/applications/misc/edgetx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/edgetx/default.nix b/pkgs/applications/misc/edgetx/default.nix index 186ad4be05c1..36626903b4c8 100644 --- a/pkgs/applications/misc/edgetx/default.nix +++ b/pkgs/applications/misc/edgetx/default.nix @@ -39,6 +39,7 @@ mkDerivation rec { firmware to the radio, backing up model settings, editing settings and running radio simulators. ''; + mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion version)); homepage = "https://edgetx.org/"; license = licenses.gpl2Only; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; From a8f2acee56f25fb884b8230ced0b1abc5b101a6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 23:18:28 +0000 Subject: [PATCH 0604/1054] kuttl: 0.19.0 -> 0.20.0 --- pkgs/by-name/ku/kuttl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kuttl/package.nix b/pkgs/by-name/ku/kuttl/package.nix index 88b8cfc73a33..8fcf488c4c1a 100644 --- a/pkgs/by-name/ku/kuttl/package.nix +++ b/pkgs/by-name/ku/kuttl/package.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.19.0"; + version = "0.20.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-7fcVmLvRbKYuWuqwqZWlQf08YEyowcTxrp5RteV8qyU="; + sha256 = "sha256-RZmylvf4q1JD8EAnxiFVfu9Q/ya1TXnbZhn4RguehII="; }; - vendorHash = "sha256-E6gzr9gCLbRaoJU/pYA2cAy0rv5SUVmwf0m34lchF+M="; + vendorHash = "sha256-XdHgPN0gE1ie4kxqmZQgxlV+RUddu6OPbqWwIHAw6Hc="; subPackages = [ "cmd/kubectl-kuttl" ]; From f3be6634ab1c932a2e96f3aa667102b769bc812e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 5 Dec 2024 00:25:43 +0100 Subject: [PATCH 0605/1054] neovim-node-client: minor fixes --- pkgs/by-name/ne/neovim-node-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/neovim-node-client/package.nix b/pkgs/by-name/ne/neovim-node-client/package.nix index 871c4c5b601a..6f31a82328bd 100644 --- a/pkgs/by-name/ne/neovim-node-client/package.nix +++ b/pkgs/by-name/ne/neovim-node-client/package.nix @@ -12,7 +12,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "neovim"; repo = "node-client"; - rev = "02a5fdef8e3ec2812d295981db38dbccf82e0728"; + rev = "refs/tags/v${version}"; hash = "sha256-0vPw2hCGUDepSpF1gp/lI71EgwGsCSnw7ePP7ElHsTQ="; }; @@ -29,7 +29,7 @@ buildNpmPackage rec { ''; meta = { - mainProgram = "node-client"; + mainProgram = "neovim-node-host"; description = "Nvim msgpack API client and remote plugin provider"; homepage = "https://github.com/neovim/node-client"; changelog = "https://github.com/neovim/node-client/releases/tag/v${version}"; From bf3c05abb19a1e149a0a128cde913d36b6fe24fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 23:29:48 +0000 Subject: [PATCH 0606/1054] kdePackages.qtutilities: 6.14.3 -> 6.14.4 --- pkgs/development/libraries/qtutilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index c04d0d72e7cd..abeb58a80894 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.14.3"; + version = "6.14.4"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-WgZZEs3Fse+0+FLVO1GTkxqxzZPfJuxS7Ij/G0ACZSY="; + hash = "sha256-98njVyEK4cFe7QqCg++74t0YTv5zp80QKpTz4JlV+LY="; }; nativeBuildInputs = [ From 77f4d48cb4be8ad8f78e5466bd546823c69fc2f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 00:01:57 +0000 Subject: [PATCH 0607/1054] juicefs: 1.2.1 -> 1.2.2 --- pkgs/tools/filesystems/juicefs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 9b50d87d9920..496cdb0db537 100644 --- a/pkgs/tools/filesystems/juicefs/default.nix +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "juicefs"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "juicedata"; repo = pname; rev = "v${version}"; - hash = "sha256-qTJU5o0wjHu3M8zMwMm6/QTAqD2JvCg9XnxfW77MCoI="; + hash = "sha256-DQ3JdP1HKWORPkcP4HJ32eg6aaockZfG+FQhBJnZCFQ="; }; - vendorHash = "sha256-y5ao4C24Py8NmZLZlpoz3C7TvUe5vsI74QdzQ7LAh6o="; + vendorHash = "sha256-fHmLTAn4W8KMtZ1Ov4gBQTUpzHqQnipGSQs5hr1MD3w="; excludedPackages = [ "sdk/java/libjfs" ]; From c95a2170eee4dc0a4b624f9ef438bf0f0457ce1a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 5 Dec 2024 01:03:49 +0100 Subject: [PATCH 0608/1054] apptainer: 1.3.5 -> 1.3.6 Diff: https://github.com/apptainer/apptainer/compare/v1.3.5...v1.3.6 Changelog: https://github.com/apptainer/apptainer/releases/tag/v1.3.6 --- pkgs/applications/virtualization/singularity/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index 525013bf86e0..9a0b1aac4406 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -9,14 +9,14 @@ let callPackage (import ./generic.nix rec { pname = "apptainer"; - version = "1.3.5"; + version = "1.3.6"; projectName = "apptainer"; src = fetchFromGitHub { owner = "apptainer"; repo = "apptainer"; rev = "refs/tags/v${version}"; - hash = "sha256-yBUCUHc9vgyKFqAOHXQjAYQnmN0yXSIvkpR/s3LNAmk="; + hash = "sha256-ZdSo9bKZ7Q1xwMe4SR840U3+fVpKwtiZQA5KDM5qF9M="; }; # Update by running From 162733d9a2740b5a319484f0ffb8cc5a1cac9fc8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 3 Dec 2024 18:24:14 +0100 Subject: [PATCH 0609/1054] materialize: format --- pkgs/servers/sql/materialize/default.nix | 159 +++++++++++++++-------- 1 file changed, 107 insertions(+), 52 deletions(-) diff --git a/pkgs/servers/sql/materialize/default.nix b/pkgs/servers/sql/materialize/default.nix index 1738b4fb92d6..1f7b35927b3b 100644 --- a/pkgs/servers/sql/materialize/default.nix +++ b/pkgs/servers/sql/materialize/default.nix @@ -1,47 +1,88 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchzip -, rustPlatform -, bootstrap_cmds -, DiskArbitration -, Foundation -, cmake -, libiconv -, openssl -, perl -, pkg-config -, protobuf -, libclang -, rdkafka +{ + stdenv, + lib, + fetchFromGitHub, + fetchzip, + rustPlatform, + bootstrap_cmds, + DiskArbitration, + Foundation, + cmake, + libiconv, + openssl, + perl, + pkg-config, + protobuf, + libclang, + rdkafka, }: let - fetchNpmPackage = {name, version, hash, js_prod_file, js_dev_file, ...} @ args: - let - package = fetchzip { - url = "https://registry.npmjs.org/${name}/-/${baseNameOf name}-${version}.tgz"; - inherit hash; - }; + fetchNpmPackage = + { + name, + version, + hash, + js_prod_file, + js_dev_file, + ... + }@args: + let + package = fetchzip { + url = "https://registry.npmjs.org/${name}/-/${baseNameOf name}-${version}.tgz"; + inherit hash; + }; - files = with args; [ - { src = js_prod_file; dst = "./src/environmentd/src/http/static/js/vendor/${name}.js"; } - { src = js_prod_file; dst = "./src/prof-http/src/http/static/js/vendor/${name}.js"; } - { src = js_dev_file; dst = "./src/environmentd/src/http/static-dev/js/vendor/${name}.js"; } - { src = js_dev_file; dst = "./src/prof-http/src/http/static-dev/js/vendor/${name}.js"; } - ] ++ lib.optionals (args ? css_file) [ - { src = css_file; dst = "./src/environmentd/src/http/static/css/vendor/${name}.css"; } - { src = css_file; dst = "./src/prof-http/src/http/static/css/vendor/${name}.css"; } - ] - ++ lib.optionals (args ? extra_file) [ - { src = extra_file.src; dst = "./src/environmentd/src/http/static/${extra_file.dst}";} - { src = extra_file.src; dst = "./src/prof-http/src/http/static/${extra_file.dst}";} - ]; - in - lib.concatStringsSep "\n" (lib.forEach files ({src, dst}: '' - mkdir -p "${dirOf dst}" - cp "${package}/${src}" "${dst}" - '')); + files = + with args; + [ + { + src = js_prod_file; + dst = "./src/environmentd/src/http/static/js/vendor/${name}.js"; + } + { + src = js_prod_file; + dst = "./src/prof-http/src/http/static/js/vendor/${name}.js"; + } + { + src = js_dev_file; + dst = "./src/environmentd/src/http/static-dev/js/vendor/${name}.js"; + } + { + src = js_dev_file; + dst = "./src/prof-http/src/http/static-dev/js/vendor/${name}.js"; + } + ] + ++ lib.optionals (args ? css_file) [ + { + src = css_file; + dst = "./src/environmentd/src/http/static/css/vendor/${name}.css"; + } + { + src = css_file; + dst = "./src/prof-http/src/http/static/css/vendor/${name}.css"; + } + ] + ++ lib.optionals (args ? extra_file) [ + { + src = extra_file.src; + dst = "./src/environmentd/src/http/static/${extra_file.dst}"; + } + { + src = extra_file.src; + dst = "./src/prof-http/src/http/static/${extra_file.dst}"; + } + ]; + in + lib.concatStringsSep "\n" ( + lib.forEach files ( + { src, dst }: + '' + mkdir -p "${dirOf dst}" + cp "${package}/${src}" "${dst}" + '' + ) + ); npmPackages = import ./npm_deps.nix; in @@ -71,7 +112,7 @@ rustPlatform.buildRustPackage rec { env.PROTOC = "${protobuf}/bin/protoc"; env.PROTOC_INCLUDE = "${protobuf}/include"; # needed to dynamically link rdkafka - env.CARGO_FEATURE_DYNAMIC_LINKING=1; + env.CARGO_FEATURE_DYNAMIC_LINKING = 1; cargoLock = { lockFile = ./Cargo.lock; @@ -94,20 +135,30 @@ rustPlatform.buildRustPackage rec { }; }; - nativeBuildInputs = [ - cmake - perl - pkg-config - rustPlatform.bindgenHook - ] + nativeBuildInputs = + [ + cmake + perl + pkg-config + rustPlatform.bindgenHook + ] # Provides the mig command used by the krb5-src build script ++ lib.optional stdenv.hostPlatform.isDarwin bootstrap_cmds; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl rdkafka libclang ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv DiskArbitration Foundation ]; + buildInputs = + [ + openssl + rdkafka + libclang + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + DiskArbitration + Foundation + ]; # the check phase requires linking with rocksdb which can be a problem since # the rust rocksdb crate is not updated very often. @@ -132,10 +183,14 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - homepage = "https://materialize.com"; + homepage = "https://materialize.com"; description = "Streaming SQL materialized view engine for real-time applications"; - license = licenses.bsl11; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + license = licenses.bsl11; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-linux" + ]; maintainers = [ maintainers.petrosagg ]; }; } From 0809ab66023a80d45328f4f3b23f954b13b4887b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 3 Dec 2024 18:30:43 +0100 Subject: [PATCH 0610/1054] materialize: move to by-name --- .../sql => by-name/ma}/materialize/Cargo.lock | 0 .../ma}/materialize/npm_deps.nix | 0 .../ma/materialize/package.nix} | 23 ++++++------------- pkgs/top-level/all-packages.nix | 5 ---- 4 files changed, 7 insertions(+), 21 deletions(-) rename pkgs/{servers/sql => by-name/ma}/materialize/Cargo.lock (100%) rename pkgs/{servers/sql => by-name/ma}/materialize/npm_deps.nix (100%) rename pkgs/{servers/sql/materialize/default.nix => by-name/ma/materialize/package.nix} (94%) diff --git a/pkgs/servers/sql/materialize/Cargo.lock b/pkgs/by-name/ma/materialize/Cargo.lock similarity index 100% rename from pkgs/servers/sql/materialize/Cargo.lock rename to pkgs/by-name/ma/materialize/Cargo.lock diff --git a/pkgs/servers/sql/materialize/npm_deps.nix b/pkgs/by-name/ma/materialize/npm_deps.nix similarity index 100% rename from pkgs/servers/sql/materialize/npm_deps.nix rename to pkgs/by-name/ma/materialize/npm_deps.nix diff --git a/pkgs/servers/sql/materialize/default.nix b/pkgs/by-name/ma/materialize/package.nix similarity index 94% rename from pkgs/servers/sql/materialize/default.nix rename to pkgs/by-name/ma/materialize/package.nix index 1f7b35927b3b..bc4ad99f79cf 100644 --- a/pkgs/servers/sql/materialize/default.nix +++ b/pkgs/by-name/ma/materialize/package.nix @@ -4,14 +4,11 @@ fetchFromGitHub, fetchzip, rustPlatform, - bootstrap_cmds, - DiskArbitration, - Foundation, cmake, - libiconv, openssl, perl, pkg-config, + darwin, protobuf, libclang, rdkafka, @@ -143,22 +140,16 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ] # Provides the mig command used by the krb5-src build script - ++ lib.optional stdenv.hostPlatform.isDarwin bootstrap_cmds; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.bootstrap_cmds; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; - buildInputs = - [ - openssl - rdkafka - libclang - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - DiskArbitration - Foundation - ]; + buildInputs = [ + openssl + rdkafka + libclang + ]; # the check phase requires linking with rocksdb which can be a problem since # the rust rocksdb crate is not updated very often. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d1b16ac787e..dc9c1e0c5058 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11714,11 +11714,6 @@ with pkgs; yarn-berry = yarn-berry.override { nodejs = nodejs-slim_22; }; }; - materialize = callPackage ../servers/sql/materialize { - inherit (buildPackages.darwin) bootstrap_cmds; - inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; - }; - micro-full = micro.wrapper.override { extraPackages = [ wl-clipboard From c5184c7481b9032f6899a036e8f290067d26bd66 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 3 Dec 2024 18:32:46 +0100 Subject: [PATCH 0611/1054] materialize: clean --- pkgs/by-name/ma/materialize/package.nix | 44 +++++++++++++++---------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix index bc4ad99f79cf..7a59b075617a 100644 --- a/pkgs/by-name/ma/materialize/package.nix +++ b/pkgs/by-name/ma/materialize/package.nix @@ -1,16 +1,20 @@ { - stdenv, lib, - fetchFromGitHub, + stdenv, fetchzip, rustPlatform, + fetchFromGitHub, + protobuf, + + # nativeBuildInputs cmake, - openssl, perl, pkg-config, darwin, - protobuf, + +# buildInputs libclang, + openssl, rdkafka, }: @@ -90,8 +94,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "MaterializeInc"; - repo = pname; - rev = "v${version}"; + repo = "materialize"; + rev = "refs/tags/v${version}"; hash = "sha256-+cvTCiTbuaPYPIyDxQlMWdJA5/6cbMoiTcSmjj5KPjs="; fetchSubmodules = true; }; @@ -99,17 +103,20 @@ rustPlatform.buildRustPackage rec { postPatch = '' ${lib.concatStringsSep "\n" (map fetchNpmPackage npmPackages)} substituteInPlace ./misc/dist/materialized.service \ - --replace /usr/bin $out/bin \ - --replace _Materialize root + --replace-fail /usr/bin $out/bin \ + --replace-fail _Materialize root substituteInPlace ./src/catalog/build.rs \ - --replace '&[ ' '&["."' + --replace-fail '&[ ' '&["."' ''; - # needed for internal protobuf c wrapper library - env.PROTOC = "${protobuf}/bin/protoc"; - env.PROTOC_INCLUDE = "${protobuf}/include"; - # needed to dynamically link rdkafka - env.CARGO_FEATURE_DYNAMIC_LINKING = 1; + env = { + # needed for internal protobuf c wrapper library + PROTOC = lib.getExe protobuf; + PROTOC_INCLUDE = "${protobuf}/include"; + + # needed to dynamically link rdkafka + CARGO_FEATURE_DYNAMIC_LINKING = 1; + }; cargoLock = { lockFile = ./Cargo.lock; @@ -146,9 +153,9 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; buildInputs = [ + libclang openssl rdkafka - libclang ]; # the check phase requires linking with rocksdb which can be a problem since @@ -173,15 +180,16 @@ rustPlatform.buildRustPackage rec { install --mode=444 -D ./misc/dist/materialized.service $out/etc/systemd/system/materialized.service ''; - meta = with lib; { + meta = { homepage = "https://materialize.com"; description = "Streaming SQL materialized view engine for real-time applications"; - license = licenses.bsl11; + license = lib.licenses.bsl11; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; - maintainers = [ maintainers.petrosagg ]; + maintainers = with lib.maintainers; [ petrosagg ]; + mainProgram = "environmentd"; }; } From 17358c6418d3f5324cb14c8d58df182fb31e6022 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 3 Dec 2024 18:36:38 +0100 Subject: [PATCH 0612/1054] materialize: switch to fetchCargoVendor --- pkgs/by-name/ma/materialize/Cargo.lock | 10042 ---------------------- pkgs/by-name/ma/materialize/package.nix | 22 +- 2 files changed, 2 insertions(+), 10062 deletions(-) delete mode 100644 pkgs/by-name/ma/materialize/Cargo.lock diff --git a/pkgs/by-name/ma/materialize/Cargo.lock b/pkgs/by-name/ma/materialize/Cargo.lock deleted file mode 100644 index 9af5a20f6450..000000000000 --- a/pkgs/by-name/ma/materialize/Cargo.lock +++ /dev/null @@ -1,10042 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "abomonation" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e72913c99b1f927aa7bd59a41518fdd9995f63ffc8760f211609e0241c4fb2" - -[[package]] -name = "abomonation_derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e50e2a046af56a864c62d97b7153fda72c596e646be1b0c7963736821f6e1efa" -dependencies = [ - "proc-macro2", - "quote", - "synstructure", -] - -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e6e951cfbb2db8de1828d49073a113a29fd7117b1596caa781a258c7e38d72" -dependencies = [ - "cfg-if", - "const-random", - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "anyhow" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" -dependencies = [ - "backtrace", -] - -[[package]] -name = "array-concat" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9180feb72ccbc07cfe5ef7fa8bbf86ca71490d5dc9ef8ea02c7298ba94e7f7d" - -[[package]] -name = "array-init-cursor" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "arrow-format" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb83ada98f9d252a3c3642d96c53a357684a87d2e9a753ddf2a30bae20b91790" -dependencies = [ - "planus", - "serde", -] - -[[package]] -name = "arrow2" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a4c5b03335bc1cb0fd9f5297f8fd3bbfd6fb04f3cb0bc7d6c91b7128cb8336a" -dependencies = [ - "ahash", - "arrow-format", - "base64 0.13.1", - "bytemuck", - "chrono", - "dyn-clone", - "either", - "ethnum", - "fallible-streaming-iterator", - "foreign_vec", - "futures", - "getrandom", - "hash_hasher", - "multiversion", - "num-traits", - "parquet2", - "rustc_version", - "simdutf8", - "streaming-iterator", -] - -[[package]] -name = "askama" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb98f10f371286b177db5eeb9a6e5396609555686a35e1d4f7b9a9c6d8af0139" -dependencies = [ - "askama_derive", - "askama_escape", - "askama_shared", -] - -[[package]] -name = "askama_derive" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71" -dependencies = [ - "askama_shared", - "proc-macro2", - "syn 1.0.107", -] - -[[package]] -name = "askama_escape" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" - -[[package]] -name = "askama_shared" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf722b94118a07fcbc6640190f247334027685d4e218b794dbfe17c32bf38ed0" -dependencies = [ - "askama_escape", - "mime", - "mime_guess", - "nom", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 1.0.107", - "toml", -] - -[[package]] -name = "assert_cmd" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5c2ca00549910ec251e3bd15f87aeeb206c9456b9a77b43ff6c97c54042a472" -dependencies = [ - "bstr 0.2.14", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "async-compression" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", - "zstd 0.13.0", - "zstd-safe 7.0.0", -] - -[[package]] -name = "async-stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" -dependencies = [ - "async-stream-impl", - "futures-core", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "async-trait" -version = "0.1.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "asynchronous-codec" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690" -dependencies = [ - "bytes", - "futures-sink", - "futures-util", - "memchr", - "pin-project-lite", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.6", - "libc", - "winapi", -] - -[[package]] -name = "auto_impl" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "autotools" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8138adefca3e5d2e73bfba83bd6eeaf904b26a7ac1b4a19892cfe16cc7e1701" -dependencies = [ - "cc", -] - -[[package]] -name = "aws-config" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11382bd8ac4c6c182a9775990935f96c916a865f1414486595f18eb8cfa9d90b" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-runtime", - "aws-sdk-sso", - "aws-sdk-ssooidc", - "aws-sdk-sts", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "fastrand", - "hex", - "http", - "hyper", - "ring", - "time", - "tokio", - "tracing", - "zeroize", -] - -[[package]] -name = "aws-credential-types" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a1629320d319dc715c6189b172349186557e209d2a7b893ff3d14efd33a47c" -dependencies = [ - "aws-smithy-async", - "aws-smithy-runtime-api", - "aws-smithy-types", - "zeroize", -] - -[[package]] -name = "aws-http" -version = "0.60.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e4199d5d62ab09be6a64650c06cc5c4aa45806fed4c74bc4a5c8eaf039a6fa" -dependencies = [ - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "http", - "http-body", - "pin-project-lite", - "tracing", -] - -[[package]] -name = "aws-runtime" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87116d357c905b53f1828d15366363fd27b330a0393cbef349e653f686d36bad" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-sigv4", - "aws-smithy-async", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "fastrand", - "http", - "percent-encoding", - "tracing", - "uuid", -] - -[[package]] -name = "aws-sdk-s3" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e78d98df174c479a7bb6a065a3314ccefe029c0c4a1cc49c0c012eea144264" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-runtime", - "aws-sigv4", - "aws-smithy-async", - "aws-smithy-checksums", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-smithy-xml", - "aws-types", - "bytes", - "http", - "http-body", - "once_cell", - "percent-encoding", - "regex-lite", - "tracing", - "url", -] - -[[package]] -name = "aws-sdk-secretsmanager" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a51b0a0838b8aa5b80677d73ba88e7b05c812540bd44aede473d6e65e712aa" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "fastrand", - "http", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sdk-sso" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b1779a72c60d45e5699512310d7f6fb965fecc8f7419ce1b993b716f0026fd" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "http", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sdk-ssooidc" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ba4a42aa91acecd5ca43b330b5c8eb7f8808d720b6a6f796a35faa302fc73d" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-types", - "bytes", - "http", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sdk-sts" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d27259dcd835b6069260edec09487383f40f45c1cc7f02c74258eff8a22555a4" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-query", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-smithy-xml", - "aws-types", - "http", - "once_cell", - "regex-lite", - "tracing", -] - -[[package]] -name = "aws-sigv4" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d222297ca90209dc62245f0a490355795f29de362eb5c19caea4f7f55fe69078" -dependencies = [ - "aws-credential-types", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "form_urlencoded", - "hex", - "hmac", - "http", - "once_cell", - "percent-encoding", - "sha2", - "time", - "tracing", -] - -[[package]] -name = "aws-smithy-async" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9f65000917e3aa94c259d67fe01fa9e4cd456187d026067d642436e6311a81" -dependencies = [ - "futures-util", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "aws-smithy-checksums" -version = "0.60.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2a63681f82fb85ca58d566534b7dc619c782fee0c61c1aa51e2b560c21cb4f" -dependencies = [ - "aws-smithy-http", - "aws-smithy-types", - "bytes", - "crc32c", - "crc32fast", - "hex", - "http", - "http-body", - "md-5", - "pin-project-lite", - "sha1", - "sha2", - "tracing", -] - -[[package]] -name = "aws-smithy-eventstream" -version = "0.60.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85e16fa903c70c49ab3785e5f4ac2ad2171b36e0616f321011fa57962404bb6" -dependencies = [ - "aws-smithy-types", - "bytes", - "crc32fast", -] - -[[package]] -name = "aws-smithy-http" -version = "0.60.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e816425a6b9caea4929ac97d0cb33674849bd5f0086418abc0d02c63f7a1bf" -dependencies = [ - "aws-smithy-eventstream", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "bytes-utils", - "futures-core", - "http", - "http-body", - "once_cell", - "percent-encoding", - "pin-project-lite", - "pin-utils", - "tracing", -] - -[[package]] -name = "aws-smithy-json" -version = "0.60.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ab3f6d49e08df2f8d05e1bb5b68998e1e67b76054d3c43e7b954becb9a5e9ac" -dependencies = [ - "aws-smithy-types", -] - -[[package]] -name = "aws-smithy-query" -version = "0.60.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f94a7a3aa509ff9e8b8d80749851d04e5eee0954c43f2e7d6396c4740028737" -dependencies = [ - "aws-smithy-types", - "urlencoding", -] - -[[package]] -name = "aws-smithy-runtime" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da5b0a3617390e769576321816112f711c13d7e1114685e022505cf51fe5e48" -dependencies = [ - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", - "bytes", - "fastrand", - "h2", - "http", - "http-body", - "hyper", - "once_cell", - "pin-project-lite", - "pin-utils", - "tokio", - "tracing", -] - -[[package]] -name = "aws-smithy-runtime-api" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2404c9eb08bfe9af255945254d9afc69a367b7ee008b8db75c05e3bca485fc65" -dependencies = [ - "aws-smithy-async", - "aws-smithy-types", - "bytes", - "http", - "pin-project-lite", - "tokio", - "tracing", - "zeroize", -] - -[[package]] -name = "aws-smithy-types" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aba8136605d14ac88f57dc3a693a9f8a4eab4a3f52bc03ff13746f0cd704e97" -dependencies = [ - "base64-simd", - "bytes", - "bytes-utils", - "futures-core", - "http", - "http-body", - "itoa", - "num-integer", - "pin-project-lite", - "pin-utils", - "ryu", - "serde", - "time", - "tokio", - "tokio-util", -] - -[[package]] -name = "aws-smithy-xml" -version = "0.60.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8f03926587fc881b12b102048bb04305bf7fb8c83e776f0ccc51eaa2378263" -dependencies = [ - "xmlparser", -] - -[[package]] -name = "aws-types" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5d5ee29077e0fcd5ddd0c227b521a33aaf02434b7cdba1c55eec5c1f18ac47" -dependencies = [ - "aws-credential-types", - "aws-smithy-async", - "aws-smithy-runtime-api", - "aws-smithy-types", - "http", - "rustc_version", - "tracing", -] - -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core", - "base64 0.21.5", - "bitflags 1.3.2", - "bytes", - "futures-util", - "headers", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sha1", - "sync_wrapper", - "tokio", - "tokio-tungstenite", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "getrandom", - "instant", - "rand", -] - -[[package]] -name = "backtrace" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base16ct" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" - -[[package]] -name = "base64-simd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" -dependencies = [ - "outref", - "vsimd", -] - -[[package]] -name = "base64ct" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdca834647821e0b13d9539a8634eb62d3501b6b6c2cec1722786ee6671b851" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bindgen" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "prettyplease 0.2.4", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.39", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[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 = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "block-buffer" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bstr" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata 0.1.9", -] - -[[package]] -name = "bstr" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" -dependencies = [ - "memchr", - "regex-automata 0.3.9", - "serde", -] - -[[package]] -name = "btoi" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" -dependencies = [ - "num-traits", -] - -[[package]] -name = "built" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f346b6890a0dfa7266974910e7df2d5088120dd54721b9b0e5aae1ae5e05715" -dependencies = [ - "cargo-lock", -] - -[[package]] -name = "bumpalo" -version = "3.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" - -[[package]] -name = "bytecount" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" - -[[package]] -name = "bytefmt" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590b1af059a21c47d4da7cd11f05e08b1992b58b5b4acf2a5e10d7e53aed3d74" -dependencies = [ - "regex", -] - -[[package]] -name = "bytemuck" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562e382481975bc61d11275ac5e62a19abd00b0547d99516a415336f183dcd0e" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" -dependencies = [ - "serde", -] - -[[package]] -name = "bytes-utils" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e314712951c43123e5920a446464929adc667a5eade7f8fb3997776c9df6e54" -dependencies = [ - "bytes", - "either", -] - -[[package]] -name = "bytesize" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "camino" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-lock" -version = "7.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c408da54db4c50d4693f7e649c299bc9de9c23ead86249e5368830bb32a734b" -dependencies = [ - "semver", - "serde", - "toml", - "url", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", -] - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdbc37d37da9e5bce8173f3a41b71d9bf3c674deebbaceacd0ebdabde76efb03" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "serde", - "winapi", -] - -[[package]] -name = "chrono-tz" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa48fa079165080f11d7753fd0bc175b7d391f276b965fe4b55bfad67856e463" -dependencies = [ - "chrono", - "chrono-tz-build", - "phf", - "serde", - "uncased", -] - -[[package]] -name = "chrono-tz-build" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9998fb9f7e9b2111641485bf8beb32f92945f97f92a3d061f744cfef335f751" -dependencies = [ - "parse-zoneinfo", - "phf", - "phf_codegen", - "uncased", -] - -[[package]] -name = "chunked_transfer" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" - -[[package]] -name = "ciborium" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" - -[[package]] -name = "ciborium-ll" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "clang-sys" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "3.2.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef2b3ded6a26dfaec672a742c93c8cf6b689220324da509ec5caa20de55dc83" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_derive", - "clap_lex", - "indexmap 1.9.1", - "once_cell", - "strsim", - "termcolor", - "terminal_size", - "textwrap", -] - -[[package]] -name = "clap_derive" -version = "3.2.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d756c5824fc5c0c1ee8e36000f576968dbcb2081def956c83fad6f40acd46f96" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "clap_lex" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "cmake" -version = "0.1.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" -dependencies = [ - "cc", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "columnation" -version = "0.1.0" -source = "git+https://github.com/MaterializeInc/columnation.git#2cd6d86e5ffabf98aef5cbef09a57f515eae7c55" -dependencies = [ - "paste", -] - -[[package]] -name = "compact_bytes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de71a0422a777179ab4baef92325e56396443df4a680bc443b11f63d644ca019" -dependencies = [ - "serde", - "static_assertions", -] - -[[package]] -name = "compile-time-run" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b5affba7c91c039a483065125dd8c6d4a0985e1e9ac5ab6dffdea4fe4e637f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "connection-string" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510ca239cf13b7f8d16a2b48f263de7b4f8c566f0af58d901031473c76afb1e3" - -[[package]] -name = "console" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.42.0", -] - -[[package]] -name = "console-api" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" -dependencies = [ - "prost", - "prost-types", - "tonic", - "tracing-core", -] - -[[package]] -name = "console-subscriber" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb" -dependencies = [ - "console-api", - "crossbeam-channel", - "crossbeam-utils", - "futures", - "hdrhistogram", - "humantime", - "prost-types", - "serde", - "serde_json", - "thread_local", - "tokio", - "tokio-stream", - "tonic", - "tracing", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "const-oid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - -[[package]] -name = "const-random" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" -dependencies = [ - "getrandom", - "once_cell", - "proc-macro-hack", - "tiny-keccak", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "core_affinity" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4436406e93f52cce33bfba4be067a9f7229da44a634c385e4b22cdfaca5f84cc" -dependencies = [ - "libc", - "num_cpus", - "winapi", -] - -[[package]] -name = "cpp_demangle" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b446fd40bcc17eddd6a4a78f24315eb90afdb3334999ddfd4909985c47722442" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "cpufeatures" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32c" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfea2db42e9927a3845fb268a10a72faed6d416065f77873f05e411457c363e" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" -dependencies = [ - "anes", - "atty", - "cast", - "ciborium", - "clap", - "criterion-plot", - "futures", - "itertools", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "tokio", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools", -] - -[[package]] -name = "crossbeam" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" -dependencies = [ - "cfg-if", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6" -dependencies = [ - "cfg-if", - "lazy_static", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "csv" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-async" -version = "1.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71933d3f2d0481d5111cb2817b15b6961961458ec58adf8008194e6c850046f4" -dependencies = [ - "bstr 1.6.0", - "cfg-if", - "csv-core", - "futures", - "tokio", - "tokio-stream", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.107", -] - -[[package]] -name = "cxx" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c949f4e2576a655698463c56dbc5c5ea4c00964becc9adb0458baa943e862a5b" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618f85c8f132bd8912aab124e15a38adc762bb7e3cef84524adde1692ef3e8bc" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 1.0.107", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b44dad556b0c83d86676135d6c684bdc2b1b9a1188052dd1cb5998246163536" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acc9305a8b69bc2308c2e17dbb98debeac984cdc89ac550c01507cc129433c3" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "darling" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.39", -] - -[[package]] -name = "darling_macro" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "dashmap" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8858831f7781322e539ea39e72449c46b059638250c14344fec8d0aa6e539c" -dependencies = [ - "cfg-if", - "num_cpus", - "parking_lot", -] - -[[package]] -name = "data-encoding" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" - -[[package]] -name = "datadriven" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c496e3277b660041bd6a2c0618593e99c3ba450b30d5f8d89035f78c87b4106" -dependencies = [ - "anyhow", - "futures", -] - -[[package]] -name = "deadpool" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e" -dependencies = [ - "async-trait", - "deadpool-runtime", - "num_cpus", - "retain_mut", - "tokio", -] - -[[package]] -name = "deadpool-postgres" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e866e414e9e12fc988f0bfb89a0b86228e7ed196ca509fbc4dcbc738c56e753c" -dependencies = [ - "deadpool", - "log", - "tokio", - "tokio-postgres", -] - -[[package]] -name = "deadpool-runtime" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1" -dependencies = [ - "tokio", -] - -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "serde", - "uuid", -] - -[[package]] -name = "dec" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdeb628adfc427c3f926528cf76daf4418453e103151739d48f79b8182cb41f" -dependencies = [ - "decnumber-sys", - "libc", - "serde", - "static_assertions", -] - -[[package]] -name = "decnumber-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a99b958f19724bc0a2202086d135c2e7ed098e95cdae778546e965648fa47b" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "der" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" -dependencies = [ - "const-oid", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "derive-getters" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2c35ab6e03642397cdda1dd58abbc05d418aef8e36297f336d5aba060fe8df" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "diff" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" - -[[package]] -name = "differential-dataflow" -version = "0.12.0" -source = "git+https://github.com/MaterializeInc/differential-dataflow.git#c5b9baca0283f4d96f7e6f914de8578fb5c521de" -dependencies = [ - "abomonation", - "abomonation_derive", - "fnv", - "serde", - "timely", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "doc-comment" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97" - -[[package]] -name = "dogsdogsdogs" -version = "0.1.0" -source = "git+https://github.com/MaterializeInc/differential-dataflow.git#c5b9baca0283f4d96f7e6f914de8578fb5c521de" -dependencies = [ - "abomonation", - "abomonation_derive", - "differential-dataflow", - "serde", - "serde_derive", - "timely", -] - -[[package]] -name = "dyn-clone" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" - -[[package]] -name = "either" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" -dependencies = [ - "serde", -] - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - -[[package]] -name = "encoding_rs" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enum-as-inner" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "enum-iterator" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91a4ec26efacf4aeff80887a175a419493cb6f8b5480d26387eb0bd038976187" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "enum-kinds" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "enum_dispatch" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "enumflags2" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" -dependencies = [ - "enumflags2_derive", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "version_check", -] - -[[package]] -name = "ethnum" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eac3c0b9fa6eb75255ebb42c0ba3e2210d102a66d2795afef6fed668f373311" - -[[package]] -name = "eventsource-client" -version = "0.11.0" -source = "git+https://github.com/MaterializeInc/rust-eventsource-client#fb749fde693a9757289238ee71d4e9b3590fb24b" -dependencies = [ - "futures", - "hyper", - "hyper-timeout", - "hyper-tls", - "log", - "pin-project", - "rand", - "tokio", -] - -[[package]] -name = "exclusion-set" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3708c48ed7245587498d116a41566942d6d9943f5b3207fbf522e2bd0b72d0" -dependencies = [ - "loom", -] - -[[package]] -name = "fail" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5e43d0f78a42ad591453aedb1d7ae631ce7ee445c7643691055a9ed8d3b01c" -dependencies = [ - "log", - "once_cell", - "rand", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fancy-regex" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" -dependencies = [ - "bit-set", - "regex", -] - -[[package]] -name = "fast-float" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "filetime" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.10", - "winapi", -] - -[[package]] -name = "findshlibs" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64" -dependencies = [ - "cc", - "lazy_static", - "libc", - "winapi", -] - -[[package]] -name = "fixedbitset" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" - -[[package]] -name = "flate2" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -dependencies = [ - "crc32fast", - "libz-sys", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee1b05cbd864bcaecbd3455d6d967862d446e4ebfc3c2e5e5b9841e53cba6673" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futures" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[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.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[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.39", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows", -] - -[[package]] -name = "generic-array" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" -dependencies = [ - "aho-corasick", - "bstr 0.2.14", - "fnv", - "log", - "regex", - "serde", -] - -[[package]] -name = "governor" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4" -dependencies = [ - "cfg-if", - "dashmap", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext", - "parking_lot", - "quanta", - "rand", - "smallvec", -] - -[[package]] -name = "h2" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 1.9.1", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177" - -[[package]] -name = "hash_hasher" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "hdrhistogram" -version = "7.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6490be71f07a5f62b564bc58e36953f675833df11c7e4a0647bee7a07ca1ec5e" -dependencies = [ - "base64 0.13.1", - "byteorder", - "flate2", - "nom", - "num-traits", -] - -[[package]] -name = "headers" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" -dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hex-literal" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" - -[[package]] -name = "hibitset" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ede5cfa60c958e60330d65163adbc4211e15a2653ad80eb0cce878de120121" -dependencies = [ - "rayon", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "http-range-header" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.4.9", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-openssl" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b" -dependencies = [ - "http", - "hyper", - "linked_hash_set", - "once_cell", - "openssl", - "openssl-sys", - "parking_lot", - "tokio", - "tokio-openssl", - "tower-layer", -] - -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "js-sys", - "once_cell", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "include_dir" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d551dc625a699489a6903cd41dd91aef674a5126f3d28799a316d14e7b15fcf5" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown 0.14.0", -] - -[[package]] -name = "indicatif" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4295cbb7573c16d310e99e713cf9e75101eb190ab31fccd35f2d2691b4352b19" -dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "insta" -version = "1.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686" -dependencies = [ - "console", - "lazy_static", - "linked-hash-map", - "similar", - "yaml-rust", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ipnet" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jobserver" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" -dependencies = [ - "libc", -] - -[[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 = "json-patch" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" -dependencies = [ - "serde", - "serde_json", - "thiserror", - "treediff", -] - -[[package]] -name = "jsonpath_lib" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa63191d68230cccb81c5aa23abd53ed64d83337cacbb25a7b8c7979523774f" -dependencies = [ - "log", - "serde", - "serde_json", -] - -[[package]] -name = "jsonwebtoken" -version = "9.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" -dependencies = [ - "base64 0.21.5", - "js-sys", - "pem", - "ring", - "serde", - "serde_json", - "simple_asn1", -] - -[[package]] -name = "junit-report" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c3a3342e6720a82d7d179f380e9841b73a1dd49344e33959fdfe571ce56b55" -dependencies = [ - "derive-getters", - "quick-xml", - "strip-ansi-escapes", - "time", -] - -[[package]] -name = "k8s-openapi" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc3606fd16aca7989db2f84bb25684d0270c6d6fa1dbcd0025af7b4130523a6" -dependencies = [ - "base64 0.21.5", - "bytes", - "chrono", - "schemars", - "serde", - "serde-value", - "serde_json", -] - -[[package]] -name = "keyed_priority_queue" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d63b6407b66fc81fc539dccf3ddecb669f393c5101b6a2be3976c95099a06e8" -dependencies = [ - "indexmap 1.9.1", -] - -[[package]] -name = "kube" -version = "0.87.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34392aea935145070dcd5b39a6dea689ac6534d7d117461316c3d157b1d0fc3" -dependencies = [ - "k8s-openapi", - "kube-client", - "kube-core", - "kube-derive", - "kube-runtime", -] - -[[package]] -name = "kube-client" -version = "0.87.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7266548b9269d9fa19022620d706697e64f312fb2ba31b93e6986453fcc82c92" -dependencies = [ - "base64 0.21.5", - "bytes", - "chrono", - "either", - "futures", - "home", - "http", - "http-body", - "hyper", - "hyper-openssl", - "hyper-timeout", - "jsonpath_lib", - "k8s-openapi", - "kube-core", - "openssl", - "pem", - "pin-project", - "rand", - "secrecy", - "serde", - "serde_json", - "serde_yaml", - "thiserror", - "tokio", - "tokio-tungstenite", - "tokio-util", - "tower", - "tower-http", - "tracing", -] - -[[package]] -name = "kube-core" -version = "0.87.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8321c315b96b59f59ef6b33f604b84b905ab8f9ff114a4f909d934c520227b1" -dependencies = [ - "chrono", - "form_urlencoded", - "http", - "json-patch", - "k8s-openapi", - "once_cell", - "schemars", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "kube-derive" -version = "0.87.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54591e1f37fc329d412c0fdaced010cc1305b546a39f283fc51700f8fb49421" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "serde_json", - "syn 2.0.39", -] - -[[package]] -name = "kube-runtime" -version = "0.87.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e511e2c1a368d9d4bf6e70db58197e535d818df355b5a2007a8aeb17a370a8ba" -dependencies = [ - "ahash", - "async-trait", - "backoff", - "derivative", - "futures", - "hashbrown 0.14.0", - "json-patch", - "k8s-openapi", - "kube-client", - "parking_lot", - "pin-project", - "serde", - "serde_json", - "smallvec", - "thiserror", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "launchdarkly-server-sdk" -version = "1.0.0" -source = "git+https://github.com/MaterializeInc/rust-server-sdk#df1440c8b93a192d50470d1b258615febe52f1f8" -dependencies = [ - "built", - "chrono", - "crossbeam-channel", - "data-encoding", - "eventsource-client", - "futures", - "hyper", - "hyper-tls", - "launchdarkly-server-sdk-evaluation", - "lazy_static", - "log", - "lru", - "moka", - "parking_lot", - "ring", - "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", - "uuid", -] - -[[package]] -name = "launchdarkly-server-sdk-evaluation" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c27dd31ce69c55fca526d1c22c2dcca96fd0c98e496529d37eeef6c41652173" -dependencies = [ - "base16ct", - "chrono", - "itertools", - "lazy_static", - "log", - "maplit", - "regex", - "semver", - "serde", - "serde_json", - "serde_with", - "sha1", - "urlencoding", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lgalloc" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e800ee9a186dfd634b56aac0814ab6281f87c962bc63087361fa73442e30e1" -dependencies = [ - "crossbeam-deque", - "libc", - "memmap2", - "tempfile", - "thiserror", -] - -[[package]] -name = "libc" -version = "0.2.148" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" - -[[package]] -name = "libloading" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "librocksdb-sys" -version = "0.11.0+8.3.2" -source = "git+https://github.com/MaterializeInc/rust-rocksdb?branch=master#3305d514d509c6b95b0c925c78157e5e4ae4b7ba" -dependencies = [ - "bindgen", - "bzip2-sys", - "cc", - "glob", - "libc", - "libz-sys", - "lz4-sys", - "zstd-sys", -] - -[[package]] -name = "libz-sys" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cae2cd7ba2f3f63938b9c724475dfb7b9861b545a90324476324ed21dbc8c8" -dependencies = [ - "cc", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linked_hash_set" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf" - -[[package]] -name = "linux-raw-sys" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" - -[[package]] -name = "lock_api" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "lru" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" -dependencies = [ - "hashbrown 0.14.0", -] - -[[package]] -name = "lsp-types" -version = "0.94.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - -[[package]] -name = "lz4-sys" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "mach2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" -dependencies = [ - "libc", -] - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.9", -] - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "matchit" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" - -[[package]] -name = "md-5" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" -dependencies = [ - "digest", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5172b50c23043ff43dd53e51392f36519d9b35a8f3a410d30ece5d1aedd58ae" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "moka" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b49a05f67020456541f4f29cbaa812016a266a86ec76f96d3873d459c68fe5e" -dependencies = [ - "crossbeam-channel", - "crossbeam-epoch", - "crossbeam-utils", - "num_cpus", - "once_cell", - "parking_lot", - "rustc_version", - "scheduled-thread-pool", - "skeptic", - "smallvec", - "tagptr", - "thiserror", - "triomphe", - "uuid", -] - -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "multiversion" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025c962a3dd3cc5e0e520aa9c612201d127dcdf28616974961a649dca64f5373" -dependencies = [ - "multiversion-macros", -] - -[[package]] -name = "multiversion-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a3e2bde382ebf960c1f3e79689fa5941625fe9bf694a1cb64af3e85faff3af" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "mysql_async" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6750b17ce50f8f112ef1a8394121090d47c596b56a6a17569ca680a9626e2ef2" -dependencies = [ - "bytes", - "crossbeam", - "flate2", - "futures-core", - "futures-sink", - "futures-util", - "keyed_priority_queue", - "lazy_static", - "lru", - "mio", - "mysql_common", - "once_cell", - "pem", - "percent-encoding", - "pin-project", - "rand", - "serde", - "serde_json", - "socket2 0.5.3", - "thiserror", - "tokio", - "tokio-util", - "tracing", - "twox-hash", - "url", -] - -[[package]] -name = "mysql_common" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06f19e4cfa0ab5a76b627cec2d81331c49b034988eaf302c3bafeada684eadef" -dependencies = [ - "base64 0.21.5", - "bindgen", - "bitflags 2.4.1", - "bitvec", - "btoi", - "byteorder", - "bytes", - "cc", - "cmake", - "crc32fast", - "flate2", - "lazy_static", - "num-bigint", - "num-traits", - "rand", - "regex", - "saturating", - "serde", - "serde_json", - "sha1", - "sha2", - "smallvec", - "subprocess", - "thiserror", - "uuid", - "zstd 0.12.4", -] - -[[package]] -name = "mz" -version = "0.3.0" -dependencies = [ - "assert_cmd", - "axum", - "clap", - "csv", - "dirs", - "hyper", - "indicatif", - "maplit", - "mz-build-info", - "mz-cloud-api", - "mz-frontegg-auth", - "mz-frontegg-client", - "mz-ore", - "once_cell", - "open", - "openssl-probe", - "reqwest", - "rpassword", - "security-framework", - "semver", - "serde", - "serde-aux", - "serde_json", - "tabled", - "termcolor", - "thiserror", - "time", - "tokio", - "toml", - "toml_edit", - "url", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-adapter" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "bytes", - "bytesize", - "chrono", - "criterion", - "datadriven", - "deadpool-postgres", - "dec", - "derivative", - "differential-dataflow", - "enum-kinds", - "fail", - "futures", - "governor", - "hex", - "http", - "itertools", - "launchdarkly-server-sdk", - "maplit", - "mz-adapter-types", - "mz-audit-log", - "mz-build-info", - "mz-catalog", - "mz-ccsr", - "mz-cloud-resources", - "mz-cluster-client", - "mz-compute-client", - "mz-compute-types", - "mz-controller", - "mz-controller-types", - "mz-expr", - "mz-kafka-util", - "mz-orchestrator", - "mz-ore", - "mz-persist-client", - "mz-persist-types", - "mz-pgcopy", - "mz-pgrepr", - "mz-pgwire-common", - "mz-postgres-client", - "mz-postgres-util", - "mz-prof", - "mz-proto", - "mz-repr", - "mz-rocksdb-types", - "mz-secrets", - "mz-segment", - "mz-service", - "mz-sql", - "mz-sql-parser", - "mz-ssh-util", - "mz-stash", - "mz-storage-client", - "mz-storage-types", - "mz-timestamp-oracle", - "mz-tls-util", - "mz-tracing", - "mz-transform", - "once_cell", - "opentelemetry", - "prometheus", - "proptest", - "proptest-derive", - "prost", - "qcell", - "rand", - "rand_chacha", - "rdkafka", - "regex", - "reqwest", - "semver", - "serde", - "serde_json", - "serde_plain", - "smallvec", - "static_assertions", - "thiserror", - "timely", - "tokio", - "tokio-postgres", - "tokio-stream", - "tracing", - "tracing-core", - "tracing-opentelemetry", - "tracing-subscriber", - "uncased", - "url", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-adapter-types" -version = "0.0.0" -dependencies = [ - "mz-ore", - "mz-repr", - "mz-storage-types", - "serde", - "timely", - "workspace-hack", -] - -[[package]] -name = "mz-alloc" -version = "0.0.0" -dependencies = [ - "mz-ore", - "mz-prof", - "mz-prof-http", - "tikv-jemallocator", - "workspace-hack", -] - -[[package]] -name = "mz-audit-log" -version = "0.0.0" -dependencies = [ - "anyhow", - "mz-ore", - "proptest", - "proptest-derive", - "serde", - "serde_json", - "serde_plain", - "workspace-hack", -] - -[[package]] -name = "mz-avro" -version = "0.7.0" -dependencies = [ - "anyhow", - "byteorder", - "chrono", - "crc32fast", - "digest", - "enum-kinds", - "flate2", - "itertools", - "mz-ore", - "once_cell", - "rand", - "regex", - "serde", - "serde_json", - "sha2", - "snap", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-avro-derive" -version = "0.0.0" -dependencies = [ - "quote", - "syn 1.0.107", - "workspace-hack", -] - -[[package]] -name = "mz-aws-secrets-controller" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "aws-config", - "aws-credential-types", - "aws-sdk-secretsmanager", - "aws-types", - "futures", - "mz-aws-util", - "mz-repr", - "mz-secrets", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-aws-util" -version = "0.0.0" -dependencies = [ - "aws-config", - "aws-sdk-s3", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-types", - "hyper-tls", - "workspace-hack", -] - -[[package]] -name = "mz-balancerd" -version = "0.84.2" -dependencies = [ - "anyhow", - "async-trait", - "axum", - "bytes", - "bytesize", - "clap", - "futures", - "hyper", - "hyper-openssl", - "jsonwebtoken", - "mz-build-info", - "mz-environmentd", - "mz-frontegg-auth", - "mz-frontegg-mock", - "mz-http-util", - "mz-orchestrator-tracing", - "mz-ore", - "mz-pgwire-common", - "mz-server-core", - "num_cpus", - "openssl", - "postgres", - "prometheus", - "semver", - "tokio", - "tokio-openssl", - "tokio-postgres", - "tokio-util", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-build-info" -version = "0.0.0" -dependencies = [ - "compile-time-run", - "semver", - "workspace-hack", -] - -[[package]] -name = "mz-catalog" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "base64 0.13.1", - "bytes", - "bytesize", - "chrono", - "derivative", - "differential-dataflow", - "fail", - "futures", - "insta", - "itertools", - "md-5", - "mz-adapter-types", - "mz-audit-log", - "mz-build-info", - "mz-cloud-resources", - "mz-compute-client", - "mz-controller", - "mz-controller-types", - "mz-expr", - "mz-orchestrator", - "mz-ore", - "mz-persist-client", - "mz-persist-types", - "mz-pgrepr", - "mz-pgtz", - "mz-postgres-util", - "mz-proto", - "mz-repr", - "mz-secrets", - "mz-sql", - "mz-sql-parser", - "mz-stash", - "mz-stash-types", - "mz-storage-client", - "mz-storage-types", - "once_cell", - "paste", - "postgres-openssl", - "prometheus", - "proptest", - "proptest-derive", - "prost", - "prost-build", - "protobuf-src", - "rand", - "serde", - "serde_json", - "serde_plain", - "sha2", - "similar-asserts", - "static_assertions", - "thiserror", - "timely", - "tokio", - "tokio-postgres", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-catalog-debug" -version = "0.84.2" -dependencies = [ - "anyhow", - "clap", - "mz-adapter", - "mz-build-info", - "mz-catalog", - "mz-ore", - "mz-persist-client", - "mz-secrets", - "mz-sql", - "mz-stash", - "mz-storage-types", - "mz-tls-util", - "once_cell", - "serde", - "serde_json", - "tokio", - "tokio-postgres", - "url", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-ccsr" -version = "0.0.0" -dependencies = [ - "anyhow", - "hyper", - "mz-ore", - "native-tls", - "once_cell", - "openssl", - "prost-build", - "protobuf-src", - "reqwest", - "serde", - "serde_json", - "tokio", - "tracing", - "url", - "workspace-hack", -] - -[[package]] -name = "mz-cloud-api" -version = "0.0.0" -dependencies = [ - "anyhow", - "chrono", - "mz-frontegg-auth", - "mz-frontegg-client", - "once_cell", - "reqwest", - "serde", - "thiserror", - "tokio", - "url", - "workspace-hack", -] - -[[package]] -name = "mz-cloud-resources" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "chrono", - "futures", - "k8s-openapi", - "kube", - "mz-ore", - "mz-repr", - "schemars", - "serde", - "serde_json", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-cluster" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "bytesize", - "clap", - "crossbeam-channel", - "dec", - "differential-dataflow", - "futures", - "mz-build-info", - "mz-cluster-client", - "mz-ore", - "mz-persist-client", - "mz-persist-types", - "mz-pid-file", - "mz-repr", - "mz-service", - "mz-timely-util", - "once_cell", - "prometheus", - "regex", - "rocksdb", - "scopeguard", - "serde", - "smallvec", - "timely", - "tokio", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-cluster-client" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "chrono", - "futures", - "http", - "itertools", - "mz-ore", - "mz-proto", - "once_cell", - "prometheus", - "proptest", - "proptest-derive", - "prost", - "prost-build", - "protobuf-src", - "regex", - "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", - "tonic", - "tonic-build", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-clusterd" -version = "0.84.2" -dependencies = [ - "anyhow", - "axum", - "clap", - "fail", - "futures", - "mz-alloc", - "mz-build-info", - "mz-cloud-resources", - "mz-cluster", - "mz-compute", - "mz-compute-client", - "mz-http-util", - "mz-metrics", - "mz-orchestrator-tracing", - "mz-ore", - "mz-persist-client", - "mz-pid-file", - "mz-prof-http", - "mz-service", - "mz-storage", - "mz-storage-client", - "mz-storage-types", - "mz-timely-util", - "once_cell", - "timely", - "tokio", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-compute" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "bytesize", - "clap", - "core_affinity", - "crossbeam-channel", - "dec", - "differential-dataflow", - "dogsdogsdogs", - "futures", - "itertools", - "lgalloc", - "mz-build-info", - "mz-cluster", - "mz-cluster-client", - "mz-compute-client", - "mz-compute-types", - "mz-expr", - "mz-ore", - "mz-persist-client", - "mz-persist-txn", - "mz-persist-types", - "mz-pid-file", - "mz-prof", - "mz-repr", - "mz-service", - "mz-storage-operators", - "mz-storage-types", - "mz-timely-util", - "once_cell", - "prometheus", - "scopeguard", - "serde", - "smallvec", - "timely", - "tokio", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-compute-client" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-stream", - "async-trait", - "bytesize", - "chrono", - "crossbeam-channel", - "differential-dataflow", - "futures", - "http", - "mz-build-info", - "mz-cluster-client", - "mz-compute-types", - "mz-expr", - "mz-orchestrator", - "mz-ore", - "mz-persist", - "mz-persist-client", - "mz-persist-types", - "mz-proto", - "mz-repr", - "mz-service", - "mz-storage-client", - "mz-storage-types", - "mz-timely-util", - "mz-tracing", - "once_cell", - "prometheus", - "proptest", - "proptest-derive", - "prost", - "prost-build", - "protobuf-src", - "regex", - "serde", - "serde_json", - "thiserror", - "timely", - "tokio", - "tokio-stream", - "tonic", - "tonic-build", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-compute-types" -version = "0.0.0" -dependencies = [ - "columnation", - "differential-dataflow", - "itertools", - "mz-expr", - "mz-ore", - "mz-proto", - "mz-repr", - "mz-storage-types", - "proptest", - "proptest-derive", - "prost", - "prost-build", - "protobuf-src", - "serde", - "timely", - "tonic-build", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-controller" -version = "0.0.0" -dependencies = [ - "anyhow", - "bytesize", - "chrono", - "differential-dataflow", - "futures", - "mz-build-info", - "mz-cluster-client", - "mz-compute-client", - "mz-compute-types", - "mz-controller-types", - "mz-orchestrator", - "mz-ore", - "mz-persist-client", - "mz-persist-types", - "mz-proto", - "mz-repr", - "mz-service", - "mz-stash-types", - "mz-storage-client", - "mz-storage-controller", - "mz-storage-types", - "once_cell", - "regex", - "serde", - "serde_json", - "timely", - "tokio", - "tokio-stream", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-controller-types" -version = "0.0.0" -dependencies = [ - "mz-cluster-client", - "mz-compute-types", - "workspace-hack", -] - -[[package]] -name = "mz-environmentd" -version = "0.84.2" -dependencies = [ - "anyhow", - "askama", - "assert_cmd", - "async-trait", - "axum", - "base64 0.13.1", - "bytes", - "bytesize", - "cc", - "chrono", - "clap", - "datadriven", - "fail", - "fallible-iterator", - "futures", - "headers", - "http", - "http-body", - "humantime", - "hyper", - "hyper-openssl", - "hyper-tls", - "include_dir", - "itertools", - "jsonwebtoken", - "libc", - "mime", - "mz-adapter", - "mz-adapter-types", - "mz-alloc", - "mz-aws-secrets-controller", - "mz-build-info", - "mz-catalog", - "mz-cloud-resources", - "mz-controller", - "mz-environmentd", - "mz-expr", - "mz-frontegg-auth", - "mz-frontegg-mock", - "mz-http-util", - "mz-interchange", - "mz-metrics", - "mz-npm", - "mz-orchestrator", - "mz-orchestrator-kubernetes", - "mz-orchestrator-process", - "mz-orchestrator-tracing", - "mz-ore", - "mz-persist-client", - "mz-pgrepr", - "mz-pgtest", - "mz-pgwire", - "mz-pgwire-common", - "mz-prof-http", - "mz-repr", - "mz-secrets", - "mz-segment", - "mz-server-core", - "mz-service", - "mz-sql", - "mz-sql-parser", - "mz-stash", - "mz-stash-types", - "mz-storage-client", - "mz-storage-types", - "mz-tls-util", - "mz-tracing", - "nix", - "num_cpus", - "once_cell", - "openssl", - "openssl-sys", - "opentelemetry", - "opentelemetry_sdk", - "pin-project", - "postgres", - "postgres-openssl", - "postgres-protocol", - "postgres_array", - "predicates", - "prometheus", - "proptest", - "rand", - "rdkafka-sys", - "regex", - "reqwest", - "rlimit", - "sentry", - "sentry-tracing", - "serde", - "serde_json", - "serde_urlencoded", - "shell-words", - "similar-asserts", - "sysctl", - "tempfile", - "thiserror", - "timely", - "tokio", - "tokio-openssl", - "tokio-postgres", - "tokio-stream", - "tower", - "tower-http", - "tracing", - "tracing-core", - "tracing-opentelemetry", - "tracing-subscriber", - "tungstenite", - "url", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-expr" -version = "0.0.0" -dependencies = [ - "aho-corasick", - "anyhow", - "bytes", - "bytesize", - "chrono", - "chrono-tz", - "criterion", - "csv", - "datadriven", - "dec", - "derivative", - "encoding", - "enum-iterator", - "fallible-iterator", - "hex", - "hmac", - "itertools", - "md-5", - "mz-expr-test-util", - "mz-lowertest", - "mz-ore", - "mz-persist-types", - "mz-pgrepr", - "mz-pgtz", - "mz-proto", - "mz-regexp", - "mz-repr", - "mz-sql-parser", - "mz-sql-pretty", - "num", - "num_enum", - "once_cell", - "ordered-float", - "paste", - "proc-macro2", - "proptest", - "proptest-derive", - "prost", - "prost-build", - "protobuf-src", - "regex", - "regex-syntax", - "serde", - "serde_json", - "serde_regex", - "sha1", - "sha2", - "subtle", - "timely", - "tracing", - "uncased", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-expr-parser" -version = "0.0.0" -dependencies = [ - "datadriven", - "mz-expr", - "mz-ore", - "mz-repr", - "proc-macro2", - "syn 2.0.39", - "workspace-hack", -] - -[[package]] -name = "mz-expr-test-util" -version = "0.0.0" -dependencies = [ - "datadriven", - "mz-expr", - "mz-lowertest", - "mz-ore", - "mz-repr", - "mz-repr-test-util", - "proc-macro2", - "serde", - "serde_json", - "workspace-hack", -] - -[[package]] -name = "mz-fivetran-destination" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-compression", - "clap", - "csv-async", - "futures", - "itertools", - "mz-ore", - "mz-pgrepr", - "openssl", - "postgres-openssl", - "postgres-protocol", - "prost", - "prost-build", - "prost-types", - "protobuf-src", - "tokio", - "tokio-postgres", - "tonic", - "tonic-build", - "workspace-hack", -] - -[[package]] -name = "mz-frontegg-auth" -version = "0.0.0" -dependencies = [ - "anyhow", - "axum", - "base64 0.13.1", - "clap", - "derivative", - "futures", - "jsonwebtoken", - "mz-ore", - "mz-repr", - "prometheus", - "reqwest", - "reqwest-middleware", - "reqwest-retry", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-frontegg-client" -version = "0.0.0" -dependencies = [ - "jsonwebtoken", - "mz-frontegg-auth", - "mz-ore", - "once_cell", - "reqwest", - "serde", - "serde_json", - "thiserror", - "tokio", - "url", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-frontegg-mock" -version = "0.0.0" -dependencies = [ - "anyhow", - "clap", - "hyper", - "jsonwebtoken", - "mz-frontegg-auth", - "mz-ore", - "serde", - "serde_json", - "tokio", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-http-util" -version = "0.0.0" -dependencies = [ - "anyhow", - "askama", - "axum", - "headers", - "http", - "hyper", - "include_dir", - "mz-ore", - "prometheus", - "serde", - "serde_json", - "tokio", - "tower", - "tower-http", - "tracing", - "tracing-subscriber", - "workspace-hack", -] - -[[package]] -name = "mz-interchange" -version = "0.0.0" -dependencies = [ - "anyhow", - "byteorder", - "chrono", - "clap", - "criterion", - "differential-dataflow", - "itertools", - "maplit", - "mz-avro", - "mz-avro-derive", - "mz-ccsr", - "mz-ore", - "mz-repr", - "once_cell", - "ordered-float", - "prost", - "prost-build", - "prost-reflect", - "protobuf-src", - "serde_json", - "timely", - "tokio", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-kafka-util" -version = "0.0.0" -dependencies = [ - "anyhow", - "chrono", - "clap", - "crossbeam", - "fancy-regex", - "futures", - "mz-avro", - "mz-ccsr", - "mz-ore", - "mz-ssh-util", - "num_cpus", - "prost", - "prost-build", - "protobuf-src", - "rand", - "rdkafka", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "url", - "workspace-hack", -] - -[[package]] -name = "mz-lowertest" -version = "0.0.0" -dependencies = [ - "anyhow", - "datadriven", - "mz-lowertest-derive", - "mz-ore", - "proc-macro2", - "serde", - "serde_json", - "workspace-hack", -] - -[[package]] -name = "mz-lowertest-derive" -version = "0.0.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", - "workspace-hack", -] - -[[package]] -name = "mz-lsp-server" -version = "0.3.0" -dependencies = [ - "httparse", - "mz-build-info", - "mz-ore", - "mz-sql-lexer", - "mz-sql-parser", - "mz-sql-pretty", - "once_cell", - "regex", - "ropey", - "serde", - "serde_json", - "tokio", - "tower-lsp", - "workspace-hack", -] - -[[package]] -name = "mz-metabase" -version = "0.0.0" -dependencies = [ - "reqwest", - "serde", - "workspace-hack", -] - -[[package]] -name = "mz-metabase-smoketest" -version = "0.0.0" -dependencies = [ - "anyhow", - "itertools", - "mz-metabase", - "mz-ore", - "tokio", - "tokio-postgres", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-metrics" -version = "0.0.0" -dependencies = [ - "lgalloc", - "libc", - "mz-ore", - "paste", - "prometheus", - "tokio", - "workspace-hack", -] - -[[package]] -name = "mz-mysql-util" -version = "0.1.0" -dependencies = [ - "anyhow", - "indexmap 1.9.1", - "itertools", - "mysql_async", - "mz-ore", - "mz-proto", - "mz-repr", - "mz-ssh-util", - "once_cell", - "proptest", - "prost", - "prost-build", - "protobuf-src", - "serde", - "thiserror", - "tonic-build", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-npm" -version = "0.0.0" -dependencies = [ - "anyhow", - "flate2", - "hex", - "hex-literal", - "reqwest", - "sha2", - "tar", - "walkdir", - "workspace-hack", -] - -[[package]] -name = "mz-orchestrator" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "bytesize", - "chrono", - "derivative", - "futures-core", - "mz-ore", - "prost", - "protobuf-src", - "serde", - "tonic-build", - "workspace-hack", -] - -[[package]] -name = "mz-orchestrator-kubernetes" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "chrono", - "clap", - "fail", - "futures", - "k8s-openapi", - "kube", - "maplit", - "mz-cloud-resources", - "mz-orchestrator", - "mz-repr", - "mz-secrets", - "serde", - "serde_json", - "sha2", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-orchestrator-process" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-stream", - "async-trait", - "chrono", - "futures", - "hex", - "itertools", - "libc", - "maplit", - "mz-orchestrator", - "mz-ore", - "mz-pid-file", - "mz-repr", - "mz-secrets", - "nix", - "scopeguard", - "serde", - "serde_json", - "sha1", - "sysinfo", - "tokio", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-orchestrator-tracing" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "clap", - "futures-core", - "http", - "humantime", - "mz-build-info", - "mz-orchestrator", - "mz-ore", - "mz-repr", - "mz-service", - "mz-tracing", - "opentelemetry", - "opentelemetry_sdk", - "sentry-tracing", - "tracing", - "tracing-subscriber", - "workspace-hack", -] - -[[package]] -name = "mz-ore" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "atty", - "bytes", - "chrono", - "clap", - "compact_bytes", - "console-subscriber", - "criterion", - "ctor", - "either", - "futures", - "hibitset", - "http", - "hyper", - "hyper-tls", - "lgalloc", - "mz-ore", - "mz-test-macro", - "native-tls", - "num", - "once_cell", - "openssl", - "opentelemetry", - "opentelemetry-otlp", - "opentelemetry_sdk", - "paste", - "pin-project", - "prometheus", - "proptest", - "rand", - "scopeguard", - "sentry", - "sentry-tracing", - "serde", - "serde_json", - "smallvec", - "stacker", - "tokio", - "tokio-native-tls", - "tokio-openssl", - "tokio-test", - "tonic", - "tracing", - "tracing-opentelemetry", - "tracing-subscriber", - "uuid", - "workspace-hack", - "yansi", -] - -[[package]] -name = "mz-persist" -version = "0.0.0" -dependencies = [ - "anyhow", - "arrow2", - "async-stream", - "async-trait", - "aws-config", - "aws-credential-types", - "aws-sdk-s3", - "aws-types", - "base64 0.13.1", - "bytes", - "deadpool-postgres", - "differential-dataflow", - "fail", - "futures-util", - "md-5", - "mz-aws-util", - "mz-ore", - "mz-persist-types", - "mz-postgres-client", - "mz-proto", - "once_cell", - "openssl", - "openssl-sys", - "postgres-openssl", - "prometheus", - "proptest", - "proptest-derive", - "prost", - "prost-build", - "protobuf-src", - "rand", - "serde", - "serde_json", - "tempfile", - "timely", - "tokio", - "tokio-postgres", - "tracing", - "url", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-persist-client" -version = "0.84.2" -dependencies = [ - "anyhow", - "async-stream", - "async-trait", - "bytes", - "clap", - "criterion", - "datadriven", - "differential-dataflow", - "futures", - "futures-task", - "futures-util", - "h2", - "hex", - "mz-build-info", - "mz-ore", - "mz-persist", - "mz-persist-types", - "mz-postgres-client", - "mz-proto", - "mz-timely-util", - "num_cpus", - "once_cell", - "prometheus", - "proptest", - "proptest-derive", - "prost", - "prost-build", - "protobuf-src", - "semver", - "sentry-tracing", - "serde", - "serde_json", - "tempfile", - "thiserror", - "timely", - "tokio", - "tokio-metrics", - "tokio-stream", - "tonic", - "tonic-build", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-persist-txn" -version = "0.0.0" -dependencies = [ - "bytes", - "crossbeam-channel", - "differential-dataflow", - "futures", - "itertools", - "mz-ore", - "mz-persist-client", - "mz-persist-types", - "mz-timely-util", - "prometheus", - "prost", - "prost-build", - "protobuf-src", - "rand", - "serde", - "timely", - "tokio", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-persist-types" -version = "0.0.0" -dependencies = [ - "anyhow", - "arrow2", - "bytes", - "chrono", - "hex", - "mz-ore", - "mz-proto", - "parquet2", - "proptest", - "proptest-derive", - "prost", - "prost-build", - "protobuf-src", - "serde", - "serde_json", - "workspace-hack", -] - -[[package]] -name = "mz-pgcopy" -version = "0.0.0" -dependencies = [ - "bytes", - "csv", - "mz-ore", - "mz-pgrepr", - "mz-repr", - "workspace-hack", -] - -[[package]] -name = "mz-pgrepr" -version = "0.0.0" -dependencies = [ - "byteorder", - "bytes", - "chrono", - "dec", - "mz-ore", - "mz-pgrepr-consts", - "mz-pgwire-common", - "mz-repr", - "once_cell", - "postgres-types", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-pgrepr-consts" -version = "0.0.0" -dependencies = [ - "workspace-hack", -] - -[[package]] -name = "mz-pgtest" -version = "0.0.0" -dependencies = [ - "anyhow", - "bytes", - "clap", - "datadriven", - "fallible-iterator", - "mz-ore", - "postgres-protocol", - "serde", - "serde_json", - "workspace-hack", -] - -[[package]] -name = "mz-pgtz" -version = "0.0.0" -dependencies = [ - "anyhow", - "chrono", - "chrono-tz", - "mz-lowertest", - "mz-ore", - "mz-proto", - "phf", - "phf_codegen", - "proptest", - "proptest-derive", - "prost", - "prost-build", - "protobuf-src", - "serde", - "uncased", - "workspace-hack", -] - -[[package]] -name = "mz-pgwire" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "byteorder", - "bytes", - "bytesize", - "futures", - "itertools", - "mz-adapter", - "mz-adapter-types", - "mz-expr", - "mz-frontegg-auth", - "mz-ore", - "mz-pgcopy", - "mz-pgrepr", - "mz-pgwire-common", - "mz-repr", - "mz-server-core", - "mz-sql", - "openssl", - "postgres", - "tokio", - "tokio-openssl", - "tokio-stream", - "tokio-util", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-pgwire-common" -version = "0.0.0" -dependencies = [ - "async-trait", - "byteorder", - "bytes", - "bytesize", - "mz-ore", - "mz-server-core", - "tokio", - "tokio-openssl", - "tokio-postgres", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-pid-file" -version = "0.0.0" -dependencies = [ - "cc", - "libc", - "mz-ore", - "tempfile", - "workspace-hack", -] - -[[package]] -name = "mz-postgres-client" -version = "0.0.0" -dependencies = [ - "anyhow", - "deadpool-postgres", - "mz-ore", - "mz-tls-util", - "prometheus", - "tokio", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-postgres-util" -version = "0.0.0" -dependencies = [ - "anyhow", - "mz-cloud-resources", - "mz-ore", - "mz-proto", - "mz-repr", - "mz-ssh-util", - "mz-tls-util", - "openssh", - "openssl", - "postgres-openssl", - "postgres_array", - "proptest", - "prost", - "prost-build", - "protobuf-src", - "serde", - "thiserror", - "tokio", - "tokio-postgres", - "tonic-build", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-proc" -version = "0.1.0" -dependencies = [ - "anyhow", - "libc", - "mz-ore", - "workspace-hack", -] - -[[package]] -name = "mz-prof" -version = "0.0.0" -dependencies = [ - "anyhow", - "backtrace", - "flate2", - "libc", - "mz-ore", - "mz-proc", - "once_cell", - "pprof", - "prost", - "prost-build", - "protobuf-src", - "tempfile", - "tikv-jemalloc-ctl", - "tokio", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-prof-http" -version = "0.0.0" -dependencies = [ - "anyhow", - "askama", - "axum", - "bytesize", - "cfg-if", - "headers", - "http", - "include_dir", - "mime", - "mz-build-info", - "mz-http-util", - "mz-npm", - "mz-ore", - "mz-prof", - "once_cell", - "serde", - "tokio", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-proto" -version = "0.0.0" -dependencies = [ - "anyhow", - "chrono", - "chrono-tz", - "globset", - "http", - "mz-ore", - "num", - "proptest", - "prost", - "prost-build", - "protobuf-src", - "regex", - "serde_json", - "tokio-postgres", - "url", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-regexp" -version = "0.0.0" -dependencies = [ - "anyhow", - "mz-ore", - "mz-repr", - "postgres", - "regex", - "workspace-hack", -] - -[[package]] -name = "mz-repr" -version = "0.0.0" -dependencies = [ - "anyhow", - "bitflags 1.3.2", - "bytes", - "cfg-if", - "chrono", - "chrono-tz", - "columnation", - "compact_bytes", - "criterion", - "dec", - "differential-dataflow", - "enum-kinds", - "enum_dispatch", - "fast-float", - "hex", - "itertools", - "mz-lowertest", - "mz-ore", - "mz-persist", - "mz-persist-types", - "mz-pgtz", - "mz-proto", - "mz-sql-parser", - "num-traits", - "num_enum", - "once_cell", - "ordered-float", - "postgres-protocol", - "proptest", - "proptest-derive", - "prost", - "prost-build", - "protobuf-src", - "rand", - "regex", - "ryu", - "serde", - "serde_json", - "smallvec", - "static_assertions", - "strsim", - "thiserror", - "timely", - "tokio-postgres", - "tracing", - "tracing-core", - "tracing-subscriber", - "url", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-repr-test-util" -version = "0.0.0" -dependencies = [ - "chrono", - "datadriven", - "mz-lowertest", - "mz-ore", - "mz-repr", - "proc-macro2", - "workspace-hack", -] - -[[package]] -name = "mz-rocksdb" -version = "0.0.0" -dependencies = [ - "anyhow", - "bincode", - "derivative", - "itertools", - "mz-ore", - "mz-proto", - "mz-rocksdb-types", - "num_cpus", - "once_cell", - "prometheus", - "proptest", - "proptest-derive", - "prost", - "prost-build", - "protobuf-src", - "rocksdb", - "serde", - "serde_json", - "tempfile", - "thiserror", - "tokio", - "tonic-build", - "tracing", - "uncased", - "workspace-hack", -] - -[[package]] -name = "mz-rocksdb-types" -version = "0.0.0" -dependencies = [ - "anyhow", - "mz-ore", - "mz-proto", - "num_cpus", - "proptest", - "proptest-derive", - "prost", - "prost-build", - "protobuf-src", - "serde", - "tonic-build", - "uncased", - "workspace-hack", -] - -[[package]] -name = "mz-s3-datagen" -version = "0.0.0" -dependencies = [ - "anyhow", - "aws-config", - "aws-sdk-s3", - "bytefmt", - "clap", - "futures", - "indicatif", - "mz-aws-util", - "mz-ore", - "tokio", - "tracing", - "tracing-subscriber", - "workspace-hack", -] - -[[package]] -name = "mz-secrets" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "mz-ore", - "mz-repr", - "tokio", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-segment" -version = "0.0.0" -dependencies = [ - "mz-ore", - "segment", - "serde_json", - "tokio", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-server-core" -version = "0.0.0" -dependencies = [ - "anyhow", - "clap", - "futures", - "mz-ore", - "openssl", - "socket2 0.5.3", - "tokio", - "tokio-stream", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-service" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-stream", - "async-trait", - "clap", - "crossbeam-channel", - "futures", - "http", - "itertools", - "mz-aws-secrets-controller", - "mz-build-info", - "mz-orchestrator-kubernetes", - "mz-orchestrator-process", - "mz-ore", - "mz-proto", - "mz-repr", - "mz-secrets", - "once_cell", - "os_info", - "proptest", - "proptest-derive", - "prost", - "prost-build", - "protobuf-src", - "semver", - "sentry-tracing", - "serde", - "sysinfo", - "timely", - "tokio", - "tokio-stream", - "tonic", - "tonic-build", - "tower", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-sql" -version = "0.0.0" -dependencies = [ - "anyhow", - "array-concat", - "aws-sdk-sts", - "bitflags 1.3.2", - "chrono", - "clap", - "datadriven", - "enum-kinds", - "fail", - "globset", - "hex", - "http", - "itertools", - "maplit", - "mysql_async", - "mz-adapter-types", - "mz-build-info", - "mz-ccsr", - "mz-cloud-resources", - "mz-controller-types", - "mz-expr", - "mz-interchange", - "mz-kafka-util", - "mz-lowertest", - "mz-mysql-util", - "mz-orchestrator", - "mz-ore", - "mz-persist-client", - "mz-pgcopy", - "mz-pgrepr", - "mz-pgwire-common", - "mz-postgres-util", - "mz-proto", - "mz-repr", - "mz-rocksdb-types", - "mz-secrets", - "mz-sql-lexer", - "mz-sql-parser", - "mz-ssh-util", - "mz-storage-types", - "mz-tracing", - "num_enum", - "once_cell", - "paste", - "postgres_array", - "proptest", - "proptest-derive", - "prost", - "protobuf-native", - "rdkafka", - "regex", - "reqwest", - "serde", - "serde_json", - "static_assertions", - "thiserror", - "tokio", - "tokio-postgres", - "tracing", - "tracing-subscriber", - "uncased", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-sql-lexer" -version = "0.0.0" -dependencies = [ - "anyhow", - "datadriven", - "mz-ore", - "phf", - "phf_codegen", - "serde", - "uncased", - "workspace-hack", -] - -[[package]] -name = "mz-sql-parser" -version = "0.0.0" -dependencies = [ - "anyhow", - "bytesize", - "datadriven", - "enum-kinds", - "itertools", - "mz-ore", - "mz-sql-lexer", - "mz-sql-parser", - "mz-walkabout", - "phf", - "serde", - "thiserror", - "tracing", - "uncased", - "unicode-width", - "workspace-hack", -] - -[[package]] -name = "mz-sql-pretty" -version = "0.0.0" -dependencies = [ - "datadriven", - "mz-ore", - "mz-sql-parser", - "pretty", - "thiserror", - "workspace-hack", -] - -[[package]] -name = "mz-sqllogictest" -version = "0.0.1" -dependencies = [ - "anyhow", - "bytes", - "chrono", - "clap", - "dec", - "fallible-iterator", - "futures", - "itertools", - "junit-report", - "md-5", - "mz-build-info", - "mz-cloud-resources", - "mz-controller", - "mz-environmentd", - "mz-orchestrator", - "mz-orchestrator-process", - "mz-orchestrator-tracing", - "mz-ore", - "mz-persist-client", - "mz-pgrepr", - "mz-repr", - "mz-secrets", - "mz-service", - "mz-sql", - "mz-sql-parser", - "mz-stash-types", - "mz-storage-types", - "mz-tracing", - "once_cell", - "postgres-protocol", - "regex", - "reqwest", - "serde_json", - "shell-words", - "tempfile", - "time", - "tokio", - "tokio-postgres", - "tokio-stream", - "tower-http", - "tracing", - "uuid", - "walkdir", - "workspace-hack", -] - -[[package]] -name = "mz-ssh-util" -version = "0.0.0" -dependencies = [ - "anyhow", - "futures", - "mz-ore", - "openssh", - "openssh-mux-client", - "openssl", - "rand", - "scopeguard", - "serde", - "serde_json", - "ssh-key", - "tempfile", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "workspace-hack", - "zeroize", -] - -[[package]] -name = "mz-stash" -version = "0.0.0" -dependencies = [ - "bytes", - "criterion", - "derivative", - "differential-dataflow", - "fail", - "futures", - "itertools", - "mz-ore", - "mz-proto", - "mz-stash-types", - "mz-tls-util", - "once_cell", - "paste", - "postgres-openssl", - "prometheus", - "proptest", - "prost", - "rand", - "serde", - "timely", - "tokio", - "tokio-postgres", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-stash-debug" -version = "0.84.2" -dependencies = [ - "anyhow", - "clap", - "futures", - "mz-adapter", - "mz-build-info", - "mz-catalog", - "mz-ore", - "mz-secrets", - "mz-sql", - "mz-stash", - "mz-storage-controller", - "mz-storage-types", - "mz-tls-util", - "once_cell", - "prost", - "serde_json", - "tokio", - "tokio-postgres", - "tracing", - "tracing-subscriber", - "workspace-hack", -] - -[[package]] -name = "mz-stash-types" -version = "0.0.0" -dependencies = [ - "anyhow", - "mz-ore", - "mz-proto", - "paste", - "prometheus", - "prost", - "serde", - "tokio-postgres", - "workspace-hack", -] - -[[package]] -name = "mz-storage" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-stream", - "async-trait", - "axum", - "bincode", - "bytes", - "bytesize", - "chrono", - "clap", - "crossbeam-channel", - "csv-core", - "datadriven", - "dec", - "differential-dataflow", - "either", - "fail", - "futures", - "globset", - "http", - "humantime", - "indexmap 2.0.0", - "itertools", - "maplit", - "mysql_async", - "mysql_common", - "mz-avro", - "mz-aws-util", - "mz-build-info", - "mz-ccsr", - "mz-cloud-resources", - "mz-cluster", - "mz-expr", - "mz-http-util", - "mz-interchange", - "mz-kafka-util", - "mz-mysql-util", - "mz-orchestrator-tracing", - "mz-ore", - "mz-persist", - "mz-persist-client", - "mz-persist-types", - "mz-pgcopy", - "mz-pid-file", - "mz-postgres-util", - "mz-repr", - "mz-rocksdb", - "mz-secrets", - "mz-service", - "mz-sql-parser", - "mz-ssh-util", - "mz-storage-client", - "mz-storage-operators", - "mz-storage-types", - "mz-timely-util", - "num_cpus", - "once_cell", - "postgres-protocol", - "prometheus", - "prost", - "protobuf-src", - "rand", - "rdkafka", - "regex", - "rocksdb", - "seahash", - "serde", - "serde_json", - "sha2", - "tempfile", - "thiserror", - "timely", - "tokio", - "tokio-postgres", - "tokio-stream", - "tokio-util", - "tonic-build", - "tracing", - "tracing-subscriber", - "url", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-storage-client" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "chrono", - "differential-dataflow", - "http", - "itertools", - "maplit", - "mz-ccsr", - "mz-cluster-client", - "mz-kafka-util", - "mz-ore", - "mz-persist-client", - "mz-persist-types", - "mz-proto", - "mz-repr", - "mz-service", - "mz-storage-types", - "mz-timely-util", - "once_cell", - "prometheus", - "proptest", - "prost", - "prost-build", - "protobuf-src", - "rdkafka", - "serde", - "serde_json", - "static_assertions", - "timely", - "tokio", - "tokio-stream", - "tonic", - "tonic-build", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-storage-controller" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "bytes", - "chrono", - "differential-dataflow", - "futures", - "itertools", - "mz-build-info", - "mz-cluster-client", - "mz-ore", - "mz-persist-client", - "mz-persist-txn", - "mz-persist-types", - "mz-proto", - "mz-repr", - "mz-service", - "mz-stash", - "mz-stash-types", - "mz-storage-client", - "mz-storage-types", - "mz-tls-util", - "once_cell", - "proptest", - "prost", - "serde", - "serde_json", - "timely", - "tokio", - "tokio-postgres", - "tokio-stream", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-storage-operators" -version = "0.0.0" -dependencies = [ - "async-stream", - "differential-dataflow", - "futures", - "mz-expr", - "mz-ore", - "mz-persist-client", - "mz-persist-txn", - "mz-persist-types", - "mz-repr", - "mz-storage-types", - "mz-timely-util", - "prometheus", - "proptest", - "serde", - "timely", - "tokio", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-storage-types" -version = "0.0.0" -dependencies = [ - "anyhow", - "aws-config", - "aws-credential-types", - "aws-sdk-sts", - "aws-types", - "base64 0.13.1", - "bytes", - "dec", - "derivative", - "differential-dataflow", - "fail", - "itertools", - "mysql_async", - "mz-aws-util", - "mz-ccsr", - "mz-cloud-resources", - "mz-expr", - "mz-interchange", - "mz-kafka-util", - "mz-mysql-util", - "mz-ore", - "mz-persist-client", - "mz-persist-txn", - "mz-persist-types", - "mz-postgres-util", - "mz-proto", - "mz-repr", - "mz-rocksdb-types", - "mz-secrets", - "mz-service", - "mz-ssh-util", - "mz-stash-types", - "mz-timely-util", - "mz-tracing", - "native-tls", - "num_enum", - "once_cell", - "openssl", - "proptest", - "proptest-derive", - "prost", - "prost-build", - "protobuf-src", - "rdkafka", - "scopeguard", - "serde", - "serde_json", - "thiserror", - "timely", - "tokio", - "tokio-postgres", - "tonic-build", - "tracing", - "url", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-test-macro" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", - "workspace-hack", -] - -[[package]] -name = "mz-test-util" -version = "0.0.0" -dependencies = [ - "anyhow", - "chrono", - "mz-kafka-util", - "mz-ore", - "rand", - "rdkafka", - "tokio", - "tokio-postgres", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-testdrive" -version = "0.84.2" -dependencies = [ - "anyhow", - "async-compression", - "async-trait", - "atty", - "aws-config", - "aws-credential-types", - "aws-sdk-sts", - "aws-types", - "byteorder", - "bytes", - "chrono", - "clap", - "flate2", - "futures", - "globset", - "hex", - "http", - "humantime", - "itertools", - "junit-report", - "maplit", - "md-5", - "mysql_async", - "mz-adapter", - "mz-avro", - "mz-aws-util", - "mz-build-info", - "mz-catalog", - "mz-ccsr", - "mz-expr", - "mz-interchange", - "mz-kafka-util", - "mz-ore", - "mz-persist-client", - "mz-persist-types", - "mz-pgrepr", - "mz-repr", - "mz-sql", - "mz-sql-parser", - "mz-stash", - "mz-storage-types", - "mz-tls-util", - "once_cell", - "postgres_array", - "prost", - "prost-reflect", - "protobuf-src", - "rand", - "rdkafka", - "regex", - "reqwest", - "serde", - "serde_json", - "similar", - "tempfile", - "termcolor", - "tiberius", - "time", - "tokio", - "tokio-postgres", - "tokio-stream", - "tokio-util", - "tracing", - "tracing-subscriber", - "url", - "uuid", - "walkdir", - "workspace-hack", -] - -[[package]] -name = "mz-timely-util" -version = "0.0.0" -dependencies = [ - "ahash", - "differential-dataflow", - "futures-util", - "mz-ore", - "num-traits", - "proptest", - "serde", - "timely", - "tokio", - "workspace-hack", -] - -[[package]] -name = "mz-timestamp-oracle" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "deadpool-postgres", - "dec", - "futures", - "mz-adapter-types", - "mz-ore", - "mz-pgrepr", - "mz-postgres-client", - "mz-repr", - "rand", - "serde", - "tokio", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "mz-tls-util" -version = "0.0.0" -dependencies = [ - "anyhow", - "openssl", - "openssl-sys", - "postgres-openssl", - "thiserror", - "tokio", - "tokio-postgres", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-tracing" -version = "0.0.0" -dependencies = [ - "anyhow", - "mz-ore", - "mz-proto", - "proptest", - "prost", - "prost-build", - "protobuf-src", - "serde", - "tonic-build", - "tracing", - "tracing-subscriber", - "workspace-hack", -] - -[[package]] -name = "mz-transform" -version = "0.0.0" -dependencies = [ - "anyhow", - "datadriven", - "differential-dataflow", - "enum-kinds", - "itertools", - "mz-compute-types", - "mz-expr", - "mz-expr-parser", - "mz-expr-test-util", - "mz-lowertest", - "mz-ore", - "mz-persist-client", - "mz-repr", - "num-traits", - "ordered-float", - "paste", - "proc-macro2", - "serde_json", - "tracing", - "workspace-hack", -] - -[[package]] -name = "mz-walkabout" -version = "0.0.0" -dependencies = [ - "anyhow", - "datadriven", - "itertools", - "mz-ore", - "quote", - "syn 1.0.107", - "tempfile", - "workspace-hack", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "nix" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset", - "pin-utils", - "static_assertions", -] - -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - -[[package]] -name = "nom" -version = "7.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "nonzero_ext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "ntapi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" -dependencies = [ - "winapi", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "oorandom" -version = "11.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcec7c9c2a95cacc7cd0ecb89d8a8454eca13906f6deb55258ffff0adeb9405" - -[[package]] -name = "open" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" -dependencies = [ - "pathdiff", - "windows-sys 0.42.0", -] - -[[package]] -name = "openssh" -version = "0.9.9" -source = "git+https://github.com/MaterializeInc/openssh.git#34404a274c5e1a7addd48940656fa12b7531e793" -dependencies = [ - "dirs", - "libc", - "once_cell", - "openssh-mux-client", - "shell-escape", - "tempfile", - "thiserror", - "tokio", - "tokio-pipe", -] - -[[package]] -name = "openssh-mux-client" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88eac793af6170bcd6d4f39c3b7ba3f4227cab5680d7189ba30f9d174600b75f" -dependencies = [ - "once_cell", - "sendfd", - "serde", - "ssh_format", - "thiserror", - "tokio", - "tokio-io-utility", - "typed-builder", -] - -[[package]] -name = "openssl" -version = "0.10.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "openssl-probe" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" - -[[package]] -name = "openssl-src" -version = "111.25.0+1.1.1t" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "opentelemetry" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" -dependencies = [ - "futures-core", - "futures-sink", - "indexmap 2.0.0", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - -[[package]] -name = "opentelemetry-otlp" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" -dependencies = [ - "async-trait", - "futures-core", - "http", - "opentelemetry", - "opentelemetry-proto", - "opentelemetry-semantic-conventions", - "opentelemetry_sdk", - "prost", - "thiserror", - "tokio", - "tonic", -] - -[[package]] -name = "opentelemetry-proto" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" -dependencies = [ - "opentelemetry", - "opentelemetry_sdk", - "prost", - "tonic", -] - -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" -dependencies = [ - "opentelemetry", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "glob", - "once_cell", - "opentelemetry", - "ordered-float", - "percent-encoding", - "rand", - "thiserror", - "tokio", - "tokio-stream", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-float" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" -dependencies = [ - "num-traits", - "rand", - "serde", -] - -[[package]] -name = "os_info" -version = "3.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" -dependencies = [ - "log", - "serde", - "winapi", -] - -[[package]] -name = "os_str_bytes" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" - -[[package]] -name = "output_vt100" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9" -dependencies = [ - "winapi", -] - -[[package]] -name = "outref" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "papergrid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1526bb6aa9f10ec339fb10360f22c57edf81d5678d0278e93bc12a47ffbe4b01" -dependencies = [ - "bytecount", - "fnv", - "unicode-width", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.10", - "smallvec", - "windows-sys 0.42.0", -] - -[[package]] -name = "parquet-format-safe" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1131c54b167dd4e4799ce762e1ab01549ebb94d5bdd13e6ec1b467491c378e1f" -dependencies = [ - "async-trait", - "futures", -] - -[[package]] -name = "parquet2" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aefc53bedbf9bbe0ff8912befafaafe30ced83851fb0aebe86696a9289ebb29e" -dependencies = [ - "async-stream", - "futures", - "parquet-format-safe", - "seq-macro", - "streaming-decompression", -] - -[[package]] -name = "parse-zoneinfo" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" -dependencies = [ - "regex", -] - -[[package]] -name = "paste" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" -dependencies = [ - "base64 0.21.5", - "serde", -] - -[[package]] -name = "pem-rfc7468" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "persistcli" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "axum", - "bytes", - "clap", - "differential-dataflow", - "futures", - "humantime", - "mz-http-util", - "mz-orchestrator-tracing", - "mz-ore", - "mz-persist", - "mz-persist-client", - "mz-persist-txn", - "mz-persist-types", - "num_cpus", - "num_enum", - "prometheus", - "serde", - "serde_json", - "timely", - "tokio", - "tracing", - "uuid", - "workspace-hack", -] - -[[package]] -name = "petgraph" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" -dependencies = [ - "fixedbitset", - "indexmap 1.9.1", -] - -[[package]] -name = "phf" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b450720b6f75cfbfabc195814bd3765f337a4f9a83186f8537297cac12f6705" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_shared" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" -dependencies = [ - "siphasher", - "uncased", -] - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[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 = "pkg-config" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" - -[[package]] -name = "planus" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1691dd09e82f428ce8d6310bd6d5da2557c82ff17694d2a32cad7242aea89f" -dependencies = [ - "array-init-cursor", -] - -[[package]] -name = "plotters" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" - -[[package]] -name = "plotters-svg" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "portable-atomic" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" - -[[package]] -name = "postgres" -version = "0.19.5" -source = "git+https://github.com/MaterializeInc/rust-postgres#b759caa33610403aa74b1cfdd37f45eb3100c9af" -dependencies = [ - "bytes", - "fallible-iterator", - "futures-util", - "log", - "tokio", - "tokio-postgres", -] - -[[package]] -name = "postgres-openssl" -version = "0.5.0" -source = "git+https://github.com/MaterializeInc/rust-postgres#b759caa33610403aa74b1cfdd37f45eb3100c9af" -dependencies = [ - "openssl", - "tokio", - "tokio-openssl", - "tokio-postgres", -] - -[[package]] -name = "postgres-protocol" -version = "0.6.5" -source = "git+https://github.com/MaterializeInc/rust-postgres#b759caa33610403aa74b1cfdd37f45eb3100c9af" -dependencies = [ - "base64 0.21.5", - "byteorder", - "bytes", - "fallible-iterator", - "hmac", - "md-5", - "memchr", - "rand", - "sha2", - "stringprep", -] - -[[package]] -name = "postgres-types" -version = "0.2.5" -source = "git+https://github.com/MaterializeInc/rust-postgres#b759caa33610403aa74b1cfdd37f45eb3100c9af" -dependencies = [ - "bytes", - "chrono", - "fallible-iterator", - "postgres-protocol", - "serde", - "serde_json", - "uuid", -] - -[[package]] -name = "postgres_array" -version = "0.11.0" -source = "git+https://github.com/MaterializeInc/rust-postgres-array#f58d0101e5198e04e8692629018d9b58f8543534" -dependencies = [ - "bytes", - "fallible-iterator", - "postgres-protocol", - "postgres-types", -] - -[[package]] -name = "pprof" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196ded5d4be535690899a4631cc9f18cdc41b7ebf24a79400f46f48e49a11059" -dependencies = [ - "backtrace", - "cfg-if", - "findshlibs", - "libc", - "log", - "nix", - "once_cell", - "parking_lot", - "smallvec", - "symbolic-demangle", - "tempfile", - "thiserror", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "predicates" -version = "2.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54fc5dc63ed3bbf19494623db4f3af16842c0d975818e469022d09e53f0aa05" -dependencies = [ - "difflib", - "float-cmp", - "itertools", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" - -[[package]] -name = "predicates-tree" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" -dependencies = [ - "predicates-core", - "treeline", -] - -[[package]] -name = "pretty" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55c4d17d994b637e2f4daf6e5dc5d660d209d5642377d675d7a1c3ab69fa579" -dependencies = [ - "arrayvec", - "typed-arena", - "unicode-width", -] - -[[package]] -name = "pretty-hex" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" - -[[package]] -name = "pretty_assertions" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" -dependencies = [ - "ctor", - "diff", - "output_vt100", - "yansi", -] - -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.107", -] - -[[package]] -name = "prettyplease" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" -dependencies = [ - "proc-macro2", - "syn 2.0.39", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.107", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[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 = "prometheus" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" -dependencies = [ - "cfg-if", - "fnv", - "lazy_static", - "memchr", - "parking_lot", - "thiserror", -] - -[[package]] -name = "proptest" -version = "1.0.0" -source = "git+https://github.com/MaterializeInc/proptest.git#4d8c406c32260484747c828050016de599b9f3a4" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "lazy_static", - "num-traits", - "quick-error", - "rand", - "rand_chacha", - "rand_xorshift", - "regex-syntax", -] - -[[package]] -name = "proptest-derive" -version = "0.3.0" -source = "git+https://github.com/MaterializeInc/proptest.git#4d8c406c32260484747c828050016de599b9f3a4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" -dependencies = [ - "bytes", - "heck", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease 0.1.25", - "prost", - "prost-types", - "regex", - "syn 1.0.107", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "prost-reflect" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000e1e05ebf7b26e1eba298e66fe4eee6eb19c567d0ffb35e0dd34231cdac4c8" -dependencies = [ - "base64 0.21.5", - "once_cell", - "prost", - "prost-types", - "serde", - "serde-value", -] - -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost", -] - -[[package]] -name = "protobuf-native" -version = "0.2.1+3.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86df76d0f2a6933036e8a9f28f1adc8b48081fa681dba07eaa30ac75663f7f4e" -dependencies = [ - "cxx", - "cxx-build", - "paste", - "pretty_assertions", - "protobuf-src", - "tempfile", -] - -[[package]] -name = "protobuf-src" -version = "1.1.0+21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1" -dependencies = [ - "autotools", -] - -[[package]] -name = "psm" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69" -dependencies = [ - "cc", -] - -[[package]] -name = "pulldown-cmark" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6" -dependencies = [ - "bitflags 1.3.2", - "memchr", - "unicase", -] - -[[package]] -name = "qcell" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f6c04aa3dea4dab485f6d87449ba94d5664c388c0f1fe2b07c4891175513345" -dependencies = [ - "exclusion-set", - "once_cell", -] - -[[package]] -name = "quanta" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" -dependencies = [ - "crossbeam-utils", - "libc", - "mach2", - "once_cell", - "raw-cpuid", - "wasi", - "web-sys", - "winapi", -] - -[[package]] -name = "quick-error" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda" - -[[package]] -name = "quick-xml" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -dependencies = [ - "memchr", -] - -[[package]] -name = "quickcheck" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" -dependencies = [ - "rand", -] - -[[package]] -name = "quote" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", - "serde", -] - -[[package]] -name = "rand_chacha" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" -dependencies = [ - "getrandom", - "serde", -] - -[[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core", -] - -[[package]] -name = "raw-cpuid" -version = "10.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "rayon" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "lazy_static", - "num_cpus", -] - -[[package]] -name = "rdkafka" -version = "0.29.0" -source = "git+https://github.com/MaterializeInc/rust-rdkafka.git#8ea07c4d2b96636ff093e670bc921892aee0d56a" -dependencies = [ - "futures-channel", - "futures-util", - "libc", - "log", - "rdkafka-sys", - "serde", - "serde_derive", - "serde_json", - "slab", - "tokio", -] - -[[package]] -name = "rdkafka-sys" -version = "4.3.0+1.9.2" -source = "git+https://github.com/MaterializeInc/rust-rdkafka.git#8ea07c4d2b96636ff093e670bc921892aee0d56a" -dependencies = [ - "cmake", - "libc", - "libz-sys", - "num_enum", - "openssl-sys", - "pkg-config", - "zstd-sys", -] - -[[package]] -name = "redox_syscall" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" -dependencies = [ - "getrandom", - "redox_syscall 0.2.10", -] - -[[package]] -name = "regex" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" -dependencies = [ - "byteorder", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" - -[[package]] -name = "regex-lite" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "reqwest" -version = "0.11.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" -dependencies = [ - "base64 0.13.1", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "mime_guess", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "reqwest-middleware" -version = "0.2.3" -source = "git+https://github.com/MaterializeInc/reqwest-middleware.git#1c44c7ddbf4954cc2d4de73a760b9a8d84827349" -dependencies = [ - "anyhow", - "async-trait", - "http", - "reqwest", - "serde", - "task-local-extensions", - "thiserror", -] - -[[package]] -name = "reqwest-retry" -version = "0.2.2" -source = "git+https://github.com/MaterializeInc/reqwest-middleware.git#1c44c7ddbf4954cc2d4de73a760b9a8d84827349" -dependencies = [ - "anyhow", - "async-trait", - "chrono", - "futures", - "http", - "hyper", - "reqwest", - "reqwest-middleware", - "retry-policies", - "task-local-extensions", - "tokio", - "tracing", -] - -[[package]] -name = "retain_mut" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" - -[[package]] -name = "retry-policies" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09bbcb5003282bcb688f0bae741b278e9c7e8f378f561522c9806c58e075d9b" -dependencies = [ - "anyhow", - "chrono", - "rand", -] - -[[package]] -name = "ring" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" -dependencies = [ - "cc", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.48.0", -] - -[[package]] -name = "rlimit" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7278a1ec8bfd4a4e07515c589f5ff7b309a373f987393aef44813d9dcf87aa3" -dependencies = [ - "libc", -] - -[[package]] -name = "rocksdb" -version = "0.21.0" -source = "git+https://github.com/MaterializeInc/rust-rocksdb?branch=master#3305d514d509c6b95b0c925c78157e5e4ae4b7ba" -dependencies = [ - "libc", - "librocksdb-sys", -] - -[[package]] -name = "ropey" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ce7a2c43a32e50d666e33c5a80251b31147bb4b49024bcab11fb6f20c671ed" -dependencies = [ - "smallvec", - "str_indices", -] - -[[package]] -name = "rpassword" -version = "7.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" -dependencies = [ - "libc", - "rtoolbox", - "winapi", -] - -[[package]] -name = "rtoolbox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.4", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys 0.4.12", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustversion" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" - -[[package]] -name = "ryu" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" - -[[package]] -name = "same-file" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "saturating" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71" - -[[package]] -name = "schannel" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19" -dependencies = [ - "lazy_static", - "winapi", -] - -[[package]] -name = "scheduled-thread-pool" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf" -dependencies = [ - "parking_lot", -] - -[[package]] -name = "schemars" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307" -dependencies = [ - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", - "uuid", -] - -[[package]] -name = "schemars_derive" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 1.0.107", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96311ef4a16462c757bb6a39152c40f58f31cd2602a40fceb937e2bc34e6cbab" - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "sec1" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" -dependencies = [ - "der", - "generic-array", -] - -[[package]] -name = "secrecy" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" -dependencies = [ - "serde", - "zeroize", -] - -[[package]] -name = "security-framework" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "segment" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fc91c898e0487ff3e471d0849bbaf7d38a00ff5e3531009d386b0bab9b6b12" -dependencies = [ - "async-trait", - "reqwest", - "serde", - "serde_json", - "thiserror", - "time", -] - -[[package]] -name = "semver" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" -dependencies = [ - "serde", -] - -[[package]] -name = "sendfd" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" -dependencies = [ - "libc", - "tokio", -] - -[[package]] -name = "sentry" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ad137b9df78294b98cab1a650bef237cc6c950e82e5ce164655e674d07c5cc" -dependencies = [ - "httpdate", - "native-tls", - "reqwest", - "sentry-backtrace", - "sentry-contexts", - "sentry-core", - "sentry-debug-images", - "sentry-panic", - "tokio", - "ureq", -] - -[[package]] -name = "sentry-backtrace" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe4800806552aab314129761d5d3b3d422284eca3de2ab59e9fd133636cbd3d" -dependencies = [ - "backtrace", - "once_cell", - "regex", - "sentry-core", -] - -[[package]] -name = "sentry-contexts" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a42938426670f6e7974989cd1417837a96dd8bbb01567094f567d6acb360bf88" -dependencies = [ - "hostname", - "libc", - "os_info", - "rustc_version", - "sentry-core", - "uname", -] - -[[package]] -name = "sentry-core" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df9b9d8de2658a1ecd4e45f7b06c80c5dd97b891bfbc7c501186189b7e9bbdf" -dependencies = [ - "once_cell", - "rand", - "sentry-types", - "serde", - "serde_json", -] - -[[package]] -name = "sentry-debug-images" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3995208135571444b7d5a247f42bd36677553bb64185d85b317acdc1789749b3" -dependencies = [ - "findshlibs", - "once_cell", - "sentry-core", -] - -[[package]] -name = "sentry-panic" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0af37b8500f273e511ebd6eb0d342ff7937d64ce3f134764b2b4653112d48cb4" -dependencies = [ - "sentry-backtrace", - "sentry-core", -] - -[[package]] -name = "sentry-tracing" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63fc83ec2cf38726bd18cb1943ff11555b07fd5034cb68b10958ab32e2863a1f" -dependencies = [ - "sentry-core", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "sentry-types" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc95faa4078768a6bf8df45e2b894bbf372b3dbbfb364e9429c1c58ab7545c6" -dependencies = [ - "debugid", - "getrandom", - "hex", - "serde", - "serde_json", - "thiserror", - "time", - "url", - "uuid", -] - -[[package]] -name = "seq-macro" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0772c5c30e1a0d91f6834f8e545c69281c099dfa9a3ac58d96a9fd629c8d4898" - -[[package]] -name = "serde" -version = "1.0.164" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-aux" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3dfe1b7eb6f9dcf011bd6fad169cdeaae75eda0d61b1a99a3f015b41b0cae39" -dependencies = [ - "chrono", - "serde", - "serde_json", -] - -[[package]] -name = "serde-value" -version = "0.7.0" -source = "git+https://github.com/MaterializeInc/serde-value.git#a84c6b71825efaffb332c0d19f18c2bdf9ee7b40" -dependencies = [ - "ordered-float", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.164" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "serde_derive_internals" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "serde_json" -version = "1.0.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" -dependencies = [ - "indexmap 2.0.0", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_plain" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6018081315db179d0ce57b1fe4b62a12a0028c9cf9bbef868c9cf477b3c34ae" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_regex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" -dependencies = [ - "regex", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0a21fba416426ac927b1691996e82079f8b6156e920c85345f135b2e9ba2de" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "serde_spanned" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" -dependencies = [ - "base64 0.13.1", - "chrono", - "hex", - "indexmap 1.9.1", - "serde", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "serde_yaml" -version = "0.9.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" -dependencies = [ - "indexmap 2.0.0", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shell-escape" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[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 = "signature" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" - -[[package]] -name = "simdutf8" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970da16e7c682fa90a261cf0724dee241c9f7831635ecc4e988ae8f3b505559" - -[[package]] -name = "similar" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" -dependencies = [ - "bstr 0.2.14", - "unicode-segmentation", -] - -[[package]] -name = "similar-asserts" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf644ad016b75129f01a34a355dcb8d66a5bc803e417c7a77cc5d5ee9fa0f18" -dependencies = [ - "console", - "similar", -] - -[[package]] -name = "simple_asn1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a762b1c38b9b990c694b9c2f8abe3372ce6a9ceaae6bca39cfc46e054f45745" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror", - "time", -] - -[[package]] -name = "siphasher" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7" - -[[package]] -name = "skeptic" -version = "0.13.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" -dependencies = [ - "bytecount", - "cargo_metadata", - "error-chain", - "glob", - "pulldown-cmark", - "tempfile", - "walkdir", -] - -[[package]] -name = "slab" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" -dependencies = [ - "serde", -] - -[[package]] -name = "snap" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "ssh-key" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02d3730e8785e797a4552137d1acc0d7f7146dad3b5fe65ed83637711dfc6c5" -dependencies = [ - "base64ct", - "pem-rfc7468", - "rand_core", - "sec1", - "sha2", - "signature", - "zeroize", -] - -[[package]] -name = "ssh_format" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8701239872766d43b8a5f9a560ff7f002b48064fadea87f44a70507069fb482" -dependencies = [ - "serde", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "stacker" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "winapi", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "str_indices" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f026164926842ec52deb1938fae44f83dfdb82d0a5b0270c5bd5935ab74d6dd" - -[[package]] -name = "streaming-decompression" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bc687acd5dc742c4a7094f2927a8614a68e4743ef682e7a2f9f0f711656cc92" -dependencies = [ - "fallible-streaming-iterator", -] - -[[package]] -name = "streaming-iterator" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "303235c177994a476226b80d076bd333b7b560fb05bd242a10609d11b07f81f5" - -[[package]] -name = "stringprep" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "strip-ansi-escapes" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" -dependencies = [ - "vte", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subprocess" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "symbolic-common" -version = "10.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d7c8cd6663e22c348c74cf0b2c77d196fd252c7efe5594ae05edb07d0475da" -dependencies = [ - "debugid", - "memmap2", - "stable_deref_trait", - "uuid", -] - -[[package]] -name = "symbolic-demangle" -version = "10.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86dc78e43163d342e72c0175113cf0c6ffc6b2540163c8680c4ed91c992af9e2" -dependencies = [ - "cpp_demangle", - "rustc-demangle", - "symbolic-common", -] - -[[package]] -name = "syn" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" - -[[package]] -name = "synstructure" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", - "unicode-xid", -] - -[[package]] -name = "sysctl" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed66d6a2ccbd656659289bc90767895b7abbdec897a0fc6031aca3ed1cb51d3e" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "enum-as-inner", - "libc", - "thiserror", - "walkdir", -] - -[[package]] -name = "sysinfo" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17351d0e9eb8841897b14e9669378f3c69fb57779cc04f8ca9a9d512edfb2563" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "rayon", - "winapi", -] - -[[package]] -name = "tabled" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c3ee73732ffceaea7b8f6b719ce3bb17f253fa27461ffeaf568ebd0cdb4b85" -dependencies = [ - "papergrid", - "tabled_derive", - "unicode-width", -] - -[[package]] -name = "tabled_derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beca1b4eaceb4f2755df858b88d9b9315b7ccfd1ffd0d7a48a52602301f01a57" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "tagptr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "task-local-extensions" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" -dependencies = [ - "pin-utils", -] - -[[package]] -name = "tempfile" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.4.1", - "rustix 0.38.21", - "windows-sys 0.48.0", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" -dependencies = [ - "rustix 0.37.15", - "windows-sys 0.48.0", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" -dependencies = [ - "terminal_size", -] - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "thread_local" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" -dependencies = [ - "once_cell", -] - -[[package]] -name = "tiberius" -version = "0.11.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66303a42b7c5daffb95c10cd8f3007a9c29b3e90128cf42b3738f58102aa2516" -dependencies = [ - "async-trait", - "asynchronous-codec", - "byteorder", - "bytes", - "connection-string", - "encoding", - "enumflags2", - "futures", - "futures-sink", - "futures-util", - "num-traits", - "once_cell", - "pin-project-lite", - "pretty-hex", - "thiserror", - "tracing", - "uuid", -] - -[[package]] -name = "tikv-jemalloc-ctl" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" -dependencies = [ - "libc", - "paste", - "tikv-jemalloc-sys", -] - -[[package]] -name = "tikv-jemalloc-sys" -version = "0.5.2+5.3.0-patched" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3" -dependencies = [ - "cc", - "fs_extra", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - -[[package]] -name = "time" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" -dependencies = [ - "itoa", - "quickcheck", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" -dependencies = [ - "time-core", -] - -[[package]] -name = "timely" -version = "0.12.0" -source = "git+https://github.com/MaterializeInc/timely-dataflow.git#de20aa88cc6df3de910e9befbe68408d31e287be" -dependencies = [ - "abomonation", - "abomonation_derive", - "crossbeam-channel", - "futures-util", - "getopts", - "serde", - "serde_derive", - "timely_bytes", - "timely_communication", - "timely_container", - "timely_logging", -] - -[[package]] -name = "timely_bytes" -version = "0.12.0" -source = "git+https://github.com/MaterializeInc/timely-dataflow.git#de20aa88cc6df3de910e9befbe68408d31e287be" - -[[package]] -name = "timely_communication" -version = "0.12.0" -source = "git+https://github.com/MaterializeInc/timely-dataflow.git#de20aa88cc6df3de910e9befbe68408d31e287be" -dependencies = [ - "abomonation", - "abomonation_derive", - "bincode", - "crossbeam-channel", - "getopts", - "serde", - "serde_derive", - "timely_bytes", - "timely_logging", -] - -[[package]] -name = "timely_container" -version = "0.12.0" -source = "git+https://github.com/MaterializeInc/timely-dataflow.git#de20aa88cc6df3de910e9befbe68408d31e287be" -dependencies = [ - "columnation", - "serde", -] - -[[package]] -name = "timely_logging" -version = "0.12.0" -source = "git+https://github.com/MaterializeInc/timely-dataflow.git#de20aa88cc6df3de910e9befbe68408d31e287be" - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinytemplate" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.3", - "tokio-macros", - "tracing", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90c49f106be240de154571dd31fbe48acb10ba6c6dd6f6517ad603abffa42de9" -dependencies = [ - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-io-utility" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d672654d175710e52c7c41f6aec77c62b3c0954e2a7ebce9049d1e94ed7c263" -dependencies = [ - "tokio", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "tokio-metrics" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4b2fc67d5dec41db679b9b052eb572269616926040b7831e32c8a152df77b84" -dependencies = [ - "futures-util", - "pin-project-lite", - "tokio", - "tokio-stream", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-openssl" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" -dependencies = [ - "futures-util", - "openssl", - "openssl-sys", - "tokio", -] - -[[package]] -name = "tokio-pipe" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f213a84bffbd61b8fa0ba8a044b4bbe35d471d0b518867181e82bd5c15542784" -dependencies = [ - "libc", - "tokio", -] - -[[package]] -name = "tokio-postgres" -version = "0.7.8" -source = "git+https://github.com/MaterializeInc/rust-postgres#b759caa33610403aa74b1cfdd37f45eb3100c9af" -dependencies = [ - "async-trait", - "byteorder", - "bytes", - "fallible-iterator", - "futures-channel", - "futures-util", - "log", - "parking_lot", - "percent-encoding", - "phf", - "pin-project-lite", - "postgres-protocol", - "postgres-types", - "serde", - "socket2 0.5.3", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-stream" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-test" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" -dependencies = [ - "async-stream", - "bytes", - "futures-core", - "tokio", - "tokio-stream", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "pin-project-lite", - "slab", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" -dependencies = [ - "indexmap 2.0.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tonic" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" -dependencies = [ - "async-trait", - "axum", - "base64 0.21.5", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tonic-build" -version = "0.9.2" -source = "git+https://github.com/MaterializeInc/tonic?rev=0d86e360ab45779770ca150c8487fe7940c299a9#0d86e360ab45779770ca150c8487fe7940c299a9" -dependencies = [ - "prettyplease 0.1.25", - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.1", - "pin-project", - "pin-project-lite", - "rand", - "slab", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" -dependencies = [ - "base64 0.21.5", - "bitflags 2.4.1", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "mime", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-lsp" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508" -dependencies = [ - "async-trait", - "auto_impl", - "bytes", - "dashmap", - "futures", - "httparse", - "lsp-types", - "memchr", - "serde", - "serde_json", - "tokio", - "tokio-util", - "tower", - "tower-lsp-macros", - "tracing", -] - -[[package]] -name = "tower-lsp-macros" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "tower-service" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-opentelemetry" -version = "0.22.0" -source = "git+https://github.com/MaterializeInc/tracing-opentelemetry.git#7035e641b683985cc3b8630f3b61d53c96f83695" -dependencies = [ - "js-sys", - "once_cell", - "opentelemetry", - "opentelemetry_sdk", - "smallvec", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", - "web-time", -] - -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", - "tracing-serde", -] - -[[package]] -name = "treediff" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" -dependencies = [ - "serde_json", -] - -[[package]] -name = "treeline" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" - -[[package]] -name = "triomphe" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1ee9bd9239c339d714d657fac840c6d2a4f9c45f4f9ec7b0975113458be78db" - -[[package]] -name = "try-lock" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" - -[[package]] -name = "tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "twox-hash" -version = "1.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" -dependencies = [ - "cfg-if", - "rand", - "static_assertions", -] - -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "typed-builder" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - -[[package]] -name = "uncased" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-ident" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" - -[[package]] -name = "unicode-normalization" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "ureq" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f" -dependencies = [ - "base64 0.13.1", - "chunked_transfer", - "log", - "native-tls", - "once_cell", - "url", -] - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "urlencoding" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" -dependencies = [ - "getrandom", - "serde", - "sha1_smol", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vsimd" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" - -[[package]] -name = "vte" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" -dependencies = [ - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[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.39", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35" -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.39", - "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.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "which" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" -dependencies = [ - "either", - "lazy_static", - "libc", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winnow" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "workspace-hack" -version = "0.0.0" -dependencies = [ - "ahash", - "anyhow", - "async-compression", - "aws-config", - "aws-credential-types", - "aws-runtime", - "aws-sdk-sts", - "aws-sigv4", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "axum", - "bitflags 2.4.1", - "bstr 0.2.14", - "byteorder", - "bytes", - "cc", - "chrono", - "clap", - "console", - "criterion", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-utils", - "crypto-common", - "debugid", - "dec", - "digest", - "either", - "flate2", - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", - "globset", - "hashbrown 0.14.0", - "hyper", - "indexmap 1.9.1", - "itertools", - "k8s-openapi", - "kube", - "kube-client", - "kube-core", - "libc", - "libz-sys", - "log", - "memchr", - "mime_guess", - "mio", - "mysql_async", - "mysql_common", - "native-tls", - "nix", - "nom", - "num-bigint", - "num-integer", - "num-traits", - "once_cell", - "openssl", - "openssl-sys", - "ordered-float", - "parking_lot", - "phf", - "phf_shared", - "postgres", - "postgres-types", - "predicates", - "proc-macro2", - "prost", - "prost-reflect", - "prost-types", - "quote", - "rand", - "rand_chacha", - "rdkafka-sys", - "regex", - "regex-syntax", - "reqwest", - "ring", - "schemars", - "scopeguard", - "security-framework", - "semver", - "serde", - "serde_json", - "sha2", - "similar", - "smallvec", - "socket2 0.5.3", - "subtle", - "syn 1.0.107", - "syn 2.0.39", - "textwrap", - "tikv-jemalloc-sys", - "time", - "time-macros", - "timely", - "timely_communication", - "tokio", - "tokio-postgres", - "tokio-stream", - "tokio-util", - "toml_datetime", - "toml_edit", - "tower", - "tower-http", - "tracing", - "tracing-core", - "tracing-subscriber", - "tungstenite", - "uncased", - "url", - "uuid", - "zeroize", - "zstd-sys", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "xattr" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" -dependencies = [ - "libc", -] - -[[package]] -name = "xmlparser" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "zeroize" -version = "1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" -dependencies = [ - "serde", -] - -[[package]] -name = "zstd" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" -dependencies = [ - "zstd-safe 6.0.6", -] - -[[package]] -name = "zstd" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" -dependencies = [ - "zstd-safe 7.0.0", -] - -[[package]] -name = "zstd-safe" -version = "6.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-safe" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix index 7a59b075617a..725644309926 100644 --- a/pkgs/by-name/ma/materialize/package.nix +++ b/pkgs/by-name/ma/materialize/package.nix @@ -118,26 +118,8 @@ rustPlatform.buildRustPackage rec { CARGO_FEATURE_DYNAMIC_LINKING = 1; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "columnation-0.1.0" = "sha256-VRDQqIVLayEnMHeth4cjsS/FYah3B3mwYEGnv8jpKs8="; - "differential-dataflow-0.12.0" = "sha256-cEmtDXOZSy4rDFZ7gCd7lx6wH+m1S9vphjb+wO4MSAM="; - "eventsource-client-0.11.0" = "sha256-FeEWV2yy1et5mna0TyAnakXlcIR42Aq97Lfjjlom8T0="; - "launchdarkly-server-sdk-1.0.0" = "sha256-fSWiV9mNf5WBkWDNckiUR3URQ8lJ4GZURxbYO/753sU="; - "librocksdb-sys-0.11.0+8.3.2" = "sha256-bnAvH2z9n26MYFhTN/+Yz+7lEdNKKmHJOoHkxTdZGvw="; - "openssh-0.9.9" = "sha256-2jaQN6PhavUtlWwqCn2VXEg213uj7BQ+FIrhnL3rb8Q="; - "postgres-0.19.5" = "sha256-i0mURHTCMrgaW1DD1CihWMdZ3zoNI14dCpq/ja8RW9E="; - "postgres_array-0.11.0" = "sha256-ealgPVExRIFUt0QVao8H7Q7u/PTuCbpGrk6Tm5jVwZ0="; - "proptest-1.0.0" = "sha256-sJbPQIVeHZZiRXssRpJWRbD9l8QnfwVcpGu6knjAe5o="; - "rdkafka-0.29.0" = "sha256-48CMvJ4PoVfKyiNMSpCGBtj36j2CF1E8a/QQ/urfiPc="; - "reqwest-middleware-0.2.3" = "sha256-zzlQycH5dmgM8ew1gy8m5r6Q2ib7LXnUeX69M3ih+sY="; - "serde-value-0.7.0" = "sha256-ewEYsf1+9MmLuSm5KbO326ngGB79i00lAp2NMHuuxw8="; - "timely-0.12.0" = "sha256-wJtHJ9ygPVusN5Io8SjZGo1r7lcrrcauESSC+9038AU="; - "tonic-build-0.9.2" = "sha256-cGvHjgmdr3NU1phwUfMvEE6uU12fOlhTlL2LoWeOO4I="; - "tracing-opentelemetry-0.22.0" = "sha256-mawDGrue/e3dPYVG0ANs9nZ+xmQyd1YTWH8QmE6VD0U="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-EHVuwVYPZKaoP3GYtJpYJaKG3CLsy9CWuEmajF4P7Qc="; nativeBuildInputs = [ From 85bd7b3bce73d8af44460e6b2f62c537eba9e64b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 3 Dec 2024 19:03:42 +0100 Subject: [PATCH 0613/1054] materialize: fix build on darwin --- pkgs/by-name/ma/materialize/package.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix index 725644309926..f52fb40e64fe 100644 --- a/pkgs/by-name/ma/materialize/package.nix +++ b/pkgs/by-name/ma/materialize/package.nix @@ -12,10 +12,12 @@ pkg-config, darwin, -# buildInputs + # buildInputs libclang, openssl, rdkafka, + apple-sdk_11, + darwinMinVersionHook, }: let @@ -134,11 +136,17 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; - buildInputs = [ - libclang - openssl - rdkafka - ]; + buildInputs = + [ + libclang + openssl + rdkafka + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer + apple-sdk_11 + (darwinMinVersionHook "10.13") + ]; # the check phase requires linking with rocksdb which can be a problem since # the rust rocksdb crate is not updated very often. From 560b52ac96c82f86f6f7c045d86798e8a59d8444 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 3 Dec 2024 19:03:56 +0100 Subject: [PATCH 0614/1054] materialize: drop useless libclang --- pkgs/by-name/ma/materialize/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix index f52fb40e64fe..90afc8e69616 100644 --- a/pkgs/by-name/ma/materialize/package.nix +++ b/pkgs/by-name/ma/materialize/package.nix @@ -13,7 +13,6 @@ darwin, # buildInputs - libclang, openssl, rdkafka, apple-sdk_11, @@ -138,7 +137,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ - libclang openssl rdkafka ] From fcf5d17df5f539cf16ac6870cdfd35b3360d50d9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 08:38:39 +0100 Subject: [PATCH 0615/1054] materialize: add versionCheckHook --- pkgs/by-name/ma/materialize/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix index 90afc8e69616..7c3d52ae62bb 100644 --- a/pkgs/by-name/ma/materialize/package.nix +++ b/pkgs/by-name/ma/materialize/package.nix @@ -17,6 +17,8 @@ rdkafka, apple-sdk_11, darwinMinVersionHook, + + versionCheckHook, }: let @@ -168,6 +170,13 @@ rustPlatform.buildRustPackage rec { install --mode=444 -D ./misc/dist/materialized.service $out/etc/systemd/system/materialized.service ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/environmentd"; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + meta = { homepage = "https://materialize.com"; description = "Streaming SQL materialized view engine for real-time applications"; From 017d36cb17ffbe882cd32447144287359c99b4f9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 08:38:45 +0100 Subject: [PATCH 0616/1054] materialize: add nix-update-script --- pkgs/by-name/ma/materialize/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix index 7c3d52ae62bb..4847c3dff08d 100644 --- a/pkgs/by-name/ma/materialize/package.nix +++ b/pkgs/by-name/ma/materialize/package.nix @@ -19,6 +19,7 @@ darwinMinVersionHook, versionCheckHook, + nix-update-script, }: let @@ -177,6 +178,10 @@ rustPlatform.buildRustPackage rec { versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { homepage = "https://materialize.com"; description = "Streaming SQL materialized view engine for real-time applications"; From 61edc1b4e370a556547567b8e0125e922f3c2340 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Dec 2024 15:30:01 +0100 Subject: [PATCH 0617/1054] typstyle: 0.12.6 -> 0.12.7 Diff: https://github.com/Enter-tainer/typstyle/compare/refs/tags/v0.12.6...v0.12.7 Changelog: https://github.com/Enter-tainer/typstyle/blob/refs/tags/v0.12.7/CHANGELOG.md --- pkgs/by-name/ty/typstyle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 8cefde72fe2a..546fc7f84688 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.12.6"; + version = "0.12.7"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "refs/tags/v${version}"; - hash = "sha256-g7GudDxmTq7dRjrVrUAxJXaduQbX/g0By+hNhzicn+g="; + hash = "sha256-sezpyp5Nev9i1pxCbFSQcm551VEHPmuP1ouCusNt7h8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-e9//IvqACYErcxC7s4+PGyw6S+4xtrbfu1io0X4iR9k="; + cargoHash = "sha256-sm9U+Y21+m8Tmj5rhJ18iRSp1DACAisRUzNQpA+EG6g="; # Disabling tests requiring network access checkFlags = [ From c378f493f3815d94be74baafa72926e3d5f8e29a Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 4 Dec 2024 19:00:31 -0500 Subject: [PATCH 0618/1054] terraform: 1.10.0 -> 1.10.1 Diff: https://github.com/hashicorp/terraform/compare/v1.10.0...v1.10.1 Changelog: https://github.com/hashicorp/terraform/blob/v1.10.1/CHANGELOG.md --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 92ff4ad46c1d..49a4042c2215 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -165,9 +165,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.10.0"; - hash = "sha256-GvFBefp1RWqgB79Sv+2vYZyTjeLEYNsXFJrJxEUJAlY="; - vendorHash = "sha256-UmPnOfjR6kYI0TMH2J54LzDeDGJKMkAC0xZk6xstIuk="; + version = "1.10.1"; + hash = "sha256-fOilZJbkPkGNcnKYBZtH81YE+XHsXsvxFAMt6YRcJCo="; + vendorHash = "sha256-AajBuUwOhK0OniRRfCqR89+mA9LnQBkbG3Xge9c0qSQ="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; From 880661b8422d934f1ebc94d5f08676d837f958b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 00:30:39 +0000 Subject: [PATCH 0619/1054] reviewdog: 0.20.2 -> 0.20.3 --- pkgs/by-name/re/reviewdog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/reviewdog/package.nix b/pkgs/by-name/re/reviewdog/package.nix index ec81d929a351..5bd179d231c0 100644 --- a/pkgs/by-name/re/reviewdog/package.nix +++ b/pkgs/by-name/re/reviewdog/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-UB2cylJn90TE3ng9JaPwmpbkhuPOmRnlS/eCZSjfqwQ="; + hash = "sha256-B0gu6vhbnhMx2CNQzQlIIwsycBup6bnmAk/1C6F/AWE="; }; - vendorHash = "sha256-hFmUhA35J1c2Mp7SeaJF4+Jid8GfdsEiF7lEdPoYbS4="; + vendorHash = "sha256-k7o2r9CQNDVGgCGoYZ02nK443eolN+UGdEp2ItEkURg="; doCheck = false; From b5ef4ed35c5698c1dca77ef6e1aa7bbf92d228fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 00:32:09 +0000 Subject: [PATCH 0620/1054] python312Packages.blis: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/blis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 26cb315a62e0..a752b34d1153 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "blis"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "explosion"; repo = "cython-blis"; rev = "refs/tags/release-v${version}"; - hash = "sha256-8JaQgTda1EBiZdSrZtKwJ8e/aDENQ+dMmTiH/t1ax5I="; + hash = "sha256-J/EaJNmImcK4zScpbYPlQuoLyjoUkUgxUp6926P6rUQ="; }; postPatch = '' From ee1c6b63845918ebcfe1e654e8f7c27cd94fcc7d Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 4 Dec 2024 19:33:25 -0500 Subject: [PATCH 0621/1054] turbo: importCargoLock -> fetchCargoVendor --- pkgs/by-name/tu/turbo-unwrapped/Cargo.lock | 7596 ------------------- pkgs/by-name/tu/turbo-unwrapped/package.nix | 8 +- 2 files changed, 2 insertions(+), 7602 deletions(-) delete mode 100644 pkgs/by-name/tu/turbo-unwrapped/Cargo.lock diff --git a/pkgs/by-name/tu/turbo-unwrapped/Cargo.lock b/pkgs/by-name/tu/turbo-unwrapped/Cargo.lock deleted file mode 100644 index eb3a70c08094..000000000000 --- a/pkgs/by-name/tu/turbo-unwrapped/Cargo.lock +++ /dev/null @@ -1,7596 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d713b3834d76b85304d4d525563c1276e2e30dc97cc67bfb4585a4a29fc2c89f" -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 = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" -dependencies = [ - "backtrace", -] - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "ascii_utils" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a" - -[[package]] -name = "assert-json-diff" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "assert_cmd" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" -dependencies = [ - "anstyle", - "bstr 1.8.0", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "ast_node" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9184f2b369b3e8625712493c89b785881f27eedc6cde480a81883cef78868b2" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.58", -] - -[[package]] -name = "async-channel" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-executor" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" -dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand 1.9.0", - "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-graphql" -version = "7.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b76aba2f176af685c2229633881a3adeae51f87ae1811781e73910b7001c93e" -dependencies = [ - "async-graphql-derive", - "async-graphql-parser", - "async-graphql-value", - "async-stream", - "async-trait", - "base64 0.22.1", - "bytes", - "fast_chemail", - "fnv", - "futures-util", - "handlebars", - "http 1.1.0", - "indexmap 2.2.6", - "mime", - "multer", - "num-traits", - "once_cell", - "pin-project-lite", - "regex", - "serde", - "serde_json", - "serde_urlencoded", - "static_assertions_next", - "tempfile", - "thiserror", -] - -[[package]] -name = "async-graphql-axum" -version = "7.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686e48ce7820a1cf404b5c8e9b90ae24d03c867a408d8d651183945c7a554982" -dependencies = [ - "async-graphql", - "async-trait", - "axum 0.7.5", - "bytes", - "futures-util", - "serde_json", - "tokio", - "tokio-stream", - "tokio-util", - "tower-service", -] - -[[package]] -name = "async-graphql-derive" -version = "7.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e2e26a6b44bc61df3ca8546402cf9204c28e30c06084cc8e75cd5e34d4f150" -dependencies = [ - "Inflector", - "async-graphql-parser", - "darling", - "proc-macro-crate", - "proc-macro2", - "quote", - "strum", - "syn 2.0.58", - "thiserror", -] - -[[package]] -name = "async-graphql-parser" -version = "7.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f801451484b4977d6fe67b29030f81353cabdcbb754e5a064f39493582dac0cf" -dependencies = [ - "async-graphql-value", - "pest", - "serde", - "serde_json", -] - -[[package]] -name = "async-graphql-value" -version = "7.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69117c43c01d81a69890a9f5dd6235f2f027ca8d1ec62d6d3c5e01ca0edb4f2b" -dependencies = [ - "bytes", - "indexmap 2.2.6", - "serde", - "serde_json", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite", - "log", - "parking", - "polling", - "rustix 0.37.23", - "slab", - "socket2 0.4.9", - "waker-fn", -] - -[[package]] -name = "async-lock" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-object-pool" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb901c30ebc2fc4ab46395bbfbdba9542c16559d853645d75190c3056caf3bc" -dependencies = [ - "async-std", -] - -[[package]] -name = "async-once-cell" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" - -[[package]] -name = "async-process" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4" -dependencies = [ - "async-io", - "async-lock", - "autocfg", - "blocking", - "cfg-if", - "event-listener", - "futures-lite", - "libc", - "signal-hook", - "windows-sys 0.42.0", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "async-process", - "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-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "async-task" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" - -[[package]] -name = "async-trait" -version = "0.1.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "atomic-waker" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "auto_impl" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "axum" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f8ccfd9221ee7d1f3d4b33e1f8319b3a81ed8f61f2ea40b37b859794b4491" -dependencies = [ - "async-trait", - "axum-core 0.3.3", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http 0.2.11", - "http-body 0.4.5", - "hyper 0.14.28", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper 0.1.2", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" -dependencies = [ - "async-trait", - "axum-core 0.4.3", - "base64 0.21.4", - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.4.1", - "hyper-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sha1", - "sync_wrapper 1.0.1", - "tokio", - "tokio-tungstenite", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-core" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2f958c80c248b34b9a877a643811be8dbca03ca5ba827f2b63baf3a81e5fc4e" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 0.2.11", - "http-body 0.4.5", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper 0.1.2", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-server" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bace45b270e36e3c27a190c65883de6dfc9f1d18c829907c127464815dc67b24" -dependencies = [ - "bytes", - "futures-util", - "http 0.2.11", - "http-body 0.4.5", - "hyper 0.14.28", - "tokio", - "tower-service", -] - -[[package]] -name = "axum-server" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56bac90848f6a9393ac03c63c640925c4b7c8ca21654de40d53f55964667c7d8" -dependencies = [ - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.4.1", - "hyper-util", - "pin-project-lite", - "tokio", - "tower", - "tower-service", -] - -[[package]] -name = "backtrace" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "backtrace-ext" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" -dependencies = [ - "backtrace", -] - -[[package]] -name = "base-encode" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17bd29f7c70f32e9387f4d4acfa5ea7b7749ef784fb78cf382df97069337b8c" - -[[package]] -name = "base64" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "better_scoped_tls" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de" -dependencies = [ - "scoped-tls", -] - -[[package]] -name = "biome_console" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c672a9e31e47f8df74549a570ea3245a93ce3404115c724bb16762fcbbfe17e1" -dependencies = [ - "biome_markup", - "biome_text_size", - "schemars", - "serde", - "termcolor", - "unicode-segmentation", - "unicode-width", -] - -[[package]] -name = "biome_deserialize" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f619dc8ca0595ed8850d729ebc71722d4233aba68c5aec7d9993a53e59f3fe" -dependencies = [ - "biome_console", - "biome_deserialize_macros", - "biome_diagnostics", - "biome_json_parser", - "biome_json_syntax", - "biome_rowan", - "bitflags 2.5.0", - "indexmap 2.2.6", - "serde", - "serde_json", -] - -[[package]] -name = "biome_deserialize_macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c12826fff87ac09f63bbacf8bdf5225dfdf890da04d426f758cbcacf068e3e" -dependencies = [ - "biome_string_case", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "biome_diagnostics" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe1317b6d610541c4e6a0e1f803a946f153ace3468bbc77a8f273dcb04ee526f" -dependencies = [ - "backtrace", - "biome_console", - "biome_diagnostics_categories", - "biome_diagnostics_macros", - "biome_rowan", - "biome_text_edit", - "biome_text_size", - "bitflags 2.5.0", - "bpaf", - "oxc_resolver 1.12.0", - "serde", - "termcolor", - "unicode-width", -] - -[[package]] -name = "biome_diagnostics_categories" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832080d68a2ee2f198d98ff5d26fc0f5c2566907f773d105a4a049ee07664d19" -dependencies = [ - "quote", - "serde", -] - -[[package]] -name = "biome_diagnostics_macros" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540fec04d2e789fb992128c63d111b650733274afffff1cb3f26c8dff5167d3b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "biome_json_factory" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e409eb289040f3660689dad178b00b6ac8cfa9a7fffd8225f35cb6b3d36437cf" -dependencies = [ - "biome_json_syntax", - "biome_rowan", -] - -[[package]] -name = "biome_json_parser" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c6d23fb9b683e6356c094b4a0cb38f8aa0acee60ce9c3ef24628d21a204de4d" -dependencies = [ - "biome_console", - "biome_diagnostics", - "biome_json_factory", - "biome_json_syntax", - "biome_parser", - "biome_rowan", - "biome_unicode_table", - "tracing", - "unicode-bom", -] - -[[package]] -name = "biome_json_syntax" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2645ca57f75680d3d390b2482c35db5850b1d849e1f96151a12f15f4abdb097" -dependencies = [ - "biome_rowan", - "serde", -] - -[[package]] -name = "biome_markup" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7f11cf91599594528e97d216044ef4e410a103327212d909f215cbafe2fd9c" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", -] - -[[package]] -name = "biome_parser" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955dd999f32c086371d5c0e64b4ea1a50f50c98f1f31a3b9fe17ef47198de19b" -dependencies = [ - "biome_console", - "biome_diagnostics", - "biome_rowan", - "bitflags 2.5.0", - "drop_bomb", -] - -[[package]] -name = "biome_rowan" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c2dc25a7ba6ae89526340034abed6c89fac35b79060786771e32ed4aac77e7" -dependencies = [ - "biome_text_edit", - "biome_text_size", - "countme", - "hashbrown 0.12.3", - "memoffset 0.8.0", - "rustc-hash 1.1.0", - "tracing", -] - -[[package]] -name = "biome_string_case" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28b4d0e08c2f13f1c9e0df4e7a8f9bfa03ef3803713d1bcd5110578cc5c67be" - -[[package]] -name = "biome_text_edit" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d486fdd96d5dad6428213ce64e6b9eb5bfb2fce6387fe901e844d386283de509" -dependencies = [ - "biome_text_size", - "serde", - "similar", -] - -[[package]] -name = "biome_text_size" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec604d15cefdced636255400359aeacfdea5d1e79445efc7aa32a0de7f0319b" -dependencies = [ - "serde", -] - -[[package]] -name = "biome_unicode_table" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e8604d34b02180a58af1dbdaac166f1805f27f5370934142a3246f83870952" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand 1.9.0", - "futures-lite", -] - -[[package]] -name = "bpaf" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19232d7d855392d993f6dabd8dea40a457a6d24ef679fe98f5edca811bb11e21" -dependencies = [ - "bpaf_derive", -] - -[[package]] -name = "bpaf_derive" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efeab2975f8102de445dcf898856a638332403c50216144653a89aec22fd79e0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata 0.1.10", -] - -[[package]] -name = "bstr" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" -dependencies = [ - "memchr", - "regex-automata 0.4.6", - "serde", -] - -[[package]] -name = "build-fs-tree" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c68339add1d0c864575cd425203adee58c8b64ea1709b35bb90fc0fc07e4286" -dependencies = [ - "derive_more", - "pipe-trait", - "serde", - "serde_yaml", - "text-block-macros", -] - -[[package]] -name = "build-target" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b" - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" -dependencies = [ - "allocator-api2", -] - -[[package]] -name = "bytecount" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" -dependencies = [ - "serde", -] - -[[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde", -] - -[[package]] -name = "capnp" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e65021d89250bbfe7c2791789ced2c4bdc21b0e8bb59c64f3fd6145a5fd678" - -[[package]] -name = "capnp" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eddbd729bd9742aa22d29e871a42ffea7f216a4ddbfdaf09ea88150ef2e7f76" -dependencies = [ - "embedded-io", -] - -[[package]] -name = "capnpc" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5067f3c8ee94d993d03150153e9a57a6ff330127b1c1ad76475051e1cef79c2d" -dependencies = [ - "capnp 0.18.1", -] - -[[package]] -name = "cassowary" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - -[[package]] -name = "castaway" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" - -[[package]] -name = "castaway" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" -dependencies = [ - "rustversion", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "clap" -version = "4.5.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_complete" -version = "4.5.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_derive" -version = "4.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "clipboard-win" -version = "5.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" -dependencies = [ - "error-code", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "command-group" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5080df6b0f0ecb76cab30808f00d937ba725cebe266a3da8cd89dff92f2a9916" -dependencies = [ - "async-trait", - "nix 0.26.2", - "tokio", - "winapi", -] - -[[package]] -name = "compact_str" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" -dependencies = [ - "castaway 0.2.2", - "cfg-if", - "itoa", - "ryu", - "static_assertions", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "config" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca" -dependencies = [ - "async-trait", - "lazy_static", - "nom", - "pathdiff", - "serde", - "serde_json", -] - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.45.0", -] - -[[package]] -name = "const-random" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" -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", - "once_cell", - "tiny-keccak", -] - -[[package]] -name = "const_format" -version = "0.2.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7309d9b4d3d2c0641e018d449232f2e28f1b22933c137f157d3dbc14228b8c0e" -dependencies = [ - "const_format_proc_macros", -] - -[[package]] -name = "const_format_proc_macros" -version = "0.2.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "countme" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" - -[[package]] -name = "cpp_demangle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "cpufeatures" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crop" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f7cba78cdac608a5e2e645de47e566c0f63e1b6110318736581ec97d5669767" -dependencies = [ - "str_indices", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crossterm" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio 0.8.11", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags 2.5.0", - "crossterm_winapi", - "futures-core", - "libc", - "mio 0.8.11", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "ctor" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b" -dependencies = [ - "quote", - "syn 2.0.58", -] - -[[package]] -name = "ctrlc" -version = "3.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" -dependencies = [ - "nix 0.28.0", - "windows-sys 0.52.0", -] - -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2 0.4.9", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.60+curl-7.88.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "717abe2cb465a5da6ce06617388a3980c9a2844196734bec8ccb8e575250f13f" -dependencies = [ - "cc", - "libc", - "libnghttp2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi", -] - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.58", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "dashmap" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" -dependencies = [ - "cfg-if", - "crossbeam-utils", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "uuid", -] - -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 1.0.109", -] - -[[package]] -name = "derive_setters" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "dialoguer" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" -dependencies = [ - "console", - "fuzzy-matcher", - "shell-words", - "tempfile", - "thiserror", - "zeroize", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "directories" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" -dependencies = [ - "dirs-sys 0.4.1", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "drop_bomb" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "dyn-clone" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "embedded-io" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bbadc628dc286b9ae02f0cb0f5411c056eb7487b72f0083203f115de94060" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "erased-serde" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" -dependencies = [ - "serde", -] - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "error-code" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "fast_chemail" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495a39d30d624c2caabe6312bfead73e7717692b44e0b32df168c275a2e8e9e4" -dependencies = [ - "ascii_utils", -] - -[[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.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "filedescriptor" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e" -dependencies = [ - "libc", - "thiserror", - "winapi", -] - -[[package]] -name = "filetime" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", -] - -[[package]] -name = "findshlibs" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64" -dependencies = [ - "cc", - "lazy_static", - "libc", - "winapi", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "from_variant" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32016f1242eb82af5474752d00fd8ebcd9004bd69b462b1c91de833972d08ed4" -dependencies = [ - "proc-macro2", - "swc_macros_common", - "syn 2.0.58", -] - -[[package]] -name = "fs-err" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-lite" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fuzzy-matcher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" -dependencies = [ - "thread_local", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] -name = "git2" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" -dependencies = [ - "bitflags 1.3.2", - "libc", - "libgit2-sys", - "log", - "url", -] - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr 1.8.0", - "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] - -[[package]] -name = "globwalk" -version = "0.1.0" -dependencies = [ - "camino", - "itertools 0.10.5", - "path-clean", - "path-slash", - "rayon", - "regex", - "tempfile", - "test-case", - "thiserror", - "tracing", - "turbopath", - "walkdir", - "wax", -] - -[[package]] -name = "globwatch" -version = "0.1.0" -dependencies = [ - "futures", - "itertools 0.10.5", - "merge-streams", - "notify", - "stop-token", - "test-case", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "tracing-subscriber", - "tracing-test", - "turbopath", - "unic-segment", -] - -[[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 = "go-parse-duration" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558b88954871f5e5b2af0e62e2e176c8bde7a6c2c4ed41b13d138d96da2e2cbd" - -[[package]] -name = "h2" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.11", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "h2" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http 1.1.0", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "handlebars" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b" -dependencies = [ - "log", - "pest", - "pest_derive", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -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 = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "hstr" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dae404c0c5d4e95d4858876ab02eecd6a196bb8caa42050dfa809938833fc412" -dependencies = [ - "hashbrown 0.14.5", - "new_debug_unreachable", - "once_cell", - "phf", - "rustc-hash 1.1.0", - "triomphe", -] - -[[package]] -name = "http" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http 0.2.11", - "pin-project-lite", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http 1.1.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "httpmock" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b02e044d3b4c2f94936fb05f9649efa658ca788f44eb6b87554e2033fc8ce93" -dependencies = [ - "assert-json-diff", - "async-object-pool", - "async-trait", - "base64 0.21.4", - "crossbeam-utils", - "form_urlencoded", - "futures-util", - "hyper 0.14.28", - "isahc", - "lazy_static", - "levenshtein", - "log", - "regex", - "serde", - "serde_json", - "serde_regex", - "similar", - "tokio", - "url", -] - -[[package]] -name = "human-panic" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f016c89920bbb30951a8405ecacbb4540db5524313b9445736e7e1855cf370" -dependencies = [ - "anstream", - "anstyle", - "backtrace", - "os_info", - "serde", - "serde_derive", - "toml", - "uuid", -] - -[[package]] -name = "human_format" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3b1f728c459d27b12448862017b96ad4767b1ec2ec5e6434e99f1577f085b8" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.24", - "http 0.2.11", - "http-body 0.4.5", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.5.6", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2 0.4.5", - "http 1.1.0", - "http-body 1.0.1", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" -dependencies = [ - "futures-util", - "http 1.1.0", - "hyper 1.4.1", - "hyper-util", - "rustls", - "rustls-native-certs", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", - "webpki-roots", -] - -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper 0.14.28", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper 1.4.1", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "hyper 1.4.1", - "pin-project-lite", - "socket2 0.5.6", - "tokio", - "tower", - "tower-service", - "tracing", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.6", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown 0.14.5", - "serde", -] - -[[package]] -name = "indicatif" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" -dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "indoc" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" - -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "insta" -version = "1.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" -dependencies = [ - "console", - "lazy_static", - "linked-hash-map", - "regex", - "serde", - "similar", -] - -[[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 0.3.9", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ioctl-rs" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7970510895cee30b3e9128319f2cefd4bde883a39f38baa279567ba3a7eb97d" -dependencies = [ - "libc", -] - -[[package]] -name = "ipnet" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" - -[[package]] -name = "is-macro" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2069faacbe981460232f880d26bf3c7634e322d49053aa48c27e3ae642f728f1" -dependencies = [ - "Inflector", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.9", - "rustix 0.38.31", - "windows-sys 0.48.0", -] - -[[package]] -name = "is_ci" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" - -[[package]] -name = "isahc" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" -dependencies = [ - "async-channel", - "castaway 0.1.2", - "crossbeam-utils", - "curl", - "curl-sys", - "encoding_rs", - "event-listener", - "futures-lite", - "http 0.2.11", - "log", - "mime", - "once_cell", - "polling", - "slab", - "sluice", - "tracing", - "tracing-futures", - "url", - "waker-fn", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json-strip-comments" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d129799327c8f80861e467c59b825ba24c277dba6ad0d71a141dc98f9e04ee" - -[[package]] -name = "jsonc-parser" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1853e40333206f9a685358046d13ab200169e3ee573019bddf0ede0dc29307" - -[[package]] -name = "jsonc-parser" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7725c320caac8c21d8228c1d055af27a995d371f78cc763073d3e068323641b5" - -[[package]] -name = "kqueue" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - -[[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-regex" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff63c423c68ea6814b7da9e88ce585f793c87ddd9e78f646970891769c8235d4" -dependencies = [ - "lazy-regex-proc_macros", - "once_cell", - "regex", -] - -[[package]] -name = "lazy-regex-proc_macros" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8edfc11b8f56ce85e207e62ea21557cfa09bb24a8f6b04ae181b086ff8611c22" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "levenshtein" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" - -[[package]] -name = "libc" -version = "0.2.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - -[[package]] -name = "libgit2-sys" -version = "0.14.2+1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - -[[package]] -name = "libloading" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "libm" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" - -[[package]] -name = "libnghttp2-sys" -version = "0.1.10+1.61.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "959c25552127d2e1fa72f0e52548ec04fc386e827ba71a7bd01db46a447dc135" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "libz-sys" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -dependencies = [ - "value-bag", -] - -[[package]] -name = "lru" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "lsp-types" -version = "0.94.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matchit" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" - -[[package]] -name = "memchr" -version = "2.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "merge" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9" -dependencies = [ - "merge_derive", - "num-traits", -] - -[[package]] -name = "merge-streams" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f84f6452969abd246e7ac1fe4fe75906c76e8ec88d898df9aef37e0f3b6a7c2" -dependencies = [ - "futures-core", - "pin-project", -] - -[[package]] -name = "merge_derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "miette" -version = "5.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" -dependencies = [ - "backtrace", - "backtrace-ext", - "is-terminal", - "miette-derive", - "once_cell", - "owo-colors", - "supports-color", - "supports-hyperlinks", - "supports-unicode", - "terminal_size 0.1.17", - "textwrap", - "thiserror", - "unicode-width", -] - -[[package]] -name = "miette-derive" -version = "5.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "mio" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "multer" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http 1.1.0", - "httparse", - "memchr", - "mime", - "spin", - "version_check", -] - -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "napi" -version = "2.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbf98e1bcb85cc441bbf7cdfb11070d2537a100e2697d75397b2584c32492d1" -dependencies = [ - "bitflags 2.5.0", - "ctor", - "napi-derive", - "napi-sys", - "once_cell", - "tokio", -] - -[[package]] -name = "napi-build" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e" - -[[package]] -name = "napi-derive" -version = "2.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7622f0dbe0968af2dacdd64870eee6dee94f93c989c841f1ad8f300cf1abd514" -dependencies = [ - "cfg-if", - "convert_case 0.6.0", - "napi-derive-backend", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "napi-derive-backend" -version = "1.0.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cf2d74ac66fd1cccb646be75fdd1c1dce8acfe20a68f61566a31da0d3eb9786" -dependencies = [ - "convert_case 0.6.0", - "once_cell", - "proc-macro2", - "quote", - "regex", - "semver 1.0.23", - "syn 2.0.58", -] - -[[package]] -name = "napi-sys" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b" -dependencies = [ - "libloading", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", - "pin-utils", -] - -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", - "pin-utils", - "static_assertions", -] - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "cfg_aliases", - "libc", -] - -[[package]] -name = "node-semver" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f390c1756333538f2aed01cf280a56bc683e199b9804a504df6e7320d40116" -dependencies = [ - "bytecount", - "miette", - "nom", - "serde", - "thiserror", -] - -[[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 = "notify" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" -dependencies = [ - "bitflags 2.5.0", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio 0.8.11", - "walkdir", - "windows-sys 0.48.0", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", - "serde", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openssl" -version = "0.10.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b277f87dacc05a6b709965d1cbafac4649d6ce9f3ce9ceb88508b5666dfec9" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a95792af3c4e0153c3914df2261bedd30a98476f94dc892b67dfe1d89d433a04" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-multimap" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f" -dependencies = [ - "dlv-list", - "hashbrown 0.14.5", -] - -[[package]] -name = "os_info" -version = "3.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" -dependencies = [ - "log", - "serde", - "windows-sys 0.52.0", -] - -[[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" -dependencies = [ - "memchr", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "oxc_resolver" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c20bb345f290c46058ba650fef7ca2b579612cf2786b927ebad7b8bec0845a7" -dependencies = [ - "cfg-if", - "dashmap 6.1.0", - "dunce", - "indexmap 2.2.6", - "json-strip-comments", - "once_cell", - "rustc-hash 2.0.0", - "serde", - "serde_json", - "simdutf8", - "thiserror", - "tracing", -] - -[[package]] -name = "oxc_resolver" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf8bcda84674ae69228a823dcdb81eac9a398d99f1bbc1dbf00623009fc11c1" -dependencies = [ - "cfg-if", - "dashmap 6.1.0", - "dunce", - "indexmap 2.2.6", - "json-strip-comments", - "once_cell", - "rustc-hash 2.0.0", - "serde", - "serde_json", - "simdutf8", - "thiserror", - "tracing", -] - -[[package]] -name = "parking" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "smallvec", - "windows-targets 0.48.1", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "path-clean" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" - -[[package]] -name = "path-slash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pest" -version = "2.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "pest_meta" -version = "2.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - -[[package]] -name = "petgraph" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" -dependencies = [ - "fixedbitset", - "indexmap 1.9.3", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "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_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pidlock" -version = "0.1.4" -dependencies = [ - "libc", - "log", - "rand", - "tempfile", - "thiserror", - "windows-sys 0.45.0", -] - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pipe-trait" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1be1ec9e59f0360aefe84efa6f699198b685ab0d5718081e9f72aa2344289e2" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "polling" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.45.0", -] - -[[package]] -name = "pori" -version = "0.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a63d338dec139f56dacc692ca63ad35a6be6a797442479b55acd611d79e906" -dependencies = [ - "nom", -] - -[[package]] -name = "port_scanner" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325a6d2ac5dee293c3b2612d4993b98aec1dff096b0a2dae70ed7d95784a05da" - -[[package]] -name = "portable-atomic" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b" - -[[package]] -name = "portable-pty" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806ee80c2a03dbe1a9fb9534f8d19e4c0546b790cde8fd1fea9d6390644cb0be" -dependencies = [ - "anyhow", - "bitflags 1.3.2", - "downcast-rs", - "filedescriptor", - "lazy_static", - "libc", - "log", - "nix 0.25.1", - "serial", - "shared_library", - "shell-words", - "winapi", - "winreg", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "pprof" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978385d59daf9269189d052ca8a84c1acfd0715c0599a5d5188d4acc078ca46a" -dependencies = [ - "backtrace", - "cfg-if", - "findshlibs", - "libc", - "log", - "nix 0.26.2", - "once_cell", - "parking_lot", - "prost 0.11.8", - "prost-build", - "prost-derive 0.11.8", - "sha2", - "smallvec", - "symbolic-demangle", - "tempfile", - "thiserror", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "predicates" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" -dependencies = [ - "anstyle", - "difflib", - "itertools 0.10.5", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", -] - -[[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.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prost" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537" -dependencies = [ - "bytes", - "prost-derive 0.11.8", -] - -[[package]] -name = "prost" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" -dependencies = [ - "bytes", - "prost-derive 0.12.3", -] - -[[package]] -name = "prost-build" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c828f93f5ca4826f97fedcbd3f9a536c16b12cff3dbbb4a007f932bbad95b12" -dependencies = [ - "bytes", - "heck 0.4.1", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost 0.11.8", - "prost-types", - "regex", - "syn 1.0.109", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-derive" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" -dependencies = [ - "anyhow", - "itertools 0.11.0", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "prost-types" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88" -dependencies = [ - "prost 0.11.8", -] - -[[package]] -name = "psm" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" -dependencies = [ - "cc", -] - -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "quickcheck" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" -dependencies = [ - "env_logger", - "log", - "rand", -] - -[[package]] -name = "quinn" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash 2.0.0", - "rustls", - "socket2 0.5.6", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" -dependencies = [ - "bytes", - "rand", - "ring", - "rustc-hash 2.0.0", - "rustls", - "slab", - "thiserror", - "tinyvec", - "tracing", -] - -[[package]] -name = "quinn-udp" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" -dependencies = [ - "libc", - "once_cell", - "socket2 0.5.6", - "tracing", - "windows-sys 0.59.0", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "ratatui" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcb12f8fbf6c62614b0d56eb352af54f6a22410c3b079eb53ee93c7b97dd31d8" -dependencies = [ - "bitflags 2.5.0", - "cassowary", - "compact_str", - "crossterm 0.27.0", - "indoc", - "itertools 0.12.0", - "lru", - "paste", - "stability", - "strum", - "unicode-segmentation", - "unicode-width", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f851a03551ceefd30132e447f07f96cb7011d6b658374f3aed847333adb5559" - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.3", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "reqwest" -version = "0.12.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" -dependencies = [ - "base64 0.22.1", - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.4.1", - "hyper-rustls", - "hyper-tls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-native-certs", - "rustls-pemfile", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 1.0.1", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots", - "windows-registry", -] - -[[package]] -name = "ring" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" -dependencies = [ - "cc", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.48.0", -] - -[[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-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc-hash" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.23", -] - -[[package]] -name = "rustc_version_runtime" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f" -dependencies = [ - "rustc_version 0.2.3", - "semver 0.9.0", -] - -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys 0.4.13", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.23.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" -dependencies = [ - "log", - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-native-certs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "rustls-pki-types", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" - -[[package]] -name = "rustls-webpki" -version = "0.102.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[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 = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "schemars" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" -dependencies = [ - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", -] - -[[package]] -name = "schemars_derive" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 1.0.109", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "security-framework" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.210" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.210" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_derive_internals" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "serde_json" -version = "1.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" -dependencies = [ - "indexmap 2.2.6", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" -dependencies = [ - "itoa", - "serde", -] - -[[package]] -name = "serde_regex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" -dependencies = [ - "regex", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.9.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129" -dependencies = [ - "indexmap 2.2.6", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "serial" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1237a96570fc377c13baa1b88c7589ab66edced652e43ffb17088f003db3e86" -dependencies = [ - "serial-core", - "serial-unix", - "serial-windows", -] - -[[package]] -name = "serial-core" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f46209b345401737ae2125fe5b19a77acce90cd53e1658cda928e4fe9a64581" -dependencies = [ - "libc", -] - -[[package]] -name = "serial-unix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03fbca4c9d866e24a459cbca71283f545a37f8e3e002ad8c70593871453cab7" -dependencies = [ - "ioctl-rs", - "libc", - "serial-core", - "termios", -] - -[[package]] -name = "serial-windows" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c6d3b776267a75d31bbdfd5d36c0ca051251caafc285827052bc53bcdc8162" -dependencies = [ - "libc", - "serial-core", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shared_child" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "shared_library" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11" -dependencies = [ - "lazy_static", - "libc", -] - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio 0.8.11", - "signal-hook", -] - -[[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 = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "similar" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" -dependencies = [ - "bstr 0.2.17", - "unicode-segmentation", -] - -[[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 = "sluice" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" -dependencies = [ - "async-channel", - "futures-core", - "futures-io", -] - -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "static_assertions", - "version_check", -] - -[[package]] -name = "smawk" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "stability" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "stacker" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "windows-sys 0.59.0", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "static_assertions_next" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7beae5182595e9a8b683fa98c4317f956c9a2dec3b9716990d20023cc60c766" - -[[package]] -name = "stop-token" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af91f480ee899ab2d9f8435bfdfc14d08a5754bd9d3fef1f1a1c23336aad6c8b" -dependencies = [ - "async-channel", - "cfg-if", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "str_indices" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9557cb6521e8d009c51a8666f09356f4b817ba9ba0981a305bd86aee47bd35c" - -[[package]] -name = "string_enum" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e383308aebc257e7d7920224fa055c632478d92744eca77f99be8fa1545b90" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.58", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "struct_iterable" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "849a064c6470a650b72e41fa6c057879b68f804d113af92900f27574828e7712" -dependencies = [ - "struct_iterable_derive", - "struct_iterable_internal", -] - -[[package]] -name = "struct_iterable_derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb939ce88a43ea4e9d012f2f6b4cc789deb2db9d47bad697952a85d6978662c" -dependencies = [ - "erased-serde", - "proc-macro2", - "quote", - "struct_iterable_internal", - "syn 2.0.58", -] - -[[package]] -name = "struct_iterable_internal" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9426b2a0c03e6cc2ea8dbc0168dbbf943f88755e409fb91bcb8f6a268305f4a" - -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.58", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "supports-color" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" -dependencies = [ - "is-terminal", - "is_ci", -] - -[[package]] -name = "supports-hyperlinks" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d" -dependencies = [ - "is-terminal", -] - -[[package]] -name = "supports-unicode" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6c2cb240ab5dd21ed4906895ee23fe5a48acdbd15a3ce388e7b62a9b66baf7" -dependencies = [ - "is-terminal", -] - -[[package]] -name = "svix-ksuid" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75d773122e48817eb6eb74605cf799574a855bf4c7eb0c1bb06c005067123b13" -dependencies = [ - "base-encode", - "byteorder", - "getrandom", - "serde", - "time", -] - -[[package]] -name = "swc_allocator" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc8bd3075d1c6964010333fae9ddcd91ad422a4f8eb8b3206a9b2b6afb4209e" -dependencies = [ - "bumpalo", - "hashbrown 0.14.5", - "ptr_meta", - "rustc-hash 1.1.0", - "triomphe", -] - -[[package]] -name = "swc_atoms" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6567e4e67485b3e7662b486f1565bdae54bd5b9d6b16b2ba1a9babb1e42125" -dependencies = [ - "hstr", - "once_cell", - "rustc-hash 1.1.0", - "serde", -] - -[[package]] -name = "swc_common" -version = "0.37.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d0a8eaaf1606c9207077d75828008cb2dfb51b095a766bd2b72ef893576e31" -dependencies = [ - "ast_node", - "better_scoped_tls", - "cfg-if", - "either", - "from_variant", - "new_debug_unreachable", - "num-bigint", - "once_cell", - "parking_lot", - "rustc-hash 1.1.0", - "serde", - "siphasher", - "swc_allocator", - "swc_atoms", - "swc_eq_ignore_macros", - "swc_visit", - "termcolor", - "tracing", - "unicode-width", - "url", -] - -[[package]] -name = "swc_ecma_ast" -version = "0.118.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f866d12e4d519052b92a0a86d1ac7ff17570da1272ca0c89b3d6f802cd79df" -dependencies = [ - "bitflags 2.5.0", - "is-macro", - "num-bigint", - "phf", - "scoped-tls", - "serde", - "string_enum", - "swc_atoms", - "swc_common", - "unicode-id-start", -] - -[[package]] -name = "swc_ecma_parser" -version = "0.149.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683dada14722714588b56481399c699378b35b2ba4deb5c4db2fb627a97fb54b" -dependencies = [ - "either", - "new_debug_unreachable", - "num-bigint", - "num-traits", - "phf", - "serde", - "smallvec", - "smartstring", - "stacker", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "tracing", - "typed-arena", -] - -[[package]] -name = "swc_ecma_visit" -version = "0.104.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1c6802e68e51f336e8bc9644e9ff9da75d7da9c1a6247d532f2e908aa33e81" -dependencies = [ - "new_debug_unreachable", - "num-bigint", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_visit", - "tracing", -] - -[[package]] -name = "swc_eq_ignore_macros" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63db0adcff29d220c3d151c5b25c0eabe7e32dd936212b84cdaa1392e3130497" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "swc_macros_common" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f486687bfb7b5c560868f69ed2d458b880cebc9babebcb67e49f31b55c5bf847" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "swc_visit" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ceb044142ba2719ef9eb3b6b454fce61ab849eb696c34d190f04651955c613d" -dependencies = [ - "either", - "new_debug_unreachable", -] - -[[package]] -name = "symbolic-common" -version = "12.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac08504d60cf5bdffeb8a6a028f1a4868a5da1098bb19eb46239440039163fb" -dependencies = [ - "debugid", - "memmap2", - "stable_deref_trait", - "uuid", -] - -[[package]] -name = "symbolic-demangle" -version = "12.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b212728d4f6c527c1d50d6169e715f6e02d849811843c13e366d8ca6d0cf5c4" -dependencies = [ - "cpp_demangle", - "rustc-demangle", - "symbolic-common", -] - -[[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.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" -dependencies = [ - "futures-core", -] - -[[package]] -name = "sysinfo" -version = "0.27.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a902e9050fca0a5d6877550b769abd2bd1ce8c04634b941dbe2809735e1a1e33" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "rayon", - "winapi", -] - -[[package]] -name = "tabwriter" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08e1173ee641651a3095fe95d86ae314cd1f959888097debce3e0f9ca532eef1" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tardar" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900c942f83b6a8b9998cc8f74ad3ffa24b7ff3c4279ea1c1c52d95dced9f3516" -dependencies = [ - "miette", - "vec1", -] - -[[package]] -name = "tempfile" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" -dependencies = [ - "cfg-if", - "fastrand 2.1.0", - "once_cell", - "rustix 0.38.31", - "windows-sys 0.59.0", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "terminal_size" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" -dependencies = [ - "rustix 0.37.23", - "windows-sys 0.48.0", -] - -[[package]] -name = "termios" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d9cf598a6d7ce700a4e6a9199da127e6819a61e64b68609683cc9a01b5683a" -dependencies = [ - "libc", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "test-case" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1d6e7bde536b0412f20765b76e921028059adfd1b90d8974d33fd3c91b25df" -dependencies = [ - "test-case-macros", -] - -[[package]] -name = "test-case-core" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72dc21b5887f4032c4656502d085dc28f2afbb686f25f216472bb0526f4b1b88" -dependencies = [ - "cfg-if", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "test-case-macros" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3786898e0be151a96f730fd529b0e8a10f5990fa2a7ea14e37ca27613c05190" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", - "test-case-core", -] - -[[package]] -name = "text-block-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f8b59b4da1c1717deaf1de80f0179a9d8b4ac91c986d5fd9f4a8ff177b84049" - -[[package]] -name = "textwrap" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" -dependencies = [ - "smawk", - "unicode-linebreak", - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny-gradient" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8063c572fcc935676f1e01615f201f355a053e88525ec41c1b0c4884ce104847" -dependencies = [ - "libm", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.39.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio 1.0.1", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.6", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-macros" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-retry" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" -dependencies = [ - "pin-project", - "rand", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" -dependencies = [ - "rustls", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-scoped" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4beb8ba13bc53ac53ce1d52b42f02e5d8060f0f42138862869beb769722b256" -dependencies = [ - "tokio", - "tokio-stream", -] - -[[package]] -name = "tokio-stream" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.15", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.22.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", - "toml_datetime", -] - -[[package]] -name = "tonic" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" -dependencies = [ - "async-stream", - "async-trait", - "axum 0.6.12", - "base64 0.21.4", - "bytes", - "h2 0.3.24", - "http 0.2.11", - "http-body 0.4.5", - "hyper 0.14.28", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost 0.12.3", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tonic-build" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" -dependencies = [ - "prettyplease", - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand", - "slab", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" -dependencies = [ - "bitflags 2.5.0", - "bytes", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", - "pin-project-lite", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-lsp" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508" -dependencies = [ - "async-trait", - "auto_impl", - "bytes", - "dashmap 5.5.3", - "futures", - "httparse", - "lsp-types", - "memchr", - "serde", - "serde_json", - "tokio", - "tokio-util", - "tower", - "tower-lsp-macros", - "tracing", -] - -[[package]] -name = "tower-lsp-macros" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tower-uds" -version = "0.1.0" -dependencies = [ - "async-io", - "tokio", - "tokio-util", - "tower", - "uds_windows", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-appender" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" -dependencies = [ - "crossbeam-channel", - "time", - "tracing-subscriber", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "tracing-chrome" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496b3cd5447f7ff527bbbf19b071ad542a000adf297d4127078b4dfdb931f41a" -dependencies = [ - "serde_json", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "tracing-test" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4" -dependencies = [ - "lazy_static", - "tracing-core", - "tracing-subscriber", - "tracing-test-macro", -] - -[[package]] -name = "tracing-test-macro" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" -dependencies = [ - "lazy_static", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "triomphe" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" -dependencies = [ - "serde", - "stable_deref_trait", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "tui-term" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4612d4537b4c9f69192596f5b48516b2faf5442fafab885e999e6195cd19463f" -dependencies = [ - "ratatui", -] - -[[package]] -name = "tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.1.0", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "turbo" -version = "0.1.0" -dependencies = [ - "anyhow", - "assert_cmd", - "build-target", - "camino", - "insta", - "itertools 0.10.5", - "miette", - "pretty_assertions", - "serde_json", - "tempfile", - "turbopath", - "turborepo-lib", - "which", - "winapi", -] - -[[package]] -name = "turbo-trace" -version = "0.1.0" -dependencies = [ - "camino", - "clap", - "futures", - "globwalk", - "miette", - "oxc_resolver 2.0.0", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "swc_ecma_visit", - "thiserror", - "tokio", - "tracing", - "tracing-subscriber", - "turbopath", -] - -[[package]] -name = "turbo-updater" -version = "0.1.0" -dependencies = [ - "atty", - "console", - "reqwest", - "semver 1.0.23", - "serde", - "thiserror", - "update-informer", -] - -[[package]] -name = "turbopath" -version = "0.1.0" -dependencies = [ - "anyhow", - "biome_deserialize", - "biome_deserialize_macros", - "biome_diagnostics", - "biome_json_parser", - "camino", - "dunce", - "fs-err", - "miette", - "path-clean", - "serde", - "serde_json", - "tempfile", - "test-case", - "thiserror", - "turborepo-unescape", - "wax", -] - -[[package]] -name = "turborepo-analytics" -version = "0.1.0" -dependencies = [ - "futures", - "thiserror", - "tokio", - "tracing", - "turborepo-api-client", - "turborepo-vercel-api", - "uuid", -] - -[[package]] -name = "turborepo-api-client" -version = "0.1.0" -dependencies = [ - "anyhow", - "bytes", - "chrono", - "http 1.1.0", - "httpmock", - "insta", - "lazy_static", - "port_scanner", - "regex", - "reqwest", - "rustc_version_runtime", - "serde", - "serde_json", - "test-case", - "thiserror", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", - "turbopath", - "turborepo-ci", - "turborepo-vercel-api", - "turborepo-vercel-api-mock", - "url", -] - -[[package]] -name = "turborepo-auth" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "axum 0.7.5", - "axum-server 0.7.1", - "chrono", - "hostname", - "lazy_static", - "port_scanner", - "reqwest", - "serde", - "serde_json", - "tempfile", - "thiserror", - "tokio", - "tracing", - "turbopath", - "turborepo-api-client", - "turborepo-dirs", - "turborepo-ui", - "turborepo-vercel-api", - "turborepo-vercel-api-mock", - "url", - "webbrowser", -] - -[[package]] -name = "turborepo-cache" -version = "0.1.0" -dependencies = [ - "anyhow", - "base64 0.21.4", - "bytes", - "camino", - "futures", - "hmac", - "insta", - "libc", - "miette", - "os_str_bytes", - "path-clean", - "petgraph", - "pin-project", - "port_scanner", - "reqwest", - "serde", - "serde_json", - "sha2", - "tar", - "tempfile", - "test-case", - "thiserror", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", - "turbopath", - "turborepo-analytics", - "turborepo-api-client", - "turborepo-vercel-api", - "turborepo-vercel-api-mock", - "zstd", -] - -[[package]] -name = "turborepo-ci" -version = "0.1.0" -dependencies = [ - "chrono", - "test-case", - "tracing", -] - -[[package]] -name = "turborepo-dirs" -version = "0.1.0" -dependencies = [ - "dirs-next", - "thiserror", - "turbopath", -] - -[[package]] -name = "turborepo-env" -version = "0.1.0" -dependencies = [ - "hex", - "regex", - "serde", - "sha2", - "test-case", - "thiserror", - "turborepo-ci", - "turborepo-ui", -] - -[[package]] -name = "turborepo-errors" -version = "0.1.0" -dependencies = [ - "biome_deserialize", - "biome_diagnostics", - "miette", - "serde", - "serde_json", - "test-case", - "thiserror", -] - -[[package]] -name = "turborepo-filewatch" -version = "0.1.0" -dependencies = [ - "bitflags 1.3.2", - "fsevent-sys", - "futures", - "git2", - "itertools 0.10.5", - "libc", - "nibble_vec", - "notify", - "radix_trie", - "tempfile", - "thiserror", - "tokio", - "tokio-scoped", - "tracing", - "tracing-test", - "turbopath", - "turborepo-repository", - "turborepo-scm", - "walkdir", - "wax", -] - -[[package]] -name = "turborepo-fs" -version = "0.1.0" -dependencies = [ - "fs-err", - "tempfile", - "thiserror", - "turbopath", - "walkdir", -] - -[[package]] -name = "turborepo-graph-utils" -version = "0.1.0" -dependencies = [ - "futures", - "insta", - "itertools 0.10.5", - "log", - "petgraph", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "turborepo-lib" -version = "0.1.0" -dependencies = [ - "anyhow", - "assert_cmd", - "async-graphql", - "async-graphql-axum", - "async-io", - "async-stream", - "atty", - "axum 0.7.5", - "biome_deserialize", - "biome_deserialize_macros", - "biome_diagnostics", - "biome_json_parser", - "biome_json_syntax", - "camino", - "capnp 0.17.2", - "capnpc", - "chrono", - "clap", - "clap_complete", - "command-group", - "console", - "const_format", - "convert_case 0.6.0", - "crossterm 0.26.1", - "ctrlc", - "derive_setters", - "dialoguer", - "dirs-next", - "dunce", - "either", - "futures", - "futures-core", - "globwalk", - "globwatch", - "go-parse-duration", - "hex", - "human-panic", - "human_format", - "humantime", - "ignore", - "insta", - "itertools 0.10.5", - "jsonc-parser 0.21.0", - "lazy_static", - "libc", - "merge", - "miette", - "nix 0.26.2", - "notify", - "num_cpus", - "owo-colors", - "path-clean", - "petgraph", - "pidlock", - "port_scanner", - "portable-pty", - "pprof", - "pretty_assertions", - "prost 0.12.3", - "radix_trie", - "rand", - "rayon", - "regex", - "reqwest", - "semver 1.0.23", - "serde", - "serde_json", - "serde_yaml", - "sha2", - "shared_child", - "struct_iterable", - "svix-ksuid", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "sysinfo", - "tabwriter", - "tempfile", - "test-case", - "thiserror", - "time", - "tiny-gradient", - "tokio", - "tokio-stream", - "tokio-util", - "tonic", - "tonic-build", - "tower", - "tower-http", - "tracing", - "tracing-appender", - "tracing-chrome", - "tracing-subscriber", - "tracing-test", - "turbo-trace", - "turbo-updater", - "turbopath", - "turborepo-analytics", - "turborepo-api-client", - "turborepo-auth", - "turborepo-cache", - "turborepo-ci", - "turborepo-dirs", - "turborepo-env", - "turborepo-errors", - "turborepo-filewatch", - "turborepo-fs", - "turborepo-graph-utils", - "turborepo-lockfiles", - "turborepo-micro-frontend", - "turborepo-repository", - "turborepo-scm", - "turborepo-telemetry", - "turborepo-ui", - "turborepo-unescape", - "turborepo-vercel-api", - "turborepo-vercel-api-mock", - "twox-hash", - "uds_windows", - "wax", - "webbrowser", - "which", - "winapi", -] - -[[package]] -name = "turborepo-lockfiles" -version = "0.1.0" -dependencies = [ - "itertools 0.10.5", - "nom", - "pest", - "pest_derive", - "pretty_assertions", - "rayon", - "regex", - "semver 1.0.23", - "serde", - "serde_json", - "serde_yaml", - "test-case", - "thiserror", - "tracing", - "turbopath", -] - -[[package]] -name = "turborepo-lsp" -version = "0.1.0" -dependencies = [ - "crop", - "itertools 0.10.5", - "jsonc-parser 0.23.0", - "pidlock", - "serde_json", - "tokio", - "tokio-retry", - "tower-lsp", - "turbopath", - "turborepo-lib", - "turborepo-repository", - "wax", -] - -[[package]] -name = "turborepo-micro-frontend" -version = "0.1.0" -dependencies = [ - "biome_deserialize", - "biome_deserialize_macros", - "biome_diagnostics", - "biome_json_parser", - "biome_json_syntax", - "insta", - "pretty_assertions", - "serde", - "serde_json", - "thiserror", - "turbopath", - "turborepo-errors", -] - -[[package]] -name = "turborepo-napi" -version = "0.1.0" -dependencies = [ - "napi", - "napi-build", - "napi-derive", - "thiserror", - "tokio", - "turbopath", - "turborepo-repository", -] - -[[package]] -name = "turborepo-repository" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-once-cell", - "biome_deserialize", - "biome_deserialize_macros", - "biome_diagnostics", - "biome_json_parser", - "biome_json_syntax", - "globwalk", - "itertools 0.10.5", - "lazy-regex", - "miette", - "node-semver", - "petgraph", - "pretty_assertions", - "regex", - "rust-ini", - "serde", - "serde_json", - "serde_yaml", - "tempfile", - "test-case", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "turbopath", - "turborepo-errors", - "turborepo-graph-utils", - "turborepo-lockfiles", - "turborepo-unescape", - "wax", - "which", -] - -[[package]] -name = "turborepo-scm" -version = "0.1.0" -dependencies = [ - "bstr 1.8.0", - "git2", - "globwalk", - "hex", - "ignore", - "nom", - "serde", - "serde_json", - "sha1", - "tempfile", - "test-case", - "thiserror", - "tracing", - "turbopath", - "turborepo-ci", - "turborepo-telemetry", - "wax", - "which", -] - -[[package]] -name = "turborepo-telemetry" -version = "0.1.0" -dependencies = [ - "chrono", - "config", - "futures", - "hex", - "once_cell", - "reqwest", - "serde", - "serde_json", - "sha2", - "tempfile", - "test-case", - "thiserror", - "tokio", - "tracing", - "turbopath", - "turborepo-api-client", - "turborepo-ci", - "turborepo-dirs", - "turborepo-ui", - "turborepo-vercel-api", - "turborepo-vercel-api-mock", - "url", - "uuid", -] - -[[package]] -name = "turborepo-ui" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-graphql", - "async-graphql-axum", - "async-stream", - "atty", - "axum 0.7.5", - "axum-server 0.7.1", - "base64 0.22.1", - "chrono", - "clipboard-win", - "console", - "crossterm 0.27.0", - "dialoguer", - "futures", - "indicatif", - "indoc", - "itertools 0.10.5", - "lazy_static", - "nix 0.26.2", - "ratatui", - "serde", - "serde_json", - "tempfile", - "test-case", - "thiserror", - "tokio", - "tracing", - "tui-term", - "turbopath", - "turborepo-ci", - "turborepo-vt100", - "which", - "winapi", -] - -[[package]] -name = "turborepo-unescape" -version = "0.1.0" -dependencies = [ - "biome_deserialize", - "biome_diagnostics", - "serde", - "serde_json", -] - -[[package]] -name = "turborepo-vercel-api" -version = "0.1.0" -dependencies = [ - "chrono", - "insta", - "serde", - "serde_json", - "test-case", - "url", -] - -[[package]] -name = "turborepo-vercel-api-mock" -version = "0.1.0" -dependencies = [ - "anyhow", - "axum 0.7.5", - "axum-server 0.4.7", - "futures-util", - "port_scanner", - "tempfile", - "tokio", - "turborepo-vercel-api", -] - -[[package]] -name = "turborepo-vt100" -version = "0.15.2" -dependencies = [ - "itoa", - "log", - "quickcheck", - "rand", - "ratatui", - "serde", - "serde_json", - "terminal_size 0.2.6", - "tui-term", - "unicode-width", - "vte", -] - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "rand", - "static_assertions", -] - -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "uds_windows" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" -dependencies = [ - "tempfile", - "winapi", -] - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-segment" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ed5d26be57f84f176157270c112ef57b86debac9cd21daaabbe56db0f88f23" -dependencies = [ - "unic-ucd-segment", -] - -[[package]] -name = "unic-ucd-segment" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2079c122a62205b421f499da10f3ee0f7697f012f55b675e002483c73ea34700" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-bom" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" - -[[package]] -name = "unicode-id-start" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc3882f69607a2ac8cc4de3ee7993d8f68bb06f2974271195065b3bd07f2edea" - -[[package]] -name = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[package]] -name = "unicode-linebreak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "update-informer" -version = "1.1.0" -source = "git+https://github.com/nicholaslyang/update-informer.git#7a78e90e62479e022bae77ada824c9df53036f96" -dependencies = [ - "directories", - "reqwest", - "semver 1.0.23", - "serde", - "serde_json", - "ureq", -] - -[[package]] -name = "ureq" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" -dependencies = [ - "base64 0.22.1", - "flate2", - "log", - "native-tls", - "once_cell", - "rustls", - "rustls-pki-types", - "serde", - "serde_json", - "url", - "webpki-roots", -] - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" -dependencies = [ - "getrandom", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "value-bag" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec1" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vte" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" -dependencies = [ - "arrayvec", - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[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.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.58", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" - -[[package]] -name = "wasm-streams" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wax" -version = "0.6.0" -dependencies = [ - "build-fs-tree", - "const_format", - "dunce", - "itertools 0.11.0", - "miette", - "nom", - "path-slash", - "pori", - "regex", - "tardar", - "tempfile", - "thiserror", - "walkdir", -] - -[[package]] -name = "web-sys" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webbrowser" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579cc485bd5ce5bfa0d738e4921dd0b956eca9800be1fd2e5257ebe95bc4617e" -dependencies = [ - "core-foundation", - "dirs", - "jni", - "log", - "ndk-context", - "objc", - "raw-window-handle", - "url", - "web-sys", -] - -[[package]] -name = "webpki-roots" -version = "0.26.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.1", -] - -[[package]] -name = "windows-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" -dependencies = [ - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.1", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys 0.4.13", - "rustix 0.38.31", -] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" - -[[package]] -name = "zstd" -version = "0.12.3+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "6.0.5+zstd.1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index a34038d71cdb..98dabcd54637 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -27,12 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-R3fr52v5DAfl+Isk2AspDabQIx00IoIoFKbkTSSgvXA="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "update-informer-1.1.0" = "sha256-pvt4f7tfefWin+DMql/zarN/q9gijpERF7l0CxcvX2s="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-2T6yqJXnEQehCGnJIod0tYZCNuSYjjP8QRmHWnUKJ04="; nativeBuildInputs = [ From 310f6e70af89d4c5e91258735b0a7ad2b36efeea Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 4 Dec 2024 19:37:54 -0500 Subject: [PATCH 0622/1054] turbo: 2.3.0 -> 2.3.3 Changelog: https://github.com/vercel/turborepo/releases/tag/v2.3.3 Diff: https://github.com/vercel/turborepo/compare/v2.3.0...v2.3.3 --- pkgs/by-name/tu/turbo-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index 98dabcd54637..36e68b687da2 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -18,17 +18,17 @@ rustPlatform.buildRustPackage rec { pname = "turbo-unwrapped"; - version = "2.3.0"; + version = "2.3.3"; src = fetchFromGitHub { owner = "vercel"; repo = "turbo"; rev = "refs/tags/v${version}"; - hash = "sha256-R3fr52v5DAfl+Isk2AspDabQIx00IoIoFKbkTSSgvXA="; + hash = "sha256-L51RgXUlA9hnVt232qdLo6t0kqXl7b01jotUk1r8wO0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-2T6yqJXnEQehCGnJIod0tYZCNuSYjjP8QRmHWnUKJ04="; + cargoHash = "sha256-qv5bK65vA94M/YSjSRaYilg44NqkzF2ybmUVapu8cpI="; nativeBuildInputs = [ From fafd0c1fb285125b5584ec35c73da3649c7c6496 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 00:59:40 +0000 Subject: [PATCH 0623/1054] sslscan: 2.1.5 -> 2.1.6 --- pkgs/tools/security/sslscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 6c12b20a613f..a248e6fe2109 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = "refs/tags/${version}"; - hash = "sha256-K0OJvb9jym7P6ehtV5M/edq4ZKwacn8D5IC4PyttqZY="; + hash = "sha256-XFoTwBtufkT/Ja0a3MEytPHx37eg3ZZ7x15EXHjZey4="; }; buildInputs = [ openssl ]; From 1cc7ce358959868b228acd1b31985d9a1c3d1d2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 01:02:07 +0000 Subject: [PATCH 0624/1054] tagparser: 12.3.1 -> 12.4.0 --- pkgs/by-name/ta/tagparser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tagparser/package.nix b/pkgs/by-name/ta/tagparser/package.nix index 3eaa0e238518..cdd3aacf26d8 100644 --- a/pkgs/by-name/ta/tagparser/package.nix +++ b/pkgs/by-name/ta/tagparser/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "tagparser"; - version = "12.3.1"; + version = "12.4.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - hash = "sha256-ihrtUd9R8Tdkuv0kdIZNzBDrhwmsC3LNDsmoCroSMPM="; + hash = "sha256-wVdE1lgSQsH4g10/lxa8bZlYT141Vd7gRhefxyz8kRM="; }; nativeBuildInputs = [ cmake ]; From 63721dc5cf4d0646abbb321c20adbfd907f068a6 Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 5 Dec 2024 01:17:46 +0000 Subject: [PATCH 0625/1054] jay: remove `/usr` prefix from installed files NixOS expects these in top-level /share, not /usr/share --- pkgs/by-name/ja/jay/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix index 9eff972a0c60..fece52ba58e4 100644 --- a/pkgs/by-name/ja/jay/package.nix +++ b/pkgs/by-name/ja/jay/package.nix @@ -48,8 +48,8 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - install -D etc/jay.portal $out/usr/share/xdg-desktop-portal/portals/jay.portal - install -D etc/jay-portals.conf $out/usr/share/xdg-desktop-portal/jay-portals.conf + install -D etc/jay.portal $out/share/xdg-desktop-portal/portals/jay.portal + install -D etc/jay-portals.conf $out/share/xdg-desktop-portal/jay-portals.conf ''; meta = with lib; { From 64131d53638f112f8c9ffae12567ab3f286eca74 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Wed, 4 Dec 2024 20:25:11 -0500 Subject: [PATCH 0626/1054] zed-editor: 0.163.3 -> 0.164.2 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 8776f4a06033..44d2094e73ae 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -90,13 +90,13 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.163.3"; + version = "0.164.2"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-AkfMAGkxo4ZQVqR+8T9IgBMXvSyFd15jU5hCoAWDk0A="; + hash = "sha256-qWfd/d+czk/1YjncRAhgWIRDUUrJQKj7UaEV7RJ5FFs="; }; patches = @@ -118,7 +118,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-Ol7GPWACb8jGhki3rlLxNw3486+LOR2fyh7qVXWkGJ0="; + cargoHash = "sha256-j8t4i4YNB7eQuJ8+GtOLX0ZSfw6SracFE1sw71l4IKI="; nativeBuildInputs = [ From 000133b4ab900a18bc15ad1a2312ad7e18fd17e5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 2 Dec 2024 14:12:01 -0500 Subject: [PATCH 0627/1054] julia_111-bin: 1.11.1 -> 1.11.2 --- pkgs/development/compilers/julia/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 6a805b5ccb83..63b2a14be7e1 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -40,12 +40,12 @@ in { }); julia_111-bin = wrapJulia (callPackage (import ./generic-bin.nix { - version = "1.11.1"; + version = "1.11.2"; sha256 = { - x86_64-linux = "cca8d13dc4507e4f62a129322293313ee574f300d4df9e7db30b7b41c5f8a8f3"; - aarch64-linux = "bd623ef3801c5a56103464d349c7901d5cc034405ad289332c67f1e8ecc05840"; - x86_64-darwin = "59885de9310788c1ed12f41e7d2c2f05eabd314888cd105d299837b76a4a7240"; - aarch64-darwin = "e09d13e1c6c98452e91e698220688dd784ec8e5367e9e6443099c5f9aa2add78"; + x86_64-linux = "8a372ad262d4d4d55a1044f4fe3bce7c9a4a3ce8c513d2470e58e8071eecd476"; + aarch64-linux = "0346e6d65852a3b73ced2c80c40f5a8cf38e7048d001cd57d3d1dd9efb2f6641"; + x86_64-darwin = "0b52ba3d7f283e43ba853bc3d0f401decf993d8d53da752bd644a9f934679184"; + aarch64-darwin = "bcfe9c788f3dcf613a4753a4d9771d8381d00caf0e8af64d8aa87af10068b754"; }; }) { }); From 849e76f9329eba81fce984e7e1895c341bfdc275 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 2 Dec 2024 14:14:54 -0500 Subject: [PATCH 0628/1054] julia_111: 1.11.1 -> 1.11.2 --- pkgs/development/compilers/julia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 63b2a14be7e1..bab7cab1f300 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -69,8 +69,8 @@ in { }); julia_111 = wrapJulia (callPackage (import ./generic.nix { - version = "1.11.1"; - hash = "sha256-pJuATeboagP+Jsc/WIUeruH/JD1yBPK1rk28XB3CdY0="; + version = "1.11.2"; + hash = "sha256-pzZblplE8n3w2FY3FsqXaeB/P3e5+fu0i80RTd91LKQ="; patches = [ ./patches/1.11/0002-skip-failing-and-flaky-tests.patch ]; From a923ebbe806af07cea3d68cba595a83484428493 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 01:28:48 +0000 Subject: [PATCH 0629/1054] maelstrom-clj: 0.2.3 -> 0.2.4 --- pkgs/by-name/ma/maelstrom-clj/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/maelstrom-clj/package.nix b/pkgs/by-name/ma/maelstrom-clj/package.nix index 3f6a700e0bdc..ab1cc23ce48e 100644 --- a/pkgs/by-name/ma/maelstrom-clj/package.nix +++ b/pkgs/by-name/ma/maelstrom-clj/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "maelstrom"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "https://github.com/jepsen-io/maelstrom/releases/download/v${version}/maelstrom.tar.bz2"; - hash = "sha256-ISS2qma139Jz9eDxLJvULkqDZeu1vyx9ot4uO0LIVho="; + hash = "sha256-MB7HHWsSrw12XttBP1z1qhBGtWCb1OMTdqC1SVSOV5k="; }; installPhase = '' From 6f8001faa372c5e22c516058b7bdbb198d425fef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 01:29:43 +0000 Subject: [PATCH 0630/1054] mainsail: 2.12.0 -> 2.13.0 --- pkgs/by-name/ma/mainsail/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mainsail/package.nix b/pkgs/by-name/ma/mainsail/package.nix index e57d286318a6..a28428bc988f 100644 --- a/pkgs/by-name/ma/mainsail/package.nix +++ b/pkgs/by-name/ma/mainsail/package.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mainsail"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "mainsail-crew"; repo = "mainsail"; rev = "v${version}"; - hash = "sha256-ZRs+KhHNQIGXy/3MUNM5OUuWSntfjYsW3d0OOvuvdAQ="; + hash = "sha256-1DpGfCa1jw6PO/a1dfsA4Oo5J1NqE4vlEbF0KKbwM4w="; }; - npmDepsHash = "sha256-du1X58wUTelgJO/0JYwxfHjjNpu1e4M1GDvx6tgz8Zw="; + npmDepsHash = "sha256-jOuIV6yR7hIPYRiAy5odxk8LreHiVTlZ03stwV2Nf4o="; # Prevent Cypress binary download. CYPRESS_INSTALL_BINARY = 0; From 8e4cf35970d666f6f9154abeaf642a26d2340647 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 4 Dec 2024 20:36:04 -0500 Subject: [PATCH 0631/1054] nodePackages.ganache: drop (#361285) * lighthouse: remove unused ganache dependency * nodePackages.ganache: drop --- .../manual/release-notes/rl-2505.section.md | 2 + .../blockchains/lighthouse/default.nix | 2 - pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 226 ------------------ 5 files changed, 3 insertions(+), 229 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 39849d5d64c2..f928d75a1fd8 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -60,6 +60,8 @@ - `gkraken` software and `hardware.gkraken.enable` option have been removed, use `coolercontrol` via `programs.coolercontrol.enable` option instead. +- `nodePackages.ganache` has been removed, as the package has been deprecated by upstream. + - `containerd` has been updated to v2, which contains breaking changes. See the [containerd 2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more details. diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index 2afce895da6e..3846ae0a82a1 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -5,7 +5,6 @@ , lib , lighthouse , nix-update-script -, nodePackages , openssl , pkg-config , postgresql @@ -131,7 +130,6 @@ rustPlatform.buildRustPackage rec { ]; nativeCheckInputs = [ - nodePackages.ganache postgresql ]; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index a38d11119a23..ab312eff0b7d 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -97,6 +97,7 @@ mapAliases { inherit (pkgs) firebase-tools; # added 2023-08-18 inherit (pkgs) fixjson; # added 2024-06-26 flood = pkgs.flood; # Added 2023-07-25 + ganache = throw "ganache was removed because it was deprecated upstream"; # added 2024-12-02 generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24 inherit (pkgs) git-run; # added 2024-06-26 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6c57b171efe2..e9ba9e79b798 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -92,7 +92,6 @@ , "fleek-cli" , "forever" , "fx" -, "ganache" , "gatsby-cli" , "@gitbeaker/cli" , "graphql" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 9d2c50812251..91c126feeee4 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -9949,15 +9949,6 @@ let sha512 = "C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="; }; }; - "@trufflesuite/uws-js-unofficial-20.30.0-unofficial.0" = { - name = "_at_trufflesuite_slash_uws-js-unofficial"; - packageName = "@trufflesuite/uws-js-unofficial"; - version = "20.30.0-unofficial.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@trufflesuite/uws-js-unofficial/-/uws-js-unofficial-20.30.0-unofficial.0.tgz"; - sha512 = "r5X0aOQcuT6pLwTRLD+mPnAM/nlKtvIK4Z+My++A8tTOR0qTjNRx8UB8jzRj3D+p9PMAp5LnpCUUGmz7/TppwA=="; - }; - }; "@trysound/sax-0.2.0" = { name = "_at_trysound_slash_sax"; packageName = "@trysound/sax"; @@ -10093,15 +10084,6 @@ let sha512 = "FisOhG87cCFqzCgq6FUtSYsTMOHCB/p28zJbSN1QBo4ZGJfg9PEhMjdIV++NDeOnloUUe0Gz6jwBV+L1Ac00Mw=="; }; }; - "@types/bn.js-5.1.6" = { - name = "_at_types_slash_bn.js"; - packageName = "@types/bn.js"; - version = "5.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.6.tgz"; - sha512 = "Xh8vSwUeMKeYYrj3cX4lGQgFSF/N03r+tv4AiLl1SucqV+uTQpxRcnM8AkXKHwYP9ZPXOYXRr2KPXpVlIvqh9w=="; - }; - }; "@types/body-parser-1.19.5" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -10516,15 +10498,6 @@ let sha512 = "8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA=="; }; }; - "@types/lru-cache-5.1.1" = { - name = "_at_types_slash_lru-cache"; - packageName = "@types/lru-cache"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw=="; - }; - }; "@types/markdown-it-14.1.2" = { name = "_at_types_slash_markdown-it"; packageName = "@types/markdown-it"; @@ -10858,15 +10831,6 @@ let sha512 = "3xSjTp3v03X/lSQLkczaN9UIEwJMoMCA1+Nb5HfbJEQWogdeQIyVtTvxPXDQjZ5zws8rFQfVfRdz03ARihPJgw=="; }; }; - "@types/seedrandom-3.0.1" = { - name = "_at_types_slash_seedrandom"; - packageName = "@types/seedrandom"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/seedrandom/-/seedrandom-3.0.1.tgz"; - sha512 = "giB9gzDeiCeloIXDgzFBCgjj1k4WxcDrZtGl6h1IqmUPlxF+Nx8Ve+96QCyDZ/HseB/uvDsKbpib9hU5cU53pw=="; - }; - }; "@types/semver-7.5.8" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; @@ -12469,24 +12433,6 @@ let sha512 = "JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ=="; }; }; - "abstract-level-1.0.3" = { - name = "abstract-level"; - packageName = "abstract-level"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/abstract-level/-/abstract-level-1.0.3.tgz"; - sha512 = "t6jv+xHy+VYwc4xqZMn2Pa9DjcdzvzZmQGRjTFc8spIbRGHgBrEKbPq+rYXc7CCo0lxgYvSgKVg9qZAhpVQSjA=="; - }; - }; - "abstract-leveldown-7.2.0" = { - name = "abstract-leveldown"; - packageName = "abstract-leveldown"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz"; - sha512 = "DnhQwcFEaYsvYDnACLZhMmCWd3rkOeEvglpa4q5i/5Jlm3UIsWaxVzuXvDLFCSCWRO3yy2/+V/G7FusFgejnfQ=="; - }; - }; "abstract-logging-1.0.0" = { name = "abstract-logging"; packageName = "abstract-logging"; @@ -14008,15 +13954,6 @@ let sha512 = "p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ=="; }; }; - "async-eventemitter-0.2.4" = { - name = "async-eventemitter"; - packageName = "async-eventemitter"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/async-eventemitter/-/async-eventemitter-0.2.4.tgz"; - sha512 = "pd20BwL7Yt1zwDFy+8MX8F1+WCT8aQeKj0kQnTrH9WaeRETlRamVhD0JtRPmrV4GfOJ2F9CvdQkZeZhnh2TuHw=="; - }; - }; "async-limiter-1.0.1" = { name = "async-limiter"; packageName = "async-limiter"; @@ -15772,24 +15709,6 @@ let sha512 = "HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg=="; }; }; - "bufferutil-4.0.5" = { - name = "bufferutil"; - packageName = "bufferutil"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.5.tgz"; - sha512 = "HTm14iMQKK2FjFLRTM5lAVcyaUzOnqbPtesFIvREgXpJHdQm8bWS+GkQgIkfaBYRHuCnea7w8UVNfwiAQhlr9A=="; - }; - }; - "bufferutil-4.0.7" = { - name = "bufferutil"; - packageName = "bufferutil"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.7.tgz"; - sha512 = "kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw=="; - }; - }; "bufferutil-4.0.8" = { name = "bufferutil"; packageName = "bufferutil"; @@ -16339,15 +16258,6 @@ let sha512 = "4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="; }; }; - "catering-2.1.1" = { - name = "catering"; - packageName = "catering"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/catering/-/catering-2.1.1.tgz"; - sha512 = "K7Qy8O9p76sL3/3m7/zLKbRkyOlSZAgzEaLhyj2mXS8PsCud2Eo4hAb8aLtZqHh0QGqLcb9dlJSu6lHRVENm1w=="; - }; - }; "catharsis-0.9.0" = { name = "catharsis"; packageName = "catharsis"; @@ -21993,15 +21903,6 @@ let sha256 = "017c2be5bb31d76e87a1910024d0e420e05aa7c1f4f0b0c792e15d0746ae77a6"; }; }; - "emittery-0.10.0" = { - name = "emittery"; - packageName = "emittery"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emittery/-/emittery-0.10.0.tgz"; - sha512 = "AGvFfs+d0JKCJQ4o01ASQLGPmSCxgfU9RFXvzPvZdjKK8oscynksuJhWrSTSw7j7Ep/sZct5b5ZhYCi8S/t0HQ=="; - }; - }; "emoji-regex-10.4.0" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -32443,42 +32344,6 @@ let sha512 = "DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg=="; }; }; - "level-concat-iterator-3.1.0" = { - name = "level-concat-iterator"; - packageName = "level-concat-iterator"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/level-concat-iterator/-/level-concat-iterator-3.1.0.tgz"; - sha512 = "BWRCMHBxbIqPxJ8vHOvKUsaO0v1sLYZtjN3K2iZJsRBYtp+ONsY6Jfi6hy9K3+zolgQRryhIn2NRZjZnWJ9NmQ=="; - }; - }; - "level-supports-2.1.0" = { - name = "level-supports"; - packageName = "level-supports"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/level-supports/-/level-supports-2.1.0.tgz"; - sha512 = "E486g1NCjW5cF78KGPrMDRBYzPuueMZ6VBXHT6gC7A8UYWGiM14fGgp+s/L1oFfDWSPV/+SFkYCmZ0SiESkRKA=="; - }; - }; - "level-supports-4.0.1" = { - name = "level-supports"; - packageName = "level-supports"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/level-supports/-/level-supports-4.0.1.tgz"; - sha512 = "PbXpve8rKeNcZ9C1mUicC9auIYFyGpkV9/i6g76tLgANwWhtG2v7I4xNBUlkn3lE2/dZF3Pi0ygYGtLc4RXXdA=="; - }; - }; - "level-transcoder-1.0.1" = { - name = "level-transcoder"; - packageName = "level-transcoder"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/level-transcoder/-/level-transcoder-1.0.1.tgz"; - sha512 = "t7bFwFtsQeD8cl8NIoQ2iwxA0CL/9IFw7/9gAjOonH0PWTTiRfY7Hq+Ejbsxh86tXobDQ6IOiddjNYIfOBs06w=="; - }; - }; "leven-3.1.0" = { name = "leven"; packageName = "leven"; @@ -36665,15 +36530,6 @@ let sha512 = "fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA=="; }; }; - "module-error-1.0.2" = { - name = "module-error"; - packageName = "module-error"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/module-error/-/module-error-1.0.2.tgz"; - sha512 = "0yuvsqSCv8LbaOKhnsQ/T5JhyFlCYLPXK3U2sgV10zoKQwzs/MyfuQUOZQ1V/6OCOJsK/TRgNVrPuPDqtdMFtA=="; - }; - }; "mold-source-map-0.4.1" = { name = "mold-source-map"; packageName = "mold-source-map"; @@ -51984,24 +51840,6 @@ let sha512 = "Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ=="; }; }; - "utf-8-validate-5.0.7" = { - name = "utf-8-validate"; - packageName = "utf-8-validate"; - version = "5.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.7.tgz"; - sha512 = "vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q=="; - }; - }; - "utf-8-validate-6.0.3" = { - name = "utf-8-validate"; - packageName = "utf-8-validate"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.3.tgz"; - sha512 = "uIuGf9TWQ/y+0Lp+KGZCMuJWc3N9BHA+l/UmHd/oUHwJJDeysyTRxNQVkbzsIWfGFbRe3OcgML/i0mvVRPOyDA=="; - }; - }; "utf-8-validate-6.0.4" = { name = "utf-8-validate"; packageName = "utf-8-validate"; @@ -54360,15 +54198,6 @@ let sha512 = "HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg=="; }; }; - "ws-8.13.0" = { - name = "ws"; - packageName = "ws"; - version = "8.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz"; - sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="; - }; - }; "ws-8.17.1" = { name = "ws"; packageName = "ws"; @@ -67505,61 +67334,6 @@ in bypassCache = true; reconstructLock = true; }; - ganache = nodeEnv.buildNodePackage { - name = "ganache"; - packageName = "ganache"; - version = "7.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ganache/-/ganache-7.9.2.tgz"; - sha512 = "7gsVVDpO9AhrFyDMWWl7SpMsPpqGcnAzjxz3k32LheIPNd64p2XsY9GYRdhWmKuryb60W1iaWPZWDkFKlbRWHA=="; - }; - dependencies = [ - (sources."@trufflesuite/uws-js-unofficial-20.30.0-unofficial.0" // { - dependencies = [ - sources."bufferutil-4.0.7" - sources."utf-8-validate-6.0.3" - ]; - }) - sources."@types/bn.js-5.1.6" - sources."@types/lru-cache-5.1.1" - sources."@types/node-22.5.5" - sources."@types/seedrandom-3.0.1" - sources."abstract-level-1.0.3" - (sources."abstract-leveldown-7.2.0" // { - dependencies = [ - sources."level-supports-2.1.0" - ]; - }) - sources."async-2.6.4" - sources."async-eventemitter-0.2.4" - sources."base64-js-1.5.1" - sources."buffer-6.0.3" - sources."bufferutil-4.0.5" - sources."catering-2.1.1" - sources."emittery-0.10.0" - sources."ieee754-1.2.1" - sources."is-buffer-2.0.5" - sources."level-concat-iterator-3.1.0" - sources."level-supports-4.0.1" - sources."level-transcoder-1.0.1" - sources."lodash-4.17.21" - sources."module-error-1.0.2" - sources."node-gyp-build-4.8.2" - sources."queue-microtask-1.2.3" - sources."undici-types-6.19.8" - sources."utf-8-validate-5.0.7" - sources."ws-8.13.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A library and cli to create a local blockchain for fast Ethereum development."; - homepage = "https://github.com/trufflesuite/ganache/tree/develop/packages/ganache#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; From 69f9ca4bc0108ebbc47b8aa416c7f74ca81b0629 Mon Sep 17 00:00:00 2001 From: ppenguin Date: Thu, 5 Dec 2024 02:38:02 +0100 Subject: [PATCH 0632/1054] enkei: init at 0.9.3 (#233095) enkei: init @ v0.9.3 Update pkgs/by-name/en/enkei/package.nix Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> Update pkgs/by-name/en/enkei/package.nix Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> enkei: init @ v0.9.3 Cleanup / remove top-level attr (since using pkgs/by-name) nixfmt --- pkgs/by-name/en/enkei/package.nix | 49 +++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/en/enkei/package.nix diff --git a/pkgs/by-name/en/enkei/package.nix b/pkgs/by-name/en/enkei/package.nix new file mode 100644 index 000000000000..e2abf1870afe --- /dev/null +++ b/pkgs/by-name/en/enkei/package.nix @@ -0,0 +1,49 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + glib, + cairo, + wayland, + libGL, +}: +rustPlatform.buildRustPackage rec { + pname = "enkei"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "fia0"; + repo = "enkei"; + rev = "v${version}"; + sha256 = "sha256-COU2JtiJcPRA3Jno0qLEIVgimYBWfn5Pgc1OMImsJtI="; + }; + + cargoHash = "sha256-nf9JM5FfXBNEKzZrfu3jphupL9PdoQLVpqGoZ/X9p5E="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + wayland + libGL + glib + cairo + ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "Wallpaper daemon and control tool for Wayland"; + longDescription = '' + Created to allow displaying dynamic wallpapers based on the specification format used for example in the `Gnome` desktop environment. + It is designed to offer a _smooth_ transition between wallpapers and gradual change over long and short periods of time. + For a fast handling `enkei` uses `OpenGL` to render images and blending them for transitions. + ''; + homepage = "https://github.com/jwuensche/enkei"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ppenguin ]; + }; +} From 5fbd8b3558e3c38017f4b5b58e72741478e17f78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 01:59:05 +0000 Subject: [PATCH 0633/1054] hurl: 5.0.1 -> 6.0.0 --- pkgs/by-name/hu/hurl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix index 7132d2f9ed0f..335ba94b0120 100644 --- a/pkgs/by-name/hu/hurl/package.nix +++ b/pkgs/by-name/hu/hurl/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "5.0.1"; + version = "6.0.0"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = "hurl"; rev = "refs/tags/${version}"; - hash = "sha256-+GmIKxD5wHovhKXuV2IbDX43gbD8OxJzWvH3Z0MwwV4="; + hash = "sha256-zrZWYnXUuzf2cS3n56/hWDvyXVM4Y/34SOlMPrtAhJo="; }; - cargoHash = "sha256-exAEJhHm7zTzXykkLyz46C0GJ7/7HYEwdfCd8zUDZ/A="; + cargoHash = "sha256-IuxTuIU9/6BpAXXunJ1Jjz3FPYRVPFNQhBqVAzMjNro="; nativeBuildInputs = [ pkg-config From ad884b3b02321d68812c4d5975fc321e9635e36c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 02:04:12 +0000 Subject: [PATCH 0634/1054] php82Packages.phing: 3.0.0 -> 3.0.1 --- pkgs/development/php-packages/phing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix index de9de209f1ba..d5eb0b099ed1 100644 --- a/pkgs/development/php-packages/phing/default.nix +++ b/pkgs/development/php-packages/phing/default.nix @@ -7,16 +7,16 @@ (php.withExtensions ({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject2 (finalAttrs: { pname = "phing"; - version = "3.0.0"; + version = "3.0.1"; # Upstream no longer provides the composer.lock in their release artifact src = fetchgit { url = "https://github.com/phingofficial/phing"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-PEJuEsVl6H4tdqOUvkuazVmyvsRvhBD5AA7EWkMHmFk="; + hash = "sha256-eVDHwG8UPvQPrhD3KuO4ZONsnGGbclVs4kNVG+Ac1/E="; }; - vendorHash = "sha256-P829cADIJ5Hl5gHXbgTkpWHGF1pCtUKvx1GMrbPLkik="; + vendorHash = "sha256-NqCzrVZRsyiOjxXtSE7DeiAq21S8sjFgFNMmP99KUSE="; meta = { description = "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant"; From 77a0bdd5afe11aec9c96c9c0f094bd70927634c8 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Wed, 4 Dec 2024 19:19:50 -0700 Subject: [PATCH 0635/1054] scrcpy: 3.0 -> 3.0.2 https://github.com/Genymobile/scrcpy/releases/tag/v3.0.2 --- pkgs/by-name/sc/scrcpy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scrcpy/package.nix b/pkgs/by-name/sc/scrcpy/package.nix index d02b5a903286..afe4147f1930 100644 --- a/pkgs/by-name/sc/scrcpy/package.nix +++ b/pkgs/by-name/sc/scrcpy/package.nix @@ -16,12 +16,12 @@ }: let - version = "3.0"; + version = "3.0.2"; prebuilt_server = fetchurl { name = "scrcpy-server"; inherit version; url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - hash = "sha256-gABExiqU1fwW9auchtRbEFDq4+tDZRTRsNL+Jka4lOo="; + hash = "sha256-4Z/gJL+jNngJSUQHrWyoCab2532slemfhbp1FE4Lo10="; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = "scrcpy"; rev = "refs/tags/v${version}"; - hash = "sha256-fKfiBx3uQH30ZLCWRY33KyisjxLDvWJCdKbGn4j0dWw="; + hash = "sha256-6CViFgQuazvKGPHGpityEI/mpgOmIBA6LTEHobWybV0="; }; # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. From 25d2577bebfd7dfaa50d495993907ca46f408b7e Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 5 Dec 2024 11:14:45 +0900 Subject: [PATCH 0636/1054] act: add updateScript --- pkgs/by-name/ac/act/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix index 9e26c99508b8..9351d7eb1e95 100644 --- a/pkgs/by-name/ac/act/package.nix +++ b/pkgs/by-name/ac/act/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, buildGoModule, testers, + nix-update-script, act, }: @@ -30,8 +31,12 @@ buildGoModule { "-X main.version=${version}" ]; - passthru.tests.version = testers.testVersion { - package = act; + passthru = { + tests.version = testers.testVersion { + package = act; + }; + + updateScript = nix-update-script { }; }; meta = { From 5aea15ef39b08e5e636a0e2c34b96efdfa185d20 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 5 Dec 2024 11:19:04 +0900 Subject: [PATCH 0637/1054] act: 0.2.68 -> 0.2.70 Diff: https://github.com/nektos/act/compare/v0.2.68...v0.2.70 Bumped with `nix-shell ./maintainers/scripts/update.nix --argstr package act` And checked with `nix-build --attr pkgs.act.passthru.tests` --- pkgs/by-name/ac/act/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix index 9351d7eb1e95..7b85786b43c7 100644 --- a/pkgs/by-name/ac/act/package.nix +++ b/pkgs/by-name/ac/act/package.nix @@ -8,7 +8,7 @@ }: let - version = "0.2.68"; + version = "0.2.70"; in buildGoModule { pname = "act"; @@ -18,10 +18,10 @@ buildGoModule { owner = "nektos"; repo = "act"; rev = "refs/tags/v${version}"; - hash = "sha256-BON29uUruBoeBLoBdOgnonrVIyLZlvBW5UyWfxFgjPs="; + hash = "sha256-7e2ehUM3d5hcFtaahW/hrhVkpy74ufMdYwdnbsUA+WM="; }; - vendorHash = "sha256-yxuOORShJL9nFIS5srZFI31Nyz7xFxnJCmcN8UFhyr0="; + vendorHash = "sha256-2fHNiquFg6I0JefqXfXRrnXxKPkNQOtQB7fznldO3GE="; doCheck = false; From d5326bc21787f9ea88d15fbe214bb15309f80efa Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 18 Nov 2024 15:39:48 -0500 Subject: [PATCH 0638/1054] llm: 0.17.1 -> 0.19 Diff: https://github.com/simonw/llm/compare/refs/tags/0.17.1...0.18 Changelog: https://github.com/simonw/llm/releases/tag/0.18 --- pkgs/development/python-modules/llm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index 568c57683215..10c19142e2c0 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -22,7 +22,7 @@ let llm = buildPythonPackage rec { pname = "llm"; - version = "0.17.1"; + version = "0.19"; pyproject = true; build-system = [ setuptools ]; @@ -33,7 +33,7 @@ let owner = "simonw"; repo = "llm"; rev = "refs/tags/${version}"; - hash = "sha256-6OO0SIIxChM5HRJoUM4CYGbsINmc3i+iyL/oahLHhrY="; + hash = "sha256-FlE4VtvCvlNMJCf7qPrvQzJn9HcN/7UwH/UNL0XP618="; }; patches = [ ./001-disable-install-uninstall-commands.patch ]; From c78ef18e9c2a548082de547c80e5cbdd9c10de71 Mon Sep 17 00:00:00 2001 From: Jean-Francois Chevrette Date: Wed, 4 Dec 2024 22:19:42 -0500 Subject: [PATCH 0639/1054] rosa: 1.2.46 -> 1.2.48 (#359440) rosa: rosa: 1.2.46 -> 1.2.48 --- pkgs/by-name/ro/rosa/package.nix | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix index 40a1cccaf1b2..95b1d9f68476 100644 --- a/pkgs/by-name/ro/rosa/package.nix +++ b/pkgs/by-name/ro/rosa/package.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, rosa, nix-update-script }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, rosa, nix-update-script }: buildGoModule rec { pname = "rosa"; - version = "1.2.46"; + version = "1.2.48"; src = fetchFromGitHub { owner = "openshift"; repo = "rosa"; rev = "v${version}"; - hash = "sha256-XRoHapuH0MJNrtu+Rk/yxJqeqjNIbdGYqDB84q05rdA="; + hash = "sha256-qJKzJrCZKhaqoRxloTUqaRsR4/X/hoMxmDQCTNccTqk="; }; vendorHash = null; @@ -16,17 +16,19 @@ buildGoModule rec { __darwinAllowLocalNetworking = true; - postPatch = '' - # e2e tests require network access - rm -r tests/e2e - ''; + # skip e2e tests package + excludedPackages = [ "tests/e2e" ]; - preCheck = '' - # Workaround for cmd/list/rhRegion/cmd_test.go:39 - # Failed to get OCM regions: Can't retrieve shards: Get "https://api.stage.openshift.com/static/ocm-shards.json": dial tcp: lookup api.stage.openshift.com on [::1]:53: read udp [::1]:55793->[::1]:53: read: connection refused - substituteInPlace "cmd/list/rhRegion/cmd_test.go" \ - --replace-fail "TestRhRegionCommand" "SkipRhRegionCommand" - ''; + # skip tests that require network access + checkFlags = + let + skippedTests = [ + "TestCluster" + "TestRhRegionCommand" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestCache" ]; + in + [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; nativeBuildInputs = [ installShellFiles ]; postInstall = '' From cf5c3ee399803dc4ec2e08ae52fd9578ee46c6c1 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 5 Dec 2024 12:24:04 +0900 Subject: [PATCH 0640/1054] dprint: 0.47.5 -> 0.47.6 Release: https://github.com/dprint/dprint/releases/tag/0.47.6 This diff is generated by ```bash nix-shell ./maintainers/scripts/update.nix --argstr package dprint ``` And checked with ```bash nix-build --attr pkgs.dprint.passthru.tests ``` --- pkgs/development/tools/dprint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index 38cb068c4d59..5cf6abe3633c 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.47.5"; + version = "0.47.6"; src = fetchCrate { inherit pname version; - hash = "sha256-1TfROcng9hF8j2PR+LEXNWnIKLapTPU1QunoCi5NxhI="; + hash = "sha256-7tGzSFp7Dnu27L65mqFd7hzeFFDfe1xJ6cMul3hGyJs="; }; - cargoHash = "sha256-EliiKKRt+7IMPR8+0OWn+YKizPT9SZjVALAdbwi301w="; + cargoHash = "sha256-y3tV3X7YMOUGBn2hCmxsUUc9QQleKEioTIw7SGoBvSQ="; # Tests fail because they expect a test WASM plugin. Tests already run for # every commit upstream on GitHub Actions From 435da03a6e6e374a60dcb6f633a617c2666603b6 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 5 Dec 2024 12:41:32 +0900 Subject: [PATCH 0641/1054] dprint: move to pkgs/by-name https://github.com/NixOS/nixpkgs/blob/fbafd4f6751c961b36f8d4ff6b13cd2d163622bf/pkgs/by-name/README.md?plain=1#L79-L114 --- .../tools/dprint/default.nix => by-name/dp/dprint/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/dprint/default.nix => by-name/dp/dprint/package.nix} (100%) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/by-name/dp/dprint/package.nix similarity index 100% rename from pkgs/development/tools/dprint/default.nix rename to pkgs/by-name/dp/dprint/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6323a2b13be..99a230410aaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8231,8 +8231,6 @@ with pkgs; dbt = with python3Packages; toPythonApplication dbt-core; - dprint = callPackage ../development/tools/dprint { }; - devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo123Module; }; libcxx = llvmPackages.libcxx; From 49c1d7a3df0271023bddd0cb737dbe7b4443cbb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 03:56:35 +0000 Subject: [PATCH 0642/1054] python312Packages.tesla-fleet-api: 0.8.4 -> 0.8.5 --- pkgs/development/python-modules/tesla-fleet-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 4d5d49d7b007..161b8778d785 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.8.4"; + version = "0.8.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-tPMX8zmiwNF/j4FdOU/cWROrBCensfLKfl1A8ouF+0Y="; + hash = "sha256-vsgWdAvNl1lZgVK7SU6oF93gfEQ1hsAuFMSIpmKNWAg="; }; build-system = [ setuptools ]; From 42f325451d7e0278ebfd0a93bde9c74c08215ea5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 04:04:53 +0000 Subject: [PATCH 0643/1054] smug: 0.3.5 -> 0.3.6 --- pkgs/by-name/sm/smug/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sm/smug/package.nix b/pkgs/by-name/sm/smug/package.nix index 8caf8e4b3f3d..213d8ee77139 100644 --- a/pkgs/by-name/sm/smug/package.nix +++ b/pkgs/by-name/sm/smug/package.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "smug"; - version = "0.3.5"; + version = "0.3.6"; subPackages = [ "." ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "ivaaaan"; repo = "smug"; rev = "v${version}"; - sha256 = "sha256-5n4EmkcHv6pw1gd9VUtJRR3QdRJsu5DYYsozJ25uggs="; + sha256 = "sha256-9So81tZwQa3rQYgVO+KjOlTVIzlm/e2K5C/qULZeA7U="; }; vendorHash = "sha256-vaDUzVRmpmNn8/vUPeR1U5N6T4llFRIk9A1lum8uauU="; From e23bacc84412715346d68bcde6448fa9e46d8d16 Mon Sep 17 00:00:00 2001 From: birkhoff Date: Thu, 5 Dec 2024 05:34:18 +0100 Subject: [PATCH 0644/1054] nexttrace: build with go 1.22 to fix darwin build (#352581) use go 1.22 to build nexttrace This project is meant to be build on Go 1.22 instead of any later versions References: - https://github.com/nxtrace/NTrace-core/issues/270 - https://github.com/nxtrace/NTrace-core/issues/257 --- pkgs/by-name/ne/nexttrace/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nexttrace/package.nix b/pkgs/by-name/ne/nexttrace/package.nix index f3051ba451f2..f82444e68feb 100644 --- a/pkgs/by-name/ne/nexttrace/package.nix +++ b/pkgs/by-name/ne/nexttrace/package.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGo122Module, fetchFromGitHub }: -buildGoModule rec { +buildGo122Module rec { pname = "nexttrace"; version = "1.3.5"; From c434c9198d11ab499921e99150f04dc996cdd726 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 5 Dec 2024 14:04:56 +0900 Subject: [PATCH 0645/1054] expr: update repository owner It is clarified in https://github.com/expr-lang/expr/commit/4391851a621e2c1b7e9995fcb4f79337f2545b3e, which was signed by the original author. --- pkgs/by-name/ex/expr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ex/expr/package.nix b/pkgs/by-name/ex/expr/package.nix index 33dce18738e9..3fa6182c6f88 100644 --- a/pkgs/by-name/ex/expr/package.nix +++ b/pkgs/by-name/ex/expr/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { version = "1.16.9"; src = fetchFromGitHub { - owner = "antonmedv"; + owner = "expr-lang"; repo = "expr"; rev = "v${version}"; hash = "sha256-AyFL+XHxitueAadx1M/xWqeittDCQ/hzsE/fUzt75yI="; @@ -26,8 +26,8 @@ buildGoModule rec { meta = with lib; { description = "Expression language and expression evaluation for Go"; - homepage = "https://github.com/antonmedv/expr"; - changelog = "https://github.com/antonmedv/expr/releases/tag/${src.rev}"; + homepage = "https://github.com/expr-lang/expr"; + changelog = "https://github.com/expr-lang/expr/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; mainProgram = "expr"; From 7096d05302ef3d67dc4132d74d109001297452e9 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Wed, 24 Jan 2024 12:13:30 +0100 Subject: [PATCH 0646/1054] logrotate: disable acl on non-Linux platforms Currently running `nix build nixpkgs#logrotate` on Darwin fails, because it tries to build `acl`, which is a Linux-only package - since it's an optional dependency, let's disable it on non-Linux platforms. --- pkgs/by-name/lo/logrotate/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lo/logrotate/package.nix b/pkgs/by-name/lo/logrotate/package.nix index d25f0dd7168b..6ff2a178fa10 100644 --- a/pkgs/by-name/lo/logrotate/package.nix +++ b/pkgs/by-name/lo/logrotate/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, gzip, popt, autoreconfHook -, aclSupport ? true, acl +, aclSupport ? stdenv.isLinux, acl , nixosTests }: From 1d0e98f2f9976d805dd02ffe298574b2ebe7f88b Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 5 Dec 2024 06:22:16 +0100 Subject: [PATCH 0647/1054] ndcurves: init at 1.4.1 (#347703) * ndcurves: init at 1.4.1 * ndcurves: python-curves is also failing on aarch64-linux --- pkgs/by-name/nd/ndcurves/package.nix | 73 ++++++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/by-name/nd/ndcurves/package.nix diff --git a/pkgs/by-name/nd/ndcurves/package.nix b/pkgs/by-name/nd/ndcurves/package.nix new file mode 100644 index 000000000000..cc58991bb325 --- /dev/null +++ b/pkgs/by-name/nd/ndcurves/package.nix @@ -0,0 +1,73 @@ +{ + cmake, + doxygen, + fetchFromGitHub, + jrl-cmakemodules, + lib, + pinocchio, + pkg-config, + python3Packages, + pythonSupport ? false, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ndcurves"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "loco-3d"; + repo = "ndcurves"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XJ3VSSGKSJ+x3jc4408PGHTYg3nC7o/EeFnbKBELefs="; + }; + + outputs = [ + "out" + "doc" + ]; + + strictDeps = true; + + nativeBuildInputs = + [ + cmake + doxygen + pkg-config + ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pythonImportsCheckHook + ]; + propagatedBuildInputs = + [ jrl-cmakemodules ] + ++ lib.optionals pythonSupport [ + python3Packages.eigenpy + python3Packages.pinocchio + ] + ++ lib.optional (!pythonSupport) pinocchio; + + cmakeFlags = + [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + (lib.cmakeBool "CURVES_WITH_PINOCCHIO_SUPPORT" true) + ] + ++ lib.optional stdenv.hostPlatform.isAarch64 ( + lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'curves_tests|python-curves'" + ) + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ( + lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test-so3-smooth'" + ); + + doCheck = true; + + pythonImportsCheck = [ "ndcurves" ]; + + meta = { + description = "Library for creating smooth cubic splines"; + homepage = "https://github.com/loco-3d/ndcurves"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.nim65s ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba43430e48c1..b4429cfa2792 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8962,6 +8962,8 @@ self: super: with self; { natural = callPackage ../development/python-modules/natural { }; + ndcurves = toPythonModule (pkgs.ndcurves.override { python3Packages = self; pythonSupport = true; }); + nomadnet = callPackage ../development/python-modules/nomadnet { }; noneprompt = callPackage ../development/python-modules/noneprompt { }; From 6fa847d2669770776f466bcc7e2215831c4e88de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 05:44:43 +0000 Subject: [PATCH 0648/1054] python312Packages.django-admin-datta: 1.0.11 -> 1.0.15 --- .../development/python-modules/django-admin-datta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-admin-datta/default.nix b/pkgs/development/python-modules/django-admin-datta/default.nix index 35e3d880da4d..7ec5744cdc00 100644 --- a/pkgs/development/python-modules/django-admin-datta/default.nix +++ b/pkgs/development/python-modules/django-admin-datta/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "django-admin-datta"; - version = "1.0.11"; + version = "1.0.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jcX0PKyE2gHfaVJhXRvshJuZMfRJTloqIncNBLp3auc="; + hash = "sha256-QVobNrSZyDMldrhSccPnBEfXrwphVgtJ03yBHfTpits="; }; propagatedBuildInputs = [ django ]; From 96ce00dc5ed999a189bbdd4479cec43d308a1062 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 06:02:03 +0000 Subject: [PATCH 0649/1054] python312Packages.yattag: 1.16.0 -> 1.16.1 --- pkgs/development/python-modules/yattag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index 5fcd36765519..e6765bf0df11 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.16.0"; + version = "1.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CXgke5dU2fRONwPGQ3Srn6hy0Y3pWsV3L9/dPD8NBwY="; + hash = "sha256-uqjyVOfqXT4GGCga0v9WEODlNgs2COaVwpv7OynQUfQ="; }; pythonImportsCheck = [ "yattag" ]; From 08a7dd9e12a6016270a61dfc51078c8059d431be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 06:14:16 +0000 Subject: [PATCH 0650/1054] sakura: 3.8.7 -> 3.8.8 --- pkgs/by-name/sa/sakura/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/sakura/package.nix b/pkgs/by-name/sa/sakura/package.nix index cc883a488d68..f9c1b3f31a55 100644 --- a/pkgs/by-name/sa/sakura/package.nix +++ b/pkgs/by-name/sa/sakura/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sakura"; - version = "3.8.7"; + version = "3.8.8"; src = fetchFromGitHub { owner = "dabisu"; repo = "sakura"; rev = "SAKURA_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - hash = "sha256-mDYwqRPezHEgLyZlJQ6taTQiP9HDWmN09mapfp7/TPs="; + hash = "sha256-YeZIYIfFgkK5nxMHq9mslrjIWTRAebhXyzXv5hTmOpI="; }; nativeBuildInputs = [ From e6037ddab8756012cce48334adc8c5ccb3985f01 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 5 Dec 2024 15:22:20 +0900 Subject: [PATCH 0651/1054] hugo: enable doCheck with skipping failing tests --- pkgs/by-name/hu/hugo/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 1807d306527d..763fb3b93a2b 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -23,7 +23,10 @@ buildGoModule rec { vendorHash = "sha256-qhiCZMSLRnLbyHplcaPn/BGJ3Lv8O8eEvCuIHwA4sMs="; - doCheck = false; + checkFlags = [ + # Workaround for "failed to load modules" + "-skip=TestCommands/mod" + ]; proxyVendor = true; From 0e2d8416d05253be410f4b4c400e510b3add3c67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 06:44:06 +0000 Subject: [PATCH 0652/1054] openstackclient-full: 7.2.0 -> 7.2.1 --- .../python-modules/python-openstackclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 2933fa619b55..037bfa4859fe 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "7.2.0"; + version = "7.2.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-9je3W78PU3iZJjzVMSPXPxBZ0vMYY5xSLJA9zBJ7O5I="; + hash = "sha256-65q+VrUnJiRbmb37U5ps1RlsBSA5gJcDxlxpBJ5Eyjk="; }; build-system = [ From 4d9e16e24ac90b232d823c205612b7d2c8726003 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 06:44:43 +0000 Subject: [PATCH 0653/1054] subread: 2.0.7 -> 2.0.8 --- pkgs/by-name/su/subread/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/subread/package.nix b/pkgs/by-name/su/subread/package.nix index 66fc2152a4e7..287e55cb0a74 100644 --- a/pkgs/by-name/su/subread/package.nix +++ b/pkgs/by-name/su/subread/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "subread"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz"; - sha256 = "sha256-/tjt3hn52NiqEo721K5atnvOLb8iWJ9AlJlaE6cVq3U="; + sha256 = "sha256-y12t9xyFDxKKg0ciP+DOGeHBfjlZ6fPrqQ6AkGcfhXA="; }; buildInputs = [ From 8f97a00f0871839c4902f057095b30043296740e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 5 Dec 2024 06:54:16 +0000 Subject: [PATCH 0654/1054] hfst-ospell: 0.5.3 -> 0.5.4 Changes: https://github.com/hfst/hfst-ospell/compare/v0.5.3...v0.5.4 --- pkgs/by-name/hf/hfst-ospell/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/hf/hfst-ospell/package.nix b/pkgs/by-name/hf/hfst-ospell/package.nix index 823bcbbe8c08..eda613aede61 100644 --- a/pkgs/by-name/hf/hfst-ospell/package.nix +++ b/pkgs/by-name/hf/hfst-ospell/package.nix @@ -2,7 +2,6 @@ , stdenv , autoreconfHook , fetchFromGitHub -, fetchpatch , icu , libarchive , pkg-config @@ -10,24 +9,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "hfst-ospell"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "hfst"; repo = "hfst-ospell"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-16H1nbAIe+G71+TnlLG0WnH9LktZwmc0d0O+oYduH1k="; + hash = "sha256-BmM0acqPL8qPOJ0KEkcI264xj89v+VaItZ0yS8QLF3o="; }; - patches = [ - # Pull upstream fix for gcc-13 - (fetchpatch { - name = "cstdint.patch"; - url = "https://github.com/hfst/hfst-ospell/commit/7481bffbf622bc9aee3547183fbe8db9cf8b22ce.patch"; - hash = "sha256-q/B5mLx8Oc0nIRe3n3gl0OTyjIaEMCBsPc1GvpE226c="; - }) - ]; - buildInputs = [ icu libarchive From d8885f551811633d97f289ee72b1a0d966d58c99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 07:06:10 +0000 Subject: [PATCH 0655/1054] python312Packages.mockito: 1.5.1 -> 1.5.3 --- pkgs/development/python-modules/mockito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index 4a5dc1a60be1..8cf9371a349d 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "mockito"; - version = "1.5.1"; + version = "1.5.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QFYkCRcVzDlU4vo5zFDlCNWXeNTS+1bI23v6X1k9MwM="; + hash = "sha256-txkoQOfXDsJGOcxeGO/uXUGMg62GwP0r9+ccPkKuCqc="; }; nativeBuildInputs = [ hatchling ]; From 8dee843fa64736933335b729776194f24c7a422a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 07:44:48 +0000 Subject: [PATCH 0656/1054] nimdow: 0.7.39 -> 0.7.40 --- pkgs/by-name/ni/nimdow/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nimdow/package.nix b/pkgs/by-name/ni/nimdow/package.nix index f6b9d5bb9be5..ad5935a9c34b 100644 --- a/pkgs/by-name/ni/nimdow/package.nix +++ b/pkgs/by-name/ni/nimdow/package.nix @@ -3,13 +3,13 @@ buildNimPackage (finalAttrs: { pname = "nimdow"; - version = "0.7.39"; + version = "0.7.40"; src = fetchFromGitHub { owner = "avahe-kellenberger"; repo = "nimdow"; rev = "v${finalAttrs.version}"; - hash = "sha256-9gYlVuKDHCs6yaY1b6dJgwQUJdko6npjom4ab7nKZ7w="; + hash = "sha256-Q+oUmQ2ABl2nOSnHJYCrqN7dees4JBZgkb9OF4XFr5M="; }; lockFile = ./lock.json; From c22ea8530985f4eea0152d28a95fdf609c1ee1d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 07:47:57 +0000 Subject: [PATCH 0657/1054] maltego: 4.8.0 -> 4.8.1 --- pkgs/by-name/ma/maltego/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/maltego/package.nix b/pkgs/by-name/ma/maltego/package.nix index b14e975dabd4..5400f828fce1 100644 --- a/pkgs/by-name/ma/maltego/package.nix +++ b/pkgs/by-name/ma/maltego/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "maltego"; - version = "4.8.0"; + version = "4.8.1"; src = fetchzip { url = "https://downloads.maltego.com/maltego-v4/linux/Maltego.v${finalAttrs.version}.linux.zip"; - hash = "sha256-BWLdgaAO905lhFiRbpCJUa/7JyfCiRjHwq2qZw2GjgQ="; + hash = "sha256-FH2gyz3/4wDBRsOQl3l2pbavvSyK73HuAXvJ0YBC1dw="; }; postPatch = '' From 914077c408c457f75d1b50b33c6fcc22f41aba99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 07:55:10 +0000 Subject: [PATCH 0658/1054] ttfb: 1.13.0 -> 1.14.0 --- pkgs/by-name/tt/ttfb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tt/ttfb/package.nix b/pkgs/by-name/tt/ttfb/package.nix index a6e35db3de73..176685a5eed3 100644 --- a/pkgs/by-name/tt/ttfb/package.nix +++ b/pkgs/by-name/tt/ttfb/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "ttfb"; - version = "1.13.0"; + version = "1.14.0"; src = fetchCrate { inherit pname version; - hash = "sha256-G5RSnh+S7gbIWJxm778pHN36xghpptcCpfElada0Afo="; + hash = "sha256-TElRWWPTwigyLikda7FdDh0tSC67XdPDg/Gu5aVQlAw="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-kgfET2hOw0OAbBcKS7BOvY3nrLNX6CcQ6fOzVJ9rMOU="; + cargoHash = "sha256-lB1AgigYsPwaIvD0HmgOnKK28pIpn1iIDKsvCpKvlfM="; # The bin feature activates all dependencies of the binary. Otherwise, # only the library is build. From 39de3af3b1d3d5a8b7d05e8e79453f9b535439d7 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Thu, 5 Dec 2024 15:56:37 +0800 Subject: [PATCH 0659/1054] hiddify-app: 2.5.7-unstable-2024-10-30 -> 2.5.7-unstable-2024-11-18 --- pkgs/by-name/hi/hiddify-app/package.nix | 44 +++++-------------------- 1 file changed, 8 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/hi/hiddify-app/package.nix b/pkgs/by-name/hi/hiddify-app/package.nix index 172c4d65bc34..88ce64869f5c 100644 --- a/pkgs/by-name/hi/hiddify-app/package.nix +++ b/pkgs/by-name/hi/hiddify-app/package.nix @@ -2,11 +2,9 @@ lib, fetchFromGitHub, pkg-config, - flutter, + flutter324, buildGoModule, libayatana-appindicator, - stdenv, - fetchurl, makeDesktopItem, copyDesktopItems, wrapGAppsHook3, @@ -14,12 +12,12 @@ }: let pname = "hiddify-app"; - version = "2.5.7-unstable-2024-10-30"; + version = "2.5.7-unstable-2024-11-18"; src = fetchFromGitHub { owner = "hiddify"; repo = "hiddify-app"; - rev = "0144cddf670df11d1586a0dc76483f4c4f5b4230"; - hash = "sha256-bjZkc0H0409YxM6AGrhm6gPaKNj/9SiVs0AUPoLJX+o="; + rev = "9d3de0ae2ea2687f189f75fa2a9196a035a0bb32"; + hash = "sha256-P04A14lFfgvl0kkxMsNXNaHnwfJ3AWkhrfI7VMESGHc="; fetchSubmodules = true; }; libcore = buildGoModule rec { @@ -55,9 +53,8 @@ let installPhase = '' runHook preInstall - mkdir -p $out/bin $out/lib - cp ./bin/HiddifyCli $out/bin/HiddifyCli - cp ./lib/libcore.so $out/lib/libcore.so + install -Dm0755 ./bin/HiddifyCli $out/bin/HiddifyCli + install -Dm0755 ./lib/libcore.so $out/lib/libcore.so runHook postInstall ''; @@ -71,12 +68,8 @@ let maintainers = with lib.maintainers; [ aucub ]; }; }; - sqlite-autoconf = fetchurl { - url = "https://sqlite.org/2024/sqlite-autoconf-3460000.tar.gz"; - hash = "sha256-b45qezNSc3SIFvmztiu9w3Koid6HgtfwSMZTpEdBen0="; - }; in -flutter.buildFlutterApplication { +flutter324.buildFlutterApplication { inherit pname version src; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -92,26 +85,6 @@ flutter.buildFlutterApplication { copyDesktopItems ]; - customSourceBuilders = { - sqlite3_flutter_libs = - { version, src, ... }: - stdenv.mkDerivation rec { - pname = "sqlite3_flutter_libs"; - inherit version src; - inherit (src) passthru; - postPatch = '' - substituteInPlace linux/CMakeLists.txt \ - --replace-fail "https://sqlite.org/2024/sqlite-autoconf-3460000.tar.gz" "file://${sqlite-autoconf}" - ''; - installPhase = '' - runHook preInstall - mkdir $out - cp -a ./* $out/ - runHook postInstall - ''; - }; - }; - postPatch = '' substituteInPlace ./linux/my_application.cc \ --replace-fail "./hiddify.png" "${placeholder "out"}/share/pixmaps/hiddify.png" @@ -125,8 +98,7 @@ flutter.buildFlutterApplication { ''; postInstall = '' - mkdir -p $out/share/pixmaps/ - cp ./assets/images/source/ic_launcher_border.png $out/share/pixmaps/hiddify.png + install -Dm0644 ./assets/images/source/ic_launcher_border.png $out/share/pixmaps/hiddify.png ''; desktopItems = [ From 6a5614466d671d89f6caa273fbb745e22d48dc0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 08:03:18 +0000 Subject: [PATCH 0660/1054] gnome-network-displays: 0.93.0 -> 0.94.0 --- pkgs/by-name/gn/gnome-network-displays/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-network-displays/package.nix b/pkgs/by-name/gn/gnome-network-displays/package.nix index a8ae96e12e23..01c82aacd209 100644 --- a/pkgs/by-name/gn/gnome-network-displays/package.nix +++ b/pkgs/by-name/gn/gnome-network-displays/package.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-network-displays"; - version = "0.93.0"; + version = "0.94.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-network-displays/${lib.versions.majorMinor finalAttrs.version}/gnome-network-displays-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-xxvR8zR+Yglo0e9HRrSFPbgEriYpcRN5K0SXg/D0Oo4="; + sha256 = "sha256-FzNaA2Our7gb8FgEmYjRtphGVcQt3pw+wQNyLHtKI4M="; }; nativeBuildInputs = [ From 651dc94a6379f24789ee1bdec5f0b42d9386b86b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 08:05:06 +0000 Subject: [PATCH 0661/1054] commonsIo: 2.17.0 -> 2.18.0 --- pkgs/by-name/co/commonsIo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/commonsIo/package.nix b/pkgs/by-name/co/commonsIo/package.nix index ae0ed04b0e42..077adb9547c0 100644 --- a/pkgs/by-name/co/commonsIo/package.nix +++ b/pkgs/by-name/co/commonsIo/package.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.17.0"; + version = "2.18.0"; pname = "commons-io"; src = fetchurl { url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-4CM53Ujdtt0E9zAg9ytOa7UIw5bGNz/zrZqKJOQM9bg="; + sha256 = "sha256-qrB4cLnvaTQaZJWrrDO8IYsYI2hp6/nN7nCRcFhKTeE="; }; installPhase = '' From 52166f9bfec3acb758dccf1f2fdc7d1e8ff7d56e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 08:06:20 +0000 Subject: [PATCH 0662/1054] door-knocker: 0.5.0 -> 0.6.0 --- pkgs/by-name/do/door-knocker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/door-knocker/package.nix b/pkgs/by-name/do/door-knocker/package.nix index c75cbd80788f..c45ff499c391 100644 --- a/pkgs/by-name/do/door-knocker/package.nix +++ b/pkgs/by-name/do/door-knocker/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "door-knocker"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "tytan652"; repo = "door-knocker"; rev = finalAttrs.version; - hash = "sha256-932zUfCEN24hZxkCX9uJ2HpvmLNdTtbkXvv50Hu7KxE="; + hash = "sha256-n25Bcn1SJuTTRhl8u4M0DF5bAuWV2KVkFfMU65+np78="; }; nativeBuildInputs = [ From 6e70864059f82fd095177b4ea2d35ce1b46faace Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 08:06:25 +0000 Subject: [PATCH 0663/1054] wxmaxima: 24.08.0 -> 24.11.0 --- pkgs/applications/science/math/wxmaxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index d529b7e0ea3c..048389d80b5c 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs:{ pname = "wxmaxima"; - version = "24.08.0"; + version = "24.11.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${finalAttrs.version}"; - hash = "sha256-W9sZlCPi+pz37OQoICnRGQR2hoe/UciMN6NIzDgHNPQ="; + hash = "sha256-3tGMkxp7nadD+LNluIiyPf55Daf7N1MPTH62U8/GxuA="; }; buildInputs = [ From bb2a1fd9b091da3aba7ef31f2297eacd906b6881 Mon Sep 17 00:00:00 2001 From: mrtnvgr Date: Wed, 4 Dec 2024 13:06:08 +0700 Subject: [PATCH 0664/1054] m8c: init at 1.7.8 --- pkgs/by-name/m8/m8c/package.nix | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/m8/m8c/package.nix diff --git a/pkgs/by-name/m8/m8c/package.nix b/pkgs/by-name/m8/m8c/package.nix new file mode 100644 index 000000000000..78891d527cdb --- /dev/null +++ b/pkgs/by-name/m8/m8c/package.nix @@ -0,0 +1,40 @@ +{ + stdenv, + fetchFromGitHub, + lib, + pkg-config, + SDL2, + libserialport, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "m8c"; + version = "1.7.8"; + + src = fetchFromGitHub { + owner = "laamaa"; + repo = "m8c"; + rev = "v${finalAttrs.version}"; + hash = "sha256-kUXNtAO8yUBeBg1NEwk+3jB7lL8ITm5hmXiemTUWbGc="; + }; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + + installFlags = [ "PREFIX=$(out)" ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + SDL2 + libserialport + ]; + + meta = { + description = "Cross-platform M8 tracker headless client"; + homepage = "https://github.com/laamaa/m8c"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ mrtnvgr ]; + mainProgram = "m8c"; + }; +}) From a9b433bf9f04c14daba27012482844d621c67718 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 08:21:55 +0000 Subject: [PATCH 0665/1054] python312Packages.roadlib: 0.27.0 -> 0.29.0 --- pkgs/development/python-modules/roadlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/roadlib/default.nix b/pkgs/development/python-modules/roadlib/default.nix index 9d45400b7dc7..01061aefd205 100644 --- a/pkgs/development/python-modules/roadlib/default.nix +++ b/pkgs/development/python-modules/roadlib/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "roadlib"; - version = "0.27.0"; + version = "0.29.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-k2ePgxWLbDGjMNfA/cQabSx98FRVrsdV9WANXuIGD+E="; + hash = "sha256-bCdPL9ic1zf6Kzv10bUQI5baqWofGDWk4ipuarsqbeY="; }; build-system = [ setuptools ]; From 6cc6d2ebce7bc0223a2580c70495b59fd1580973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?= <23130178+ShadowRZ@users.noreply.github.com> Date: Thu, 5 Dec 2024 16:27:07 +0800 Subject: [PATCH 0666/1054] nixos/pykms: Fix eval --- nixos/modules/services/misc/pykms.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix index 5bdb0bd52c0f..19985229f548 100644 --- a/nixos/modules/services/misc/pykms.nix +++ b/nixos/modules/services/misc/pykms.nix @@ -69,9 +69,9 @@ in serviceConfig = with pkgs; { DynamicUser = true; StateDirectory = baseNameOf libDir; - ExecStartPre = "${getBin pykms}/libexec/create_pykms_db.sh ${libDir}/clients.db"; + ExecStartPre = "${lib.getBin pykms}/libexec/create_pykms_db.sh ${libDir}/clients.db"; ExecStart = lib.concatStringsSep " " ([ - "${getBin pykms}/bin/server" + "${lib.getBin pykms}/bin/server" "--logfile=STDOUT" "--loglevel=${cfg.logLevel}" "--sqlite=${libDir}/clients.db" From 47b5e2e54c47453fbd223eee2ad49fa4880ff1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paw=20M=C3=B8ller?= Date: Thu, 5 Dec 2024 09:35:56 +0100 Subject: [PATCH 0667/1054] urh: 2.9.6 -> 2.9.8; install desktop file (#357930) * urh: 2.9.6 -> 2.9.8 * urh: dont double wrap binary with GApps Fix for previous pull-request #357400. See https://nixos.org/manual/nixpkgs/stable/#ssec-gnome-common-issues-double-wrapped * urh: install desktop-file --------- Co-authored-by: Franz Pletz Co-authored-by: Aleksana --- pkgs/by-name/ur/urh/package.nix | 35 ++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ur/urh/package.nix b/pkgs/by-name/ur/urh/package.nix index bdb6a2efce6d..8643ca9e7607 100644 --- a/pkgs/by-name/ur/urh/package.nix +++ b/pkgs/by-name/ur/urh/package.nix @@ -1,22 +1,25 @@ { stdenv, lib, fetchFromGitHub, python3Packages , hackrf, rtl-sdr, airspy, limesuite, libiio , libbladeRF +, imagemagick +, makeDesktopItem +, copyDesktopItems , qt5 , wrapGAppsHook3 , USRPSupport ? false, uhd }: python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.9.6"; + version = "2.9.8"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-4Fe2+BUdnVdNQHqZeftXLabn/vTzgyynOtqy0rAb0Rk="; + hash = "sha256-r3d80dzGwgf5Tuwt1IWGcmNbblwBNKTKKm+GGx1r2HE="; }; - nativeBuildInputs = [ qt5.wrapQtAppsHook wrapGAppsHook3 ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook wrapGAppsHook3 copyDesktopItems ]; buildInputs = [ hackrf rtl-sdr airspy limesuite libiio libbladeRF ] ++ lib.optional USRPSupport uhd ++ lib.optional stdenv.hostPlatform.isLinux qt5.qtwayland; @@ -25,12 +28,34 @@ python3Packages.buildPythonApplication rec { pyqt5 numpy psutil cython pyzmq pyaudio setuptools ]; - postFixup = '' - wrapQtApp $out/bin/urh + # dont double wrap + # https://nixos.org/manual/nixpkgs/stable/#ssec-gnome-common-issues-double-wrapped + dontWrapGApps = true; + dontWrapQtApps = true; + preFixup = '' + makeWrapperArgs+=( + ''${gappsWrapperArgs[@]} + ''${qtWrapperArgs[@]} + ) ''; doCheck = false; + desktopItems = [ + (makeDesktopItem { + name = "urh"; + exec = "urh"; + icon = "urh"; + desktopName = "Universal Radio Hacker"; + categories = [ "Network" "HamRadio" ]; + comment = meta.description; + }) + ]; + + postInstall = '' + install -Dm644 data/icons/appicon.png $out/share/pixmaps/urh.png + ''; + meta = with lib; { homepage = "https://github.com/jopohl/urh"; description = "Universal Radio Hacker: investigate wireless protocols like a boss"; From fb08f31009ad8702deaeff23a25f90ab81a5451a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 08:37:27 +0000 Subject: [PATCH 0668/1054] corectrl: 1.4.2 -> 1.4.3 --- pkgs/by-name/co/corectrl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/corectrl/package.nix b/pkgs/by-name/co/corectrl/package.nix index eb8437ae5a05..3a8d2851b8be 100644 --- a/pkgs/by-name/co/corectrl/package.nix +++ b/pkgs/by-name/co/corectrl/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corectrl"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-WOljOakh177om7tLlroFwWO4gYsarfTCeVXX6+dmZs4="; + hash = "sha256-rQibIjLmSnkA8jk6GOo68JIeb4wZq0wxXpLs3zsB7GI="; }; nativeBuildInputs = [ From c87fec8a4f94400fe4914cf154c076a64a773d53 Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 2 Dec 2024 20:11:00 -0500 Subject: [PATCH 0669/1054] nodePackages.insect: drop --- .../manual/release-notes/rl-2505.section.md | 2 + pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 203 ------------------ pkgs/development/node-packages/overrides.nix | 4 - 5 files changed, 3 insertions(+), 208 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index d14fda8c77b6..0a36bf78d52d 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -44,6 +44,8 @@ - `zammad` has had its support for MySQL removed, since it was never working correctly and is now deprecated upstream. Check the [migration guide](https://docs.zammad.org/en/latest/appendix/migrate-to-postgresql.html) for how to convert your database to PostgreSQL. +- `nodePackages.insect` has been removed, as it's deprecated by upstream. The suggested replacement is `numbat`. + - The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses. - `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel. diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index b9347ffffaa4..d4df1cb6dbb1 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -122,6 +122,7 @@ mapAliases { indium = throw "indium was removed because it was broken"; # added 2023-08-19 inliner = throw "inliner was removed because it was abandoned upstream"; # added 2024-08-23 inherit (pkgs) intelephense; # added 2024-08-31 + insect = throw "insect was removed becuase it was deprecated by upstream. Use numbat instead."; # added 2024-12-02 ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19 inherit (pkgs) jake; # added 2023-08-19 inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index a3a442ecbd5e..836e26745c3e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -105,7 +105,6 @@ , "hs-airdrop" , "ijavascript" , "imapnotify" -, "insect" , "joplin" , "js-beautify" , "js-yaml" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1f84ebf7b856..61abd414f989 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -5962,15 +5962,6 @@ let sha512 = "SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ=="; }; }; - "@jcubic/lily-0.3.0" = { - name = "_at_jcubic_slash_lily"; - packageName = "@jcubic/lily"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jcubic/lily/-/lily-0.3.0.tgz"; - sha512 = "4z6p4jLGSthc8gQ7wu4nHfGYn/IgCKFr+7hjuf80VdXUs7sm029mZGGDpS8sb29PVZWUBvMMTBCVGFhH2nN4Vw=="; - }; - }; "@jest/schemas-29.6.3" = { name = "_at_jest_slash_schemas"; packageName = "@jest/schemas"; @@ -10435,15 +10426,6 @@ let sha512 = "pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ=="; }; }; - "@types/jquery-3.5.30" = { - name = "_at_types_slash_jquery"; - packageName = "@types/jquery"; - version = "3.5.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.30.tgz"; - sha512 = "nbWKkkyb919DOUxjmRVk8vwtDb0/k8FKncmUKFi+NY+QXqWltooxTrswvz4LspQwxvLdvzBN1TImr6cw3aQx2A=="; - }; - }; "@types/js-levenshtein-1.1.3" = { name = "_at_types_slash_js-levenshtein"; packageName = "@types/js-levenshtein"; @@ -10858,15 +10840,6 @@ let sha512 = "W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw=="; }; }; - "@types/sizzle-2.3.8" = { - name = "_at_types_slash_sizzle"; - packageName = "@types/sizzle"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz"; - sha512 = "0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg=="; - }; - }; "@types/sockjs-0.3.36" = { name = "_at_types_slash_sockjs"; packageName = "@types/sockjs"; @@ -13081,15 +13054,6 @@ let sha512 = "QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg=="; }; }; - "ansidec-0.3.4" = { - name = "ansidec"; - packageName = "ansidec"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ansidec/-/ansidec-0.3.4.tgz"; - sha512 = "Ydgbey4zqUmmNN2i2OVeVHXig3PxHRbok2X6B2Sogmb92JzZUFfTL806dT7os6tBL1peXItfeFt76CP3zsoXUg=="; - }; - }; "ansis-3.3.2" = { name = "ansis"; packageName = "ansis"; @@ -17068,15 +17032,6 @@ let sha512 = "2EECQDk23AtYy9WTUDS0UwdlyGJe62IatdR9dOfG/T3+VIoC6/SA5AnYJWGTjXjweTYL360HEGu4DchCeee4Ng=="; }; }; - "clipboardy-2.3.0" = { - name = "clipboardy"; - packageName = "clipboardy"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz"; - sha512 = "mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ=="; - }; - }; "clipboardy-3.0.0" = { name = "clipboardy"; packageName = "clipboardy"; @@ -18752,15 +18707,6 @@ let sha512 = "+8cK7jRAReYkMwMiG+bxhcNKiHJDM6bR9FD/nGBXOWdMLuYawjF5cGrtLilJ+LGd3ZjCXnJjR5DkfWPoIVlqJA=="; }; }; - "coveralls-next-4.2.1" = { - name = "coveralls-next"; - packageName = "coveralls-next"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/coveralls-next/-/coveralls-next-4.2.1.tgz"; - sha512 = "O/SBGZsCryt+6Q3NuJHENyQYaucTEV9qp0KGaed+y42PUh+GuF949LRLHKZbxWwOIc1tV8bJRIVWlfbZ8etEwQ=="; - }; - }; "cp-file-10.0.0" = { name = "cp-file"; packageName = "cp-file"; @@ -20327,15 +20273,6 @@ let sha512 = "WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg=="; }; }; - "decimal.js-10.3.1" = { - name = "decimal.js"; - packageName = "decimal.js"; - version = "10.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz"; - sha512 = "V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="; - }; - }; "decimal.js-10.4.3" = { name = "decimal.js"; packageName = "decimal.js"; @@ -31030,24 +30967,6 @@ let sha512 = "WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="; }; }; - "jquery-3.7.1" = { - name = "jquery"; - packageName = "jquery"; - version = "3.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz"; - sha512 = "m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="; - }; - }; - "jquery.terminal-2.43.1" = { - name = "jquery.terminal"; - packageName = "jquery.terminal"; - version = "2.43.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.43.1.tgz"; - sha512 = "TcezgCLdtAn0dTzPXK6kdnzJV4k9vcdTVxt7l0teFV+7LGWRCFIhs49U3WeNKU0aereFtlR5N5qrSWBGqPlw0A=="; - }; - }; "js-base64-3.7.7" = { name = "js-base64"; packageName = "js-base64"; @@ -31939,15 +31858,6 @@ let sha512 = "fF6aj9/XFwJiE/4zihw/ZdXg+KeyU4nFvmutF+PkAVadSGqP298+Zm6IzWFzgeDBgvLk3o8boBxNtd1g5Kdjfg=="; }; }; - "keyboardevent-key-polyfill-1.1.0" = { - name = "keyboardevent-key-polyfill"; - packageName = "keyboardevent-key-polyfill"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/keyboardevent-key-polyfill/-/keyboardevent-key-polyfill-1.1.0.tgz"; - sha512 = "NTDqo7XhzL1fqmUzYroiyK2qGua7sOMzLav35BfNA/mPUSCtw8pZghHFMTYR9JdnJ23IQz695FcaM6EE6bpbFQ=="; - }; - }; "keychain-1.3.0" = { name = "keychain"; packageName = "keychain"; @@ -32245,15 +32155,6 @@ let sha512 = "YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw=="; }; }; - "lcov-parse-1.0.0" = { - name = "lcov-parse"; - packageName = "lcov-parse"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz"; - sha512 = "aprLII/vPzuQvYZnDRU78Fns9I2Ag3gi4Ipga/hxnVMCZC8DnR2nI7XBqrPoywGfxqIx/DgarGvDJZAD3YBTgQ=="; - }; - }; "ldap-filter-0.3.3" = { name = "ldap-filter"; packageName = "ldap-filter"; @@ -32434,15 +32335,6 @@ let sha512 = "FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="; }; }; - "line-reader-0.4.0" = { - name = "line-reader"; - packageName = "line-reader"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/line-reader/-/line-reader-0.4.0.tgz"; - sha512 = "AYJ8g+eE7v+Ba4s/cuYqzuNulH/WbjdKQ55fvx8fNVn8WQzTpioY6vI1MoxTuMgcHYX3VlmZWbVvnkIqkyJbCA=="; - }; - }; "lines-and-columns-1.2.4" = { name = "lines-and-columns"; packageName = "lines-and-columns"; @@ -33622,15 +33514,6 @@ let sha512 = "tEWS6Fb+Xv0yLChJ6saA1DP3H1yPL0PfiIN7SDJ+U/CyP+fD4G/dhKfow+P5UuJWi6BdE4mUcPkJclGXCWxDrg=="; }; }; - "log-driver-1.2.7" = { - name = "log-driver"; - packageName = "log-driver"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz"; - sha512 = "U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg=="; - }; - }; "log-symbols-1.0.2" = { name = "log-symbols"; packageName = "log-symbols"; @@ -41823,15 +41706,6 @@ let sha512 = "XHV6WP6xUvy42gUxdNyPQKCC9j36VzpVQ8Ztoffq0D6+PugiNsZ0FqBladXXPFQWthDDCA9OvGIsjEigMtznOQ=="; }; }; - "prismjs-1.29.0" = { - name = "prismjs"; - packageName = "prismjs"; - version = "1.29.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz"; - sha512 = "Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q=="; - }; - }; "probe-image-size-6.0.0" = { name = "probe-image-size"; packageName = "probe-image-size"; @@ -69172,83 +69046,6 @@ in bypassCache = true; reconstructLock = true; }; - insect = nodeEnv.buildNodePackage { - name = "insect"; - packageName = "insect"; - version = "5.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/insect/-/insect-5.9.0.tgz"; - sha512 = "F1+BVkyIkzZ/zD1DiNgxcc33lGt7WQ1V8caX2X7JNXo+g0Wnr8339mSHT1PAtfupmTDz/OQ2MmXHPBRIddpt+w=="; - }; - dependencies = [ - sources."@jcubic/lily-0.3.0" - sources."@types/jquery-3.5.30" - sources."@types/sizzle-2.3.8" - sources."ansidec-0.3.4" - sources."arch-2.2.0" - sources."argparse-2.0.1" - sources."asynckit-0.4.0" - sources."clipboardy-2.3.0" - sources."clone-1.0.4" - sources."combined-stream-1.0.8" - sources."coveralls-next-4.2.1" - sources."cross-spawn-6.0.5" - sources."data-uri-to-buffer-4.0.1" - sources."decimal.js-10.3.1" - sources."defaults-1.0.4" - sources."delayed-stream-1.0.0" - sources."end-of-stream-1.4.4" - sources."execa-1.0.0" - sources."fetch-blob-3.2.0" - sources."form-data-4.0.0" - sources."formdata-polyfill-4.0.10" - sources."get-stream-4.1.0" - sources."iconv-lite-0.6.3" - sources."is-docker-2.2.1" - sources."is-stream-1.1.0" - sources."is-wsl-2.2.0" - sources."isexe-2.0.0" - sources."jquery-3.7.1" - sources."jquery.terminal-2.43.1" - sources."js-yaml-4.1.0" - sources."keyboardevent-key-polyfill-1.1.0" - sources."lcov-parse-1.0.0" - sources."line-reader-0.4.0" - sources."log-driver-1.2.7" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimist-1.2.8" - sources."nice-try-1.0.5" - sources."node-domexception-1.0.0" - sources."node-fetch-3.3.2" - sources."npm-run-path-2.0.2" - sources."once-1.4.0" - sources."p-finally-1.0.0" - sources."path-key-2.0.1" - sources."prismjs-1.29.0" - sources."pump-3.0.2" - sources."safer-buffer-2.1.2" - sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.7" - sources."strip-eof-1.0.0" - sources."wcwidth-1.0.1" - sources."web-streams-polyfill-3.3.3" - sources."which-1.3.1" - sources."wrappy-1.0.2" - sources."xdg-basedir-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "High precision scientific calculator with support for physical units"; - homepage = "https://github.com/sharkdp/insect"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index a9108d934d43..41a6ed87746f 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -75,10 +75,6 @@ final: prev: { buildInputs = oldAttrs.buildInputs ++ [ final.node-gyp-build pkgs.zeromq ]; }); - insect = prev.insect.override (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ pkgs.psc-package final.pulp ]; - }); - joplin = prev.joplin.override (oldAttrs:{ nativeBuildInputs = [ pkgs.pkg-config From 44ddedd2be90e7126703e8562420176747f65b1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 08:45:22 +0000 Subject: [PATCH 0670/1054] lunacy: 10.0.1 -> 10.9.0 --- pkgs/by-name/lu/lunacy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lunacy/package.nix b/pkgs/by-name/lu/lunacy/package.nix index 19ede0331570..5cd8c7e48922 100644 --- a/pkgs/by-name/lu/lunacy/package.nix +++ b/pkgs/by-name/lu/lunacy/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lunacy"; - version = "10.0.1"; + version = "10.9.0"; src = fetchurl { url = "https://lcdn.icons8.com/setup/Lunacy_${finalAttrs.version}.deb"; - hash = "sha256-roD/bKv1N2sru/tZ6Zl1J2AyY1mgj2ssB2a42kwBNHM="; + hash = "sha256-z5EUztSbU/8G0UE6UVgtIu6iQUY40PZYy1jDbjPIuv8="; }; buildInputs = [ From 57efa159d816a2229cb5d2a8a3e2ec1db850c373 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 08:46:31 +0000 Subject: [PATCH 0671/1054] jq-lsp: 0.1.4 -> 0.1.9 --- pkgs/by-name/jq/jq-lsp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jq/jq-lsp/package.nix b/pkgs/by-name/jq/jq-lsp/package.nix index e33133c42634..599cabec3d1e 100644 --- a/pkgs/by-name/jq/jq-lsp/package.nix +++ b/pkgs/by-name/jq/jq-lsp/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "jq-lsp"; - version = "0.1.4"; + version = "0.1.9"; src = fetchFromGitHub { owner = "wader"; repo = "jq-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-ueSf32C4BznDKBQD0OIJKZhrwLq1xpn6WWEnsqoWkl8="; + hash = "sha256-BvnSX8pDdmj3t9/DHdV8zf0IZiu4sm97/KJdWOumNEI="; }; vendorHash = "sha256-8sZGnoP7l09ZzLJqq8TUCquTOPF0qiwZcFhojUnnEIY="; From db447cab67b88f9ac0b8125117fe2a5fed460b37 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 3 Dec 2024 15:29:54 +0100 Subject: [PATCH 0672/1054] python3Packages.torchtnt: init at v0.2.4 --- .../python-modules/torchtnt/default.nix | 71 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/python-modules/torchtnt/default.nix diff --git a/pkgs/development/python-modules/torchtnt/default.nix b/pkgs/development/python-modules/torchtnt/default.nix new file mode 100644 index 000000000000..78c948823c77 --- /dev/null +++ b/pkgs/development/python-modules/torchtnt/default.nix @@ -0,0 +1,71 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + setuptools, + + # dependencies + fsspec, + numpy, + packaging, + psutil, + pyre-extensions, + tabulate, + tensorboard, + torch, + tqdm, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "torchtnt"; + version = "0.2.4"; + pyproject = true; + + # no tag / releases on github + src = fetchPypi { + inherit pname version; + hash = "sha256-Js9OcYllr8KT52FYtHKDciBVvPeelNDmfnC12/YcDJs="; + }; + + # requirements.txt is not included in Pypi archive + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'read_requirements("requirements.txt")' "[]" \ + --replace-fail 'read_requirements("dev-requirements.txt")' "[]" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + fsspec + numpy + packaging + psutil + pyre-extensions + setuptools + tabulate + tensorboard + torch + tqdm + typing-extensions + ]; + + pythonImportsCheck = [ + "torchtnt" + ]; + + # Tests are not included in Pypi archive + doCheck = false; + + meta = { + description = "lightweight library for PyTorch training tools and utilities"; + homepage = "https://github.com/pytorch/tnt"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nim65s ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba43430e48c1..fd8b6c4a5ba6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16152,6 +16152,8 @@ self: super: with self; { torchsummary = callPackage ../development/python-modules/torchsummary { }; + torchtnt = callPackage ../development/python-modules/torchtnt { }; + torchvision = callPackage ../development/python-modules/torchvision { }; torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { From 50b1f1121fb4b190eebda223a65dbec052ee14ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 08:53:50 +0000 Subject: [PATCH 0673/1054] commonsCompress: 1.26.2 -> 1.27.1 --- pkgs/by-name/co/commonsCompress/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/commonsCompress/package.nix b/pkgs/by-name/co/commonsCompress/package.nix index f5c5922e800a..cce498c21f53 100644 --- a/pkgs/by-name/co/commonsCompress/package.nix +++ b/pkgs/by-name/co/commonsCompress/package.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.26.2"; + version = "1.27.1"; pname = "commons-compress"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-EyGbVhcsuEhLfKh0TPFjySFd9/Z8BEBhkslpfdu4er8="; + sha256 = "sha256-psD9VseWxx2ovdUGjEbUCm+fjnQ/D2S70NuyZ2nsXwA="; }; installPhase = '' From 897a55c324ae42633aeabe78d7c3a413e547c438 Mon Sep 17 00:00:00 2001 From: arminius-smh Date: Mon, 2 Dec 2024 00:58:41 +0100 Subject: [PATCH 0674/1054] hyprlauncher: 0.2.2 -> 0.2.7 --- pkgs/by-name/hy/hyprlauncher/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprlauncher/package.nix b/pkgs/by-name/hy/hyprlauncher/package.nix index 74db3f447e0a..f7ad3cc1d5fb 100644 --- a/pkgs/by-name/hy/hyprlauncher/package.nix +++ b/pkgs/by-name/hy/hyprlauncher/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprlauncher"; - version = "0.2.2"; + version = "0.2.7"; src = fetchFromGitHub { owner = "hyprutils"; repo = "hyprlauncher"; rev = "refs/tags/v${version}"; - hash = "sha256-E6/V9p5YIjg3/Svw70GwY1jibkg2xnzdAvmphc0xbQQ="; + hash = "sha256-yP3g/hWhQj0JwXNbZFMRJrg0a4upOUwDD0EkW1W8acE="; }; - cargoHash = "sha256-gkBpBlBR9Y2dkuqK7X/sxKdS9staFsbHv3Slg9UvP3A="; + cargoHash = "sha256-ehFkZKiMtJyH0DVBzxI08uVlMACslnYfxZX5gQ7xbPU="; strictDeps = true; From 5e08416193d569e5a59607fe83d62d0f45c921eb Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 5 Dec 2024 18:28:03 +0900 Subject: [PATCH 0675/1054] kopia: enable doCheck This flag has been disabled since cea7cd902eb4cd87f0b8eac9ee08f6cd8b92635f --- pkgs/by-name/ko/kopia/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ko/kopia/package.nix b/pkgs/by-name/ko/kopia/package.nix index 35dfc707474f..3dbafcde8c1b 100644 --- a/pkgs/by-name/ko/kopia/package.nix +++ b/pkgs/by-name/ko/kopia/package.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorHash = "sha256-/NMp64JeCQjCcEYkE6lYzu/E+irTcwkmDCJhB04ALFY="; - doCheck = false; - subPackages = [ "." ]; ldflags = [ From a6346d9f5e0d4ea63617c9af20138fe7431604de Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 5 Dec 2024 10:42:34 +0100 Subject: [PATCH 0676/1054] python312Packages.oslo-log: fix build in darwin sandbox --- pkgs/development/python-modules/oslo-log/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 81a9bd5b8e4b..8e3c1514d733 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -56,6 +56,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "oslo_log" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "oslo.log library"; mainProgram = "convert-json"; From eeed703362e911be95ece32a568a16e88eaf1ecd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 5 Dec 2024 10:42:53 +0100 Subject: [PATCH 0677/1054] python312Packages.oslo-log: misc cleaning --- .../python-modules/oslo-log/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 8e3c1514d733..196f66bf3cbd 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -3,18 +3,23 @@ stdenv, buildPythonPackage, fetchPypi, - eventlet, + + # build-system + setuptools, + + # dependencies oslo-config, oslo-context, oslo-serialization, oslo-utils, - oslotest, pbr, - pyinotify, python-dateutil, + pyinotify, + + # tests + eventlet, + oslotest, pytestCheckHook, - pythonOlder, - setuptools, }: buildPythonPackage rec { @@ -22,8 +27,6 @@ buildPythonPackage rec { version = "6.1.2"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { pname = "oslo.log"; inherit version; @@ -58,11 +61,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "oslo.log library"; mainProgram = "convert-json"; homepage = "https://github.com/openstack/oslo.log"; - license = licenses.asl20; - maintainers = teams.openstack.members; + license = lib.licenses.asl20; + maintainers = lib.teams.openstack.members; }; } From 3c9fb90e4575b154217175afee35d6c166dcecb5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 5 Dec 2024 10:45:22 +0100 Subject: [PATCH 0678/1054] python312Packages.oslo-log: switch to fetchFromGitHub --- .../python-modules/oslo-log/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 196f66bf3cbd..4ea8636bf14d 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -2,7 +2,7 @@ lib, stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system setuptools, @@ -27,12 +27,17 @@ buildPythonPackage rec { version = "6.1.2"; pyproject = true; - src = fetchPypi { - pname = "oslo.log"; - inherit version; - hash = "sha256-92gEffnXBsSE3WZl3LvqKJAh1Iy3zlq/eh9poJSR9f4="; + src = fetchFromGitHub { + owner = "openstack"; + repo = "oslo.log"; + rev = "refs/tags/${version}"; + hash = "sha256-uNY+t3mv56F5wZOCWnOpZz8IWVR3+/kWGwu61AIbXbQ="; }; + # Manually set version because prb wants to get it from the git upstream repository (and we are + # installing from tarball instead) + PBR_VERSION = version; + build-system = [ setuptools ]; dependencies = [ From 45d4837c7a8e2e89a1abdb98b6c2f0e11c4e0b58 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 5 Dec 2024 10:46:57 +0100 Subject: [PATCH 0679/1054] python312Packages.oslo-log: 6.1.2 -> 6.2.0 Diff: https://github.com/openstack/oslo.log/compare/refs/tags/6.1.2...6.2.0 --- pkgs/development/python-modules/oslo-log/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 4ea8636bf14d..342cf229365e 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "6.1.2"; + version = "6.2.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "oslo.log"; rev = "refs/tags/${version}"; - hash = "sha256-uNY+t3mv56F5wZOCWnOpZz8IWVR3+/kWGwu61AIbXbQ="; + hash = "sha256-IEhIhGE95zZiWp602rFc+NLco/Oyx9XEL5e2RExNBMs="; }; # Manually set version because prb wants to get it from the git upstream repository (and we are From 628a0d24b0e8beb2b7686ed7b2720eaf7c085f68 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 5 Dec 2024 17:44:28 +0800 Subject: [PATCH 0680/1054] deepin.deepin-calculator: 5.8.24 -> 6.5.2 --- .../deepin/apps/deepin-calculator/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix index d241359a22a6..e9be91858384 100644 --- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix @@ -6,7 +6,6 @@ qt5integration, qt5platform-plugins, libsForQt5, - dde-qt-dbus-factory, cmake, pkg-config, gtest, @@ -14,13 +13,13 @@ stdenv.mkDerivation rec { pname = "deepin-calculator"; - version = "5.8.24"; + version = "6.5.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-Gv4X1vT3w3kd1FN6BBpUeG2VBz/e+OWLBQyBL7r3BrI="; + hash = "sha256-5igRoyXx71LepvWlS+CDRq0q9BFCDitM+83j3Mt6DxU="; }; nativeBuildInputs = [ @@ -36,7 +35,6 @@ stdenv.mkDerivation rec { qt5platform-plugins libsForQt5.qtbase libsForQt5.qtsvg - dde-qt-dbus-factory gtest ]; @@ -44,12 +42,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; - meta = with lib; { + meta = { description = "Easy to use calculator for ordinary users"; mainProgram = "deepin-calculator"; homepage = "https://github.com/linuxdeepin/deepin-calculator"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; }; } From 5cf1fc3b7325b1474f9b6e552c3e065c14b97eb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 09:52:50 +0000 Subject: [PATCH 0681/1054] timeular: 6.8.4 -> 6.8.5 --- pkgs/by-name/ti/timeular/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/timeular/package.nix b/pkgs/by-name/ti/timeular/package.nix index 3191838a20f7..27227cff0274 100644 --- a/pkgs/by-name/ti/timeular/package.nix +++ b/pkgs/by-name/ti/timeular/package.nix @@ -4,12 +4,12 @@ }: let - version = "6.8.4"; + version = "6.8.5"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - hash = "sha256-0x8Ra6NlYnYCcRTmEzFTBYOtUIaMBtL4/0293gxxeS0="; + hash = "sha256-hawVddF6jt0/fTL0bWAoK82F7mqskQLEO6w7/HBLLxQ="; }; appimageContents = appimageTools.extractType2 { From 18a0bec0c0e64ca48991ed7c0b89ec05c6fdbbe0 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 3 Dec 2024 14:06:17 +0100 Subject: [PATCH 0682/1054] python3Packages.roma: init at v1.5.1 --- .../python-modules/roma/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/roma/default.nix diff --git a/pkgs/development/python-modules/roma/default.nix b/pkgs/development/python-modules/roma/default.nix new file mode 100644 index 000000000000..f1890cfe8624 --- /dev/null +++ b/pkgs/development/python-modules/roma/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + numpy, + torch, +}: + +buildPythonPackage rec { + pname = "roma"; + version = "1.5.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "naver"; + repo = "roma"; + rev = "refs/tags/v${version}"; + hash = "sha256-DuQjnHoZKQF/xnFMYb0OXhycsRcK4oHoocq6o+NoGRs="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + torch + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "roma" + ]; + + meta = { + description = "Lightweight library to deal with 3D rotations in PyTorch"; + homepage = "https://github.com/naver/roma"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nim65s ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d18facd85026..b038f26fbdfa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14073,6 +14073,8 @@ self: super: with self; { rollbar = callPackage ../development/python-modules/rollbar { }; + roma = callPackage ../development/python-modules/roma { }; + roman = callPackage ../development/python-modules/roman { }; romy = callPackage ../development/python-modules/romy { }; From 191f38e09634ccf0159a3d57eb958385fe401e67 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 25 Nov 2024 20:12:13 +0900 Subject: [PATCH 0683/1054] cloudflare-warp: add versionCheckHook Preferred hook rather than passthru.tests.version here. Especially this package is unfree and ofboard skips. - https://github.com/NixOS/nixpkgs/pull/358956#discussion_r1871002548 - f42d4debf076b03f48b24fb59a7a75d0d8c29363 --- pkgs/by-name/cl/cloudflare-warp/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index cc629fb850a0..a20d7bf95ddc 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -2,6 +2,7 @@ stdenv, lib, autoPatchelfHook, + versionCheckHook, copyDesktopItems, dbus, dpkg, @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg autoPatchelfHook + versionCheckHook makeWrapper copyDesktopItems ]; @@ -99,6 +101,10 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/warp-svc --prefix PATH : ${lib.makeBinPath [ nftables ]} ''; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgramArg = [ "--version" ]; + meta = with lib; { description = "Replaces the connection between your device and the Internet with a modern, optimized, protocol"; homepage = "https://pkg.cloudflareclient.com/packages/cloudflare-warp"; From e772730caa0db5c2dc6d15a6c0a85e9c2cf067d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 10:00:50 +0000 Subject: [PATCH 0684/1054] python312Packages.hg-git: 1.1.3 -> 1.1.4 --- pkgs/development/python-modules/hg-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index 2a4c67d100b4..ea51b918130f 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "hg-git"; - version = "1.1.3"; + version = "1.1.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hg_git"; inherit version; - hash = "sha256-lqnCi4MjdPVCIXdYAIDGdRY5zcU5QPrSHzy+NKysMtc="; + hash = "sha256-XF9vAtvUK5yRP4OxZv83/AA2jde5t7za3jqgyuXc5eU="; }; build-system = [ From 8edc70ed5b74bfc86f3e6e8340a1d55884524b88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 10:03:54 +0000 Subject: [PATCH 0685/1054] nanopb: 0.4.9 -> 0.4.9.1 --- pkgs/by-name/na/nanopb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nanopb/package.nix b/pkgs/by-name/na/nanopb/package.nix index bd8c4356e877..a2f341594f9e 100644 --- a/pkgs/by-name/na/nanopb/package.nix +++ b/pkgs/by-name/na/nanopb/package.nix @@ -58,13 +58,13 @@ let in { pname = "nanopb"; - version = "0.4.9"; + version = "0.4.9.1"; src = fetchFromGitHub { owner = "nanopb"; repo = "nanopb"; rev = self.version; - hash = "sha256-zXhUEajCZ24VA/S0pSFewz096s8rmhKARSWbSC5TdAg="; + hash = "sha256-bMSZZaF8egAegi3enCM+DRyxOrPoWKAKybvWsrKZEDc="; }; dontPatch = true; From 40caf32dd979521be11bc8a432271f71405840cf Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 5 Dec 2024 10:21:06 +0000 Subject: [PATCH 0686/1054] butt: 1.42.0 -> 1.44.0 Add more patching to remove advertising. --- pkgs/by-name/bu/butt/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/butt/package.nix b/pkgs/by-name/bu/butt/package.nix index 9e0938652e01..558d044d34d9 100644 --- a/pkgs/by-name/bu/butt/package.nix +++ b/pkgs/by-name/bu/butt/package.nix @@ -3,17 +3,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "butt"; - version = "1.42.0"; + version = "1.44.0"; src = fetchurl { url = "https://danielnoethen.de/butt/release/${finalAttrs.version}/butt-${finalAttrs.version}.tar.gz"; - hash = "sha256-/Y96Pq/3D37n/2JZdvcEQ1BBEtHlJ030QLesfNyBg2g="; + hash = "sha256-2RC0ChDbyhzjd+4jnBRuR0botIVQugpA1rUZm1yH4Kc="; }; postPatch = '' # remove advertising substituteInPlace src/FLTK/flgui.cpp \ - --replace 'idata_radio_co_badge, 124, 61, 4,' 'nullptr, 0, 0, 0,' + --replace-fail 'idata_radio_co_badge, 124, 61, 4,' 'nullptr, 0, 0, 0,' + substituteInPlace src/FLTK/fl_timer_funcs.cpp \ + --replace-fail 'radio_co_logo, 124, 61, 4,' 'nullptr, 0, 0, 0,' \ + --replace-fail 'live365_logo, 124, 61, 4,' 'nullptr, 0, 0, 0,' ''; nativeBuildInputs = [ pkg-config ]; From 4198bea39e4e60c0bcab4ef594dab779cfbdb8b9 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 4 Dec 2024 20:03:07 +0100 Subject: [PATCH 0687/1054] termshot: 0.2.8 -> 0.2.12 --- pkgs/by-name/te/termshot/go-mod.patch | 12 ++++++++++++ pkgs/by-name/te/termshot/package.nix | 8 +++++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/te/termshot/go-mod.patch diff --git a/pkgs/by-name/te/termshot/go-mod.patch b/pkgs/by-name/te/termshot/go-mod.patch new file mode 100644 index 000000000000..5618ec24f8b2 --- /dev/null +++ b/pkgs/by-name/te/termshot/go-mod.patch @@ -0,0 +1,12 @@ +diff --git a/go.mod b/go.mod +index 6627fb1..a3397a9 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,6 +1,6 @@ + module github.com/homeport/termshot + +-go 1.20 ++go 1.22.0 + + require ( + github.com/creack/pty v1.1.23 diff --git a/pkgs/by-name/te/termshot/package.nix b/pkgs/by-name/te/termshot/package.nix index 17f83504ef46..7ef65ba90e30 100644 --- a/pkgs/by-name/te/termshot/package.nix +++ b/pkgs/by-name/te/termshot/package.nix @@ -5,16 +5,18 @@ }: buildGoModule rec { pname = "termshot"; - version = "0.2.8"; + version = "0.2.12"; src = fetchFromGitHub { owner = "homeport"; repo = "termshot"; rev = "v${version}"; - hash = "sha256-cCtae2O9P9czivNVcytJKz3tQ41TaqokZcTOwt2v6jk="; + hash = "sha256-ua2tFyOjLeqOpipLoSisASqwjqGEFdkxd2qHybZ1VDU="; }; - vendorHash = "sha256-ji2B9Gr1oQGouGH2hBpTyfjbht6bRfIeLcdTBhmmIwk="; + vendorHash = "sha256-JweKjKvShiimFHQwRtoVuongWqqGIPcPz77qEVNec+M="; + + patches = [./go-mod.patch]; ldflags = [ "-s" From 05e93b530bb1669df0bd4fbd639cd37daf12aa62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 10:48:18 +0000 Subject: [PATCH 0688/1054] intel-gmmlib: 22.5.2 -> 22.5.4 --- pkgs/by-name/in/intel-gmmlib/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/intel-gmmlib/package.nix b/pkgs/by-name/in/intel-gmmlib/package.nix index 15bce8e5cdb1..6a475711bd7a 100644 --- a/pkgs/by-name/in/intel-gmmlib/package.nix +++ b/pkgs/by-name/in/intel-gmmlib/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.5.2"; + version = "22.5.4"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - hash = "sha256-vc4Jk+XAXf/lq5ouCP+04YBuyeypl0XSOPUT1YkL+7A="; + hash = "sha256-BxWWTUVAvU3dpbcPvCvXbh5npRT5t4S3d4m2/cCj36g="; }; nativeBuildInputs = [ cmake ]; From df46eade405436c869dd0947b9366a77e7238192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Thu, 5 Dec 2024 12:03:09 +0100 Subject: [PATCH 0689/1054] eza: 0.20.10 -> 0.20.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 861ddf7704fb..1cd13c801ca4 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.20.10"; + version = "0.20.11"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-zAyklIIm6jAhFmaBu3BEysLfGEwB34rpYztZaJEQtYg="; + hash = "sha256-JK2JXZCtrq5iVgzJ5mIrHSEhlWGgtxhKGVgbN3IuMxg="; }; - cargoHash = "sha256-fXrw753Hn4fbeX6+GRoH9MKrH0udjxnBK7AVCHnqIcs="; + cargoHash = "sha256-5KVLxIYmWIcFcGNZUvNOrHrKTy0UD9LQvPn3IGpV6B0="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ]; From 0650670854410eabf425574c82f995637055ae58 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 5 Dec 2024 12:09:58 +0100 Subject: [PATCH 0690/1054] python3Packages.django-mfa3: Disable failing test --- pkgs/development/python-modules/django-mfa3/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-mfa3/default.nix b/pkgs/development/python-modules/django-mfa3/default.nix index c0ed1e4f287b..f93f543bf58d 100644 --- a/pkgs/development/python-modules/django-mfa3/default.nix +++ b/pkgs/development/python-modules/django-mfa3/default.nix @@ -36,7 +36,9 @@ buildPythonPackage rec { pythonRelaxDeps = [ "qrcode" ]; checkPhase = '' - ${python.interpreter} -m django test --settings tests.settings + # Disable failing test test_origin_https + # https://github.com/xi/django-mfa3/issues/24 + ${python.interpreter} -m django test --settings tests.settings -k "not test_origin_https" ''; meta = { From 5e74aff1db541744ac1f2bde7fde8527f537a28b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 11:10:19 +0000 Subject: [PATCH 0691/1054] cni-plugins: 1.6.0 -> 1.6.1 --- pkgs/applications/networking/cluster/cni/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 5785c614260f..417bf7fb6901 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - hash = "sha256-7jl8c/191KiQSzixDXMcSFCrSqZFs4F7ZCe9BwrFqQ8="; + hash = "sha256-thtN7po5SToM0ZFYIbycaPJTafLvk9hFV4XFGOpWmpg="; }; vendorHash = null; From a635264f9609a638c3d22673761a481608573b43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 11:23:17 +0000 Subject: [PATCH 0692/1054] emacsPackages.ebuild-mode: 1.75 -> 1.76 --- .../elisp-packages/manual-packages/ebuild-mode/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index ae10492957eb..8224b030b7ec 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -6,11 +6,11 @@ melpaBuild rec { pname = "ebuild-mode"; - version = "1.75"; + version = "1.76"; src = fetchzip { url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2"; - hash = "sha256-zEJCjSL90Ok2bUbLNcEK3vWcQSOyfrWvctHqZACfdIc="; + hash = "sha256-o964/Sk33PzyNm2+yoz7oAhw1M0gYwggaYSukuo9ALg="; }; meta = { From 1989c9f4b53f8cc705d6bcea1151291877336bfe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 11:48:53 +0000 Subject: [PATCH 0693/1054] ptyxis: 47.4 -> 47.5 --- pkgs/by-name/pt/ptyxis/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pt/ptyxis/package.nix b/pkgs/by-name/pt/ptyxis/package.nix index e4a4b670c909..56676c62505d 100644 --- a/pkgs/by-name/pt/ptyxis/package.nix +++ b/pkgs/by-name/pt/ptyxis/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ptyxis"; - version = "47.4"; + version = "47.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "ptyxis"; rev = finalAttrs.version; - hash = "sha256-G2WesIaz+eYiDExyMi6Ww2cHMthuxAX5b+B68dz6Yb0="; + hash = "sha256-h5e+H4Tf7T1poM1Srf/ZINk5chScXNFLaEqtlMgrhHs="; }; nativeBuildInputs = [ From fe2a6466c6e960b393bfcf2234db44b624e5f63f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 11:50:29 +0000 Subject: [PATCH 0694/1054] python312Packages.plaid-python: 27.0.0 -> 28.0.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index a1ecf82c6309..0f8e2a7a3bb6 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "27.0.0"; + version = "28.0.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "plaid_python"; inherit version; - hash = "sha256-nMDAJs9W2L3/wB7lOP5hMYF0ytqMVgDLOYzn9UsUVEw="; + hash = "sha256-JA4KH7zxSlxAyKHEsJ4YH8oAI2/s1ELwPrXwmi1HhYo="; }; build-system = [ setuptools ]; From d456aa4fc9ae2140c290774c8d34a2732eb199fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 11:52:40 +0000 Subject: [PATCH 0695/1054] qpwgraph: 0.7.9 -> 0.8.0 --- pkgs/applications/audio/qpwgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 536f65799725..218148ca8fa5 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.7.9"; + version = "0.8.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-VEJbjrXSMERGUyfIo43hg7v/S7lRzzvQ4gmwlqOMgAQ="; + sha256 = "sha256-jB2mMLwJ1e/fIsf1R9Wd0stwp/RQH6f9pkF1qQX72Aw="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; From e54605b8394f15608d3f2d944eb742cb388d72a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 11:55:54 +0000 Subject: [PATCH 0696/1054] redocly: 1.25.9 -> 1.25.11 --- pkgs/by-name/re/redocly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix index d1986ae940ae..a0cf3d87c4bb 100644 --- a/pkgs/by-name/re/redocly/package.nix +++ b/pkgs/by-name/re/redocly/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "redocly"; - version = "1.25.9"; + version = "1.25.11"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-QOD1EqigHa/daanwajoiQAy0fJRi8yWJKj41k0SZyJo="; + hash = "sha256-mZrD+ex1AZfQopnroA9gu7z5DeuC79k90KIWGhgAgrQ="; }; - npmDepsHash = "sha256-Bo8Zdft+AfjSXDnxXvKq+AEpU4vtB+XBkmzqLRuHLrw="; + npmDepsHash = "sha256-pavWVmCOM40eaYgIcese/XTumV8Jsb8nKU86AyNdsz4="; npmBuildScript = "prepare"; From fc117208b4a1d0e2735f71d0b6068ae95dd067ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 12:01:58 +0000 Subject: [PATCH 0697/1054] di: 4.54 -> 4.54.0.1 --- pkgs/by-name/di/di/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/di/package.nix b/pkgs/by-name/di/di/package.nix index 2aa69399b575..460f2d6fd3d1 100644 --- a/pkgs/by-name/di/di/package.nix +++ b/pkgs/by-name/di/di/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "di"; - version = "4.54"; + version = "4.54.0.1"; src = fetchurl { url = "mirror://sourceforge/diskinfo-di/${pname}-${version}.tar.gz"; - sha256 = "sha256-9QD8H+J1hnOOEtdz2rya8Qj+RpDWu8giCpw8P3dPh0g="; + sha256 = "sha256-tAHmR+zDyKaXZRvSmtHMauMZ9poki03E068HQvZLT/s="; }; makeFlags = [ "PREFIX=$(out)" ]; From ed6c80272febc9724eceff2742a580a1fe74665d Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 1 Dec 2024 20:21:13 +0800 Subject: [PATCH 0698/1054] pdfstudio: fix hash mismatch --- pkgs/applications/misc/pdfstudio/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index 967a946060d9..9d0eaddf1cda 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -12,7 +12,7 @@ lib, stdenv, program ? "pdfstudio", - year ? "2023", + year ? "2024", fetchurl, callPackage, jdk11, @@ -34,13 +34,13 @@ in program year ; - version = "${year}.0.3"; + version = "${year}.0.1"; longDescription = '' PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio. ''; src = fetchurl { - url = "https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb"; - sha256 = "sha256-JQx5yJLjwW4VRXLM+/VNDXFN8ZcHJxlxyKDIzc++hEs="; + url = "https://web.archive.org/web/20241201121627/https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb"; + hash = "sha256-hxReGuyGsBiEr7wWxWzQUQvxk11sgF9HkJ07L9i+e+0="; }; jdk = jdk17; }; @@ -56,7 +56,7 @@ in version = "${year}.2.2"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; - sha256 = "sha256-HdkwRMqwquAaW6l3AukGReFtw2f5n36tZ8vXo6QiPvU="; + hash = "sha256-HdkwRMqwquAaW6l3AukGReFtw2f5n36tZ8vXo6QiPvU="; }; extraBuildInputs = [ (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 @@ -75,7 +75,7 @@ in version = "${year}.2.5"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; - sha256 = "sha256-3faZyWUnFe//S+gOskWhsZ6jzHw67FRsv/xP77R1jj4="; + hash = "sha256-3faZyWUnFe//S+gOskWhsZ6jzHw67FRsv/xP77R1jj4="; }; extraBuildInputs = [ (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 @@ -94,7 +94,7 @@ in version = "${year}.0.3"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; - sha256 = "sha256-Po7BMmEWoC46rP7tUwZT9Ji/Wi8lKc6WN8x47fx2DXg="; + hash = "sha256-Po7BMmEWoC46rP7tUwZT9Ji/Wi8lKc6WN8x47fx2DXg="; }; extraBuildInputs = [ (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 @@ -113,7 +113,7 @@ in version = "${year}.0.0"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; - sha256 = "sha256-9TMSKtBE0+T7wRnBgtUjRr/JUmCaYdyD/7y0ML37wCM="; + hash = "sha256-9TMSKtBE0+T7wRnBgtUjRr/JUmCaYdyD/7y0ML37wCM="; }; extraBuildInputs = [ (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 From 35b1e02e9f938be139764070f4f96f9b8c84608c Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Thu, 5 Dec 2024 12:13:44 +0000 Subject: [PATCH 0699/1054] pdfstudio2023: 2023.0.3->2023.0.4 --- pkgs/applications/misc/pdfstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index 9d0eaddf1cda..03305f685fa0 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -91,10 +91,10 @@ in program year ; - version = "${year}.0.3"; + version = "${year}.0.4"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; - hash = "sha256-Po7BMmEWoC46rP7tUwZT9Ji/Wi8lKc6WN8x47fx2DXg="; + hash = "sha256-TTh0yzpCOpxFKGfrakvnu1Y+l9NI0nfWlVuvSWpkRkE="; }; extraBuildInputs = [ (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 From f70bc8c98219d911a6c5258116bda59cd921d762 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 12:14:57 +0000 Subject: [PATCH 0700/1054] pv: 1.8.14 -> 1.9.7 --- pkgs/by-name/pv/pv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pv/pv/package.nix b/pkgs/by-name/pv/pv/package.nix index f6b600f3ec4d..4430a14ce9ab 100644 --- a/pkgs/by-name/pv/pv/package.nix +++ b/pkgs/by-name/pv/pv/package.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pv"; - version = "1.8.14"; + version = "1.9.7"; src = fetchurl { url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz"; - hash = "sha256-DMGIEaSAmlh9SxHUdpG7wK2DpdldLCYGr3Tqe0pnR1Y="; + hash = "sha256-aXanie4bvP3EdzIBW2BYnB0ECIkiUt18u0T0M2Oi8zo="; }; meta = { From ae435d0bac5196222a0c3f320852a998bee5b9df Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 5 Dec 2024 09:25:25 +0100 Subject: [PATCH 0701/1054] wgpu-native: init at 22.1.0.5 --- pkgs/by-name/wg/wgpu-native/examples.nix | 88 ++++++++++++++++++++++++ pkgs/by-name/wg/wgpu-native/package.nix | 62 +++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 pkgs/by-name/wg/wgpu-native/examples.nix create mode 100644 pkgs/by-name/wg/wgpu-native/package.nix diff --git a/pkgs/by-name/wg/wgpu-native/examples.nix b/pkgs/by-name/wg/wgpu-native/examples.nix new file mode 100644 index 000000000000..81d361dc4f35 --- /dev/null +++ b/pkgs/by-name/wg/wgpu-native/examples.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + cmake, + pkg-config, + ninja, + makeWrapper, + wgpu-native, + glfw, + wayland, + xorg, + vulkan-loader, + + version, + src, +}: + +stdenv.mkDerivation (finalAttrs: { + inherit version src; + pname = "wgpu-native-examples"; + + sourceRoot = "${src.name}/examples"; + + postPatch = '' + substituteInPlace ./CMakeLists.txt \ + --replace-fail 'add_subdirectory(vendor/glfw)' 'find_package(glfw3 3.4 REQUIRED)' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ninja + makeWrapper + ]; + + buildInputs = + [ + wgpu-native + glfw + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wayland + xorg.libX11 + xorg.libXrandr + ]; + + runtimeInputs = lib.optionals stdenv.hostPlatform.isLinux [ + # Without wayland in library path, this warning is raised: + # "No windowing system present. Using surfaceless platform" + wayland + # Without vulkan-loader present, wgpu won't find any adapter + vulkan-loader + ]; + + makeWrapperArgs = lib.optionals (finalAttrs.runtimeInputs != [ ]) [ + "--prefix LD_LIBRARY_PATH : ${builtins.toString (lib.makeLibraryPath finalAttrs.runtimeInputs)}" + ]; + + installPhase = '' + runHook preInstall + + concatTo makeWrapperArgsArray makeWrapperArgs + + # find all executables that have the same name as their directory + for executable in $(find . -regex '.*\(/[^/]*\)\1' -type f -executable) + do + target="$(basename "$(dirname "$executable")")" + install -Dm755 $executable -t $out/bin + mkdir -p $out/share/$target + wrapProgram $out/bin/$target --chdir $out/share/$target "''${makeWrapperArgsArray[@]}" + + # The examples expect their shaders in the CWD, so we copy them into the store + # and wrap the examples to run in the directory containing the shader. + for shader in $(find ../$target -type f -name '*.wgsl'); do + install -Dm644 $shader $out/share/$target/ + done + done + + runHook postInstall + ''; + + meta = wgpu-native.meta // { + description = "Examples for the native WebGPU implementation based on wgpu-core"; + mainProgram = "triangle"; + }; +}) diff --git a/pkgs/by-name/wg/wgpu-native/package.nix b/pkgs/by-name/wg/wgpu-native/package.nix new file mode 100644 index 000000000000..f9705f15ea13 --- /dev/null +++ b/pkgs/by-name/wg/wgpu-native/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + fixDarwinDylibNames, + vulkan-loader, + nix-update-script, + callPackage, +}: + +rustPlatform.buildRustPackage rec { + pname = "wgpu-native"; + version = "22.1.0.5"; + + src = fetchFromGitHub { + owner = "gfx-rs"; + repo = "wgpu-native"; + rev = "refs/tags/v${version}"; + hash = "sha256-lEUHRU7+sFWtEYTOB2F+SmMNG8nrjro3IL7BgYuIGgM="; + fetchSubmodules = true; + }; + + outputs = [ + "out" + "dev" + ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-frlGlUqyKa3PTRbpLhcnUvu+SX64V/CnZGa6+ADxKCo="; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + vulkan-loader + ]; + + postInstall = '' + rm $out/lib/libwgpu_native.a + install -Dm644 ./ffi/wgpu.h -t $dev/include/webgpu + install -Dm644 ./ffi/webgpu-headers/webgpu.h -t $dev/include/webgpu + ''; + + passthru = { + updateScript = nix-update-script { }; + examples = callPackage ./examples.nix { + inherit version src; + }; + }; + + meta = { + description = "Native WebGPU implementation based on wgpu-core"; + homepage = "https://github.com/gfx-rs/wgpu-native"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ niklaskorz ]; + }; +} From 3e53e7e7bc04b454f4c4e63fc43e989226704702 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 12:35:10 +0000 Subject: [PATCH 0702/1054] xreader: 4.2.2 -> 4.2.3 --- pkgs/by-name/xr/xreader/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix index bf1ad8410bd0..411f88c7e1a7 100644 --- a/pkgs/by-name/xr/xreader/package.nix +++ b/pkgs/by-name/xr/xreader/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-c3oZ+PAsu180mlriQlF86TCBAnehLBv9Nc0SCtSkUuQ="; + hash = "sha256-qBnnxygkAn1wF3gtqR0At1e1e+sx1/2MoSWqmshW5Qg="; }; nativeBuildInputs = [ From f7c9f1aa799aa79da47743896620da726927e978 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Thu, 5 Dec 2024 20:35:43 +0800 Subject: [PATCH 0703/1054] minimal-grub-theme: init at 0.3.0 --- .../by-name/mi/minimal-grub-theme/package.nix | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/mi/minimal-grub-theme/package.nix diff --git a/pkgs/by-name/mi/minimal-grub-theme/package.nix b/pkgs/by-name/mi/minimal-grub-theme/package.nix new file mode 100644 index 000000000000..70e9c51d096c --- /dev/null +++ b/pkgs/by-name/mi/minimal-grub-theme/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "minimal-grub-theme"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "tomdewildt"; + repo = "minimal-grub-theme"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-CegLznlW+UJZbVe+WG/S8tREFdw0aq3flGvJeDrLWK0="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/ + + cp -r minimal/icons minimal/theme.txt minimal/*.png $out/ + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Minimalistic GRUB theme insipired by primitivistical and vimix"; + homepage = "https://github.com/tomdewildt/minimal-grub-theme"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ azuwis ]; + platforms = lib.platforms.linux; + }; +}) From 1266ded08f8d4df00339f2b8a71ebd3d1400efdd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 12:39:57 +0000 Subject: [PATCH 0704/1054] xapp: 2.8.6 -> 2.8.7 --- pkgs/by-name/xa/xapp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix index a8454fda4239..75abb95960bc 100644 --- a/pkgs/by-name/xa/xapp/package.nix +++ b/pkgs/by-name/xa/xapp/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.8.6"; + version = "2.8.7"; outputs = [ "out" "dev" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-OQfP0XPBQrxJDrKb5PEqpBtinkQ35NMUbsYnxhbuehU="; + hash = "sha256-PMTsaY04rML2vmVIOWArYqWmGvpTtA1DpFw3ZAtu+oU="; }; # Recommended by upstream, which enables the build of xapp-debug. From 58254b5abc5560b8f936337d36e519495cdb299b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 12:43:31 +0000 Subject: [PATCH 0705/1054] unrar: 7.1.1 -> 7.1.2 --- pkgs/by-name/un/unrar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unrar/package.nix b/pkgs/by-name/un/unrar/package.nix index b5edc7eb2311..745cdd1003a8 100644 --- a/pkgs/by-name/un/unrar/package.nix +++ b/pkgs/by-name/un/unrar/package.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "unrar"; - version = "7.1.1"; + version = "7.1.2"; src = fetchzip { url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; stripRoot = false; - hash = "sha256-dGF5xCZRHnaMVj/OGIIFbytN7Jnj39gq7ym6hq/EZsk="; + hash = "sha256-6xqAik10YSXh2pm/j0dSeQXDWAGVnOf6eOD7Od9+LZA="; }; sourceRoot = finalAttrs.src.name; From 4cce7a0518b81d124b9b09cd082033b14114e783 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 12:59:00 +0000 Subject: [PATCH 0706/1054] dosbox-x: 2024.10.01 -> 2024.12.04 --- pkgs/applications/emulators/dosbox-x/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix index dc12dc2da62e..a7cc9b5ea6a3 100644 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ b/pkgs/applications/emulators/dosbox-x/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-x"; - version = "2024.10.01"; + version = "2024.12.04"; src = fetchFromGitHub { owner = "joncampbell123"; repo = "dosbox-x"; rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-qfrEy7OndhJ/UnfFDCp7qlIhYWANkUBy2ejYVvRrG3k="; + hash = "sha256-wZCLwEInUfzuOCcUsz8W+Gi00lp4Nwc0QZjLF8/e9iM="; }; # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants From 07d388a43bf4823500753041a459d49527b0a487 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 5 Dec 2024 14:03:00 +0100 Subject: [PATCH 0707/1054] Update pkgs/development/python-modules/torchtnt/default.nix Co-authored-by: OTABI Tomoya --- pkgs/development/python-modules/torchtnt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/torchtnt/default.nix b/pkgs/development/python-modules/torchtnt/default.nix index 78c948823c77..0b1520d50e95 100644 --- a/pkgs/development/python-modules/torchtnt/default.nix +++ b/pkgs/development/python-modules/torchtnt/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { doCheck = false; meta = { - description = "lightweight library for PyTorch training tools and utilities"; + description = "Lightweight library for PyTorch training tools and utilities"; homepage = "https://github.com/pytorch/tnt"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nim65s ]; From 83dad7d43cf20f72ad31172ae6ff8bf8f11790be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 13:03:17 +0000 Subject: [PATCH 0708/1054] flake-checker: 0.2.0 -> 0.2.1 --- pkgs/by-name/fl/flake-checker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix index 80512e1bf7d9..0025e55c56d1 100644 --- a/pkgs/by-name/fl/flake-checker/package.nix +++ b/pkgs/by-name/fl/flake-checker/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "flake-checker"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "flake-checker"; rev = "v${version}"; - hash = "sha256-cvjSQNvRnreherInbieJnaanU/TzDAgM544MBi7UWvQ="; + hash = "sha256-Uc3Fycn4SBYo2XWoAn4egAtjKt0XxBcyS0uN5a3bRKk="; }; - cargoHash = "sha256-0iH5owyNfIpRz6nYwrJUoqd9lVGZ3T3K8rmsOk2UoGI="; + cargoHash = "sha256-Muajqf7jcr10DLythl/hlFM2qG83i81Q3eGk3mg/4GU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security From 6da0724cf33c0c7215920d7513fb47777d002f34 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 3 Dec 2024 18:23:59 +0530 Subject: [PATCH 0709/1054] ci: add Nixpkgs lib-tests workflow Ofborg also does this. Should be run on `lib/*` dirs Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- .github/workflows/eval-lib-tests.yml | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/eval-lib-tests.yml diff --git a/.github/workflows/eval-lib-tests.yml b/.github/workflows/eval-lib-tests.yml new file mode 100644 index 000000000000..3ca5707e09b4 --- /dev/null +++ b/.github/workflows/eval-lib-tests.yml @@ -0,0 +1,30 @@ +name: "Building Nixpkgs lib-tests" + +permissions: + contents: read + +on: + pull_request_target: + paths: + - 'lib/**' +jobs: + get-merge-commit: + uses: ./.github/workflows/get-merge-commit.yml + + nixpkgs-lib-tests: + name: nixpkgs-lib-tests + runs-on: ubuntu-latest + needs: get-merge-commit + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + if: needs.get-merge-commit.outputs.mergedSha + with: + # pull_request_target checks out the base branch by default + ref: ${{ needs.get-merge-commit.outputs.mergedSha }} + - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + with: + # explicitly enable sandbox + extra_nix_config: sandbox = true + - name: Building Nixpkgs lib-tests + run: | + nix-build --arg pkgs "(import ./ci/. {}).pkgs" ./lib/tests/release.nix From a3da8b04d20b85964c3fda18d41f3b5e242ff246 Mon Sep 17 00:00:00 2001 From: Devin Droddy Date: Thu, 5 Dec 2024 08:10:07 -0500 Subject: [PATCH 0710/1054] hypr-dynamic-cursors: 0-unstable-2024-11-10 -> 0-unstable-2024-11-19 --- .../hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix index e21eb2560bc0..f5caf1b87578 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix @@ -8,13 +8,13 @@ mkHyprlandPlugin hyprland { pluginName = "hypr-dynamic-cursors"; - version = "0-unstable-2024-11-10"; + version = "0-unstable-2024-11-19"; src = fetchFromGitHub { owner = "VirtCode"; repo = "hypr-dynamic-cursors"; - rev = "a3427f2a7f1dc70236dbaa870eadead03d9807a6"; - hash = "sha256-7nznQzeq0rzvTos2axd4LvzLJ64n0erP3WxMIpCE5Ew="; + rev = "81f4b964f997a3174596ef22c7a1dee8a5f616c7"; + hash = "sha256-3SDwq2i2QW9nu7HBCPuDtLmrwLt2kajzImBsawKRZ+s="; }; dontUseCmakeConfigure = true; From b2853e04b379f5008592e70c8a266e76b182bfc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 13:17:02 +0000 Subject: [PATCH 0711/1054] ksmbd-tools: 3.5.2 -> 3.5.3 --- pkgs/by-name/ks/ksmbd-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ks/ksmbd-tools/package.nix b/pkgs/by-name/ks/ksmbd-tools/package.nix index fa4bdbd9e66d..cb6d637e5011 100644 --- a/pkgs/by-name/ks/ksmbd-tools/package.nix +++ b/pkgs/by-name/ks/ksmbd-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ksmbd-tools"; - version = "3.5.2"; + version = "3.5.3"; src = fetchFromGitHub { owner = "cifsd-team"; repo = pname; rev = version; - sha256 = "sha256-QE/Pnba4zgeInlVqOEjT3EqV6NPkQTp6xeYU3dsIl4M="; + sha256 = "sha256-f2B+24AboAWLIrtuHWn8YMEPzWahIafc3kfx0zKyz8g="; }; buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5; From 27e573eec13b135b26bb76aaecf38ce165d84b64 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 14:45:02 +0100 Subject: [PATCH 0712/1054] checkov: 3.2.328 -> 3.2.330 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.328...3.2.330 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.330 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index d65ac33b96f2..76c7bb8b341e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.328"; + version = "3.2.330"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-1eQvzrYuScOLDb5ZoXN4EyUzYiOZ3LysDSQRdXBL2Iw="; + hash = "sha256-rMovncMrVpvj60WWdU5mBTpR2QVF2DLso1TUGjl3m38="; }; patches = [ ./flake8-compat-5.x.patch ]; From 5eaa12216f51eae5ffb8785d735760ad19dea74b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 14:48:44 +0100 Subject: [PATCH 0713/1054] nuclei-templates: 10.0.4 -> 10.1.0 Diff: https://github.com/projectdiscovery/nuclei-templates/compare/refs/tags/v10.0.4...v10.1.0 Changelog: https://github.com/projectdiscovery/nuclei-templates/releases/tag/v10.1.0 --- pkgs/by-name/nu/nuclei-templates/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 2a7c699e1aec..f5334c6801f8 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "10.0.4"; + version = "10.1.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-1kz48njrg5wumrMb2bYs1IYziYKDLkxM3G8TKfjtv2A="; + hash = "sha256-QQPsj6s1CuEBfUI5L3gV8v2d4CxgoCOlsXe8FIkSJjU="; }; installPhase = '' From 93382b5e83e762432dbce263c21ba79dc6553dcc Mon Sep 17 00:00:00 2001 From: ShawnToubeau Date: Thu, 5 Dec 2024 08:51:43 -0500 Subject: [PATCH 0714/1054] google-alloy-db-auth-proxy: init at 1.11.3 --- .../go/google-alloydb-auth-proxy/package.nix | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/go/google-alloydb-auth-proxy/package.nix diff --git a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix new file mode 100644 index 000000000000..74853ac87bec --- /dev/null +++ b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule rec { + pname = "google-alloydb-auth-proxy"; + version = "1.11.3"; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = "alloydb-auth-proxy"; + rev = "refs/tags/v${version}"; + hash = "sha256-MjLnGsZ4xoZpyjJQbBd3vihIA2sZ7AAhnW8Xtu7Au+U="; + }; + + subPackages = [ "." ]; + + vendorHash = "sha256-uUv/PqfuMAAwfcD2Sk36NcDoVWTrIVNxfoKM7cpFG5A="; + + checkFlags = [ + "-short" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Utility for connecting securely to your AlloyDB instances"; + longDescription = '' + The AlloyDB Auth Proxy is a binary that provides IAM-based authorization and encryption when connecting to an AlloyDB instance. + + See the Connecting Overview page for more information on connecting to an AlloyDB instance, or the About the proxy page for details on how the AlloyDB Auth Proxy works. + ''; + homepage = "https://github.com/GoogleCloudPlatform/alloydb-auth-proxy"; + changelog = "https://github.com/GoogleCloudPlatform/alloydb-auth-proxy/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ShawnToubeau ]; + mainProgram = "alloydb-auth-proxy"; + }; +} From 11bca208933fc76a31cc4f65a28258d7e7f482c5 Mon Sep 17 00:00:00 2001 From: ReecerTV Date: Thu, 5 Dec 2024 14:48:46 +0100 Subject: [PATCH 0715/1054] vscode-extensions.ltex-plus.vscode-ltex-plus: init at 15.3.0 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3e8eb9a0cfb5..c3b0a65a95dd 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3006,6 +3006,22 @@ let }; }; + ltex-plus.vscode-ltex-plus = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-ltex-plus"; + publisher = "ltex-plus"; + version = "15.3.0"; + hash = "sha256-hkHFDLeH+kJ7MJIYtXmCfi8LlCGujy/yPotwkZDrmHY="; + }; + meta = { + description = "VS Code extension for grammar/spell checking using LanguageTool with support for LaTeX, Markdown, and others"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ltex-plus.vscode-ltex-plus"; + homepage = "https://github.com/ltex-plus/vscode-ltex-plus"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ thtrf ]; + }; + }; + lucperkins.vrl-vscode = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "lucperkins"; From d87b843af3b43d078a0a881005dae592475bfd70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Mon, 2 Dec 2024 23:56:14 +0100 Subject: [PATCH 0716/1054] scarab: migrate to by-name --- pkgs/{tools/games => by-name/sc}/scarab/deps.nix | 0 .../games/scarab/default.nix => by-name/sc/scarab/package.nix} | 0 pkgs/{tools/games => by-name/sc}/scarab/scaling-settings.bash | 0 pkgs/{tools/games => by-name/sc}/scarab/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/games => by-name/sc}/scarab/deps.nix (100%) rename pkgs/{tools/games/scarab/default.nix => by-name/sc/scarab/package.nix} (100%) rename pkgs/{tools/games => by-name/sc}/scarab/scaling-settings.bash (100%) rename pkgs/{tools/games => by-name/sc}/scarab/update.sh (100%) diff --git a/pkgs/tools/games/scarab/deps.nix b/pkgs/by-name/sc/scarab/deps.nix similarity index 100% rename from pkgs/tools/games/scarab/deps.nix rename to pkgs/by-name/sc/scarab/deps.nix diff --git a/pkgs/tools/games/scarab/default.nix b/pkgs/by-name/sc/scarab/package.nix similarity index 100% rename from pkgs/tools/games/scarab/default.nix rename to pkgs/by-name/sc/scarab/package.nix diff --git a/pkgs/tools/games/scarab/scaling-settings.bash b/pkgs/by-name/sc/scarab/scaling-settings.bash similarity index 100% rename from pkgs/tools/games/scarab/scaling-settings.bash rename to pkgs/by-name/sc/scarab/scaling-settings.bash diff --git a/pkgs/tools/games/scarab/update.sh b/pkgs/by-name/sc/scarab/update.sh similarity index 100% rename from pkgs/tools/games/scarab/update.sh rename to pkgs/by-name/sc/scarab/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13bc48f1dae3..1b8ef4e29fec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1076,8 +1076,6 @@ with pkgs; ronin = callPackage ../tools/security/ronin { }; - scarab = callPackage ../tools/games/scarab { }; - inherit (callPackage ../development/libraries/sdbus-cpp { }) sdbus-cpp sdbus-cpp_2; sdkmanager = with python3Packages; toPythonApplication sdkmanager; From a46125dd5d9fa1bfbd8369ee7beaecaa8cbc6e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 3 Dec 2024 00:14:51 +0100 Subject: [PATCH 0717/1054] scarab: .NET 6 -> 8 --- pkgs/by-name/sc/scarab/deps.nix | 536 +++++++++++++++-------------- pkgs/by-name/sc/scarab/package.nix | 7 +- 2 files changed, 278 insertions(+), 265 deletions(-) diff --git a/pkgs/by-name/sc/scarab/deps.nix b/pkgs/by-name/sc/scarab/deps.nix index a440529298e9..10d83f3ec4a9 100644 --- a/pkgs/by-name/sc/scarab/deps.nix +++ b/pkgs/by-name/sc/scarab/deps.nix @@ -2,268 +2,276 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.0"; sha256 = "0wfbwrr8p5hg9f809d44gh2zfkfwnwayfw84vs33hh7ms0r380gd"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) - (fetchNuGet { pname = "Avalonia.AvaloniaEdit"; version = "11.0.0"; sha256 = "12ibz472083iiz5zskd1ivigggbl0d9yv3nazgw17s97nmnl2lpj"; }) - (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.28"; sha256 = "0d9hyc1zmyvzlb320arwrv12ncp45llq98hibv711b7ibm11dm7c"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0"; sha256 = "06wgzhxkivlaxkn8p61wainsprml2g1q4jmvy9fpn64qnfywjdn7"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0"; sha256 = "0qlcdx4w1pcljgs7sfbn5xmmnqwp2m0fqyswrgz6c8cvjzcfsjsj"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0"; sha256 = "08y31b357fax7c1ggwhjsfwgaj6zkm2abhpc6amlmk6ci4zn12lf"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0"; sha256 = "134xl19rfswnz75a1mhil9yqy8haqa788rmd1p1kk6ibjbhb3np9"; }) - (fetchNuGet { pname = "Avalonia.Fonts.Inter"; version = "11.0.0"; sha256 = "1vbkk97jhy9qwix25jc875m98cp6vrl86029la55cbky9m1819am"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0"; sha256 = "042s8lc83lw6ygcsiza14wlsc09rgzw3ch2qaxkhlp73bh736ps3"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0"; sha256 = "1j7wpv81wqwh6zhfzc1f36vb5dp6s2ig45v8km9sp0q6f66zkrsh"; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.0"; sha256 = "1fhp6f2aj2bmzlcj0s5r9i9rcxwakdg9gvjqvdqaq8s98d0s06qh"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; sha256 = "1b5031k8slwiz7bncih67fjl6ny234yd4skqxk611l9zp5snjic2"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; sha256 = "1ra1kd0kkblppr5zy7rzdbwllggrzvp9lkxblf9mg3y8rnp6fk83"; }) - (fetchNuGet { pname = "Avalonia.Svg"; version = "11.0.0.1"; sha256 = "0a61xg6pcmjy90mmjv42d64av5a7q919qbrhnv6vd1rmm6hxv7zf"; }) - (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0.1"; sha256 = "1bywgrqdqc5wgcsabnhm8yssg78g9lw3p3sza5f8w5vdzmr116ff"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0"; sha256 = "1qw76n78c14xl419yzabahbsrgymm850ql05gd4fh5naq2brksdm"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0"; sha256 = "1djp4m5yin4i2f9sjv4v3syv02fllwbfinzm9h0hm2abc2ccvrm3"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0"; sha256 = "1gd4zrjyw3hg3d48ivhxp0ca7ma13dnpr8y1wc7d51ddlrj3c86g"; }) - (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; sha256 = "1caf4878nvjid3cw3rw18p9cn53brfs5x8dkvf82xvcdwc3i0nd1"; }) - (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.0-d1"; sha256 = "1vf5fp11zx21bsakbpf12j6mchafh749cs03w9cifb6ci98jchgh"; }) - (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.2"; sha256 = "0zvdgpg6r142zhldam5kcpmjpi0qjxsm40cy491gb9ynrj39hrhn"; }) - (fetchNuGet { pname = "coverlet.collector"; version = "1.3.0"; sha256 = "0k65d9hag6d59w1ixf4n5ihcphp04vrjmd99x5nhga81w1k9i20y"; }) - (fetchNuGet { pname = "DryIoc.dll"; version = "5.4.1"; sha256 = "1dbaac5pi7mim4qil3lrqcpad9vbn261rznk5rw26kvngzcc65n6"; }) - (fetchNuGet { pname = "DryIoc.Microsoft.DependencyInjection"; version = "6.2.0"; sha256 = "0iygbabd73ggzyq1ckbxifrh1kvzwlkr3x32ahamka7pv3982khb"; }) - (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; sha256 = "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x"; }) - (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; }) - (fetchNuGet { pname = "FakeItEasy"; version = "8.0.0-alpha.1.10"; sha256 = "0492cayij2ap7rc9l8rkmmch1rb0jqckaspqxrsy0myldfqc2lpq"; }) - (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.42"; sha256 = "0cvnc1qdfcjbqkh335bv4wp44zisb4hc69lq3zphiyzqfrjisnyb"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0"; sha256 = "0nx7nrzbg9gk9skdc9x330cbr5xbsly6z9gzxm46vywf55yp8vaj"; }) - (fetchNuGet { pname = "Markdown.Avalonia"; version = "11.0.2"; sha256 = "1nx1f3pqlpffwwpdk8d6bbd27mz2q45k3gkc5dz6m2pfxi0ij6ak"; }) - (fetchNuGet { pname = "Markdown.Avalonia.Html"; version = "11.0.2"; sha256 = "1xjz45lg9dcfwcdl0sbfy0145m6bd8y3b6kvwh96fnnj8ks6074q"; }) - (fetchNuGet { pname = "Markdown.Avalonia.Svg"; version = "11.0.2"; sha256 = "1s5yazazpmhkc2nizzm46cnfwk7wwdd6gg2lzcs30k813i3621z3"; }) - (fetchNuGet { pname = "Markdown.Avalonia.SyntaxHigh"; version = "11.0.2"; sha256 = "0di7r0wiif2lvgr0wlw1lj7b9j85yp1pf5hyhh4n9ciykklkkq0p"; }) - (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.0-d1"; sha256 = "0ks9k3wqwvdssiwbcjc4gnrfn1r8x2dbp9amraxkmws5a7vbjdyk"; }) - (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.2"; sha256 = "1mz229r42f1p320xkjl45pdv72lycn9cqk46arycm9km45jgzzgl"; }) - (fetchNuGet { pname = "MessageBox.Avalonia"; version = "2.3.1-rc1"; sha256 = "13zvqg95wa5v5b8h8kl63ydpprxqyk6zgzqdh673y005s1y58w4a"; }) - (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.7.1"; sha256 = "1farw63445cdyciplfs6l9j1gayxw16rkzmrwsiswfyjhqz70xd4"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.7.1"; sha256 = "0yqxipj74ax2n76w9ccydppx78ym8m5fda88qnvj4670qjvl0kf8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.7.1"; sha256 = "0s9dyh99gzdpk1i5v468i2r9m6i3jrr41r394pwdwiajsz99kay0"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.7.1"; sha256 = "1xik06rxn9ps83in0zn9vcl2ibv3acmdqvrx07qq89lxj1sgqlhs"; }) - (fetchNuGet { pname = "Microsoft.Toolkit.HighPerformance"; version = "7.1.2"; sha256 = "18l950mq0l8s1z771l9p332ni7jryidjh4hi9p37l6p8frcnccxb"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) - (fetchNuGet { pname = "Projektanker.Icons.Avalonia"; version = "6.6.0-rc1.1"; sha256 = "04sac2grc1mbx1rfx29i16k0yrqh29c60njsj2mq8yrs1z2ky9jj"; }) - (fetchNuGet { pname = "Projektanker.Icons.Avalonia.FontAwesome"; version = "6.6.0-rc1.1"; sha256 = "1mzdgds62f7apy8gajrpsa6fay89rzfl7f9mf6y573ani7a131xc"; }) - (fetchNuGet { pname = "PropertyChanged.SourceGenerator"; version = "1.0.8"; sha256 = "05ygdj1sizcw678vf459hzhz4ynz2s5s206vl99g5gy3d9kaham6"; }) - (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Semi.Avalonia"; version = "11.0.0"; sha256 = "1js7lk05y171y6hrh39ai6ddqn17x08ri2fdpz9iq0ic8iryrvxi"; }) - (fetchNuGet { pname = "Serilog"; version = "3.0.1"; sha256 = "1sigmcsy6mvjk2lqlxdxj47f961p1wvc0b8d8nx84hwy7mfikxvi"; }) - (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "7.0.0"; sha256 = "0qbdgjfr534jhrl87fjav46pbbrzj3izw3wd6hbz5gi1lrphmzar"; }) - (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; sha256 = "1rpkphmqfh3bv3m7v1zwz88wz4sirj4xqyff9ga0c6bqhblj6wii"; }) - (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) - (fetchNuGet { pname = "SerilogAnalyzer"; version = "0.15.0"; sha256 = "0k83cyzl9520q282vp07zb8rs16a56axv7a31l3m5fb1afq2hv9l"; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.1"; sha256 = "1iza1yvvvz5pfl2vx6fwlb0gj262gwva9fay6pb6kgiv70h7rmcg"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) - (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) - (fetchNuGet { pname = "Splat"; version = "14.4.1"; sha256 = "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b"; }) - (fetchNuGet { pname = "Splat"; version = "14.6.37"; sha256 = "1rj2ik4b4mxl2w2d8316a2afyfd23p6ysc5vczsis7bhxcjp1x2h"; }) - (fetchNuGet { pname = "Splat"; version = "14.7.1"; sha256 = "1rs8bmwcvzg4yn05zglgk7vbmyi2flyyhjqn62sx1cjkrd9m0cs7"; }) - (fetchNuGet { pname = "Splat.Microsoft.Extensions.DependencyInjection"; version = "14.6.37"; sha256 = "1pqb0ij1kmzjx92j5slp579aqshsp499wd8vxbnm58z0ix4a7bn6"; }) - (fetchNuGet { pname = "Splat.Serilog"; version = "14.7.1"; sha256 = "0xdw92jxarvpan9v8zja2710z2m03yam94qwar8j5axvnqbh8fhj"; }) - (fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.1"; sha256 = "00ly1pbm8a7s2k71gz7ikw42l25wfgabdx4bqrzdxysgnfaaa43d"; }) - (fetchNuGet { pname = "Svg.Model"; version = "1.0.0.1"; sha256 = "0kyllnbya6zvhv8rg53b3zdndmdz9hak4k204gjzcnhkqsn8dcy6"; }) - (fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.1"; sha256 = "1z487pnz12cy6554xl4nifj4y4a2l15yxz5d3rlsc3asb4qs5jvy"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.6.0"; sha256 = "1pbxzdz3pwqyybzv5ff2b7nrc281bhg7hq34w0fn1w3qfgrbwyw2"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; sha256 = "08y1x2d5w2hnhkh9r1998pjc7r4qp0rmzax062abha85s11chifd"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Abstractions"; version = "19.2.29"; sha256 = "1d25i63zg36w1xf7f89036qi3hjb567lc9if1acnvd769ss7qc09"; }) - (fetchNuGet { pname = "System.IO.Abstractions.TestingHelpers"; version = "19.2.29"; sha256 = "08a1v4a5nmmqk6mbzqd7k41cw0d478na9pf3cnbl8935fqc176ys"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) - (fetchNuGet { pname = "System.Reactive.Linq"; version = "5.0.0"; sha256 = "07p05v13yixbxhs84231k5l8jw3nji0j3zcqc6nsbcmh54jpjsrb"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; sha256 = "0scb0lp7wbgcinaa4kqiqs7b8i5nx4ppfad81138jiwd1sl37pyp"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "19.2.29"; sha256 = "00gf9bw3dbacp1vnyr4m3lj61vnllrxhsiryn91jaylld4yl2r7x"; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.TestingHelpers"; version = "19.2.29"; sha256 = "1j1728yfj29bc24pc3dz8vnsybs8islgzrkmdyp9p193dmc9ryb5"; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "19.2.29"; sha256 = "1ffk5z4wi61711rwng67wviw0g0xyzvmf352i3yyfhm4i4xlsf3z"; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) - (fetchNuGet { pname = "xunit"; version = "2.4.1"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; }) - (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.4.1"; sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; }) - (fetchNuGet { pname = "xunit.core"; version = "2.4.1"; sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.1"; sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.1"; sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; }) - (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.3"; sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.0"; hash = "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; }) + (fetchNuGet { pname = "Avalonia.AvaloniaEdit"; version = "11.0.0"; hash = "sha256-8lJBbbUn6RP4+8qO7VMDdL334o6hTf3Lj3EgIA75K4o="; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.28"; hash = "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0"; hash = "sha256-xzbJvbOYGHtd8rtKgsMTtOarbVQ8mIvs7IruODv8jxs="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0"; hash = "sha256-Ukvt2JebIWb+y1x77EAVl2Nbay92OX30k5TdwElvjGI="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0"; hash = "sha256-jopgP4nMzEqrMuzCpUSd30j1uNMS8vcCO125U8YKwyM="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0"; hash = "sha256-6dqx4JIrmjnDDa1mhI7CCiKPfaIR1qDK+ZZrl1OgnYw="; }) + (fetchNuGet { pname = "Avalonia.Fonts.Inter"; version = "11.0.0"; hash = "sha256-VaWAQk1+LlaKokkAg2je5jKUajmIySJ65Dh5KE+ac+0="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0"; hash = "sha256-Q18zDlzjXApnV1hANvh/OQGmKSdB/ajZ84bTgRhFWhA="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0"; hash = "sha256-UOf5jXEGg6tTnWgX8qLQ5raythkusO/gN5BjHtC+/Mg="; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.0"; hash = "sha256-EBugQUNJI6xw21jul16bineWU0y5aCAZ/XUJqYQzF7o="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; hash = "sha256-A01nrs3Ij1eTo6tPmu7++T1K+Wo/H/9LvpeuOUGbQeU="; }) + (fetchNuGet { pname = "Avalonia.Svg"; version = "11.0.0.1"; hash = "sha256-7p/doak1h7bNtjAvnELCR5WtiGmCbFkrSF5Wds3rwSg="; }) + (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0.1"; hash = "sha256-zpkQcv1tF45cUV+POzhND52ntUcV2qU0e7ww3HB+3K8="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0"; hash = "sha256-temZl8DKFuhIewVQDAqq1b+sF1RLfZ8CoZ0Eho41h+M="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0"; hash = "sha256-o+bNmGBLiQoBTPXb6Ban1AmwvR6bbKmTE5HY6EslV7Y="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0"; hash = "sha256-zyA2ZKathdIO48GjfG0bQdWjGLgd7ohIGw8O7mX+pL0="; }) + (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; hash = "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="; }) + (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.0-d1"; hash = "sha256-8EEmUYrMLBdZ4gNolsiBTkFWjRTB3TWVXkH0H8J1xe0="; }) + (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.2"; hash = "sha256-FmaYhszWp/VCIp4BUnWXGMQr62WzVNUo/IKEbN59bX8="; }) + (fetchNuGet { pname = "coverlet.collector"; version = "1.3.0"; hash = "sha256-HoiYZuABqQdt6Sm1KvMm4MLLYCyWuB4DT6WZp2BqxUw="; }) + (fetchNuGet { pname = "DryIoc.dll"; version = "5.4.1"; hash = "sha256-xhbD2H92TyN4LtP+HIywa6emLsOZDhoxqbGeeAtTarU="; }) + (fetchNuGet { pname = "DryIoc.Microsoft.DependencyInjection"; version = "6.2.0"; hash = "sha256-C06B0tj3qFkVVGL0kSflf88As4t9TRaw/++N05Zaz0c="; }) + (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; hash = "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU="; }) + (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; hash = "sha256-7dKCwRC+Jt4CTLz9LF3LpmaB8ch1HFrcan7CmM3toPg="; }) + (fetchNuGet { pname = "FakeItEasy"; version = "8.0.0-alpha.1.10"; hash = "sha256-+FLBsGvUV+B17vhqNRmWYOUAWa0zI5pYPlcJGb1iIhE="; }) + (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; hash = "sha256-FROW1WzitXTauf2Hn7YejOLqNKN2Nd+Q2etFB1pYsvA="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; hash = "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; hash = "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; hash = "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; hash = "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; hash = "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.42"; hash = "sha256-y1sdZXb4+wjvH5gmwyBZOn5CLid7lTHgxEsy13BgdjM="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0"; hash = "sha256-Um10fSmO+21I7f+lbzzVq5e8GBijJ9amTvOlt362p1s="; }) + (fetchNuGet { pname = "Markdown.Avalonia"; version = "11.0.2"; hash = "sha256-UxkZQezuimp+K2y+MQvB4tcj2lqmodku585diu9wods="; }) + (fetchNuGet { pname = "Markdown.Avalonia.Html"; version = "11.0.2"; hash = "sha256-mBxg9ETSWmcS5HuaNTxqy9RCAvBuaUAb44619GghX/Y="; }) + (fetchNuGet { pname = "Markdown.Avalonia.Svg"; version = "11.0.2"; hash = "sha256-4wdhRhwBTTA0+1S8Z1rj/EzuLDOk/h+tYBPW+9VXvug="; }) + (fetchNuGet { pname = "Markdown.Avalonia.SyntaxHigh"; version = "11.0.2"; hash = "sha256-F+A56Zw+smQJhB4Wd8P1Bcm0jqSBUw7y21S4GDnIJzY="; }) + (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.0-d1"; hash = "sha256-0ze59lFF8zq7ylWlu5roKAfrsn2ESbZ41LptjvmYSU8="; }) + (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.2"; hash = "sha256-9P3/ZCF1psp8VoZMzJJlnoqz2y2EytmBGDc4QXIS4tc="; }) + (fetchNuGet { pname = "MessageBox.Avalonia"; version = "2.3.1-rc1"; hash = "sha256-inBUfNAFAD+OgQ3/9830uOd7mx+GTgTRKrsoXtLD+48="; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.36"; hash = "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.36"; hash = "sha256-JQULJyF0ivLoUU1JaFfK/HHg+/qzpN7V2RR2Cc+WlQ4="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.36"; hash = "sha256-zUsVIpV481vMLAXaLEEUpEMA9/f1HGOnvaQnaWdzlyY="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.7.1"; hash = "sha256-pHVwPobSO66j5rn+mU3g3asXZKJGO3oj840VQobhWbk="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; hash = "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; hash = "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; hash = "sha256-rr/NXIZ/3FG5FYGrHD7iIIr12AksP4CnfUy1YvEdDa8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; hash = "sha256-uoMkX/TnwP0YabThacTMmyxdc9itQp73CN7xEFFox74="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; hash = "sha256-pj9I/2HpCU7bLu002/Bb5NF+ofUrJ3IyH7yVqfP8IC0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; hash = "sha256-AGnfNNDvZDGZ0Er9JQxeyLoUbVH+jfXF3anFr12qk6w="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.7.1"; hash = "sha256-yE1At8TgGCK3xQip5kpF1aPT722escTNsaIrcuSNHXs="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.36"; hash = "sha256-9lC/LYnthYhjkWWz2kkFCvlA5LJOv11jdt59SDnpdy0="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.36"; hash = "sha256-VFRDzx7LJuvI5yzKdGmw/31NYVbwHWPKQvueQt5xc10="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.36"; hash = "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.36"; hash = "sha256-k3rxvUhCEU0pVH8KgEMtkPiSOibn+nBh+0zT2xIfId8="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.36"; hash = "sha256-U8wJ2snSDFqeAgDVLXjnniidC7Cr5aJ1/h/BMSlyu0c="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.7.1"; hash = "sha256-wKuZ0tdSRd74JWnkQHKWI5qasojIkF1imLf9lxL0LWk="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.7.1"; hash = "sha256-GlL8dJCdJoTxAT1v3CpTY68oKNvJfmDjQPom27MBM/Y="; }) + (fetchNuGet { pname = "Microsoft.Toolkit.HighPerformance"; version = "7.1.2"; hash = "sha256-qzNmWXboGnrGTRESKFv0WZ5oxRg30XDODxpRgCsoiaI="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; hash = "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI="; }) + (fetchNuGet { pname = "Projektanker.Icons.Avalonia"; version = "6.6.0-rc1.1"; hash = "sha256-UiY/xQ86e4SrkFpaYFgSEGcPpgkxie5y6KsGlp9gShM="; }) + (fetchNuGet { pname = "Projektanker.Icons.Avalonia.FontAwesome"; version = "6.6.0-rc1.1"; hash = "sha256-rIcR1IlWjVO8cTW5Q93PCXnljNI3S/WQv+o4YXR77dc="; }) + (fetchNuGet { pname = "PropertyChanged.SourceGenerator"; version = "1.0.8"; hash = "sha256-piqoZmrDv/JSotsAoYsW33ry4YepELfRMZz9qINszxc="; }) + (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; hash = "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "Semi.Avalonia"; version = "11.0.0"; hash = "sha256-se/sc0QsAhzTv82JmBHoJ1jcmokqDZih8eEEX8CkR8s="; }) + (fetchNuGet { pname = "Serilog"; version = "3.0.1"; hash = "sha256-cfcZXT2eQ4K6RQ0twDYPN5jkDpG9dYqpmHJX4zWrL+o="; }) + (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "7.0.0"; hash = "sha256-Wf0Kb6YhvvIXNI0P/uOQP691DdlKuoNohpKMkp18bWE="; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; hash = "sha256-MXIj6YJ4GQbUS8553InMUZPPEfr8h33q2GtAhyu88+Y="; }) + (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; }) + (fetchNuGet { pname = "SerilogAnalyzer"; version = "0.15.0"; hash = "sha256-NG0osFNhuVIHDUOd3ZUpygSd0foH3C2QwECURL9nA00="; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.1"; hash = "sha256-j9V8IDg7vmnWNV65pDZ/wgj5wKLcmb4Fdbf8vbcP6sc="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; hash = "sha256-ykTtwAzO+ne5Wmss/IDvfUlR84wG5Xx0/AOC590Xvys="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; hash = "sha256-eExWAAURgnwwm2fRwsK/rf+TeOAPs2n02XZzC0zeUjU="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; hash = "sha256-8G4swiLMr6XS3kjfO/YC1PyoVdfSq7nxZthZZ+KTKqQ="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; hash = "sha256-/SkV2pIZnt0ziSKB7gt7U2Rltk2Id+zOzbmqgfWUtvA="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; hash = "sha256-2PhMTwRHitT13KCKiZltKIFieAvNY4jBmVZ2ndVynA8="; }) + (fetchNuGet { pname = "Splat"; version = "14.4.1"; hash = "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="; }) + (fetchNuGet { pname = "Splat"; version = "14.6.37"; hash = "sha256-UPRwJetwHR31Z7sw7c0dojnvlFAmDNQEF7RXssiMQuY="; }) + (fetchNuGet { pname = "Splat"; version = "14.7.1"; hash = "sha256-RzNQU8tTstC1MBZL6D11Ivq69pmPvl+A9eT9zXhdSOc="; }) + (fetchNuGet { pname = "Splat.Microsoft.Extensions.DependencyInjection"; version = "14.6.37"; hash = "sha256-xq6jSI/go1Lt6hs1nhK5Gmqs0imX6iJF6vLXGWQEC98="; }) + (fetchNuGet { pname = "Splat.Serilog"; version = "14.7.1"; hash = "sha256-EjoEF7a7qyJRVhyTVJUfoIoPwhFKfrSTVXdn1aVIvHU="; }) + (fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.1"; hash = "sha256-bRCllLNP+95+xov0ttRzvAgqCJ/x/BfOFPooVNcNngI="; }) + (fetchNuGet { pname = "Svg.Model"; version = "1.0.0.1"; hash = "sha256-xrOGrMYTWvblI0BMMhVMv9Vm2x9rlJfRhvsb5Zel1E8="; }) + (fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.1"; hash = "sha256-fsuiMVlaDaZpHq387kugQhFPpIuW0E5KMZ6J8O09iPw="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.6.0"; hash = "sha256-gnu+8nN48GAd4GRgeB5cAQmW7VnCubL/8h7zO377fd0="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; hash = "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Abstractions"; version = "19.2.29"; hash = "sha256-CTB8tE7mtG2ZCi4mRo8pS8IRsRkgIXdcD9yM94eJRbQ="; }) + (fetchNuGet { pname = "System.IO.Abstractions.TestingHelpers"; version = "19.2.29"; hash = "sha256-2psTGHZlJESXZcPdpCw6pAHOApmn4b+qmbhWWxTZQSE="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; hash = "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="; }) + (fetchNuGet { pname = "System.Reactive.Linq"; version = "5.0.0"; hash = "sha256-K2t5JSmwsqWtYZj9IUGUdnCJaJlhCII07KtHP8Iu4B4="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; hash = "sha256-198zqA6NR4lGCKgpdy/ptkS0jsYRT6KUjewtfi4Fi2k="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "19.2.29"; hash = "sha256-/WRBPWmUeiVDsj5HDXum1O5gJB2VZG93uEytNvhK7gE="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.TestingHelpers"; version = "19.2.29"; hash = "sha256-ZfmcWG0jhZuub3Xm/6iOSC+v7Ua/DXaJYCsJ6TwSJ8g="; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "19.2.29"; hash = "sha256-fzhNO4mkQuf9iKIMV/f3HTzA4+bHPMtzCCeYyMkv07k="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; }) + (fetchNuGet { pname = "xunit"; version = "2.4.1"; hash = "sha256-QGDuE0ZnsxyEJONP8GcJ80PmPeb+OawwdSW8y72aw3U="; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; hash = "sha256-8lRZhogXHYksa9ChnkFXpBnTMlLlYIvu3Av7qQYWwJY="; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.4.1"; hash = "sha256-hl1cMSakAlwkpFEchxCNMdvQie6PMJ1uFrhzgOC3vsY="; }) + (fetchNuGet { pname = "xunit.core"; version = "2.4.1"; hash = "sha256-KgUgAIJIPHQ5VQ4FiB+i5u2JXSYxmvMCV8zXP4kcy9o="; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.1"; hash = "sha256-oACVOrvF4XmKFr+8ZqPVpjbopZgeRwaXveJGW2XUeIA="; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.1"; hash = "sha256-KmKEdgsUq4zuQJ2saJA0YT1CIZ2AuhZL5V7cF2Cncd0="; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.3"; hash = "sha256-42axn0yDDiJWKV8UEYzYWgiKbpc6mHh9M/eeylYGLUg="; }) ] diff --git a/pkgs/by-name/sc/scarab/package.nix b/pkgs/by-name/sc/scarab/package.nix index 4bf15142a618..482a7d5a1160 100644 --- a/pkgs/by-name/sc/scarab/package.nix +++ b/pkgs/by-name/sc/scarab/package.nix @@ -20,12 +20,17 @@ buildDotnetModule rec { sha256 = "sha256-z1hmMrfeoYyjVEPPjWvUfKUKsOS7UsocSWMYrFY+/kI="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; nugetDeps = ./deps.nix; projectFile = "Scarab/Scarab.csproj"; testProjectFile = "Scarab.Tests/Scarab.Tests.csproj"; executables = [ "Scarab" ]; + postPatch = '' + substituteInPlace Scarab/Scarab.csproj Scarab.Tests/Scarab.Tests.csproj \ + --replace-fail 'net6.0' 'net8.0' + ''; + preConfigureNuGet = '' # This should really be in the upstream nuget.config dotnet nuget add source https://api.nuget.org/v3/index.json \ From 7cd9f932236ead6a8af90c3618406845b3111a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 3 Dec 2024 00:18:48 +0100 Subject: [PATCH 0718/1054] scarab: remove nuget patch --- pkgs/by-name/sc/scarab/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/sc/scarab/package.nix b/pkgs/by-name/sc/scarab/package.nix index 482a7d5a1160..a1484d8a23d4 100644 --- a/pkgs/by-name/sc/scarab/package.nix +++ b/pkgs/by-name/sc/scarab/package.nix @@ -31,12 +31,6 @@ buildDotnetModule rec { --replace-fail 'net6.0' 'net8.0' ''; - preConfigureNuGet = '' - # This should really be in the upstream nuget.config - dotnet nuget add source https://api.nuget.org/v3/index.json \ - -n nuget.org --configfile NuGet.Config - ''; - runtimeDeps = [ bc ]; From 73f99fe4ca11ace041ad0ffd104e75118abc116e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 3 Dec 2024 00:22:45 +0100 Subject: [PATCH 0719/1054] scarab: explicit `rev` and `pname` in `fetchFromGitHub`, migrate to hash --- pkgs/by-name/sc/scarab/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scarab/package.nix b/pkgs/by-name/sc/scarab/package.nix index a1484d8a23d4..27404c72cd4f 100644 --- a/pkgs/by-name/sc/scarab/package.nix +++ b/pkgs/by-name/sc/scarab/package.nix @@ -15,9 +15,9 @@ buildDotnetModule rec { src = fetchFromGitHub { owner = "fifty-six"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-z1hmMrfeoYyjVEPPjWvUfKUKsOS7UsocSWMYrFY+/kI="; + repo = "scarab"; + rev = "refs/tags/v${version}"; + hash = "sha256-z1hmMrfeoYyjVEPPjWvUfKUKsOS7UsocSWMYrFY+/kI="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; From 492818a9e38eaf31238656b171056ceb8fcf02ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 3 Dec 2024 00:24:54 +0100 Subject: [PATCH 0720/1054] scarab: avoid rebuild after `meta` changes --- pkgs/by-name/sc/scarab/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sc/scarab/package.nix b/pkgs/by-name/sc/scarab/package.nix index 27404c72cd4f..ad4580990e49 100644 --- a/pkgs/by-name/sc/scarab/package.nix +++ b/pkgs/by-name/sc/scarab/package.nix @@ -61,7 +61,7 @@ buildDotnetModule rec { name = "scarab"; exec = "Scarab"; icon = "scarab"; - comment = meta.description; + comment = "Hollow Knight mod installer and manager"; type = "Application"; categories = [ "Game" ]; }) From 597474a8f184e9be781e0509f8a85dceb378c327 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 2 Dec 2024 08:03:03 -0400 Subject: [PATCH 0721/1054] dotnet: nixfmt output of nuget-to-nix --- pkgs/build-support/dotnet/add-nuget-deps/default.nix | 2 ++ pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh | 2 ++ pkgs/development/compilers/dotnet/stage0.nix | 7 ++++++- pkgs/development/tools/godot/3/mono/make-deps.nix | 5 +++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/dotnet/add-nuget-deps/default.nix b/pkgs/build-support/dotnet/add-nuget-deps/default.nix index bf3df815af8a..fb349679e579 100644 --- a/pkgs/build-support/dotnet/add-nuget-deps/default.nix +++ b/pkgs/build-support/dotnet/add-nuget-deps/default.nix @@ -5,6 +5,7 @@ lib, substituteAll, nuget-to-nix, + nixfmt-rfc-style, cacert, fetchNupkg, callPackage, @@ -67,6 +68,7 @@ attrs isExecutable = true; inherit cacert; nugetToNix = nuget-to-nix; + nixfmt = nixfmt-rfc-style; }; defaultDepsFile = diff --git a/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh b/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh index af560b96fcd5..4ffba4783677 100644 --- a/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh +++ b/pkgs/build-support/dotnet/add-nuget-deps/fetch-deps.sh @@ -7,5 +7,7 @@ genericBuild @nugetToNix@/bin/nuget-to-nix "${NUGET_PACKAGES%/}" ) > deps.nix +@nixfmt@/bin/nixfmt deps.nix + mv deps.nix "$1" echo "Succesfully wrote lockfile to $1" diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix index e8be69d1f038..0a8a2b4a7b5c 100644 --- a/pkgs/development/compilers/dotnet/stage0.nix +++ b/pkgs/development/compilers/dotnet/stage0.nix @@ -7,6 +7,7 @@ nix, cacert, nuget-to-nix, + nixfmt-rfc-style, dotnetCorePackages, xmlstarlet, patchNupkgs, @@ -94,6 +95,7 @@ let nix cacert nuget-to-nix + nixfmt-rfc-style ]; postPatch = old.postPatch or "" @@ -138,7 +140,10 @@ let --arg list "[ ''${depsFiles[*]} ]" \ --argstr baseRid ${targetRid} \ --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}' \ - ) > "${toString prebuiltPackages.sourceFile}" + ) > deps.nix + nixfmt deps.nix + + mv deps.nix "${toString prebuiltPackages.sourceFile}" EOF ''; }; diff --git a/pkgs/development/tools/godot/3/mono/make-deps.nix b/pkgs/development/tools/godot/3/mono/make-deps.nix index 553b125dc635..b654576daced 100644 --- a/pkgs/development/tools/godot/3/mono/make-deps.nix +++ b/pkgs/development/tools/godot/3/mono/make-deps.nix @@ -1,9 +1,9 @@ -{ godot3-mono, nuget-to-nix }: +{ godot3-mono, nuget-to-nix, nixfmt-rfc-style }: godot3-mono.overrideAttrs (self: base: { pname = "godot3-mono-make-deps"; - nativeBuildInputs = base.nativeBuildInputs ++ [ nuget-to-nix ]; + nativeBuildInputs = base.nativeBuildInputs ++ [ nuget-to-nix nixfmt-rfc-style ]; nugetDeps = null; nugetSource = null; @@ -50,6 +50,7 @@ godot3-mono.overrideAttrs (self: base: { nugetRestore modules/mono/editor/GodotTools/GodotTools.sln nuget-to-nix nugetPackages > "$outdir"/deps.nix + nixfmt "$outdir"/deps.nix popd > /dev/null ''; From d343c85889cd9b80eaa6032788a3f681c93c0dcd Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 5 Dec 2024 09:33:09 -0400 Subject: [PATCH 0722/1054] dotnet: use fallback target packages from current binary sdk This was using the bootstrap SDK, which doesn't match the version of the source-built SDK. This will still be a problem if the binary and source-built SDKs don't have the same version. --- pkgs/development/compilers/dotnet/8/default.nix | 1 + pkgs/development/compilers/dotnet/9/default.nix | 1 + pkgs/development/compilers/dotnet/dotnet.nix | 2 ++ pkgs/development/compilers/dotnet/stage0.nix | 1 + pkgs/development/compilers/dotnet/stage1.nix | 4 ++-- 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dotnet/8/default.nix b/pkgs/development/compilers/dotnet/8/default.nix index d7310cd81994..a660ac97f84a 100644 --- a/pkgs/development/compilers/dotnet/8/default.nix +++ b/pkgs/development/compilers/dotnet/8/default.nix @@ -5,4 +5,5 @@ releaseInfoFile = ./release-info.json; bootstrapSdkFile = ./bootstrap-sdk.nix; depsFile = ./deps.nix; + fallbackTargetPackages = dotnetCorePackages.sdk_8_0.targetPackages; } diff --git a/pkgs/development/compilers/dotnet/9/default.nix b/pkgs/development/compilers/dotnet/9/default.nix index 55cb65f49503..c641543ad521 100644 --- a/pkgs/development/compilers/dotnet/9/default.nix +++ b/pkgs/development/compilers/dotnet/9/default.nix @@ -6,4 +6,5 @@ bootstrapSdkFile = ./bootstrap-sdk.nix; allowPrerelease = true; depsFile = ./deps.nix; + fallbackTargetPackages = dotnetCorePackages.sdk_9_0.targetPackages; } diff --git a/pkgs/development/compilers/dotnet/dotnet.nix b/pkgs/development/compilers/dotnet/dotnet.nix index 2a61a5cb01ed..cf5a0bca0782 100644 --- a/pkgs/development/compilers/dotnet/dotnet.nix +++ b/pkgs/development/compilers/dotnet/dotnet.nix @@ -8,6 +8,7 @@ bootstrapSdkFile, allowPrerelease ? false, depsFile, + fallbackTargetPackages, pkgsBuildHost, buildDotnetSdk, }: @@ -25,6 +26,7 @@ let releaseManifestFile tarballHash depsFile + fallbackTargetPackages ; bootstrapSdk = (buildDotnetSdk bootstrapSdkFile).sdk.unwrapped.overrideAttrs (old: { passthru = old.passthru or { } // { diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix index 0a8a2b4a7b5c..4e1000e4a968 100644 --- a/pkgs/development/compilers/dotnet/stage0.nix +++ b/pkgs/development/compilers/dotnet/stage0.nix @@ -17,6 +17,7 @@ releaseManifestFile, tarballHash, depsFile, + fallbackTargetPackages, bootstrapSdk, }: diff --git a/pkgs/development/compilers/dotnet/stage1.nix b/pkgs/development/compilers/dotnet/stage1.nix index 729ff7866a75..6954fc6ca8c1 100644 --- a/pkgs/development/compilers/dotnet/stage1.nix +++ b/pkgs/development/compilers/dotnet/stage1.nix @@ -7,6 +7,7 @@ tarballHash, depsFile, bootstrapSdk, + fallbackTargetPackages, }@args: let @@ -33,8 +34,7 @@ let in mkPackages { - inherit vmr; - fallbackTargetPackages = bootstrapSdk.targetPackages; + inherit vmr fallbackTargetPackages; } // { stage0 = lib.dontRecurseIntoAttrs stage0; From 9970958d8d94f2d5798948452d1eab18ea902dca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 14:15:53 +0000 Subject: [PATCH 0723/1054] parallel: 20240922 -> 20241122 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index a5c49ca7c082..98c397cd4e2a 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20240922"; + version = "20241122"; src = fetchurl { url = "mirror://gnu/parallel/parallel-${version}.tar.bz2"; - hash = "sha256-YyEHFei3xeEp4JjzM8183V/HovMl6OD7ntbtup8ay8Q="; + hash = "sha256-Gp51L0LBfKELwH0KY6LKbtzuUyKC5V0rNL2d0UyXilg="; }; outputs = [ "out" "man" "doc" ]; From 51c4a6cd8b7c18eab0ff5fabd901467b33089634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9B=A7-440729=20=5Bsophie=5D?= Date: Thu, 5 Dec 2024 09:07:53 +0100 Subject: [PATCH 0724/1054] fedifetcher: 7.1.12 -> 7.1.14 --- pkgs/by-name/fe/fedifetcher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fe/fedifetcher/package.nix b/pkgs/by-name/fe/fedifetcher/package.nix index 4eac63989761..9ef45d07a39f 100644 --- a/pkgs/by-name/fe/fedifetcher/package.nix +++ b/pkgs/by-name/fe/fedifetcher/package.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "7.1.12"; + version = "7.1.14"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; rev = "refs/tags/v${version}"; - hash = "sha256-DWex4pZV9ZVR1bqYcOpTe74ZQCQCQQxjWrv0QgtRY40="; + hash = "sha256-SfR4CYVs2kLLguKCau+x5vy6ha48Zd43OJ+tsA6M9yg="; }; propagatedBuildInputs = with python3.pkgs; [ From 1433a8fcd99aa6acc5b885689eac2ddefdf12565 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Dec 2024 22:21:14 +0800 Subject: [PATCH 0725/1054] bulky: 3.4 -> 3.5 https://github.com/linuxmint/bulky/compare/3.4...3.5 --- pkgs/by-name/bu/bulky/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/bulky/package.nix b/pkgs/by-name/bu/bulky/package.nix index df9c7bb5d16f..a9510f37b916 100644 --- a/pkgs/by-name/bu/bulky/package.nix +++ b/pkgs/by-name/bu/bulky/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "3.4"; + version = "3.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - hash = "sha256-YByzRDL/LuI/VwBHLRZ3+S2VnttYeuMgJpRLPhR/NCA="; + hash = "sha256-yGW2vEYGmd0FawbgB0lJoi5sId8MG9gNQa71wF1XupQ="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - (python3.withPackages (p: with p; [ pygobject3 magic setproctitle ])) + (python3.withPackages (p: with p; [ pygobject3 magic setproctitle unidecode ])) gsettings-desktop-schemas gtk3 glib From 5cab70eb47be8dd5c156f1343543da6a8a805b5a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Dec 2024 22:21:15 +0800 Subject: [PATCH 0726/1054] cinnamon-common: 6.4.1 -> 6.4.2 https://github.com/linuxmint/cinnamon/compare/6.4.1...6.4.2 --- pkgs/by-name/ci/cinnamon-common/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix index 1f9410611301..473b96380662 100644 --- a/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/pkgs/by-name/ci/cinnamon-common/package.nix @@ -73,13 +73,13 @@ in # TODO (after 25.05 branch-off): Rename to pkgs.cinnamon stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "6.4.1"; + version = "6.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-xkM6t1AiFpfAJOUEP2eeWBtYLQa36FNxrpPiRgHot3w="; + hash = "sha256-r5cSm/a+xtHwwAHQmdgviDAN3nnMAnXGY/p+ER1/gbk="; }; patches = [ From f0308754b598cca2b4c7b4fcdea972b9361ad8ce Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Dec 2024 22:21:16 +0800 Subject: [PATCH 0727/1054] cinnamon-control-center: 6.4.0 -> 6.4.1 https://github.com/linuxmint/cinnamon-control-center/compare/6.4.0...6.4.1 --- pkgs/by-name/ci/cinnamon-control-center/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-control-center/package.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix index f18f5329679a..34ca22fab3af 100644 --- a/pkgs/by-name/ci/cinnamon-control-center/package.nix +++ b/pkgs/by-name/ci/cinnamon-control-center/package.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "6.4.0"; + version = "6.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-hS1vFrwMYUinFLWx33nnlcXwcMkqDCivElI1HaZsSSE="; + hash = "sha256-1Z+kXvBmENNXIqdZgPDx7ZSwJMFAm2oMih6eFFAsA/A="; }; buildInputs = [ From e9a855fb8fc02753653494c64273212eb9bc0984 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Dec 2024 22:21:20 +0800 Subject: [PATCH 0728/1054] cinnamon-translations: 6.4.0 -> 6.4.1 https://github.com/linuxmint/cinnamon-translations/compare/6.4.0...6.4.1 --- pkgs/by-name/ci/cinnamon-translations/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-translations/package.nix b/pkgs/by-name/ci/cinnamon-translations/package.nix index 66fd9e8fa2b7..d00203246da8 100644 --- a/pkgs/by-name/ci/cinnamon-translations/package.nix +++ b/pkgs/by-name/ci/cinnamon-translations/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "6.4.0"; + version = "6.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-aR1O/NaEJcu4W3bGMWVeaIVGeuMYTrQrPfeS1V+4Nmk="; + hash = "sha256-MMUXh8HFvISPZzu6+m/rm0/svLLml4OweZ7c4H9IHco="; }; nativeBuildInputs = [ From d01b81f384d520158fa1cf53e655f82626c54860 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Dec 2024 22:21:21 +0800 Subject: [PATCH 0729/1054] folder-color-switcher: 1.6.5 -> 1.6.6 https://github.com/linuxmint/folder-color-switcher/compare/ba8ea15a48a1a31f318676f4079789af20bdf099...208e66285ec33a078205a221af579c79bc8cad01 --- pkgs/by-name/fo/folder-color-switcher/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/folder-color-switcher/package.nix b/pkgs/by-name/fo/folder-color-switcher/package.nix index c219574fb1c2..aa3bfe245317 100644 --- a/pkgs/by-name/fo/folder-color-switcher/package.nix +++ b/pkgs/by-name/fo/folder-color-switcher/package.nix @@ -7,14 +7,14 @@ stdenvNoCC.mkDerivation rec { pname = "folder-color-switcher"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # They don't really do tags, this is just a named commit. - rev = "ba8ea15a48a1a31f318676f4079789af20bdf099"; - hash = "sha256-jbfc831wTA3NMa905ZzMnV0dyzzqZxOzrRPdgS7E2ZU="; + rev = "208e66285ec33a078205a221af579c79bc8cad01"; + hash = "sha256-t38eEFgbrFsZ+vy+axIeL8j6todPLg4NqS6DM20iIxQ="; }; nativeBuildInputs = [ From 5bc48afb8338e2c59354774390aebd72a042cdd8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Dec 2024 22:21:26 +0800 Subject: [PATCH 0730/1054] nemo: 6.4.2 -> 6.4.3 https://github.com/linuxmint/nemo/compare/6.4.2...6.4.3 --- pkgs/by-name/ne/nemo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nemo/package.nix b/pkgs/by-name/ne/nemo/package.nix index a73b9e60aaec..52da8ee3e867 100644 --- a/pkgs/by-name/ne/nemo/package.nix +++ b/pkgs/by-name/ne/nemo/package.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "nemo"; - version = "6.4.2"; + version = "6.4.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-J7GQV+T5Lsmu1eELQJE9C3uLI6SoTJNPp648MYqEHvo="; + hash = "sha256-3FALXfW0PzWuirX7bxP8BFkIRyQzvg3xBQCdddSpmOg="; }; patches = [ From 88efcceaa6da8d2bed33af15df0fd52083c28464 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Dec 2024 22:21:29 +0800 Subject: [PATCH 0731/1054] pix: 3.4.3 -> 3.4.4 https://github.com/linuxmint/pix/compare/3.4.3...3.4.4 --- pkgs/by-name/pi/pix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/pix/package.nix b/pkgs/by-name/pi/pix/package.nix index 854b4559165a..e1fe6e7f2e76 100644 --- a/pkgs/by-name/pi/pix/package.nix +++ b/pkgs/by-name/pi/pix/package.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-WL9EW7oKeQwufw1VYDigbqAt52GQTpc5RgDEmnKO6vc="; + hash = "sha256-BasS0Z8fj7vxFnMZ6KOd5LkvSvTaw6+DDfcRFrdus7A="; }; nativeBuildInputs = [ From c49b11790bef70994ea2ee9ad8eaefa19837fc5e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Dec 2024 22:21:30 +0800 Subject: [PATCH 0732/1054] warpinator: 1.8.6 -> 1.8.7 https://github.com/linuxmint/warpinator/compare/1.8.6...1.8.7 --- pkgs/by-name/wa/warpinator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/warpinator/package.nix b/pkgs/by-name/wa/warpinator/package.nix index c01cb066490e..bb7b97b8b38d 100644 --- a/pkgs/by-name/wa/warpinator/package.nix +++ b/pkgs/by-name/wa/warpinator/package.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation rec { pname = "warpinator"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-GJp2iRB3F42pSfYd2FLpmDTZ1zqt8thdRPAHu9/ns5E="; + hash = "sha256-EgTz0i7Dui74xYFShkLox6ITAEAF8yYATEcQ51pc7gA="; }; nativeBuildInputs = [ From 389601fa73569d90b0966f32f1defea6bd87edce Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Dec 2024 22:21:32 +0800 Subject: [PATCH 0733/1054] xviewer: 3.4.6 -> 3.4.7 https://github.com/linuxmint/xviewer/compare/3.4.6...3.4.7 --- pkgs/by-name/xv/xviewer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xv/xviewer/package.nix b/pkgs/by-name/xv/xviewer/package.nix index 0e04633f3c6a..7cea7ce972a9 100644 --- a/pkgs/by-name/xv/xviewer/package.nix +++ b/pkgs/by-name/xv/xviewer/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.4.6"; + version = "3.4.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-J1IlgHKyNGJTn1sIU3q02eTgWqyeRm2leFIhtKPIdhg="; + hash = "sha256-hRX+vSotjhoQ/fyFdCelr9IHZGUM8xaYHNfX2vD3nq0="; }; nativeBuildInputs = [ From 557621a10f51d4ab81b1e7609399fdd3a272db8c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Dec 2024 22:21:34 +0800 Subject: [PATCH 0734/1054] lightdm-slick-greeter: 2.0.7 -> 2.0.8 https://github.com/linuxmint/slick-greeter/compare/2.0.7...2.0.8 --- pkgs/by-name/li/lightdm-slick-greeter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/lightdm-slick-greeter/package.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix index 77e3a449ba4e..0b5b307625d5 100644 --- a/pkgs/by-name/li/lightdm-slick-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-slick-greeter/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lightdm-slick-greeter"; - version = "2.0.7"; + version = "2.0.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = version; - sha256 = "sha256-ZsbX4xB6sLpZH6vaVFlkC7hAhPLZa1T+FlPANqBQTOg="; + sha256 = "sha256-NkQ2oPtTN/x5uCGubcBOwOXZCwzW1RRbBwdmeytqaF4="; }; nativeBuildInputs = [ From 61c7b94dfb6c807f17156283188cbed6de6e63f2 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Dec 2024 22:21:35 +0800 Subject: [PATCH 0735/1054] sticky: 1.22 -> 1.23 https://github.com/linuxmint/sticky/compare/1.22...1.23 --- pkgs/by-name/st/sticky/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/sticky/package.nix b/pkgs/by-name/st/sticky/package.nix index dd54d9c64591..293c2e46ea81 100644 --- a/pkgs/by-name/st/sticky/package.nix +++ b/pkgs/by-name/st/sticky/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "sticky"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-JrzBME1d4qvGjF2zdiqCX7h+sFadLsRQqZKnQj7elHs="; + hash = "sha256-vNS2p3cmuQB+wusx9VSi81ZyGmUYgVXlMjIMkrnvyrI="; }; postPatch = '' From e2a3323d0047a74960f3d9ff840dc2a9320d1bd5 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 5 Dec 2024 14:51:44 +0000 Subject: [PATCH 0736/1054] raycast: 1.87.2 -> 1.87.4 --- pkgs/by-name/ra/raycast/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index fde6c41cc061..9266176a3243 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.87.2"; + version = "1.87.4"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-w4jrtrKCATUsFkMVsGee88pYiL1bahHaSy9emCh2GJE="; + hash = "sha256-tM8j9oFIn5gAskM7Fxu4xMRh3pRsmroDDLkGyaie9I0="; }; dontPatch = true; From 9036f4a0c9ed85267b92f6ac5885e0742ded407f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Dec 2024 15:58:13 +0100 Subject: [PATCH 0737/1054] emacsPackages.ebuild-mode: drop maintainership --- .../elisp-packages/manual-packages/ebuild-mode/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index ae10492957eb..9eaca7d967f3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -17,6 +17,6 @@ melpaBuild rec { homepage = "https://gitweb.gentoo.org/proj/ebuild-mode.git/"; description = "Major modes for Gentoo package files"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ qyliss ]; + maintainers = with lib.maintainers; [ ]; }; } From 4ae5e6518e133ba5a6e14d321f6fd1ab9e5a57bb Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 5 Dec 2024 10:19:15 -0500 Subject: [PATCH 0738/1054] opentofu: 1.8.6 -> 1.8.7 Diff: https://github.com/opentofu/opentofu/compare/v1.8.6...v1.8.7 Changelog: https://github.com/opentofu/opentofu/blob/v1.8.7/CHANGELOG.md --- pkgs/by-name/op/opentofu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix index 7f4d6e22c01b..9138cd53a823 100644 --- a/pkgs/by-name/op/opentofu/package.nix +++ b/pkgs/by-name/op/opentofu/package.nix @@ -15,16 +15,16 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-yJCUWRAntye3Dx2a+s/gNVa+XuCQak24TnFjSY+/3zc="; + hash = "sha256-OLXR9aA94KcIsZxk8gOZxZsljMKuymScuYcoj9W5Hj4="; }; - vendorHash = "sha256-MHdEY2nlUGTKybMPran5mTXlAlTFilfrY5K2sMlPe5U="; + vendorHash = "sha256-6M/uqwhNruIPx5srbimKuDJaFiZkyosoZQXWjxa6GxY="; ldflags = [ "-s" "-w" From f9627eafd4298cc754172f46da0325e6e4370bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 5 Dec 2024 16:24:35 +0100 Subject: [PATCH 0739/1054] git-open: 3.0.0 -> 3.1.0 Diff: https://github.com/paulirish/git-open/compare/v3.0.0...v3.1.0 --- pkgs/by-name/gi/git-open/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/git-open/package.nix b/pkgs/by-name/gi/git-open/package.nix index 1b4153f2ad1d..01d03dfef784 100644 --- a/pkgs/by-name/gi/git-open/package.nix +++ b/pkgs/by-name/gi/git-open/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-open"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "paulirish"; repo = "git-open"; rev = "v${version}"; - sha256 = "sha256-Bag2rI2uR7ilkg2ozjR8tPXqKz5XjiY7WAUJKTVTXd8="; + sha256 = "sha256-bZOknoRMkPqm1pFFFbvrHrSi90ANLEE5fLcABYHov6Q="; }; nativeBuildInputs = [ installShellFiles makeWrapper pandoc ]; From e9a31f51468e43aaf8df79d10dca5a3d6447877b Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 4 Dec 2024 01:37:01 +0100 Subject: [PATCH 0740/1054] fetchgit{,hub}: assert illegal tag + rev combinations It's quite a bit more complex due to this but this was asked for during review --- pkgs/build-support/fetchgit/default.nix | 27 ++++++++++++++++++---- pkgs/build-support/fetchgithub/default.nix | 11 +++++---- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 6f4cbba982a0..f2b4726fef09 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -15,14 +15,14 @@ lib.makeOverridable (lib.fetchers.withNormalizedHash { } ( # doc/build-helpers/fetchers.chapter.md { url , tag ? null -, rev ? if tag != null then "refs/tags/${tag}" else "HEAD" # FIXME fetching HEAD by default is problematic at best +, rev ? null , leaveDotGit ? deepClone , outputHash ? lib.fakeHash, outputHashAlgo ? null , fetchSubmodules ? true, deepClone ? false , branchName ? null , sparseCheckout ? [] , nonConeMode ? false -, name ? urlToName url rev +, name ? null , # Shell code executed after the file has been fetched # successfully. This can do things like check or transform the file. postFetch ? "" @@ -62,12 +62,30 @@ lib.makeOverridable (lib.fetchers.withNormalizedHash { } ( assert deepClone -> leaveDotGit; assert nonConeMode -> (sparseCheckout != []); +let + revWithTag = + let + warningMsg = "fetchgit requires one of either `rev` or `tag` to be provided (not both)."; + otherIsNull = other: lib.assertMsg (other == null) warningMsg; + in + if tag != null then + assert (otherIsNull rev); + "refs/tags/${tag}" + else if rev != null then + assert (otherIsNull tag); + rev + else + # FIXME fetching HEAD if no rev or tag is provided is problematic at best + "HEAD"; +in + if builtins.isString sparseCheckout then # Changed to throw on 2023-06-04 throw "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more." else stdenvNoCC.mkDerivation { - inherit name; + name = if name != null then name else urlToName url revWithTag; + builder = ./builder.sh; fetcher = ./nix-prefetch-git; @@ -82,7 +100,8 @@ stdenvNoCC.mkDerivation { # > from standard in as a newline-delimited list instead of from the arguments. sparseCheckout = builtins.concatStringsSep "\n" sparseCheckout; - inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName nonConeMode postFetch; + inherit url leaveDotGit fetchLFS fetchSubmodules deepClone branchName nonConeMode postFetch; + rev = revWithTag; postHook = if netrcPhase == null then null else '' ${netrcPhase} diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index de9912465a93..f80e01295533 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -3,7 +3,7 @@ lib.makeOverridable ( { owner, repo , tag ? null -, rev ? if tag != null then "refs/tags/${tag}" else null +, rev ? null , name ? "source" , fetchSubmodules ? false, leaveDotGit ? null , deepClone ? false, private ? false, forceFetchGit ? false @@ -14,13 +14,16 @@ lib.makeOverridable ( , ... # For hash agility }@args: -assert (lib.assertMsg (rev != null) "You must provide `fetchFromGitHub with a `rev` or `tag`."); +assert (lib.assertMsg (lib.xor (tag == null) (rev == null)) "fetchFromGitHub requires one of either `rev` or `tag` to be provided (not both)."); let position = (if args.meta.description or null != null then builtins.unsafeGetAttrPos "description" args.meta - else builtins.unsafeGetAttrPos "rev" args + else if tag != null then + builtins.unsafeGetAttrPos "tag" args + else + builtins.unsafeGetAttrPos "rev" args ); baseUrl = "https://${githubBase}/${owner}/${repo}"; newMeta = meta // { @@ -61,7 +64,7 @@ let inherit tag rev deepClone fetchSubmodules sparseCheckout fetchLFS; url = gitRepoUrl; } // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; } else { - url = "${baseUrl}/archive/${rev}.tar.gz"; + url = "${baseUrl}/archive/${if tag != null then "refs/tags/${tag}" else rev}.tar.gz"; passthru = { inherit gitRepoUrl; From 194c000ab52a424c7a6b73b01ee99b7b6ef79735 Mon Sep 17 00:00:00 2001 From: Builditluc Date: Wed, 4 Dec 2024 19:59:17 +0100 Subject: [PATCH 0741/1054] wiki-tui: 0.8.2 -> 0.9.1 --- pkgs/misc/wiki-tui/default.nix | 10 +- pkgs/misc/wiki-tui/time.patch | 211 --------------------------------- 2 files changed, 3 insertions(+), 218 deletions(-) delete mode 100644 pkgs/misc/wiki-tui/time.patch diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 4d96c78cb560..4234894fcfd8 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -11,19 +11,15 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Builditluc"; repo = "wiki-tui"; rev = "v${version}"; - hash = "sha256-euyg4wYWYerYT3hKdOCjokx8lJldGN7E3PHimDgQy3U="; + hash = "sha256-eTDxRrTP9vX7F1lmDCuF6g1pfaZChqB8Pv1kfrd7I9w="; }; - # Note: bump `time` dependency to be able to build with rust 1.80, should be removed on the next - # release (see: https://github.com/NixOS/nixpkgs/issues/332957) - cargoPatches = [ ./time.patch ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -31,7 +27,7 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cargoHash = "sha256-XovbT+KC0va7yC5j7kf6t1SnXe1uyy1KI8FRV1AwkS0="; + cargoHash = "sha256-fLA7dF91mEgjTnbhujTKaHX+qmpzYaqzL8cc/x+mrUk="; meta = with lib; { description = "Simple and easy to use Wikipedia Text User Interface"; diff --git a/pkgs/misc/wiki-tui/time.patch b/pkgs/misc/wiki-tui/time.patch deleted file mode 100644 index 09cd2a41d36e..000000000000 --- a/pkgs/misc/wiki-tui/time.patch +++ /dev/null @@ -1,211 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index e66f0ac..918c3b2 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -318,7 +318,7 @@ dependencies = [ - "log", - "num", - "owning_ref", -- "time 0.3.22", -+ "time 0.3.36", - "unicode-segmentation", - "unicode-width", - "xi-unicode", -@@ -344,7 +344,7 @@ dependencies = [ - "ident_case", - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -355,7 +355,16 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" - dependencies = [ - "darling_core", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", -+] -+ -+[[package]] -+name = "deranged" -+version = "0.3.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -+dependencies = [ -+ "powerfmt", - ] - - [[package]] -@@ -427,7 +436,7 @@ checksum = "8560b409800a72d2d7860f8e5f4e0b0bd22bea6a352ea2a9ce30ccdef7f16d2f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -448,7 +457,7 @@ dependencies = [ - "darling", - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1025,6 +1034,12 @@ dependencies = [ - "num-traits", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-integer" - version = "0.1.45" -@@ -1129,7 +1144,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1282,6 +1297,12 @@ version = "0.3.27" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -+[[package]] -+name = "powerfmt" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -+ - [[package]] - name = "ppv-lite86" - version = "0.2.17" -@@ -1518,9 +1539,9 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.167" -+version = "1.0.193" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237" -+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" - dependencies = [ - "serde_derive", - ] -@@ -1537,13 +1558,13 @@ dependencies = [ - - [[package]] - name = "serde_derive" --version = "1.0.167" -+version = "1.0.193" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9" -+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1565,7 +1586,7 @@ checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1750,9 +1771,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.23" -+version = "2.0.32" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" -+checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" - dependencies = [ - "proc-macro2", - "quote", -@@ -1832,7 +1853,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - ] - - [[package]] -@@ -1859,13 +1880,16 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.22" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ -+ "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", -+ "powerfmt", - "serde", - "time-core", - "time-macros", -@@ -1873,16 +1897,17 @@ dependencies = [ - - [[package]] - name = "time-core" --version = "0.1.1" -+version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" -+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.9" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - -@@ -2133,7 +2158,7 @@ dependencies = [ - "once_cell", - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - "wasm-bindgen-shared", - ] - -@@ -2167,7 +2192,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.23", -+ "syn 2.0.32", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] From 8fb55a6eb93c8cac75ca31d68c075e0bdf63ef33 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 5 Dec 2024 11:43:19 -0400 Subject: [PATCH 0742/1054] Revert "scarab: remove nuget patch" This reverts commit 7cd9f932236ead6a8af90c3618406845b3111a56. --- pkgs/by-name/sc/scarab/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/sc/scarab/package.nix b/pkgs/by-name/sc/scarab/package.nix index ad4580990e49..5f829b4a2805 100644 --- a/pkgs/by-name/sc/scarab/package.nix +++ b/pkgs/by-name/sc/scarab/package.nix @@ -31,6 +31,12 @@ buildDotnetModule rec { --replace-fail 'net6.0' 'net8.0' ''; + preConfigureNuGet = '' + # This should really be in the upstream nuget.config + dotnet nuget add source https://api.nuget.org/v3/index.json \ + -n nuget.org --configfile NuGet.Config + ''; + runtimeDeps = [ bc ]; From 9e8fac2a586b34bbd8e0d8b1061c33f913995519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Thu, 5 Dec 2024 16:50:01 +0100 Subject: [PATCH 0743/1054] parallel: fix strictDeps --- pkgs/tools/misc/parallel/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index a5c49ca7c082..0e9344f17da7 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - nativeBuildInputs = [ makeWrapper ]; + strictDeps = true; + nativeBuildInputs = [ makeWrapper perl ]; buildInputs = [ perl procps ]; postPatch = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' From 70f3a1673a43867e4aa779d0b44f5188a89dd8a5 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 3 Dec 2024 14:47:07 +0800 Subject: [PATCH 0744/1054] handbrake: 1.8.2 -> 1.9.0 --- pkgs/by-name/ha/handbrake/package.nix | 69 +++++++++++++++------------ 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/ha/handbrake/package.nix b/pkgs/by-name/ha/handbrake/package.nix index 264520341ece..cfe7e5a6da9c 100644 --- a/pkgs/by-name/ha/handbrake/package.nix +++ b/pkgs/by-name/ha/handbrake/package.nix @@ -93,14 +93,14 @@ let VideoToolbox ; inherit (darwin) libobjc; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "HandBrake"; repo = "HandBrake"; # uses version commit for logic in version.txt - rev = "77f199ab02ff2e3bca4ca653e922e9fef67dec43"; - hash = "sha256-vxvmyo03NcO2Nbjg76JLZqmYw7RiK4FehiB+iE3CgOw="; + rev = "fa9154a20f3f64fdc183a097e6b63f7fd4bc6cab"; + hash = "sha256-Asf8NgYk4xxIkevYA0B62T8CTSaB7SHq0lHXkawVxb8="; }; # Handbrake maintains a set of ffmpeg patches. In particular, these @@ -108,11 +108,11 @@ let # https://github.com/HandBrake/HandBrake/issues/4029 # base ffmpeg version is specified in: # https://github.com/HandBrake/HandBrake/blob/master/contrib/ffmpeg/module.defs - ffmpeg-version = "7.0.2"; + ffmpeg-version = "7.1"; ffmpeg-hb = (ffmpeg_7-full.override { version = ffmpeg-version; - hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs="; + hash = "sha256-erTkv156VskhYEJWjpWFvHjmcr2hr6qgUi28Ho8NFYk="; }).overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ @@ -120,28 +120,37 @@ let "${src}/contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch" "${src}/contrib/ffmpeg/A03-mov-read-3gpp-udta-tags.patch" "${src}/contrib/ffmpeg/A04-movenc-write-3gpp-track-names-tags-for-all-available.patch" - "${src}/contrib/ffmpeg/A05-dvdsubdec-fix-processing-of-partial-packets.patch" - "${src}/contrib/ffmpeg/A06-dvdsubdec-return-number-of-bytes-used.patch" - "${src}/contrib/ffmpeg/A07-dvdsubdec-use-pts-of-initial-packet.patch" - "${src}/contrib/ffmpeg/A08-dvdsubdec-do-not-discard-zero-sized-rects.patch" - "${src}/contrib/ffmpeg/A09-ccaption_dec-fix-pts-in-real_time-mode.patch" - "${src}/contrib/ffmpeg/A10-matroskaenc-aac-extradata-updated.patch" - "${src}/contrib/ffmpeg/A11-videotoolbox-disable-H.264-10-bit-on-Intel-macOS.patch" + "${src}/contrib/ffmpeg/A05-avformat-mov-add-support-audio-fallback-track-ref.patch" + "${src}/contrib/ffmpeg/A06-dvdsubdec-fix-processing-of-partial-packets.patch" + "${src}/contrib/ffmpeg/A07-dvdsubdec-return-number-of-bytes-used.patch" + "${src}/contrib/ffmpeg/A08-dvdsubdec-use-pts-of-initial-packet.patch" + "${src}/contrib/ffmpeg/A09-dvdsubdec-add-an-option-to-output-subtitles-with-emp.patch" + "${src}/contrib/ffmpeg/A10-ccaption_dec-fix-pts-in-real_time-mode.patch" + "${src}/contrib/ffmpeg/A11-avformat-matroskaenc-return-error-if-aac-extradata-c.patch" + "${src}/contrib/ffmpeg/A12-videotoolbox-disable-H.264-10-bit-on-Intel-macOS-it-.patch" # patch to fix # commented out because it causes ffmpeg's filter-pixdesc-p010le test to fail. - # "${src}/contrib/ffmpeg/A12-libswscale-fix-yuv420p-to-p01xle-color-conversion-bu.patch" + # "${src}/contrib/ffmpeg/A13-libswscale-fix-yuv420p-to-p01xle-color-conversion-bu.patch" - "${src}/contrib/ffmpeg/A13-qsv-fix-decode-10bit-hdr.patch" - "${src}/contrib/ffmpeg/A14-amfenc-Add-support-for-pict_type-field.patch" - "${src}/contrib/ffmpeg/A15-amfenc-Fixes-the-color-information-in-the-ou.patch" - "${src}/contrib/ffmpeg/A16-amfenc-HDR-metadata.patch" - "${src}/contrib/ffmpeg/A17-av1dec-dovi-rpu.patch" - "${src}/contrib/ffmpeg/A18-avformat-mov-add-support-audio-fallback-track-ref.patch" + "${src}/contrib/ffmpeg/A14-hevc_mp4toannexb.c-fix-qsv-decode-of-10bit-hdr.patch" + "${src}/contrib/ffmpeg/A15-Expose-the-unmodified-Dolby-Vision-RPU-T35-buffers.patch" + "${src}/contrib/ffmpeg/A16-avcodec-amfenc-Add-support-for-on-demand-key-frames.patch" + "${src}/contrib/ffmpeg/A17-avcodec-amfenc-properly-set-primaries-transfer-and-m.patch" + "${src}/contrib/ffmpeg/A18-Revert-avcodec-amfenc-GPU-driver-version-check.patch" + "${src}/contrib/ffmpeg/A19-lavc-pgssubdec-Add-graphic-plane-and-cropping.patch" + "${src}/contrib/ffmpeg/A28-enable-av1_mf-encoder.patch" + "${src}/contrib/ffmpeg/A29-Revert-lavc-Check-codec_whitelist-early-in-avcodec_o.patch" ]; }); x265-hb = x265.overrideAttrs (old: { + version = "4.1"; + sourceRoot = "x265_4.1/source"; + src = fetchurl { + url = "https://bitbucket.org/multicoreware/x265_git/downloads/x265_4.1.tar.gz"; + hash = "sha256-oxaZxqiYBrdLAVHl5qffZd5LSQUEgv5ev4pDedevjyk="; + }; # nixpkgs' x265 sourceRoot is x265-.../source whereas handbrake's x265 patches # are written with respect to the parent directory instead of that source directory. # patches which don't cleanly apply are commented out. @@ -149,12 +158,13 @@ let (old.postPatch or "") + '' pushd .. - patch -p1 < ${src}/contrib/x265/A01-threads-priority.patch - patch -p1 < ${src}/contrib/x265/A02-threads-pool-adjustments.patch - patch -p1 < ${src}/contrib/x265/A03-sei-length-crash-fix.patch - patch -p1 < ${src}/contrib/x265/A04-ambient-viewing-enviroment-sei.patch - # patch -p1 < ${src}/contrib/x265/A05-memory-leaks.patch - # patch -p1 < ${src}/contrib/x265/A06-crosscompile-fix.patch + patch -p1 < ${src}/contrib/x265/A01-Do-not-set-thread-priority-on-Windows.patch + # patch -p1 < ${src}/contrib/x265/A02-Apple-Silicon-tuning.patch + patch -p1 < ${src}/contrib/x265/A03-fix-crash-when-SEI-length-is-variable.patch + patch -p1 < ${src}/contrib/x265/A04-implement-ambient-viewing-environment-sei.patch + # patch -p1 < ${src}/contrib/x265/A05-Fix-Dolby-Vision-RPU-memory-management.patch + # patch -p1 < ${src}/contrib/x265/A06-Simplify-macOS-cross-compilation.patch + # patch -p1 < ${src}/contrib/x265/A07-add-new-matrix-coefficients-from-H.273-v3.patch popd ''; }); @@ -175,7 +185,6 @@ let optional optionals optionalString - versions ; self = stdenv.mkDerivation rec { @@ -344,7 +353,7 @@ let }; }; - meta = with lib; { + meta = { homepage = "https://handbrake.fr/"; description = "Tool for converting video files and ripping DVDs"; longDescription = '' @@ -355,13 +364,13 @@ let CLI - `HandbrakeCLI` GTK GUI - `ghb` ''; - license = licenses.gpl2Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ Anton-Latukha wmertens ]; mainProgram = "HandBrakeCLI"; - platforms = with platforms; unix; + platforms = with lib.platforms; unix; broken = stdenv.hostPlatform.isDarwin; # https://github.com/NixOS/nixpkgs/pull/297984#issuecomment-2016503434 }; }; From 2b6e06055073bbe0d0aa086d0b09afaba302d870 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 16:26:59 +0000 Subject: [PATCH 0745/1054] cargo-deb: 2.7.0 -> 2.9.1 --- pkgs/by-name/ca/cargo-deb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix index 59ecbd5bfdc6..cbe911499074 100644 --- a/pkgs/by-name/ca/cargo-deb/package.nix +++ b/pkgs/by-name/ca/cargo-deb/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.7.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-ReXDrbFY2qY/0TUYD+EiP9Qa9KwMGb9iLL+tdfDLSpc="; + hash = "sha256-2Eq3gSvIBBVjsOjJPxrFLq1jgwFU2OHzKGV63SwDVTQ="; }; - cargoHash = "sha256-yBMeiYWsb+D8WzWRDDi9JFZTFvQAQ7QUeGDb6yFelD8="; + cargoHash = "sha256-NqTZ+WCDWyPE3x8oiwb1EMxigIk3AIPfoQF49Cy/DFI="; nativeBuildInputs = [ makeWrapper From b6c7c3abceb626212362e462f5483e78ca3b49b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 16:28:35 +0000 Subject: [PATCH 0746/1054] release-plz: 0.3.98 -> 0.3.110 --- pkgs/by-name/re/release-plz/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index 87e43d32bb1c..adf9b4ac077a 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.98"; + version = "0.3.110"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-DSEtku9Xyp8MRibO8VPeRlc9CnPupAqQRFXMJD2yNA8="; + hash = "sha256-BDlLvOW13Z6jE9OVC6QskVzXONkYKjXouPzedaPDmi0="; }; - cargoHash = "sha256-66P9ShtMZM5XcH8Q9ifw92VCDcwKPhZOywj3Acbhf9o="; + cargoHash = "sha256-GptaDa8NjCcWg5OsyujIgxGH4egWGBVVTLaYp4fqP3Q="; nativeBuildInputs = [ installShellFiles pkg-config perl ]; From 958bee59f416db0b4fd2fa00e9765ed2af9f74d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 16:28:55 +0000 Subject: [PATCH 0747/1054] python312Packages.rivet: 4.0.1 -> 4.0.2 --- pkgs/development/libraries/physics/rivet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 3246d9e06ec3..55d2de981e72 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rivet"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - hash = "sha256-ToaS1uilOWHHeYPra6SJPDdlzyP3BXieTYZb5Iku/3k="; + hash = "sha256-ZaOzb0K/94LtJ2eTDmaeCbFAiZYF15cvyPd3hbSogsA="; }; latex = texliveBasic.withPackages (ps: with ps; [ From 91a69c874cf29312a2e337dbd47d3f45e0dc68a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 16:31:24 +0000 Subject: [PATCH 0748/1054] proton-pass: 1.24.1 -> 1.25.0 --- pkgs/by-name/pr/proton-pass/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index 598bf37a6435..c92a2c09b4e7 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.24.1"; + version = "1.25.0"; src = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; - hash = "sha256-NtSZ3TSF3nBD+mEU6+uW2x8nqv0dz3jpankyTjJ8xvE="; + hash = "sha256-gilHkk9vVxnYJKy79lDrlMd8uWys50TEUbGaHVr958o="; }; dontConfigure = true; From d4fc8be8a57c5500021f4a49b2b9df867aeea370 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:41:54 +0800 Subject: [PATCH 0749/1054] oneanime: init at 1.3.6 --- pkgs/by-name/on/oneanime/package.nix | 119 ++ pkgs/by-name/on/oneanime/pubspec.lock.json | 1704 ++++++++++++++++++++ 2 files changed, 1823 insertions(+) create mode 100644 pkgs/by-name/on/oneanime/package.nix create mode 100644 pkgs/by-name/on/oneanime/pubspec.lock.json diff --git a/pkgs/by-name/on/oneanime/package.nix b/pkgs/by-name/on/oneanime/package.nix new file mode 100644 index 000000000000..9e116aab3d74 --- /dev/null +++ b/pkgs/by-name/on/oneanime/package.nix @@ -0,0 +1,119 @@ +{ + lib, + fetchFromGitHub, + flutter324, + autoPatchelfHook, + wrapGAppsHook3, + makeDesktopItem, + pkg-config, + copyDesktopItems, + alsa-lib, + libepoxy, + libpulseaudio, + libdrm, + mesa, + xdg-user-dirs, + libva, + libva1, + libvdpau, + buildGoModule, +}: +let + libopencc = buildGoModule rec { + pname = "libopencc"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Predidit"; + repo = "open_chinese_convert_bridge"; + rev = "refs/tags/${version}"; + hash = "sha256-kC5+rIBOcwn9POvQlKEzuYKKcbhuqVs+pFd4JSFgINQ="; + }; + + vendorHash = "sha256-ADODygC9VRCdeuxnkK4396yBny/ClRUdG3zAujPzpOM="; + + buildPhase = '' + runHook preBuild + + go build -buildmode=c-shared -o ./libopencc.so + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm0755 ./libopencc.so $out/lib/libopencc.so + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/Predidit/open_chinese_convert_bridge"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ aucub ]; + }; + }; +in +flutter324.buildFlutterApplication rec { + pname = "oneanime"; + version = "1.3.6"; + + src = fetchFromGitHub { + owner = "Predidit"; + repo = "oneAnime"; + rev = "refs/tags/${version}"; + hash = "sha256-CespZRb2JDc6FltEdibBOFd9BmkWGT8RSMbOC7cuA18="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + desktopItems = [ + (makeDesktopItem { + name = "oneanime"; + exec = "oneanime"; + icon = "oneanime"; + desktopName = "oneAnime"; + }) + ]; + + nativeBuildInputs = [ + pkg-config + autoPatchelfHook + wrapGAppsHook3 + copyDesktopItems + ]; + + buildInputs = [ + alsa-lib + libepoxy + libpulseaudio + libdrm + mesa + ]; + + postPatch = '' + substituteInPlace lib/pages/init_page.dart \ + --replace-fail "lib/opencc.so" "${libopencc}/lib/libopencc.so" + ''; + + postInstall = '' + install -Dm0644 ./assets/images/logo/logo_android_2.png $out/share/pixmaps/oneanime.png + ln -s ${lib.getLib libva}/lib/libva.so.2 $out/app/${pname}/lib/libva.so.2 + ln -s ${lib.getLib libva1}/lib/libva.so.1 $out/app/${pname}/lib/libva.so.1 + ln -s ${lib.getLib libvdpau}/lib/libvdpau.so.1 $out/app/${pname}/lib/libvdpau.so.1 + ''; + + extraWrapProgramArgs = '' + --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]} + ''; + + meta = { + description = "Anime1 third-party client with bullet screen"; + homepage = "https://github.com/Predidit/oneAnime"; + mainProgram = "oneanime"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ aucub ]; + platforms = [ "x86_64-linux" ]; # mdk-sdk of nixpkgs currently only has x64 + }; +} diff --git a/pkgs/by-name/on/oneanime/pubspec.lock.json b/pkgs/by-name/on/oneanime/pubspec.lock.json new file mode 100644 index 000000000000..da68f450bb45 --- /dev/null +++ b/pkgs/by-name/on/oneanime/pubspec.lock.json @@ -0,0 +1,1704 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "72.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" + }, + "adaptive_theme": { + "dependency": "direct main", + "description": { + "name": "adaptive_theme", + "sha256": "f4ee609b464e5efc68131d9d15ba9aa1de4e3b5ede64be17781c6e19a52d637d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.7.0" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "audio_video_progress_bar": { + "dependency": "direct main", + "description": { + "name": "audio_video_progress_bar", + "sha256": "552b1f73c56c4c88407999e0a8507176f60c56de3e6d63bc20a0eab48467d4c9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "auto_injector": { + "dependency": "transitive", + "description": { + "name": "auto_injector", + "sha256": "d2e204bc46d7349795364884d07ba79fe6a0f3a84a651b70dcbb68d82dcebab0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.13" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.2" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "canvas_danmaku": { + "dependency": "direct main", + "description": { + "name": "canvas_danmaku", + "sha256": "6e220df0edd62c6787b24e00c05a24b570a716cfe9c61452f214c4ab0958374f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.0" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "connectivity_plus": { + "dependency": "direct main", + "description": { + "name": "connectivity_plus", + "sha256": "876849631b0c7dc20f8b471a2a03142841b482438e3b707955464f5ffca3e4c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "connectivity_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "connectivity_plus_platform_interface", + "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "cookie_jar": { + "dependency": "direct main", + "description": { + "name": "cookie_jar", + "sha256": "a6ac027d3ed6ed756bfce8f3ff60cb479e266f3b0fdabd6242b804b6765e52de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.8" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "csv": { + "dependency": "transitive", + "description": { + "name": "csv", + "sha256": "c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.7" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "device_info_plus": { + "dependency": "direct main", + "description": { + "name": "device_info_plus", + "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.2" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "dio": { + "dependency": "direct main", + "description": { + "name": "dio", + "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.7.0" + }, + "dio_cookie_manager": { + "dependency": "direct main", + "description": { + "name": "dio_cookie_manager", + "sha256": "e79498b0f632897ff0c28d6e8178b4bc6e9087412401f618c31fa0904ace050d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "dio_web_adapter": { + "dependency": "transitive", + "description": { + "name": "dio_web_adapter", + "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "direct main", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "ffigen": { + "dependency": "direct dev", + "description": { + "name": "ffigen", + "sha256": "dead012f29db2be71ea152458f5eab600de98fbc244e01088ae6bf2616bceca7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.0.0" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_displaymode": { + "dependency": "direct main", + "description": { + "name": "flutter_displaymode", + "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, + "flutter_launcher_icons": { + "dependency": "direct main", + "description": { + "name": "flutter_launcher_icons", + "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.1" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_mobx": { + "dependency": "direct main", + "description": { + "name": "flutter_mobx", + "sha256": "859fbf452fa9c2519d2700b125dd7fb14c508bbdd7fb65e26ca8ff6c92280e2e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1+1" + }, + "flutter_modular": { + "dependency": "direct main", + "description": { + "name": "flutter_modular", + "sha256": "bc17a1eb1da676b9111e59d27834fb6673bdea01aead12f0803a0847ff9d451c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.4" + }, + "flutter_open_chinese_convert": { + "dependency": "direct main", + "description": { + "name": "flutter_open_chinese_convert", + "sha256": "70bdff033615b3b235da3aab8c8db1be3dbfdad3bdc80555b0346698cc3947a5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.23" + }, + "flutter_smart_dialog": { + "dependency": "direct main", + "description": { + "name": "flutter_smart_dialog", + "sha256": "7932ab58440379094c6a568efc329d322c6dd740e5a553080f2d56a71ed53752", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.8+3" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_volume_controller": { + "dependency": "direct main", + "description": { + "name": "flutter_volume_controller", + "sha256": "fa4c36dfe7ef7f423704f34ab8e64e00b4a30a90aa6e56f251e9dba649efcd7f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "fvp": { + "dependency": "direct main", + "description": { + "name": "fvp", + "sha256": "040aa12beccd5bc60631259f27a481c4abc11a389aa4f57a47b643f58fe0b060", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.26.1" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "hive": { + "dependency": "direct main", + "description": { + "name": "hive", + "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "hive_flutter": { + "dependency": "direct main", + "description": { + "name": "hive_flutter", + "sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "hive_generator": { + "dependency": "direct dev", + "description": { + "name": "hive_generator", + "sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.4" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "intl": { + "dependency": "transitive", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "json2yaml": { + "dependency": "transitive", + "description": { + "name": "json2yaml", + "sha256": "da94630fbc56079426fdd167ae58373286f603371075b69bf46d848d63ba3e51", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.5" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "mobx": { + "dependency": "direct main", + "description": { + "name": "mobx", + "sha256": "63920b27b32ad1910adfe767ab1750e4c212e8923232a1f891597b362074ea5e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3+2" + }, + "mobx_codegen": { + "dependency": "direct dev", + "description": { + "name": "mobx_codegen", + "sha256": "8e0d8653a0c720ad933cd8358f6f89f740ce89203657c13f25bea772ef1fff7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "modular_core": { + "dependency": "transitive", + "description": { + "name": "modular_core", + "sha256": "bd60317c81cff3a510aca19d6ddd661c7c79e3cba97b9f39e9ad199156ff255d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.3" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "nm": { + "dependency": "transitive", + "description": { + "name": "nm", + "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_info_plus": { + "dependency": "transitive", + "description": { + "name": "package_info_plus", + "sha256": "df3eb3e0aed5c1107bb0fdb80a8e82e778114958b1c5ac5644fb1ac9cae8a998", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.12" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "provider": { + "dependency": "direct main", + "description": { + "name": "provider", + "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.2" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "quiver": { + "dependency": "transitive", + "description": { + "name": "quiver", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "result_dart": { + "dependency": "transitive", + "description": { + "name": "result_dart", + "sha256": "3c69c864a08df0f413a86be211d07405e9a53cc1ac111e3cc8365845a0fb5288", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "screen_brightness": { + "dependency": "direct main", + "description": { + "name": "screen_brightness", + "sha256": "7d4ac84ae26b37c01d6f5db7123a72db7933e1f2a2a8c369a51e08f81b3178d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "screen_brightness_android": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_android", + "sha256": "8c69d3ac475e4d625e7fa682a3a51a69ff59abe5b4a9e57f6ec7d830a6c69bd6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "screen_brightness_ios": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_ios", + "sha256": "f08f70ca1ac3e30719764b5cfb8b3fe1e28163065018a41b3e6f243ab146c2f1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "screen_brightness_macos": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_macos", + "sha256": "70c2efa4534e22b927e82693488f127dd4a0f008469fccf4f0eefe9061bbdd6a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "screen_brightness_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_platform_interface", + "sha256": "9f3ebf7f22d5487e7676fe9ddaf3fc55b6ff8057707cf6dc0121c7dfda346a16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "screen_brightness_windows": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_windows", + "sha256": "c8e12a91cf6dd912a48bd41fcf749282a51afa17f536c3460d8d05702fb89ffa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "screen_pixel": { + "dependency": "direct main", + "description": { + "name": "screen_pixel", + "sha256": "b7310d81d98289ba1d6fb381ec95094b30b43ee1e901fefb65a3cf4de7d77e6b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.9" + }, + "shared_preferences": { + "dependency": "transitive", + "description": { + "name": "shared_preferences", + "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.3" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "slang": { + "dependency": "direct main", + "description": { + "name": "slang", + "sha256": "a466773de768eb95bdf681e0a92e7c8010d44bb247b62130426c83ece33aeaed", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.32.0" + }, + "slang_build_runner": { + "dependency": "direct dev", + "description": { + "name": "slang_build_runner", + "sha256": "b2e0c63f3c801a4aa70b4ca43173893d6eb7d5a421fc9d97ad983527397631b3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.32.0" + }, + "slang_flutter": { + "dependency": "direct main", + "description": { + "name": "slang_flutter", + "sha256": "1a98e878673996902fa5ef0b61ce5c245e41e4d25640d18af061c6aab917b0c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.32.0" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.4" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "universal_io": { + "dependency": "transitive", + "description": { + "name": "universal_io", + "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.2" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "8fc3bae0b68c02c47c5c86fa8bfa74471d42687b0eded01b78de87872db745e2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.12" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "video_player": { + "dependency": "direct main", + "description": { + "name": "video_player", + "sha256": "4a8c3492d734f7c39c2588a3206707a05ee80cef52e8c7f3b2078d430c84bc17", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.9.2" + }, + "video_player_android": { + "dependency": "transitive", + "description": { + "name": "video_player_android", + "sha256": "2800d68d6d5b4c22da62453568ed68e63c35bea524d4fa42062e53d6bb591433", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.13" + }, + "video_player_avfoundation": { + "dependency": "transitive", + "description": { + "name": "video_player_avfoundation", + "sha256": "cd5ab8a8bc0eab65ab0cea40304097edc46da574c8c1ecdee96f28cd8ef3792f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.2" + }, + "video_player_platform_interface": { + "dependency": "transitive", + "description": { + "name": "video_player_platform_interface", + "sha256": "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.2.3" + }, + "video_player_web": { + "dependency": "transitive", + "description": { + "name": "video_player_web", + "sha256": "6dcdd298136523eaf7dfc31abaf0dfba9aa8a8dbc96670e87e9d42b6f2caf774", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.5" + }, + "wakelock_plus": { + "dependency": "direct main", + "description": { + "name": "wakelock_plus", + "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.8" + }, + "wakelock_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus_platform_interface", + "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "e1d0cc62e65dc2561f5071fcbccecf58ff20c344f8f3dc7d4922df372a11df1f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.7.1" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.5" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "yaml_edit": { + "dependency": "transitive", + "description": { + "name": "yaml_edit", + "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + } + }, + "sdks": { + "dart": ">=3.5.0 <4.0.0", + "flutter": ">=3.24.4" + } +} From bd3ea645591cd61e8140067b459e974f756b528a Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 5 Dec 2024 11:03:46 +0100 Subject: [PATCH 0750/1054] cpupower: add `which` to nativeBuildInputs linux >= 6.13 requires this. --- pkgs/os-specific/linux/cpupower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index f714ce54dd58..f811455f8a62 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, buildPackages, kernel, pciutils, gettext }: +{ lib, stdenv, buildPackages, kernel, pciutils, gettext, which }: stdenv.mkDerivation { pname = "cpupower"; inherit (kernel) version src patches; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ gettext which ]; buildInputs = [ pciutils ]; postPatch = '' From 0254bc67821a9f18575df9bd572c5312fd1399b9 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Wed, 27 Nov 2024 16:28:09 +0800 Subject: [PATCH 0751/1054] apptainer, singularity: fix the update instructions in the comment --- .../virtualization/singularity/generic.nix | 5 +++-- .../virtualization/singularity/packages.nix | 10 ++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 12a9039cb016..288fc3119ed7 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -14,8 +14,9 @@ }: let - # Workaround for vendor-related attributes not overridable (#86349) - # should be removed when the issue is resolved + # Backward compatibility layer for the obsolete workaround of + # the "vendor-related attributes not overridable" issue (#86349), + # whose solution is merged and released. _defaultGoVendorArgs = { inherit vendorHash deleteVendor proxyVendor; }; diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index 525013bf86e0..71e9a38a2731 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -19,9 +19,8 @@ let hash = "sha256-yBUCUHc9vgyKFqAOHXQjAYQnmN0yXSIvkpR/s3LNAmk="; }; - # Update by running - # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).goModules" - # at the root directory of the Nixpkgs repository + # Override vendorHash with overrideAttrs. + # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash vendorHash = "sha256-W853++SSvkAYYUczbl8vnoBQZnimUdsAEXp4MCkLPBU="; extraDescription = " (previously known as Singularity)"; @@ -57,9 +56,8 @@ let hash = "sha256-Go4um/bIgq2lCZvjJ2GR81XpA/JvjPholi1PzNG9Hz8="; }; - # Update by running - # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules" - # at the root directory of the Nixpkgs repository + # Override vendorHash with overrideAttrs. + # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash vendorHash = "sha256-CRZ42NdmJhAkV6bkl5n7rEV4Tu/h65qF5qaQ4W5wQ3w="; # Do not build conmon and squashfuse from the Git submodule sources, From 6370e0f9a45b8b32ef51713ea8f71d2710c95614 Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 5 Dec 2024 12:41:08 -0500 Subject: [PATCH 0752/1054] python312Packages.azure-multiapi-storage: fix build Removes the unused msrestazure dependency and adds the missing python-dateutil dependency --- .../python-modules/azure-multiapi-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 1a8a6b49031b..e5e2ee63770e 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -6,10 +6,10 @@ cryptography, fetchPypi, msrest, - msrestazure, pythonOlder, requests, setuptools, + python-dateutil, }: buildPythonPackage rec { @@ -31,8 +31,8 @@ buildPythonPackage rec { azure-core cryptography msrest - msrestazure requests + python-dateutil ]; # fix namespace From 04bf3d877437fd4b5742e8e1143c9f39d1353e74 Mon Sep 17 00:00:00 2001 From: Yethal <26117918+Yethal@users.noreply.github.com> Date: Thu, 5 Dec 2024 18:48:41 +0100 Subject: [PATCH 0753/1054] nixos/modules/virtualisation: additional configuration options (#349537) oci-containers: additional configuration options --- .../modules/virtualisation/oci-containers.nix | 434 +++++++++++------- nixos/tests/oci-containers.nix | 17 + 2 files changed, 297 insertions(+), 154 deletions(-) diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index 161b4f6027b2..3adf4530aeec 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -1,4 +1,10 @@ -{ config, options, lib, pkgs, ... }: +{ + config, + options, + lib, + pkgs, + ... +}: with lib; let @@ -8,7 +14,8 @@ let defaultBackend = options.virtualisation.oci-containers.backend.default; containerOptions = - { ... }: { + { ... }: + { options = { @@ -77,8 +84,8 @@ let }; cmd = mkOption { - type = with types; listOf str; - default = []; + type = with types; listOf str; + default = [ ]; description = "Commandline arguments to pass to the image's entrypoint."; example = literalExpression '' ["--port=9000"] @@ -87,7 +94,7 @@ let labels = mkOption { type = with types; attrsOf str; - default = {}; + default = { }; description = "Labels to attach to the container at runtime."; example = literalExpression '' { @@ -105,26 +112,26 @@ let environment = mkOption { type = with types; attrsOf str; - default = {}; + default = { }; description = "Environment variables to set for this container."; example = literalExpression '' { DATABASE_HOST = "db.example.com"; DATABASE_PORT = "3306"; } - ''; + ''; }; environmentFiles = mkOption { type = with types; listOf path; - default = []; + default = [ ]; description = "Environment files for this container."; example = literalExpression '' [ /path/to/.env /path/to/.env.secret ] - ''; + ''; }; log-driver = mkOption { @@ -147,7 +154,7 @@ let ports = mkOption { type = with types; listOf str; - default = []; + default = [ ]; description = '' Network ports to publish from the container to the outer host. @@ -194,7 +201,7 @@ let volumes = mkOption { type = with types; listOf str; - default = []; + default = [ ]; description = '' List of volumes to attach to this container. @@ -222,7 +229,7 @@ let dependsOn = mkOption { type = with types; listOf str; - default = []; + default = [ ]; description = '' Define which other containers this one depends on. They will be added to both After and Requires for the unit. @@ -247,14 +254,17 @@ let preRunExtraOptions = mkOption { type = with types; listOf str; - default = []; + default = [ ]; description = "Extra options for {command}`${defaultBackend}` that go before the `run` argument."; - example = [ "--runtime" "runsc" ]; + example = [ + "--runtime" + "runsc" + ]; }; extraOptions = mkOption { type = with types; listOf str; - default = []; + default = [ ]; description = "Extra options for {command}`${defaultBackend} run`."; example = literalExpression '' ["--network=host"] @@ -262,177 +272,293 @@ let }; autoStart = mkOption { - type = types.bool; + type = with types; bool; default = true; description = '' When enabled, the container is automatically started on boot. If this option is set to false, the container has to be started on-demand via its service. ''; }; + + pull = mkOption { + type = + with types; + enum [ + "always" + "missing" + "never" + "newer" + ]; + default = "missing"; + description = '' + Image pull policy for the container. Must be one of: always, missing, never, newer + ''; + }; + + capAdd = mkOption { + type = with types; lazyAttrsOf (nullOr bool); + default = { }; + description = '' + Capabilities to add to container + ''; + example = literalExpression '' + { + SYS_ADMIN = true; + { + ''; + }; + + capDrop = mkOption { + type = with types; lazyAttrsOf (nullOr bool); + default = { }; + description = '' + Capabilities to drop from container + ''; + example = literalExpression '' + { + SYS_ADMIN = true; + { + ''; + }; + + devices = mkOption { + type = with types; listOf str; + default = [ ]; + description = '' + List of devices to attach to this container. + ''; + example = literalExpression '' + [ + "/dev/dri:/dev/dri" + ] + ''; + }; + + privileged = mkOption { + type = with types; bool; + default = false; + description = '' + Give extended privileges to the container + ''; + }; + + networks = mkOption { + type = with types; listOf str; + default = [ ]; + description = '' + Networks to attach the container to + ''; + }; }; }; - isValidLogin = login: login.username != null && login.passwordFile != null && login.registry != null; + isValidLogin = + login: login.username != null && login.passwordFile != null && login.registry != null; - mkService = name: container: let - dependsOn = map (x: "${cfg.backend}-${x}.service") container.dependsOn; - escapedName = escapeShellArg name; - preStartScript = pkgs.writeShellApplication { - name = "pre-start"; - runtimeInputs = [ ]; - text = '' - ${cfg.backend} rm -f ${name} || true - ${optionalString (isValidLogin container.login) '' - # try logging in, if it fails, check if image exists locally - ${cfg.backend} login \ - ${container.login.registry} \ - --username ${container.login.username} \ - --password-stdin < ${container.login.passwordFile} \ - || ${cfg.backend} image inspect ${container.image} >/dev/null \ - || { echo "image doesn't exist locally and login failed" >&2 ; exit 1; } - ''} - ${optionalString (container.imageFile != null) '' - ${cfg.backend} load -i ${container.imageFile} - ''} - ${optionalString (container.imageStream != null) '' - ${container.imageStream} | ${cfg.backend} load - ''} - ${optionalString (cfg.backend == "podman") '' - rm -f /run/podman-${escapedName}.ctr-id - ''} - ''; + mkService = + name: container: + let + dependsOn = map (x: "${cfg.backend}-${x}.service") container.dependsOn; + escapedName = escapeShellArg name; + preStartScript = pkgs.writeShellApplication { + name = "pre-start"; + runtimeInputs = [ ]; + text = '' + ${cfg.backend} rm -f ${name} || true + ${optionalString (isValidLogin container.login) '' + # try logging in, if it fails, check if image exists locally + ${cfg.backend} login \ + ${container.login.registry} \ + --username ${container.login.username} \ + --password-stdin < ${container.login.passwordFile} \ + || ${cfg.backend} image inspect ${container.image} >/dev/null \ + || { echo "image doesn't exist locally and login failed" >&2 ; exit 1; } + ''} + ${optionalString (container.imageFile != null) '' + ${cfg.backend} load -i ${container.imageFile} + ''} + ${optionalString (container.imageStream != null) '' + ${container.imageStream} | ${cfg.backend} load + ''} + ${optionalString (cfg.backend == "podman") '' + rm -f /run/podman-${escapedName}.ctr-id + ''} + ''; + }; + in + { + wantedBy = [ ] ++ optional (container.autoStart) "multi-user.target"; + wants = lib.optional ( + container.imageFile == null && container.imageStream == null + ) "network-online.target"; + after = + lib.optionals (cfg.backend == "docker") [ + "docker.service" + "docker.socket" + ] + # if imageFile or imageStream is not set, the service needs the network to download the image from the registry + ++ lib.optionals (container.imageFile == null && container.imageStream == null) [ + "network-online.target" + ] + ++ dependsOn; + requires = dependsOn; + environment = proxy_env; + + path = + if cfg.backend == "docker" then + [ config.virtualisation.docker.package ] + else if cfg.backend == "podman" then + [ config.virtualisation.podman.package ] + else + throw "Unhandled backend: ${cfg.backend}"; + + script = concatStringsSep " \\\n " ( + [ + "exec ${cfg.backend} " + ] + ++ map escapeShellArg container.preRunExtraOptions + ++ [ + "run" + "--rm" + "--name=${escapedName}" + "--log-driver=${container.log-driver}" + ] + ++ optional (container.entrypoint != null) "--entrypoint=${escapeShellArg container.entrypoint}" + ++ optional (container.hostname != null) "--hostname=${escapeShellArg container.hostname}" + ++ lib.optionals (cfg.backend == "podman") [ + "--cidfile=/run/podman-${escapedName}.ctr-id" + "--cgroups=no-conmon" + "--sdnotify=conmon" + "-d" + "--replace" + ] + ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment) + ++ map (f: "--env-file ${escapeShellArg f}") container.environmentFiles + ++ map (p: "-p ${escapeShellArg p}") container.ports + ++ optional (container.user != null) "-u ${escapeShellArg container.user}" + ++ map (v: "-v ${escapeShellArg v}") container.volumes + ++ (mapAttrsToList (k: v: "-l ${escapeShellArg k}=${escapeShellArg v}") container.labels) + ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}" + ++ optional (container.privileged) "--privileged" + ++ mapAttrsToList (k: _: "--cap-add=${escapeShellArg k}") ( + filterAttrs (_: v: v == true) container.capAdd + ) + ++ mapAttrsToList (k: _: "--cap-drop=${escapeShellArg k}") ( + filterAttrs (_: v: v == true) container.capDrop + ) + ++ map (d: "--device=${escapeShellArg d}") container.devices + ++ map (n: "--network=${escapeShellArg n}") container.networks + ++ [ "--pull ${escapeShellArg container.pull}" ] + ++ map escapeShellArg container.extraOptions + ++ [ container.image ] + ++ map escapeShellArg container.cmd + ); + + preStop = + if cfg.backend == "podman" then + "podman stop --ignore --cidfile=/run/podman-${escapedName}.ctr-id" + else + "${cfg.backend} stop ${name} || true"; + + postStop = + if cfg.backend == "podman" then + "podman rm -f --ignore --cidfile=/run/podman-${escapedName}.ctr-id" + else + "${cfg.backend} rm -f ${name} || true"; + + serviceConfig = + { + ### There is no generalized way of supporting `reload` for docker + ### containers. Some containers may respond well to SIGHUP sent to their + ### init process, but it is not guaranteed; some apps have other reload + ### mechanisms, some don't have a reload signal at all, and some docker + ### images just have broken signal handling. The best compromise in this + ### case is probably to leave ExecReload undefined, so `systemctl reload` + ### will at least result in an error instead of potentially undefined + ### behaviour. + ### + ### Advanced users can still override this part of the unit to implement + ### a custom reload handler, since the result of all this is a normal + ### systemd service from the perspective of the NixOS module system. + ### + # ExecReload = ...; + ### + ExecStartPre = [ "${preStartScript}/bin/pre-start" ]; + TimeoutStartSec = 0; + TimeoutStopSec = 120; + Restart = "always"; + } + // optionalAttrs (cfg.backend == "podman") { + Environment = "PODMAN_SYSTEMD_UNIT=podman-${name}.service"; + Type = "notify"; + NotifyAccess = "all"; + }; }; - in { - wantedBy = [] ++ optional (container.autoStart) "multi-user.target"; - wants = lib.optional (container.imageFile == null && container.imageStream == null) "network-online.target"; - after = lib.optionals (cfg.backend == "docker") [ "docker.service" "docker.socket" ] - # if imageFile or imageStream is not set, the service needs the network to download the image from the registry - ++ lib.optionals (container.imageFile == null && container.imageStream == null) [ "network-online.target" ] - ++ dependsOn; - requires = dependsOn; - environment = proxy_env; - path = - if cfg.backend == "docker" then [ config.virtualisation.docker.package ] - else if cfg.backend == "podman" then [ config.virtualisation.podman.package ] - else throw "Unhandled backend: ${cfg.backend}"; - - script = concatStringsSep " \\\n " ([ - "exec ${cfg.backend} " - ] ++ map escapeShellArg container.preRunExtraOptions ++ [ - "run" - "--rm" - "--name=${escapedName}" - "--log-driver=${container.log-driver}" - ] ++ optional (container.entrypoint != null) - "--entrypoint=${escapeShellArg container.entrypoint}" - ++ optional (container.hostname != null) - "--hostname=${escapeShellArg container.hostname}" - ++ lib.optionals (cfg.backend == "podman") [ - "--cidfile=/run/podman-${escapedName}.ctr-id" - "--cgroups=no-conmon" - "--sdnotify=conmon" - "-d" - "--replace" - ] ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment) - ++ map (f: "--env-file ${escapeShellArg f}") container.environmentFiles - ++ map (p: "-p ${escapeShellArg p}") container.ports - ++ optional (container.user != null) "-u ${escapeShellArg container.user}" - ++ map (v: "-v ${escapeShellArg v}") container.volumes - ++ (mapAttrsToList (k: v: "-l ${escapeShellArg k}=${escapeShellArg v}") container.labels) - ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}" - ++ map escapeShellArg container.extraOptions - ++ [container.image] - ++ map escapeShellArg container.cmd - ); - - preStop = if cfg.backend == "podman" - then "podman stop --ignore --cidfile=/run/podman-${escapedName}.ctr-id" - else "${cfg.backend} stop ${name} || true"; - - postStop = if cfg.backend == "podman" - then "podman rm -f --ignore --cidfile=/run/podman-${escapedName}.ctr-id" - else "${cfg.backend} rm -f ${name} || true"; - - serviceConfig = { - ### There is no generalized way of supporting `reload` for docker - ### containers. Some containers may respond well to SIGHUP sent to their - ### init process, but it is not guaranteed; some apps have other reload - ### mechanisms, some don't have a reload signal at all, and some docker - ### images just have broken signal handling. The best compromise in this - ### case is probably to leave ExecReload undefined, so `systemctl reload` - ### will at least result in an error instead of potentially undefined - ### behaviour. - ### - ### Advanced users can still override this part of the unit to implement - ### a custom reload handler, since the result of all this is a normal - ### systemd service from the perspective of the NixOS module system. - ### - # ExecReload = ...; - ### - ExecStartPre = [ "${preStartScript}/bin/pre-start" ]; - TimeoutStartSec = 0; - TimeoutStopSec = 120; - Restart = "always"; - } // optionalAttrs (cfg.backend == "podman") { - Environment="PODMAN_SYSTEMD_UNIT=podman-${name}.service"; - Type="notify"; - NotifyAccess="all"; - }; - }; - -in { +in +{ imports = [ - ( - lib.mkChangedOptionModule - [ "docker-containers" ] - [ "virtualisation" "oci-containers" ] - (oldcfg: { - backend = "docker"; - containers = lib.mapAttrs (n: v: builtins.removeAttrs (v // { - extraOptions = v.extraDockerOptions or []; - }) [ "extraDockerOptions" ]) oldcfg.docker-containers; - }) - ) + (lib.mkChangedOptionModule [ "docker-containers" ] [ "virtualisation" "oci-containers" ] (oldcfg: { + backend = "docker"; + containers = lib.mapAttrs ( + n: v: + builtins.removeAttrs ( + v + // { + extraOptions = v.extraDockerOptions or [ ]; + } + ) [ "extraDockerOptions" ] + ) oldcfg.docker-containers; + })) ]; options.virtualisation.oci-containers = { backend = mkOption { - type = types.enum [ "podman" "docker" ]; + type = types.enum [ + "podman" + "docker" + ]; default = if versionAtLeast config.system.stateVersion "22.05" then "podman" else "docker"; description = "The underlying Docker implementation to use."; }; containers = mkOption { - default = {}; + default = { }; type = types.attrsOf (types.submodule containerOptions); description = "OCI (Docker) containers to run as systemd services."; }; }; - config = lib.mkIf (cfg.containers != {}) (lib.mkMerge [ - { - systemd.services = mapAttrs' (n: v: nameValuePair "${cfg.backend}-${n}" (mkService n v)) cfg.containers; + config = lib.mkIf (cfg.containers != { }) ( + lib.mkMerge [ + { + systemd.services = mapAttrs' ( + n: v: nameValuePair "${cfg.backend}-${n}" (mkService n v) + ) cfg.containers; - assertions = - let - toAssertion = _: { imageFile, imageStream, ... }: - { assertion = imageFile == null || imageStream == null; + assertions = + let + toAssertion = + _: + { imageFile, imageStream, ... }: + { + assertion = imageFile == null || imageStream == null; - message = "You can only define one of imageFile and imageStream"; - }; + message = "You can only define one of imageFile and imageStream"; + }; - in + in lib.mapAttrsToList toAssertion cfg.containers; - } - (lib.mkIf (cfg.backend == "podman") { - virtualisation.podman.enable = true; - }) - (lib.mkIf (cfg.backend == "docker") { - virtualisation.docker.enable = true; - }) - ]); + } + (lib.mkIf (cfg.backend == "podman") { + virtualisation.podman.enable = true; + }) + (lib.mkIf (cfg.backend == "docker") { + virtualisation.docker.enable = true; + }) + ] + ); } diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix index bc80f2d9b5db..09075c20d79b 100644 --- a/nixos/tests/oci-containers.nix +++ b/nixos/tests/oci-containers.nix @@ -22,6 +22,16 @@ let image = "nginx-container"; imageStream = pkgs.dockerTools.examples.nginxStream; ports = ["8181:80"]; + capAdd = { + CAP_AUDIT_READ = true; + }; + capDrop = { + CAP_AUDIT_WRITE = true; + }; + privileged = false; + devices = [ + "/dev/random:/dev/random" + ]; }; }; @@ -32,11 +42,18 @@ let }; testScript = '' + import json + start_all() ${backend}.wait_for_unit("${backend}-nginx.service") ${backend}.wait_for_open_port(8181) ${backend}.wait_until_succeeds("curl -f http://localhost:8181 | grep Hello") + output = json.loads(${backend}.succeed("${backend} inspect nginx --format json").strip())[0] ${backend}.succeed("systemctl stop ${backend}-nginx.service", timeout=10) + assert output['HostConfig']['CapAdd'] == ["CAP_AUDIT_READ"] + assert output['HostConfig']['CapDrop'] == ${if backend == "docker" then "[\"CAP_AUDIT_WRITE\"]" else "[]"} # Rootless podman runs with no capabilities so it cannot drop them + assert output['HostConfig']['Privileged'] == False + assert output['HostConfig']['Devices'] == [{'PathOnHost': '/dev/random', 'PathInContainer': '/dev/random', 'CgroupPermissions': '${if backend == "docker" then "rwm" else ""}'}] ''; }; From 9c51cc752f1e02a45e8466efc81ece3507ff69bb Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Dec 2024 18:51:39 +0100 Subject: [PATCH 0754/1054] palemoon-bin: 33.4.1 -> 33.5.0 --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 4fa6b759929d..07b2b8049431 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.4.1"; + version = "33.5.0"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-pjOzU8atFNzYujxxoVihn0Cvq4Xvh7U2auSznE29Wpc="; + hash = "sha256-TlmDsZKHolTS+y+1BymyY49+AvqUv8zmUXCGNHCRPL0="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-ikgO0vVTySw3I6gdSu5k2e35xZ95bJY4f18Fjh+c0rA="; + hash = "sha256-f6vLHbpmvVfkjZr7x0DiCFoGGvfxHfFZ3KTagq2Mwp4="; }; }; From 07e0e431b1d35e806c3512f488cf52ca7350a775 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 20 Sep 2024 12:59:40 -0700 Subject: [PATCH 0755/1054] qhexedit2: init at 0.8.9 --- pkgs/by-name/qh/qhexedit2/package.nix | 66 +++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 pkgs/by-name/qh/qhexedit2/package.nix diff --git a/pkgs/by-name/qh/qhexedit2/package.nix b/pkgs/by-name/qh/qhexedit2/package.nix new file mode 100644 index 000000000000..d8fb0aff0afb --- /dev/null +++ b/pkgs/by-name/qh/qhexedit2/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchpatch, + fetchFromGitHub, + qt6, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qhexedit2"; + version = "0.8.9"; + + src = fetchFromGitHub { + owner = "Simsys"; + repo = "qhexedit2"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-qg8dyXwAsTVSx85Ad7UYhr4d1aTRG9QbvC0uyOMcY8g="; + }; + + postPatch = '' + # Replace QPallete::Background with QPallete::Window in all files, since QPallete::Background was removed in Qt 6 + find . -type f -exec sed -i 's/QPalette::Background/QPalette::Window/g' {} + + ''; + + nativeBuildInputs = [ + qt6.qmake + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qtbase + qt6.qttools + qt6.qtwayland + ]; + + qmakeFlags = [ + "./example/qhexedit.pro" + ]; + + # A custom installPhase is needed because no [native] build input provides an installPhase hook + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp qhexedit $out/bin + + runHook postInstall + ''; + + passthru = { + updateScript = nix-update-script { }; + # I would use testers.testVersion except for some reason it fails, even with my patches that add a --version flag + # TODO: Debug why testVersion reports a non-zero status code in the nix sandbox + }; + + meta = { + description = "Hex Editor for Qt"; + homepage = "https://github.com/Simsys/qhexedit2"; + changelog = "https://github.com/Simsys/qhexedit2/releases"; + mainProgram = "qhexedit"; + license = lib.licenses.lgpl21Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ pandapip1 ]; + }; +}) From cb8dd4a8adc9fc0776e0af3d498f70668c44d70e Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Sat, 9 Nov 2024 00:30:11 +0530 Subject: [PATCH 0756/1054] opengist: 1.7.5 -> 1.8.3 Co-authored-by: Sandro Signed-off-by: phanirithvij --- pkgs/by-name/op/opengist/package.nix | 42 +++++++++++-------- pkgs/by-name/op/opengist/update.sh | 61 ++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 18 deletions(-) create mode 100755 pkgs/by-name/op/opengist/update.sh diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index ef8c6f5b8232..9c5fc9bd9652 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -3,39 +3,36 @@ buildGoModule, buildNpmPackage, fetchFromGitHub, + fetchpatch, moreutils, - npm-lockfile-fix, jq, git, }: let # finalAttrs when 🥺 (buildGoModule does not support them) # https://github.com/NixOS/nixpkgs/issues/273815 - version = "1.7.5"; + version = "1.8.3"; src = fetchFromGitHub { owner = "thomiceli"; repo = "opengist"; rev = "v${version}"; - hash = "sha256-mZ4j9UWdKa3nygcRO5ceyONetkks3ZGWxvzD34eOXew="; - - # follow https://github.com/thomiceli/opengist/pull/350 and remove here - postFetch = '' - ${lib.getExe npm-lockfile-fix} $out/package-lock.json - ''; + hash = "sha256-Wpn9rqOUwbwi6pbPTnVzHb+ip3ay9WykEZDyHNdXYJU="; }; frontend = buildNpmPackage { pname = "opengist-frontend"; inherit version src; - - nativeBuildInputs = [ - moreutils - jq + patches = [ + # fix lock file + # https://github.com/thomiceli/opengist/pull/395 + (fetchpatch { + url = "https://github.com/thomiceli/opengist/pull/395/commits/f77c624f73f18010c7e4360287d0a3c013c21c9d.patch"; + hash = "sha256-oCMt1HptH0jsi2cvv8wEP0+bpujx1jBxCjw0KMDGFfk="; + }) ]; - # npm complains of "invalid package". shrug. we can give it a version. - preBuild = '' - jq '.version = "${version}"' package.json | sponge package.json + postPatch = '' + ${lib.getExe jq} '.version = "${version}"' package.json | ${lib.getExe' moreutils "sponge"} package.json ''; # copy pasta from the Makefile upstream, seems to be a workaround of sass @@ -50,13 +47,13 @@ let cp -R public $out ''; - npmDepsHash = "sha256-cITkgRvWOml6uH77WkiNgFedEuPNze63Gntet09uS5w="; + npmDepsHash = "sha256-fj2U8oRNfdIEnRkAOQQGiPyQFuWltLGkMzT2IQO60v0="; }; in buildGoModule { pname = "opengist"; inherit version src; - vendorHash = "sha256-6PpS/dsonc/akBn8NwUIVFNe2FjynAhF1TYIYT9K/ws="; + vendorHash = "sha256-mLFjRL4spAWuPLVOtt88KH+p2g9lGCYzaHokVxdrLOw="; tags = [ "fs_embed" ]; ldflags = [ "-s" @@ -73,11 +70,20 @@ buildGoModule { export OG_OPENGIST_HOME=$(mktemp -d) ''; + checkPhase = '' + runHook preCheck + make test + runHook postCheck + ''; + postPatch = '' cp -R ${frontend}/public/{manifest.json,assets} public/ ''; - passthru.frontend = frontend; + passthru = { + inherit frontend; + updateScript = ./update.sh; + }; meta = { description = "Self-hosted pastebin powered by Git"; diff --git a/pkgs/by-name/op/opengist/update.sh b/pkgs/by-name/op/opengist/update.sh new file mode 100755 index 000000000000..ad3ac9ca639a --- /dev/null +++ b/pkgs/by-name/op/opengist/update.sh @@ -0,0 +1,61 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash curl coreutils jq git prefetch-npm-deps moreutils common-updater-scripts common-updater-scripts + +# shellcheck shell=bash + +set -eou pipefail + +NIXPKGS_DIR="$PWD" +SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")" + +# Get latest release +OPENGIST_RELEASE=$( + curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/thomiceli/opengist/releases/latest +) + +# Get release information +latestVersion=$(echo "$OPENGIST_RELEASE" | jq -r ".tag_name") +latestVersion="${latestVersion:1}" # remove first char 'v' + +oldVersion=$(nix eval --raw -f "$NIXPKGS_DIR" opengist.version) + +if [[ "$oldVersion" == "$latestVersion" ]]; then + echo "opengist is up-to-date: ${oldVersion}" + exit 0 +fi + +echo "Updating opengist $oldVersion -> $latestVersion" + +update-source-version opengist "${latestVersion}" + +pushd "$SCRIPT_DIR" >/dev/null || exit 1 + +## npm hash +rm -f package{,-lock}.json +curl -sLO "https://raw.githubusercontent.com/thomiceli/opengist/refs/tags/v$latestVersion/package-lock.json" + +npmDepsHash="$(prefetch-npm-deps package-lock.json)" +sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' --in-place package.nix + +popd >/dev/null + +# nix-prefetch broken due to ninja finalAttrs.src.rev +# nix-update with goModules broken for this package + +setKV () { + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${SCRIPT_DIR}/package.nix" +} + +setKV vendorHash "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" # The same as lib.fakeHash + +set +e +VENDOR_HASH=$(nix-build --no-out-link -A opengist "$NIXPKGS_DIR" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') +set -e + +if [ -n "${VENDOR_HASH:-}" ]; then + setKV vendorHash "${VENDOR_HASH}" +else + echo "Update failed. VENDOR_HASH is empty." + exit 1 +fi From 4ba028e8856a32c10eded2e94785b62454fba032 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 5 Dec 2024 14:06:55 -0400 Subject: [PATCH 0757/1054] dotnet/update.sh: check sdk version when updating --- pkgs/development/compilers/dotnet/update.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 7e8e6bfc880f..66520f4658fd 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -281,15 +281,18 @@ update() { # If patch was not specified, check if the package is already the latest version # If it is, exit early if [ "$patch_specified" == false ] && [ -f "$output" ]; then - local current_version - current_version=$(nix-instantiate --eval -E "(import $output { \ - buildAspNetCore = { ... }: {}; \ - buildNetSdk = { ... }: {}; \ - buildNetRuntime = { ... }: {}; \ - fetchNupkg = { ... }: {}; \ - }).release_${major_minor_underscore}" | jq -r) - - if [[ "$current_version" == "$major_minor_patch" ]]; then + local -a versions + IFS= readarray -d '' versions < <( + nix-instantiate --eval --json -E "with (import $output { + buildAspNetCore = { ... }: {}; + buildNetSdk = { version, ... }: { inherit version; }; + buildNetRuntime = { version, ... }: { inherit version; }; + fetchNupkg = { ... }: {}; + }); (x: builtins.deepSeq x x) [ + runtime_${major_minor_underscore}.version + sdk_${major_minor_underscore}.version + ]" | jq --raw-output0 .[]) + if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "${sdk_versions[0]}" ]]; then echo "Nothing to update." return fi From 62fb70556cc6dcec730a78d2fecb6a93edc51755 Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 5 Dec 2024 12:42:32 -0500 Subject: [PATCH 0758/1054] python312Packages.azure-multiapi-storage: modernize and fix metadata --- .../python-modules/azure-multiapi-storage/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index e5e2ee63770e..600b5e515259 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -42,14 +42,13 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ - "azure.common" "azure.multiapi.storage" ]; - meta = with lib; { + meta = { description = "Microsoft Azure Storage Client Library for Python with multi API version support"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; - license = licenses.mit; + homepage = "https://github.com/Azure/azure-multiapi-storage-python"; + license = lib.licenses.mit; maintainers = [ ]; }; } From b1d10ad85e16873b36142084ba84d5eba90ee1c2 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 5 Dec 2024 18:12:33 +0000 Subject: [PATCH 0759/1054] dotnet-sdk_9: 9.0.100 -> 9.0.101 --- .../compilers/dotnet/versions/9.0.nix | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix index b8af661041b3..3afb110ccbd7 100644 --- a/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -204,39 +204,39 @@ in rec { }; sdk_9_0_1xx = buildNetSdk { - version = "9.0.100"; + version = "9.0.101"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/526d93c5-bae2-4cfc-a9cf-b2d28d7b5c98/17c926df21958999f74992973837d261/dotnet-sdk-9.0.100-linux-arm.tar.gz"; - hash = "sha512-3gbonlWbx2P/Z3O8+FLZFexH8tifTnBluggA2pmrVjV/MUNzkad9cJbkBfYzGGJbDLB09rQQA2++kG/OfzeU6A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/fa0fa6b6-8db2-441e-a393-2dd2f5c841b9/19b664790a03e20ce4069449eaa74b21/dotnet-sdk-9.0.101-linux-arm.tar.gz"; + hash = "sha512-zfiYnQLkpqoh5oCB6VYxjJTGAVg6dX1etDORnr5/pRjyB6oPWKCe4oz5X0RcSGOGwineaYkUM6SikUXvWWqhpA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/6f79d99b-dc38-4c44-a549-32329419bb9f/a411ec38fb374e3a4676647b236ba021/dotnet-sdk-9.0.100-linux-arm64.tar.gz"; - hash = "sha512-aERQ5tH3xxH//b8yorhqky0XpR9HQr0npCieMZxbJPZ0NVP8fgrRxxY+RI7VxAzR7PQZiy5oGsxGItjmGTpc8g=="; + url = "https://download.visualstudio.microsoft.com/download/pr/93a7156d-01ef-40a1-b6e9-bbe7602f7e8b/3c93e90c63b494972c44f073e15bfc26/dotnet-sdk-9.0.101-linux-arm64.tar.gz"; + hash = "sha512-xfnBfd7VEBy0tlrRAzrk2C/FsEMDvc5OthptxH76hCAr1ybQXK8RflNqAb14rXc7jSPL9DvGVeXrmRKxIHjgsQ=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/308f16a9-2ecf-4a42-b8bb-c1233de985fd/be6e87045ab21935bd8bb98ce69026c4/dotnet-sdk-9.0.100-linux-x64.tar.gz"; - hash = "sha512-f2m9oEfeH5Uihr4zCl6FgXHe2VLRqiQWnmIhL5CicUnmO2NsiK0xOm4+yGDaMfjFR/9KtoCBA6Bw9/smupnBxw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/d74fd2dd-3384-4952-924b-f5d492326e35/e91d8295d4cbe82ba3501e411d78c9b8/dotnet-sdk-9.0.101-linux-x64.tar.gz"; + hash = "sha512-kbN+/WQkLl8fPCAl0YPrNOF/OpJxxWAvKd33lIRe7hA3I++VXthpeI6/WnMejdxpMoeZySxkyxGOEyjSWaatAQ=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/c77904f4-57f5-46cf-bf99-d0dd1e4b9b3b/d7b454d3500c1a930b38e39a916aa38f/dotnet-sdk-9.0.100-linux-musl-arm.tar.gz"; - hash = "sha512-sJIPgOhmp2A86mKKETDfADvF14GCdciliCoxxuTinwcyL8XP2HMziT5BMb2WEw+yOE0AjLrXBAIsiSZ9UmhuBw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/5528c94e-1708-4291-917f-c9b693df3389/b851b22328c11e88f9fb61ea3e18582f/dotnet-sdk-9.0.101-linux-musl-arm.tar.gz"; + hash = "sha512-fmVg5puDueZJYekRVfhYVCHDos52iXhx04ZJLGI+koD2byKE3Ek2K8OHOeSBclI85UsiaVJENzlOo+kIcooBGA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ca5a82b7-704c-4405-bde2-4bde4b932d2e/0332e51e8d339cbc0410079f911205f3/dotnet-sdk-9.0.100-linux-musl-arm64.tar.gz"; - hash = "sha512-2uBtAHMn9vU/UMs6KIS5PNL8u3PHVqisX/ZzYX+b3wAJOTLzqDZSIR/C7rV8JxB4ZE71wopCiX2Dl/dtDolYbQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a8f1d5c7-c724-451c-8659-fe6ea4e72ea8/1c90dea91c1e117b96198bdccdc0b594/dotnet-sdk-9.0.101-linux-musl-arm64.tar.gz"; + hash = "sha512-am1qbW372stIN0wKyb2xyTeB85cMh3iwvuHxWaIrABdoaCZOYFMx/vgzy5/tgptP/UFCdtDRFAqLDiVxlcLzdA=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/404c65f4-7595-4792-85ab-e26084ebb5cf/db570cf4dc8d0a61270243c61fbdf619/dotnet-sdk-9.0.100-linux-musl-x64.tar.gz"; - hash = "sha512-4gMua07Zmts6krfgQeqJXuCcbtJFWh9o5V7VO9YTyMIO9KpcQ0OTu1/bwvVjWoMGf3dFH+L9P+vO4mT+B3rNqg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/73c11b94-0188-458f-b599-f7591718fc28/c44e21ffbf353b50ef88a76122e89e24/dotnet-sdk-9.0.101-linux-musl-x64.tar.gz"; + hash = "sha512-P04U+3tS37V7HjHLWXPm4KM49/Aw8SswgtO1XxL5WH3fSSanxfz4a3ZxOX5E+OXCD7lJ1w6afdDcJ75zpUjf/A=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/4569c514-16ac-49fc-ac41-4416f547c249/851fb0aa9b2a8bdcb0d1d9f9493a952e/dotnet-sdk-9.0.100-osx-arm64.tar.gz"; - hash = "sha512-lN+kllIZWohPBtBs6yPvb31zgP4MQBW5bo+VC1epVYcR+6YRKHEPnI3gCB3ZGvSKkPe9D4uQA4rrWusk+2ck/w=="; + url = "https://download.visualstudio.microsoft.com/download/pr/6707b71c-f95b-46b9-a4f8-067922291242/93d5be41bfa39461c47bae856a8ad93c/dotnet-sdk-9.0.101-osx-arm64.tar.gz"; + hash = "sha512-xmCO0oDlp2xGzo+bBrjHAUx721SpeVxFhd644FfbTVJAN+ToL5yvMkRO7eQnyctf27ciUI84nviahk8LuuR2ag=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/cab5bf72-f0c7-46c7-a8f2-074f71e4b6ca/a14ec2fc3b6fd32d47b4293994ab3c61/dotnet-sdk-9.0.100-osx-x64.tar.gz"; - hash = "sha512-We8yAol5arvcVzA20NG0qhkZyDFAt6NjF0q9aL5cwCUnQVRqIdRsIBWGMx9fkhF4e9GbU4G5AvO9fCJiIDRK6Q=="; + url = "https://download.visualstudio.microsoft.com/download/pr/330381bd-72dc-47ba-b5fb-884bd8b0bb44/8f1eef9415fc29a806fbf80a54e28c0e/dotnet-sdk-9.0.101-osx-x64.tar.gz"; + hash = "sha512-DBPjCBNI3SvPLgxrhLw3X4BlUPbDibH8phdnrWuQBDAK9yct4Zk1jzKv7ylVE7pexD9fhhTRJDe7iEvo7KTeAQ=="; }; }; inherit commonPackages hostPackages targetPackages; From 4b11103f9da89d4dfb2371eaa68256fdffcd57ab Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 5 Dec 2024 13:16:56 -0500 Subject: [PATCH 0760/1054] python312Packages.azure-mgmt-logic: remove msrestazure dependency --- pkgs/development/python-modules/azure-mgmt-logic/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-logic/default.nix b/pkgs/development/python-modules/azure-mgmt-logic/default.nix index c3e74008da92..326de9b191d5 100644 --- a/pkgs/development/python-modules/azure-mgmt-logic/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-logic/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, msrest, - msrestazure, azure-common, azure-mgmt-core, pythonOlder, @@ -24,7 +23,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ msrest - msrestazure azure-common azure-mgmt-core ]; From 11cbbfdd0844086bdc0f6710782123aabfac84a9 Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 5 Dec 2024 13:17:59 -0500 Subject: [PATCH 0761/1054] python312Packages.azure-mgmt-logic: modernize --- .../azure-mgmt-logic/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-logic/default.nix b/pkgs/development/python-modules/azure-mgmt-logic/default.nix index 326de9b191d5..93978474cb93 100644 --- a/pkgs/development/python-modules/azure-mgmt-logic/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-logic/default.nix @@ -5,15 +5,13 @@ msrest, azure-common, azure-mgmt-core, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-logic"; version = "10.0.0"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -21,7 +19,9 @@ buildPythonPackage rec { hash = "sha256-s/pIZPFKqnr0HXeNkl8FHtKbYBb0Y0R2Xs0PSdDwTdY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest azure-common azure-mgmt-core @@ -30,12 +30,14 @@ buildPythonPackage rec { # Module has no tests doCheck = false; + pythonNamespaces = [ "azure.mgmt" ]; + pythonImportsCheck = [ "azure.mgmt.logic" ]; - meta = with lib; { + meta = { description = "This is the Microsoft Azure Logic Apps Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - license = licenses.mit; - maintainers = with maintainers; [ maxwilson ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ maxwilson ]; }; } From 17ddfd8ca1090321149a6d857110fd8eee856569 Mon Sep 17 00:00:00 2001 From: Sander Date: Thu, 5 Dec 2024 20:01:11 +0400 Subject: [PATCH 0762/1054] opentelemetry-collector-contrib: fix darwin build --- pkgs/tools/misc/opentelemetry-collector/releases.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/releases.nix b/pkgs/tools/misc/opentelemetry-collector/releases.nix index 508fe54693ed..3f816f2ebd05 100644 --- a/pkgs/tools/misc/opentelemetry-collector/releases.nix +++ b/pkgs/tools/misc/opentelemetry-collector/releases.nix @@ -81,6 +81,7 @@ let name, sourceHash, vendorHash, + proxyVendor ? false, }: let package = buildGoModule { @@ -92,7 +93,7 @@ let hash = sourceHash; }; - inherit vendorHash; + inherit proxyVendor vendorHash; nativeBuildInputs = [ installShellFiles ]; @@ -155,7 +156,8 @@ lib.recurseIntoAttrs { otelcol-contrib = mkDistribution { name = "otelcol-contrib"; sourceHash = "sha256-1TIzfR9F6iwSwoDc08SdOWYH378Y3qjwOcQ4IDbHTWE="; - vendorHash = "sha256-KObLO3bXqGL1WSTKbJjg+hYJ9sYU4rn9gC/o38U1XJI="; + vendorHash = "sha256-AmSn2M+HkOpZ0ev6Gjb+gaeE+h70W/RtXKMqaModJPs="; + proxyVendor = true; # hash mismatch between linux and darwin }; otelcol-k8s = mkDistribution { From 2cc3ff02022b89a6c2bc2394c2cb45e70a602658 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Dec 2024 19:28:18 +0100 Subject: [PATCH 0763/1054] linux_6_12: 6.12.1 -> 6.12.2 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 735218caa3f1..5880ab2b471b 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,7 +28,7 @@ "hash": "sha256:0xzynjyyr16my0wrla4ggpjbh4g7nsqixaimz5hrsqlhaa8q9hab" }, "6.12": { - "version": "6.12.1", - "hash": "sha256:06f6y37fi7galj001wwrq5pz3vhdl9nryydf3f4yqwnkdpcb34q1" + "version": "6.12.2", + "hash": "sha256:12rx83ryh1i1n79h05zgx1mn60s9fc0p7gh560gpp1ryqw80f7mv" } } From 4f8728c893b698b0285c57037323f783824b1e25 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Dec 2024 19:28:36 +0100 Subject: [PATCH 0764/1054] linux_6_11: 6.11.10 -> 6.11.11 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5880ab2b471b..d29ae01c13e7 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:0d8q0vwv3lcix3wiq2n53rir3h298flg2l0ghpify4rlh2s4l1fi" }, "6.11": { - "version": "6.11.10", - "hash": "sha256:0xzynjyyr16my0wrla4ggpjbh4g7nsqixaimz5hrsqlhaa8q9hab" + "version": "6.11.11", + "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532" }, "6.12": { "version": "6.12.2", From d238584a09dc791a2b44f7a58ddbc8fd05752706 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 5 Dec 2024 14:30:37 -0400 Subject: [PATCH 0765/1054] dotnet/update.nix: remove stray debug print --- pkgs/development/compilers/dotnet/update.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix index 4fa837a4a274..5a44b1d9133f 100644 --- a/pkgs/development/compilers/dotnet/update.nix +++ b/pkgs/development/compilers/dotnet/update.nix @@ -93,9 +93,6 @@ writeScript "update-dotnet-vmr.sh" '' tmp="$(mktemp -d)" trap 'rm -rf "$tmp"' EXIT - echo ${lib.escapeShellArg (toString ./update.sh)} \ - -o ${lib.escapeShellArg (toString bootstrapSdkFile)} --sdk foo - cd "$tmp" curl -fsSL "$releaseUrl" -o release.json From 76f17a419ac0cd4e4cbaa25d0cd3fb4db35c2ebb Mon Sep 17 00:00:00 2001 From: Kiskae Date: Thu, 5 Dec 2024 19:42:54 +0100 Subject: [PATCH 0766/1054] linuxPackages.nvidiaPackages.vulkan_beta: 550.40.80 -> 550.40.81 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index dec82cb65dfa..e0c6e3a6da82 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -79,11 +79,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "550.40.80"; + version = "550.40.81"; persistencedVersion = "550.54.14"; settingsVersion = "550.54.14"; - sha256_64bit = "sha256-fuI9G9KHCCddtPNDz+8FAkporSB7G97UU/pw4KGGZOE="; - openSha256 = "sha256-+soDdbklk8wr/G5cj4BzZ8ql0zeHSswJ2OkOv59uMp0="; + sha256_64bit = "sha256-GfufNJ3jJKPyZhbRRPbRAjENRhJWNaZ1lJF7Z6x0h4c="; + openSha256 = "sha256-TOQN89yB29g9mka4CiRLSyvNVGP6hpkHWui2aFQPzLU="; settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4="; persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; From 50635d4aa3c99b09375c43493d03d3cd7e206904 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 20:01:34 +0100 Subject: [PATCH 0767/1054] metasploit: 6.4.37 -> 6.4.39 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 6 +- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 90 +-------------------- 4 files changed, 9 insertions(+), 93 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index cd49ec98ea5c..1454b77ec1fe 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.37" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.39" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index d0ec8f891fcd..d961f0bd5003 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: c58328ce3f0a86d24580e76961476ad37b8d6de9 - ref: refs/tags/6.4.37 + revision: b815ef9870c45e2f9d2e62475e1780ddb9bfb1d0 + ref: refs/tags/6.4.39 specs: - metasploit-framework (6.4.37) + metasploit-framework (6.4.39) aarch64 abbrev actionpack (~> 7.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index f8aaaadb9af8..0bd37f3be97c 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "metasploit-framework"; - version = "6.4.37"; + version = "6.4.39"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-/c0F/5bbuQYkNB2tzjK2NGoTr3OD4fAUUEjiJVybKFM="; + hash = "sha256-Zg6ui9B+l7tVVrv+gMpFL/xWuvdOc0Gf29s1ZvP2EYM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index f3406eb03ba8..77dacba2fca8 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -1,6 +1,5 @@ { aarch64 = { - dependencies = ["racc"]; groups = ["default"]; platforms = []; source = { @@ -21,7 +20,6 @@ version = "0.1.2"; }; actionpack = { - dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; groups = ["default"]; platforms = []; source = { @@ -32,7 +30,6 @@ version = "7.0.8.6"; }; actionview = { - dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; groups = ["default"]; platforms = []; source = { @@ -43,7 +40,6 @@ version = "7.0.8.6"; }; activemodel = { - dependencies = ["activesupport"]; groups = ["default"]; platforms = []; source = { @@ -54,7 +50,6 @@ version = "7.0.8.6"; }; activerecord = { - dependencies = ["activemodel" "activesupport"]; groups = ["default"]; platforms = []; source = { @@ -65,7 +60,6 @@ version = "7.0.8.6"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default"]; platforms = []; source = { @@ -76,7 +70,6 @@ version = "7.0.8.6"; }; addressable = { - dependencies = ["public_suffix"]; groups = ["default"]; platforms = []; source = { @@ -97,7 +90,6 @@ version = "0.2.2"; }; arel-helpers = { - dependencies = ["activerecord"]; groups = ["default"]; platforms = []; source = { @@ -138,7 +130,6 @@ version = "1.999.0"; }; aws-sdk-core = { - dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; groups = ["default"]; platforms = []; source = { @@ -149,7 +140,6 @@ version = "3.211.0"; }; aws-sdk-ec2 = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { @@ -160,7 +150,6 @@ version = "1.486.0"; }; aws-sdk-ec2instanceconnect = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { @@ -171,7 +160,6 @@ version = "1.52.0"; }; aws-sdk-iam = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { @@ -182,7 +170,6 @@ version = "1.112.0"; }; aws-sdk-kms = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { @@ -193,7 +180,6 @@ version = "1.95.0"; }; aws-sdk-s3 = { - dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { @@ -204,7 +190,6 @@ version = "1.169.0"; }; aws-sdk-ssm = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { @@ -215,7 +200,6 @@ version = "1.183.0"; }; aws-sigv4 = { - dependencies = ["aws-eventstream"]; groups = ["default"]; platforms = []; source = { @@ -276,7 +260,6 @@ version = "2.4.15"; }; bootsnap = { - dependencies = ["msgpack"]; groups = ["default"]; platforms = []; source = { @@ -377,7 +360,6 @@ version = "3.3.4"; }; dnsruby = { - dependencies = ["simpleidn"]; groups = ["default"]; platforms = []; source = { @@ -418,7 +400,6 @@ version = "1.3.0"; }; elftools = { - dependencies = ["bindata"]; groups = ["default"]; platforms = []; source = { @@ -429,7 +410,6 @@ version = "1.3.1"; }; em-http-request = { - dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"]; groups = ["default"]; platforms = []; source = { @@ -440,7 +420,6 @@ version = "1.1.7"; }; em-socksify = { - dependencies = ["base64" "eventmachine"]; groups = ["default"]; platforms = []; source = { @@ -471,7 +450,6 @@ version = "1.2.7"; }; faker = { - dependencies = ["i18n"]; groups = ["default"]; platforms = []; source = { @@ -482,7 +460,6 @@ version = "3.5.1"; }; faraday = { - dependencies = ["base64" "faraday-net_http" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { @@ -503,7 +480,6 @@ version = "3.0.2"; }; faraday-retry = { - dependencies = ["faraday"]; groups = ["default"]; platforms = []; source = { @@ -514,7 +490,6 @@ version = "2.2.1"; }; faye-websocket = { - dependencies = ["eventmachine" "websocket-driver"]; groups = ["default"]; platforms = []; source = { @@ -555,7 +530,6 @@ version = "0.2.1"; }; gssapi = { - dependencies = ["ffi"]; groups = ["default"]; platforms = []; source = { @@ -566,7 +540,6 @@ version = "1.3.1"; }; gyoku = { - dependencies = ["builder" "rexml"]; groups = ["default"]; platforms = []; source = { @@ -597,7 +570,6 @@ version = "0.4.2"; }; hrr_rb_ssh-ed25519 = { - dependencies = ["ed25519" "hrr_rb_ssh"]; groups = ["default"]; platforms = []; source = { @@ -608,7 +580,6 @@ version = "0.4.2"; }; http-cookie = { - dependencies = ["domain_name"]; groups = ["default"]; platforms = []; source = { @@ -639,7 +610,6 @@ version = "2.8.3"; }; i18n = { - dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { @@ -660,7 +630,6 @@ version = "0.7.2"; }; irb = { - dependencies = ["reline"]; groups = ["default"]; platforms = []; source = { @@ -681,7 +650,6 @@ version = "1.6.2"; }; jsobfu = { - dependencies = ["rkelly-remix"]; groups = ["default"]; platforms = []; source = { @@ -712,7 +680,6 @@ version = "1.1.4"; }; logging = { - dependencies = ["little-plugger" "multi_json"]; groups = ["default"]; platforms = []; source = { @@ -723,7 +690,6 @@ version = "2.4.0"; }; loofah = { - dependencies = ["crass" "nokogiri"]; groups = ["default"]; platforms = []; source = { @@ -744,7 +710,6 @@ version = "1.0.5"; }; metasploit-concern = { - dependencies = ["activemodel" "activesupport" "railties" "zeitwerk"]; groups = ["default"]; platforms = []; source = { @@ -755,7 +720,6 @@ version = "5.0.3"; }; metasploit-credential = { - dependencies = ["metasploit-concern" "metasploit-model" "metasploit_data_models" "net-ssh" "pg" "railties" "rex-socket" "rubyntlm" "rubyzip"]; groups = ["default"]; platforms = []; source = { @@ -766,20 +730,18 @@ version = "6.0.11"; }; metasploit-framework = { - dependencies = ["aarch64" "abbrev" "actionpack" "activerecord" "activesupport" "aws-sdk-ec2" "aws-sdk-ec2instanceconnect" "aws-sdk-iam" "aws-sdk-s3" "aws-sdk-ssm" "base64" "bcrypt" "bcrypt_pbkdf" "bigdecimal" "bootsnap" "bson" "chunky_png" "csv" "dnsruby" "drb" "ed25519" "elftools" "em-http-request" "eventmachine" "faker" "faraday" "faraday-retry" "faye-websocket" "ffi" "filesize" "getoptlong" "hrr_rb_ssh-ed25519" "http-cookie" "irb" "jsobfu" "json" "metasm" "metasploit-concern" "metasploit-credential" "metasploit-model" "metasploit-payloads" "metasploit_data_models" "metasploit_payloads-mettle" "mqtt" "msgpack" "mutex_m" "nessus_rest" "net-imap" "net-ldap" "net-sftp" "net-smtp" "net-ssh" "network_interface" "nexpose" "nokogiri" "octokit" "openssl-ccm" "openvas-omp" "packetfu" "patch_finder" "pcaprub" "pdf-reader" "pg" "puma" "railties" "rasn1" "rb-readline" "recog" "redcarpet" "reline" "rex-arch" "rex-bin_tools" "rex-core" "rex-encoder" "rex-exploitation" "rex-java" "rex-mime" "rex-nop" "rex-ole" "rex-powershell" "rex-random_identifier" "rex-registry" "rex-rop_builder" "rex-socket" "rex-sslscan" "rex-struct2" "rex-text" "rex-zip" "ruby-macho" "ruby-mysql" "ruby_smb" "rubyntlm" "rubyzip" "sinatra" "sqlite3" "sshkey" "swagger-blocks" "thin" "tzinfo" "tzinfo-data" "unix-crypt" "warden" "win32api" "windows_error" "winrm" "xdr" "xmlrpc" "zeitwerk"]; groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "c58328ce3f0a86d24580e76961476ad37b8d6de9"; - sha256 = "0lr8kdf2bqj8a0ag1qc3ffpi6silnqrcxb8x6hj0dffvjvzhbkgx"; + rev = "b815ef9870c45e2f9d2e62475e1780ddb9bfb1d0"; + sha256 = "10qiyvrncdfvvfgl2wsfyyx5dz1g8p581zmvaravp5vys25sw3k6"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.37"; + version = "6.4.39"; }; metasploit-model = { - dependencies = ["activemodel" "activesupport" "railties"]; groups = ["default"]; platforms = []; source = { @@ -800,7 +762,6 @@ version = "2.0.187"; }; metasploit_data_models = { - dependencies = ["activerecord" "activesupport" "arel-helpers" "metasploit-concern" "metasploit-model" "pg" "railties" "recog" "webrick"]; groups = ["default"]; platforms = []; source = { @@ -881,7 +842,6 @@ version = "1.15.0"; }; mustermann = { - dependencies = ["ruby2_keywords"]; groups = ["default"]; platforms = []; source = { @@ -912,7 +872,6 @@ version = "0.1.6"; }; net-imap = { - dependencies = ["date" "net-protocol"]; groups = ["default"]; platforms = []; source = { @@ -933,7 +892,6 @@ version = "0.19.0"; }; net-protocol = { - dependencies = ["timeout"]; groups = ["default"]; platforms = []; source = { @@ -944,7 +902,6 @@ version = "0.2.2"; }; net-sftp = { - dependencies = ["net-ssh"]; groups = ["default"]; platforms = []; source = { @@ -955,7 +912,6 @@ version = "4.0.0"; }; net-smtp = { - dependencies = ["net-protocol"]; groups = ["default"]; platforms = []; source = { @@ -1017,7 +973,6 @@ version = "1.16.7"; }; nori = { - dependencies = ["bigdecimal"]; groups = ["default"]; platforms = []; source = { @@ -1028,7 +983,6 @@ version = "2.7.1"; }; octokit = { - dependencies = ["faraday" "sawyer"]; groups = ["default"]; platforms = []; source = { @@ -1069,7 +1023,6 @@ version = "0.0.4"; }; packetfu = { - dependencies = ["pcaprub"]; groups = ["default"]; platforms = []; source = { @@ -1100,7 +1053,6 @@ version = "0.13.3"; }; pdf-reader = { - dependencies = ["Ascii85" "afm" "hashery" "ruby-rc4" "ttfunk"]; groups = ["default"]; platforms = []; source = { @@ -1131,7 +1083,6 @@ version = "6.0.1"; }; puma = { - dependencies = ["nio4r"]; groups = ["default"]; platforms = []; source = { @@ -1162,7 +1113,6 @@ version = "2.2.10"; }; rack-protection = { - dependencies = ["base64" "rack"]; groups = ["default"]; platforms = []; source = { @@ -1173,7 +1123,6 @@ version = "3.2.0"; }; rack-test = { - dependencies = ["rack"]; groups = ["default"]; platforms = []; source = { @@ -1184,7 +1133,6 @@ version = "2.1.0"; }; rails-dom-testing = { - dependencies = ["activesupport" "minitest" "nokogiri"]; groups = ["default"]; platforms = []; source = { @@ -1195,7 +1143,6 @@ version = "2.2.0"; }; rails-html-sanitizer = { - dependencies = ["loofah" "nokogiri"]; groups = ["default"]; platforms = []; source = { @@ -1206,7 +1153,6 @@ version = "1.6.0"; }; railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; groups = ["default"]; platforms = []; source = { @@ -1227,7 +1173,6 @@ version = "13.2.1"; }; rasn1 = { - dependencies = ["strptime"]; groups = ["default"]; platforms = []; source = { @@ -1248,7 +1193,6 @@ version = "0.5.5"; }; recog = { - dependencies = ["nokogiri"]; groups = ["default"]; platforms = []; source = { @@ -1269,7 +1213,6 @@ version = "3.6.0"; }; reline = { - dependencies = ["io-console"]; groups = ["default"]; platforms = []; source = { @@ -1280,7 +1223,6 @@ version = "0.5.10"; }; rex-arch = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1291,7 +1233,6 @@ version = "0.1.16"; }; rex-bin_tools = { - dependencies = ["metasm" "rex-arch" "rex-core" "rex-struct2" "rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1312,7 +1253,6 @@ version = "0.1.32"; }; rex-encoder = { - dependencies = ["metasm" "rex-arch" "rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1323,7 +1263,6 @@ version = "0.1.7"; }; rex-exploitation = { - dependencies = ["jsobfu" "metasm" "rex-arch" "rex-encoder" "rex-text" "rexml"]; groups = ["default"]; platforms = []; source = { @@ -1344,7 +1283,6 @@ version = "0.1.7"; }; rex-mime = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1355,7 +1293,6 @@ version = "0.1.8"; }; rex-nop = { - dependencies = ["rex-arch"]; groups = ["default"]; platforms = []; source = { @@ -1366,7 +1303,6 @@ version = "0.1.3"; }; rex-ole = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1377,7 +1313,6 @@ version = "0.1.8"; }; rex-powershell = { - dependencies = ["rex-random_identifier" "rex-text" "ruby-rc4"]; groups = ["default"]; platforms = []; source = { @@ -1388,7 +1323,6 @@ version = "0.1.100"; }; rex-random_identifier = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1409,7 +1343,6 @@ version = "0.1.5"; }; rex-rop_builder = { - dependencies = ["metasm" "rex-core" "rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1420,7 +1353,6 @@ version = "0.1.5"; }; rex-socket = { - dependencies = ["rex-core"]; groups = ["default"]; platforms = []; source = { @@ -1431,7 +1363,6 @@ version = "0.1.57"; }; rex-sslscan = { - dependencies = ["rex-core" "rex-socket" "rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1462,7 +1393,6 @@ version = "0.2.59"; }; rex-zip = { - dependencies = ["rex-text"]; groups = ["default"]; platforms = []; source = { @@ -1533,7 +1463,6 @@ version = "0.0.5"; }; ruby_smb = { - dependencies = ["bindata" "openssl-ccm" "openssl-cmac" "rubyntlm" "windows_error"]; groups = ["default"]; platforms = []; source = { @@ -1544,7 +1473,6 @@ version = "3.3.11"; }; rubyntlm = { - dependencies = ["base64"]; groups = ["default"]; platforms = []; source = { @@ -1565,7 +1493,6 @@ version = "2.3.2"; }; sawyer = { - dependencies = ["addressable" "faraday"]; groups = ["default"]; platforms = []; source = { @@ -1586,7 +1513,6 @@ version = "0.2.3"; }; sinatra = { - dependencies = ["mustermann" "rack" "rack-protection" "tilt"]; groups = ["default"]; platforms = []; source = { @@ -1597,7 +1523,6 @@ version = "3.2.0"; }; sqlite3 = { - dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { @@ -1638,7 +1563,6 @@ version = "3.0.0"; }; thin = { - dependencies = ["daemons" "eventmachine" "rack"]; groups = ["default"]; platforms = []; source = { @@ -1679,7 +1603,6 @@ version = "0.4.1"; }; ttfunk = { - dependencies = ["bigdecimal"]; groups = ["default"]; platforms = []; source = { @@ -1690,7 +1613,6 @@ version = "1.8.0"; }; tzinfo = { - dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { @@ -1701,7 +1623,6 @@ version = "2.0.6"; }; tzinfo-data = { - dependencies = ["tzinfo"]; groups = ["default"]; platforms = []; source = { @@ -1722,7 +1643,6 @@ version = "1.3.1"; }; warden = { - dependencies = ["rack"]; groups = ["default"]; platforms = []; source = { @@ -1743,7 +1663,6 @@ version = "1.8.2"; }; websocket-driver = { - dependencies = ["websocket-extensions"]; groups = ["default"]; platforms = []; source = { @@ -1784,7 +1703,6 @@ version = "0.1.5"; }; winrm = { - dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rexml" "rubyntlm"]; groups = ["default"]; platforms = []; source = { @@ -1795,7 +1713,6 @@ version = "2.3.9"; }; xdr = { - dependencies = ["activemodel" "activesupport"]; groups = ["default"]; platforms = []; source = { @@ -1806,7 +1723,6 @@ version = "3.0.3"; }; xmlrpc = { - dependencies = ["webrick"]; groups = ["default"]; platforms = []; source = { From 915a9de5b3ab337133e890f21f44deb44598c814 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Thu, 5 Dec 2024 19:38:17 +0100 Subject: [PATCH 0768/1054] linuxPackages.nvidiaPackages.latest: 560.35.03 -> 565.77 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index dec82cb65dfa..e944fabcae46 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -23,12 +23,6 @@ let hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg="; }; - # Fixes framebuffer with linux 6.11 - fbdev_linux_611_patch = fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/NVIDIA/open-gpu-kernel-modules/pull/692.patch"; - hash = "sha256-OYw8TsHDpBE5DBzdZCBT45+AiznzO9SfECz5/uXN5Uc="; - }; - # Fixes drm device not working with linux 6.12 # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/712 drm_fop_flags_linux_612_patch = fetchpatch { @@ -55,15 +49,12 @@ rec { }; latest = selectHighestVersion production (generic { - version = "560.35.03"; - sha256_64bit = "sha256-8pMskvrdQ8WyNBvkU/xPc/CtcYXCa7ekP73oGuKfH+M="; - sha256_aarch64 = "sha256-s8ZAVKvRNXpjxRYqM3E5oss5FdqW+tv1qQC2pDjfG+s="; - openSha256 = "sha256-/32Zf0dKrofTmPZ3Ratw4vDM7B+OgpC4p7s+RHUjCrg="; - settingsSha256 = "sha256-kQsvDgnxis9ANFmwIwB7HX5MkIAcpEEAHc8IBOLdXvk="; - persistencedSha256 = "sha256-E2J2wYYyRu7Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs="; - patchesOpen = [ fbdev_linux_611_patch ]; - - broken = kernel.kernelAtLeast "6.12"; + version = "565.77"; + sha256_64bit = "sha256-CnqnQsRrzzTXZpgkAtF7PbH9s7wbiTRNcM0SPByzFHw="; + sha256_aarch64 = "sha256-LSAYUnhfnK3rcuPe1dixOwAujSof19kNOfdRHE7bToE="; + openSha256 = "sha256-Fxo0t61KQDs71YA8u7arY+503wkAc1foaa51vi2Pl5I="; + settingsSha256 = "sha256-VUetj3LlOSz/LB+DDfMCN34uA4bNTTpjDrb6C6Iwukk="; + persistencedSha256 = "sha256-wnDjC099D8d9NJSp9D0CbsL+vfHXyJFYYgU3CwcqKww="; }); beta = selectHighestVersion latest (generic { From 2585e41503d419fddba5dc719a59e3d47cf18ae2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 20:10:16 +0100 Subject: [PATCH 0769/1054] prowler: 4.6.1 -> 5.0.0 Diff: https://github.com/prowler-cloud/prowler/compare/refs/tags/4.6.1...5.0.0 Changelog: https://github.com/prowler-cloud/prowler/releases/tag/5.0.0 --- pkgs/by-name/pr/prowler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 567298b1b34f..68372a983a35 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "prowler"; - version = "4.6.1"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "prowler-cloud"; repo = "prowler"; rev = "refs/tags/${version}"; - hash = "sha256-lEoUZQh5wnfX6J5ZbpCM+ZwJyyw/Ex6LNTTT9ZXw2Z4="; + hash = "sha256-RrVmM9j+eApmTT3ufatpQ1CeQT7bart/ESs75THU574="; }; pythonRelaxDeps = true; From 4346b82dc7a62271874b989ec1473b3e4fceddc8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 20:13:49 +0100 Subject: [PATCH 0770/1054] python312Packages.mypy-boto3-kendra: 1.35.0 -> 1.35.75 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 5fca22eca00b..155bf81dc587 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -718,8 +718,8 @@ rec { "sha256-xHARaL3zzxY6jy5VyQIrZLXqwvfprktif4pcSk+7xzY="; mypy-boto3-kendra = - buildMypyBoto3Package "kendra" "1.35.0" - "sha256-fnpRggcnA4mhk1vU7I0x+nn6wvx9PQ5Gi/WckSgfZ7c="; + buildMypyBoto3Package "kendra" "1.35.75" + "sha256-yLSTXvjrML3i/z2aJUj7feOaZlR+Yy5po0iBQ1pqc7M="; mypy-boto3-kendra-ranking = buildMypyBoto3Package "kendra-ranking" "1.35.0" From 497d9e140d807658b3d190f0ab74c44ea248b5aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 20:14:25 +0100 Subject: [PATCH 0771/1054] python312Packages.mypy-boto3-sagemaker: 1.35.68 -> 1.35.75 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 155bf81dc587..e2b1c53c9607 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1174,8 +1174,8 @@ rec { "sha256-P2Yg3qvcdAcjY+uwPg2DpTgT6ZXb1XYCOeu4bVfgFKI="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.35.68" - "sha256-SjKW9Gc6TOStmB6AexAOI3VuBqBiN0me3/+nbp92cv0="; + buildMypyBoto3Package "sagemaker" "1.35.75" + "sha256-FFTK2PvJJaM8eceQZ3ndYWungIAb4CoWp8ue32+nQPs="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.0" From d0316395c33e33dcfbdb2725378c7369f32fced4 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Thu, 5 Dec 2024 19:18:53 +0000 Subject: [PATCH 0772/1054] oh-my-posh: 23.20.3 -> 24.11.4 --- pkgs/by-name/oh/oh-my-posh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index 4c3f0a905e62..d397ebf3cc24 100644 --- a/pkgs/by-name/oh/oh-my-posh/package.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "23.20.3"; + version = "24.11.4"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-quncE2OfSQUnLOEKsqKGBeONCI67CNRB/egqyf7o+4U="; + hash = "sha256-hb5XgwBg9llX/PDX8A8hL5fJbG03nTjrvEd252k2Il0="; }; - vendorHash = "sha256-VgSQMY2JyGZ50T4PCdKQNnwnP6hknnxP2AJ15A9aHig="; + vendorHash = "sha256-bOjIwBPxu/BfRaAcZTXf4xCGvVXnumb2++JZTx7ZG1s="; sourceRoot = "${src.name}/src"; From a8fd645b081993fc61264d7ba48cad748cfa39df Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 6 Dec 2024 03:08:11 +0900 Subject: [PATCH 0773/1054] komac: add shell completions The feature was introduced in version v2.4.0 - https://github.com/russellbanks/Komac/releases/tag/v2.4.0 - https://github.com/russellbanks/Komac/commit/3fb35719526c6fe22ace24f56aa261ac4a7f6626 To enable cross compilation, we have to skip generating these in some cases. https://github.com/NixOS/nixpkgs/blob/e19e156796ad04a533f9bbaba27f13289783c137/doc/hooks/installShellFiles.section.md?plain=1#L87-L110 Co-authored-by: Sefa Eyeoglu --- pkgs/by-name/ko/komac/package.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 93f251abdf11..c008ebf9c1b1 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -10,6 +10,7 @@ komac, dbus, zstd, + installShellFiles, versionCheckHook, nix-update-script, }: @@ -30,7 +31,13 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-kb18phtY5rRNUw0ZaZu2tipAaOURSy+2duf/+cOj5Y8="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = + [ + pkg-config + ] + ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + installShellFiles + ]; buildInputs = [ @@ -53,6 +60,13 @@ rustPlatform.buildRustPackage { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/komac"; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd komac \ + --bash <($out/bin/komac complete bash) \ + --zsh <($out/bin/komac complete zsh) \ + --fish <($out/bin/komac complete fish) + ''; + passthru = { tests.version = testers.testVersion { inherit version; From 124b22467423cc1aa1f5b41c7e21c0a7785ba646 Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 5 Dec 2024 12:22:23 -0500 Subject: [PATCH 0774/1054] python312Packages.azure-mgmt-relay: remove unused dependencies --- .../development/python-modules/azure-mgmt-relay/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix index 0086fa381973..a01f57711e20 100644 --- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -3,10 +3,9 @@ buildPythonPackage, fetchPypi, setuptools, - msrestazure, azure-common, azure-mgmt-core, - azure-mgmt-nspkg, + msrest, }: buildPythonPackage rec { @@ -23,10 +22,9 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - msrestazure + msrest azure-common azure-mgmt-core - azure-mgmt-nspkg ]; preBuild = '' From f63243de45c1eb03fc752c5215715bba901dbedf Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 5 Dec 2024 12:23:16 -0500 Subject: [PATCH 0775/1054] python312Packages.azure-mgmt-relay: slightly modernize --- .../development/python-modules/azure-mgmt-relay/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix index a01f57711e20..30837b47b0d4 100644 --- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -37,10 +37,10 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "azure.mgmt.relay" ]; - meta = with lib; { + meta = { description = "This is the Microsoft Azure Relay Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - license = licenses.mit; - maintainers = with maintainers; [ maxwilson ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ maxwilson ]; }; } From a0b7a4ea1e295c76f723cf16ce56100fe131c02d Mon Sep 17 00:00:00 2001 From: Shaw Vrana Date: Thu, 5 Dec 2024 11:32:36 -0800 Subject: [PATCH 0776/1054] eksctl: 0.194.0 -> 0.197.0 --- pkgs/by-name/ek/eksctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 67bb8474b9f5..1bece593d6cf 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.194.0"; + version = "0.197.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-BjMM2xjDA9rteT1dFE1DENEzM5226GW+Zv2gtZNCzNo="; + hash = "sha256-JHhZFcjnURgt+HqRwy/0rZ2qrzpeX/WGeXJ0arhRDq8="; }; - vendorHash = "sha256-3BVy2e2cbxtWP7yP4UTXvtH1Hr/Vl06e6Dsr+FLhtZg="; + vendorHash = "sha256-f7+IlOcGJL5G52wPZz1oeHmR8LR8XZh6ASV1qi7hXi0="; doCheck = false; From 4cb91d62e0652c8f5db84949c686f2613dfa983c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 20:33:21 +0100 Subject: [PATCH 0777/1054] python312Packages.plugwise: 1.6.1 -> 1.6.2 Diff: https://github.com/plugwise/python-plugwise/compare/refs/tags/v1.6.1...v1.6.2 Changelog: https://github.com/plugwise/python-plugwise/releases/tag/v1.6.2 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index a3cc2d19f899..991f52e3d688 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-Hwi/ee8XuClN2FOY0qGwOsIR6F2Z5IVihBFiu5lT5t8="; + hash = "sha256-rVal/w7ZPKjdCXTeCy6NHDlrCaKDdmJkeusUdW0BRXI="; }; postPatch = '' From dd9608a5d82e72d260fed32e5da079e833d03c10 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 5 Dec 2024 15:19:07 -0400 Subject: [PATCH 0778/1054] dotnet/update.nix: use tag name to check for updates This stops it from missing SDK-only updates. --- pkgs/development/compilers/dotnet/update.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix index 5a44b1d9133f..2a91d1fcfddc 100644 --- a/pkgs/development/compilers/dotnet/update.nix +++ b/pkgs/development/compilers/dotnet/update.nix @@ -18,7 +18,7 @@ }: let - inherit (lib.importJSON releaseManifestFile) channel release; + inherit (lib.importJSON releaseManifestFile) channel tag; pkg = stdenvNoCC.mkDerivation { name = "update-dotnet-vmr-env"; @@ -96,9 +96,8 @@ writeScript "update-dotnet-vmr.sh" '' cd "$tmp" curl -fsSL "$releaseUrl" -o release.json - release=$(jq -r .release release.json) - if [[ -z $tag && "$release" == "${release}" ]]; then + if [[ -z $tag && "$tagName" == "${tag}" ]]; then >&2 echo "release is already $release" exit fi From 92b48d7717934fd45c3fc7de497da039d96c9325 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 20:38:38 +0100 Subject: [PATCH 0779/1054] python312Packages.twilio: 9.3.7 -> 9.3.8 Diff: https://github.com/twilio/twilio-python/compare/refs/tags/9.3.7...9.3.8 Changelog: https://github.com/twilio/twilio-python/blob/9.3.8/CHANGES.md --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index c8b6bdbd3dc4..02e77649f7de 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.3.7"; + version = "9.3.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-ncLefK29GVhjiXi0zSXjUbL23oxoUH7Pu4cFttK4WrY="; + hash = "sha256-r4uhtvvsbiwcTdiT8HQtKL2587cowwGLaL2FowOEXiw="; }; build-system = [ setuptools ]; From 5470d9663b6aac67c32265b2657ed2735f4bb03f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 20:38:45 +0100 Subject: [PATCH 0780/1054] python312Packages.slack-sdk: 3.33.4 -> 3.33.5 Diff: https://github.com/slackapi/python-slack-sdk/compare/refs/tags/v3.33.4...v3.33.5 Changelog: https://github.com/slackapi/python-slack-sdk/releases/tag/v3.33.5 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index b68f415276c9..82411d20626e 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.33.4"; + version = "3.33.5"; pyproject = true; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-WIUhkIFWbIcxjTjzZ2C3VNFhGftBmyYO3iaHpz6d+Sc="; + hash = "sha256-kpilxg/S9/U6lJW8FsMvcdGh+qqDH0Kr66sc+HsY2DM="; }; postPatch = '' From ddd75c825beaef3a9ace97109b31f28ff035bd0a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 20:39:58 +0100 Subject: [PATCH 0781/1054] python312Packages.aiohomeconnect: 0.6.2 -> 0.6.3 Diff: https://github.com/MartinHjelmare/aiohomeconnect/compare/refs/tags/v0.6.2...v0.6.3 Changelog: https://github.com/MartinHjelmare/aiohomeconnect/blob/refs/tags/v0.6.3/CHANGELOG.md --- pkgs/development/python-modules/aiohomeconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix index fe9776840111..889cfd2578b5 100644 --- a/pkgs/development/python-modules/aiohomeconnect/default.nix +++ b/pkgs/development/python-modules/aiohomeconnect/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aiohomeconnect"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiohomeconnect"; rev = "refs/tags/v${version}"; - hash = "sha256-GW3SNJKj42WXEeHM209waCQjqi0Hy0HhG3gs0Nw2rVI="; + hash = "sha256-svwYNo0pWyyCYn4NsTZcoCVSW7PHoNxcAN3Uth5zUWE="; }; pythonRelaxDeps = [ "httpx" ]; From 440ec8bb8146b8c6fce030fa5f6d2e1fd7c56295 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 20:45:23 +0100 Subject: [PATCH 0782/1054] python312Packages.check-manifest: 0.49 -> 0.50 Changelog: https://github.com/mgedmin/check-manifest/blob/0.50/CHANGES.rst --- .../python-modules/check-manifest/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index a14a4ecd8ba1..f06bbda41389 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -3,7 +3,7 @@ breezy, build, buildPythonPackage, - fetchPypi, + fetchFromGitHub, git, pep517, pytestCheckHook, @@ -14,17 +14,21 @@ buildPythonPackage rec { pname = "check-manifest"; - version = "0.49"; - format = "setuptools"; + version = "0.50"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ZKZARFVCzyJpGWV8e3jQLZwcpbHCXX5m4OH/MlBg9BY="; + src = fetchFromGitHub { + owner = "mgedmin"; + repo = "check-manifest"; + rev = "refs/tags/${version}"; + hash = "sha256-wZ0mx2b3QkwTOPMLQ03SFVwnbsVO5RezOSX50ZOYvw8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ build pep517 setuptools @@ -46,10 +50,10 @@ buildPythonPackage rec { meta = with lib; { description = "Check MANIFEST.in in a Python source package for completeness"; - mainProgram = "check-manifest"; homepage = "https://github.com/mgedmin/check-manifest"; changelog = "https://github.com/mgedmin/check-manifest/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ lewo ]; + mainProgram = "check-manifest"; }; } From 20f7926344fafd91fd027d8013d796d71c99738f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 5 Dec 2024 14:48:25 -0500 Subject: [PATCH 0783/1054] python312Packages.sip: 6.8.6 -> 6.9.0 --- pkgs/development/python-modules/sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 8fd6240e4a51..c0a828ab39c8 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "sip"; - version = "6.8.6"; + version = "6.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-f8lZ5I5uxdWvi9Am9p9eJNCLPLirs0IXb1q4AwzAfXo="; + hash = "sha256-CT/Q4V2Zri+Kg91/fbqj/yUMWCp3644IRc2aytsfCTQ="; }; build-system = [ From 76c13cf2c2da276ae2f585c362c0e63b1618b8aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 20:49:03 +0100 Subject: [PATCH 0784/1054] crowdsec: 1.6.3 -> 1.6.4 Diff: https://github.com/crowdsecurity/crowdsec/compare/refs/tags/v1.6.3...v1.6.4 Changelog: https://github.com/crowdsecurity/crowdsec/releases/tag/v1.6.4 --- pkgs/by-name/cr/crowdsec/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix index 567caef0558e..5729969a9cd9 100644 --- a/pkgs/by-name/cr/crowdsec/package.nix +++ b/pkgs/by-name/cr/crowdsec/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "crowdsec"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JN2siYUUFPSz+SyQwkX6DZ9k82SGHEQ1QHBEIfEV4EM="; + hash = "sha256-U3YnLjsD+Kl/6HD+RPP0gWa4N96X5wkbdCmIrxas1I8="; }; - vendorHash = "sha256-fl5LkRz69QOq4aPyAhMFxw1FWozLzofDBUGvRptuyZY="; + vendorHash = "sha256-PtBVXPbLNdJyS8v8H9eRB6sTPaiseg18+eXToHvH7tw="; nativeBuildInputs = [ installShellFiles ]; From 188e988f72f4f847d9b1ad3da7b79c32623f789d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 20:50:34 +0100 Subject: [PATCH 0785/1054] sqlmap: 1.8.11 -> 1.8.12 Changelog: https://github.com/sqlmapproject/sqlmap/releases/tag/1.8.12 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 987f04dbdc9a..83282a797da1 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.8.11"; + version = "1.8.12"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-um1s5vqiaTRxTDIlyd4wbi/u239K5EtLFspc2QdPWOQ="; + hash = "sha256-dlu4EuRSIksXaQ0iZ1MKrXraNytIHZ/1DM5f+8ijNMo="; }; postPatch = '' From 716603a233d1739cc31826a1a2ccacfdd776795e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 5 Dec 2024 14:51:15 -0500 Subject: [PATCH 0786/1054] python312Packages.pyqt-builder: 1.16.4 -> 1.17.0 --- .../python-modules/pyqt-builder/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix index 867d0b58c04a..f00862f8804f 100644 --- a/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/pkgs/development/python-modules/pyqt-builder/default.nix @@ -6,27 +6,25 @@ setuptools, setuptools-scm, sip, - wheel, }: buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.16.4"; - format = "pyproject"; + version = "1.17.0"; + pyproject = true; src = fetchPypi { pname = "pyqt_builder"; inherit version; - hash = "sha256-RRXkGuN5vi5U+IqJ7PR81uTKxD6GLEq/3hg4nCZmr98="; + hash = "sha256-/ODpI0bSpCllJbetnwK3TqQl8mIQOQrg0+TKCMMc9Mw="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ packaging sip ]; From 62ef0ec30365d324d6a07ae7e488f936b60ca468 Mon Sep 17 00:00:00 2001 From: Trim21 Date: Fri, 6 Dec 2024 03:53:40 +0800 Subject: [PATCH 0787/1054] rtorrent: use vendored tinyxml2 for XMLRPC --- pkgs/by-name/rt/rtorrent/package.nix | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index 94da18d76891..3b58082dd422 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -14,31 +14,22 @@ ncurses, openssl, pkg-config, - xmlrpc_c, zlib, nixosTests, - gitUpdater, + unstableGitUpdater, }: stdenv.mkDerivation rec { pname = "rakshasa-rtorrent"; - version = "0.10.0"; + version = "0.10.0-unstable-2024-12-06"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "v${version}"; - hash = "sha256-G/30Enycpqg/pWC95CzT9LY99kN4tI+S8aSQhnQO+M8="; + rev = "5a200f5d8f8bc8ed28dfc948321451585f724b15"; + hash = "sha256-RLFOHJLpt7xkrEvYwEBWs5wQRThrK1N2olI64p2TPeA="; }; - patches = [ - # fix: use fsync for osx builds - (fetchpatch { - url = "https://github.com/rakshasa/rtorrent/commit/5ce84929e44fbe3f8d6cf142e3133f43afa4071f.patch"; - hash = "sha256-bFDxbpkTZ6nIUT2zMxKMgV94vWlVNzBbIbhx4Bpr8gw="; - }) - ]; - outputs = [ "out" "man" @@ -63,17 +54,16 @@ stdenv.mkDerivation rec { libtorrent ncurses openssl - xmlrpc_c zlib ]; configureFlags = [ - "--with-xmlrpc-c" + "--with-xmlrpc-tinyxml2" "--with-posix-fallocate" ]; passthru = { - updateScript = gitUpdater { rev-prefix = "v"; }; + updateScript = unstableGitUpdater { rev-prefix = "v"; }; tests = { inherit (nixosTests) rtorrent; }; From 8b5bc060a92e9f9012794d4291928e654da7e195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Chocholat=C3=BD?= Date: Thu, 5 Dec 2024 07:55:41 +0100 Subject: [PATCH 0788/1054] maintainers: Add adda --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6b44ace07984..de9fd3066a27 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -537,6 +537,13 @@ githubId = 749381; name = "Adam Tulinius"; }; + adda = { + email = "chocholaty.david@protonmail.com"; + matrix = "@adda0:matrix.org"; + github = "adda0"; + githubId = 52529234; + name = "David Chocholatý"; + }; addict3d = { email = "nickbathum@gmail.com"; matrix = "@nbathum:matrix.org"; From 9751944f85ec82d456d8a231ca0512e05d32b31a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Chocholat=C3=BD?= Date: Thu, 5 Dec 2024 07:55:20 +0100 Subject: [PATCH 0789/1054] flirt: init at 0.2 --- pkgs/by-name/fl/flirt/package.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/fl/flirt/package.nix diff --git a/pkgs/by-name/fl/flirt/package.nix b/pkgs/by-name/fl/flirt/package.nix new file mode 100644 index 000000000000..a01722b656a6 --- /dev/null +++ b/pkgs/by-name/fl/flirt/package.nix @@ -0,0 +1,29 @@ +{ + rustPlatform, + fetchFromSourcehut, + lib, +}: + +rustPlatform.buildRustPackage rec { + pname = "flirt"; + version = "0.2"; + + src = fetchFromSourcehut { + owner = "~hadronized"; + repo = "flirt"; + rev = "v${version}"; + hash = "sha256-NV6UP7fPTcn0WrZwIfe1zuZW6hJDuxrfATM2Gpx0yr0="; + }; + + cargoHash = "sha256-gVtRU+tjwf3rTei/TjUFYSMvLB9g6gNeGYO+9NBxgYQ="; + + meta = { + description = "FiLe InteRacT, the file interaction tool for your command line"; + homepage = "https://git.sr.ht/~hadronized/flirt"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + adda + ]; + mainProgram = "flirt"; + }; +} From 9b37d566f2019f3ad56adc2d49ed9e237d21e420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ry=C5=A1ka?= Date: Thu, 5 Dec 2024 21:10:11 +0100 Subject: [PATCH 0790/1054] nixos/asusd: correct suffix of asus/profile.conf to ron (#285904) --- nixos/modules/services/hardware/asusd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/asusd.nix b/nixos/modules/services/hardware/asusd.nix index 2dfe761a2172..9a3f47dae3e4 100644 --- a/nixos/modules/services/hardware/asusd.nix +++ b/nixos/modules/services/hardware/asusd.nix @@ -88,7 +88,7 @@ in "asusd/anime.ron" = maybeConfig "anime.ron" cfg.animeConfig; "asusd/asusd.ron" = maybeConfig "asusd.ron" cfg.asusdConfig; "asusd/aura.ron" = maybeConfig "aura.ron" cfg.auraConfig; - "asusd/profile.conf" = maybeConfig "profile.ron" cfg.profileConfig; + "asusd/profile.ron" = maybeConfig "profile.ron" cfg.profileConfig; "asusd/fan_curves.ron" = maybeConfig "fan_curves.ron" cfg.fanCurvesConfig; "asusd/asusd_user_ledmodes.ron" = maybeConfig "asusd_user_ledmodes.ron" cfg.userLedModesConfig; }; From 96af88adc81c7afd674617516dbab06845fc7981 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 20:12:41 +0000 Subject: [PATCH 0791/1054] lynx: 2.9.0dev.12 -> 2.9.2 --- pkgs/by-name/ly/lynx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ly/lynx/package.nix b/pkgs/by-name/ly/lynx/package.nix index 51bbb96cbab4..577dc4101475 100644 --- a/pkgs/by-name/ly/lynx/package.nix +++ b/pkgs/by-name/ly/lynx/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "lynx"; - version = "2.9.0dev.12"; + version = "2.9.2"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2" "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2" ]; - hash = "sha256-pkVbFZ0Ad22OwQUShcly3B8MVS0FcaDP8Coj7BRu6OU="; + hash = "sha256-c3S4mTbZkWaeEB9Ol/LJWSA24ejNqnuvwlmnerb7B84="; }; enableParallelBuilding = true; From 73e492d365dc00fa2c73301eee1a5405f15899cc Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 5 Dec 2024 16:16:08 -0400 Subject: [PATCH 0792/1054] dotnetCorePackages.dotnet_9.vmr: 9.0.0 -> 9.0.101 --- pkgs/development/compilers/dotnet/9/release-info.json | 2 +- pkgs/development/compilers/dotnet/9/release.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json index e86488b3151d..16f6e69ac23b 100644 --- a/pkgs/development/compilers/dotnet/9/release-info.json +++ b/pkgs/development/compilers/dotnet/9/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-reEPkJpoTCoFa4sOw6MOFXDOK4PEbF9iGkRk0Ccpr58=", + "tarballHash": "sha256-LhnsYVr+I+MY0Vu3y86rsAs8j7jNyo06SguY6uZkEcc=", "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-rc.2.24474.1.centos.9-x64.tar.gz", "artifactsHash": "sha256-Cxjdi7vISz2wMT22o4ZOEd9RdmKHI8PO/JgH1YJWsVo=" } diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json index fe1ac1e23910..09dbce37a9bf 100644 --- a/pkgs/development/compilers/dotnet/9/release.json +++ b/pkgs/development/compilers/dotnet/9/release.json @@ -1,10 +1,10 @@ { "release": "9.0.0", "channel": "9.0", - "tag": "v9.0.0", - "sdkVersion": "9.0.100", + "tag": "v9.0.101", + "sdkVersion": "9.0.101", "runtimeVersion": "9.0.0", "aspNetCoreVersion": "9.0.0", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "a2bc464e40415d625118f38fbb0556d1803783ff" + "sourceVersion": "f303476b533b0f90901c0a5e07a3bd2fb68777e3" } From 485abf95896f8dec3f3656d34c12e5f42ea43d0e Mon Sep 17 00:00:00 2001 From: Saeverix Date: Thu, 5 Dec 2024 18:59:21 +0100 Subject: [PATCH 0793/1054] resources: 1.6.0 -> 1.7.0 Diff: https://github.com/nokyan/resources/compare/refs/tags/v1.6.0...v1.7.0 Changelog: https://github.com/nokyan/resources/releases/tag/v1.7.0 --- pkgs/by-name/re/resources/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix index da4338e56e9b..080abee14620 100644 --- a/pkgs/by-name/re/resources/package.nix +++ b/pkgs/by-name/re/resources/package.nix @@ -20,19 +20,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "resources"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "nokyan"; repo = "resources"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-RYpPg9dEasHkXF2eHpeCze5j0FC1+9/J0e2lRw8AdKc="; + hash = "sha256-mnOpWVJTNGNdGd6fMIZl3AOF4NbtMm1XS8QFqfAF/18="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "resources-${finalAttrs.version}"; - hash = "sha256-zliLpmunlxRsWv9N8AswVoRqcNy5PuI5NzNjaXyTiGk="; + hash = "sha256-vIqtKJxKQ/mHFcB6IxfX27Lk2ID/W+M4hQnPB/aExa4="; }; nativeBuildInputs = [ From dd34a907fac047a44c67df35bfb62005599931f8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 22:07:19 +0100 Subject: [PATCH 0794/1054] urlscan: 1.0.3 -> 1.0.6 Diff: https://github.com/firecat53/urlscan/compare/refs/tags/1.0.3...1.0.6 Changelog: https://github.com/firecat53/urlscan/releases/tag/1.0.6 --- pkgs/by-name/ur/urlscan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ur/urlscan/package.nix b/pkgs/by-name/ur/urlscan/package.nix index d0e9e90db89f..8e5fc581b979 100644 --- a/pkgs/by-name/ur/urlscan/package.nix +++ b/pkgs/by-name/ur/urlscan/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "urlscan"; - version = "1.0.3"; + version = "1.0.6"; format = "pyproject"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-aAfsGsgCZwWcFkYaJsKjRroAZjW7b/vnX1oL/Mg0kgY="; + hash = "sha256-VbpKMaEjchfpLECCt1YtmiVynYgSLgAVP1iuHL7t8FQ="; }; nativeBuildInputs = with python3.pkgs; [ From 20ad8360fa78355fe82875060d1698678371125f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 21:08:35 +0000 Subject: [PATCH 0795/1054] codeberg-cli: 0.4.3 -> 0.4.6 --- pkgs/by-name/co/codeberg-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index ccf0d49d0cff..d3f6955c2cd2 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage rec { pname = "codeberg-cli"; - version = "0.4.3"; + version = "0.4.6"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Aviac"; repo = "codeberg-cli"; rev = "v${version}"; - hash = "sha256-95vjfjXKLXyg0d8FNAszBKwNVm9g8wRKzzHzxhTS8Bs="; + hash = "sha256-BkWI4FbacgFrbSLNSqe7vdzdLvrrgX1528qFaKCd5tY="; }; - cargoHash = "sha256-IQTT7YylByGJhFV6sLSDmVhFahkByY2S4+IE7cNxLjg="; + cargoHash = "sha256-eFS16QzPMLhoVb+hqt/p3ka58rwP5WTgHas2PZT5c/U="; nativeBuildInputs = [ pkg-config installShellFiles From 9a10296d87755e8fff8d32738d2edbb0a1e816b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 22:09:18 +0100 Subject: [PATCH 0796/1054] urlscan: refactor - format with nixfmt --- pkgs/by-name/ur/urlscan/package.nix | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ur/urlscan/package.nix b/pkgs/by-name/ur/urlscan/package.nix index 8e5fc581b979..67efc7ad64e0 100644 --- a/pkgs/by-name/ur/urlscan/package.nix +++ b/pkgs/by-name/ur/urlscan/package.nix @@ -1,35 +1,32 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "urlscan"; version = "1.0.6"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "firecat53"; - repo = pname; + repo = "urlscan"; rev = "refs/tags/${version}"; hash = "sha256-VbpKMaEjchfpLECCt1YtmiVynYgSLgAVP1iuHL7t8FQ="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ hatchling hatch-vcs ]; - propagatedBuildInputs = with python3.pkgs; [ - urwid - ]; + dependencies = with python3.pkgs; [ urwid ]; # No tests available doCheck = false; - pythonImportsCheck = [ - "urlscan" - ]; + pythonImportsCheck = [ "urlscan" ]; meta = with lib; { description = "Mutt and terminal url selector (similar to urlview)"; From 4b641f48a4c21e5cf0855ce3aadfc4edc61c173f Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 5 Dec 2024 16:48:40 -0500 Subject: [PATCH 0797/1054] nodePackages.webpack-dev-server: drop --- .../manual/release-notes/rl-2505.section.md | 2 + pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 354 ------------------ 4 files changed, 3 insertions(+), 355 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 0a36bf78d52d..d98e9aa36425 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -46,6 +46,8 @@ - `nodePackages.insect` has been removed, as it's deprecated by upstream. The suggested replacement is `numbat`. +- `nodePackages.webpack-dev-server` has been removed, as it should be installed in projects that use it instead. + - The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses. - `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel. diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index ce692ed02c9d..f212bd2347f6 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -215,6 +215,7 @@ mapAliases { vue-cli = throw "vue-cli has been removed since upstream no longer recommends using it; consider using create-vue and the new Vite-based tooling instead."; # added 2024-07-12 inherit (pkgs) web-ext; # added 2023-08-20 inherit (pkgs) webpack-cli; # added 2024-12-03 + webpack-dev-server = throw "webpack-dev-server has been removed. You should install it in your JS project instead."; # added 2024-12-05 inherit (pkgs) wrangler; # added 2024-07-01 inherit (pkgs) write-good; # added 2023-08-20 inherit (pkgs) yalc; # added 2024-06-29 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 9a4e51f2d803..58e35b8910ef 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -223,7 +223,6 @@ , "vscode-json-languageserver" , "wavedrom-cli" , "webpack" -, "webpack-dev-server" , "copy-webpack-plugin" , "webtorrent-cli" , "wring" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b8c463a6ec96..85f6be428f1b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -6466,33 +6466,6 @@ let sha512 = "14OGYM3DjEBjUOUaih+bwPgkhFnR8L9TSNSM0oE0L0hjWscTapvClqOgMDJ1ID52qkROCAgKl1d71Vmm4v0Buw=="; }; }; - "@jsonjoy.com/base64-1.1.2" = { - name = "_at_jsonjoy.com_slash_base64"; - packageName = "@jsonjoy.com/base64"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz"; - sha512 = "q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA=="; - }; - }; - "@jsonjoy.com/json-pack-1.1.0" = { - name = "_at_jsonjoy.com_slash_json-pack"; - packageName = "@jsonjoy.com/json-pack"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.0.tgz"; - sha512 = "zlQONA+msXPPwHWZMKFVS78ewFczIll5lXiVPwFPCZUsrOKdxc2AvxU1HoNBmMRhqDZUR9HkC3UOm+6pME6Xsg=="; - }; - }; - "@jsonjoy.com/util-1.3.0" = { - name = "_at_jsonjoy.com_slash_util"; - packageName = "@jsonjoy.com/util"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.3.0.tgz"; - sha512 = "Cebt4Vk7k1xHy87kHY7KSPLT77A7Ev7IfOblyLZhtYEhrdQ6fX4EoLq3xOQ3O/DRMEh2ok5nyC180E+ABS8Wmw=="; - }; - }; "@kamilkisiela/fast-url-parser-1.1.4" = { name = "_at_kamilkisiela_slash_fast-url-parser"; packageName = "@kamilkisiela/fast-url-parser"; @@ -82478,333 +82451,6 @@ in bypassCache = true; reconstructLock = true; }; - webpack-dev-server = nodeEnv.buildNodePackage { - name = "webpack-dev-server"; - packageName = "webpack-dev-server"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.1.0.tgz"; - sha512 = "aQpaN81X6tXie1FoOB7xlMfCsN19pSvRAeYUHOdFWOlhpQ/LlbfTqYwwmEDFV0h8GGuqmCmKmT+pxcUV/Nt2gQ=="; - }; - dependencies = [ - sources."@jridgewell/gen-mapping-0.3.5" - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/source-map-0.3.6" - sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.25" - sources."@jsonjoy.com/base64-1.1.2" - sources."@jsonjoy.com/json-pack-1.1.0" - sources."@jsonjoy.com/util-1.3.0" - sources."@leichtgewicht/ip-codec-2.0.5" - sources."@types/body-parser-1.19.5" - sources."@types/bonjour-3.5.13" - sources."@types/connect-3.4.38" - sources."@types/connect-history-api-fallback-1.5.4" - sources."@types/estree-1.0.6" - sources."@types/express-4.17.21" - sources."@types/express-serve-static-core-4.19.5" - sources."@types/http-errors-2.0.4" - sources."@types/http-proxy-1.17.15" - sources."@types/json-schema-7.0.15" - sources."@types/mime-1.3.5" - sources."@types/node-22.5.5" - sources."@types/node-forge-1.3.11" - sources."@types/qs-6.9.16" - sources."@types/range-parser-1.2.7" - sources."@types/retry-0.12.2" - sources."@types/send-0.17.4" - sources."@types/serve-index-1.9.4" - sources."@types/serve-static-1.15.7" - sources."@types/sockjs-0.3.36" - sources."@types/ws-8.5.12" - sources."@webassemblyjs/ast-1.12.1" - sources."@webassemblyjs/floating-point-hex-parser-1.11.6" - sources."@webassemblyjs/helper-api-error-1.11.6" - sources."@webassemblyjs/helper-buffer-1.12.1" - sources."@webassemblyjs/helper-numbers-1.11.6" - sources."@webassemblyjs/helper-wasm-bytecode-1.11.6" - sources."@webassemblyjs/helper-wasm-section-1.12.1" - sources."@webassemblyjs/ieee754-1.11.6" - sources."@webassemblyjs/leb128-1.11.6" - sources."@webassemblyjs/utf8-1.11.6" - sources."@webassemblyjs/wasm-edit-1.12.1" - sources."@webassemblyjs/wasm-gen-1.12.1" - sources."@webassemblyjs/wasm-opt-1.12.1" - sources."@webassemblyjs/wasm-parser-1.12.1" - sources."@webassemblyjs/wast-printer-1.12.1" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" - sources."accepts-1.3.8" - sources."acorn-8.12.1" - sources."acorn-import-attributes-1.9.5" - sources."ajv-8.17.1" - sources."ajv-formats-2.1.1" - sources."ajv-keywords-5.1.0" - sources."ansi-html-community-0.0.8" - sources."anymatch-3.1.3" - sources."array-flatten-1.1.1" - sources."batch-0.6.1" - sources."binary-extensions-2.3.0" - (sources."body-parser-1.20.3" // { - dependencies = [ - sources."bytes-3.1.2" - ]; - }) - sources."bonjour-service-1.2.1" - sources."braces-3.0.3" - sources."browserslist-4.23.3" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.8" - sources."bundle-name-4.1.0" - sources."bytes-3.0.0" - sources."call-bind-1.0.7" - sources."caniuse-lite-1.0.30001662" - sources."chokidar-3.6.0" - sources."chrome-trace-event-1.0.4" - sources."colorette-2.0.20" - sources."commander-2.20.3" - sources."compressible-2.0.18" - sources."compression-1.7.4" - sources."connect-history-api-fallback-2.0.0" - (sources."content-disposition-0.5.4" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."content-type-1.0.5" - sources."cookie-0.6.0" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.3" - sources."debug-2.6.9" - sources."default-browser-5.2.1" - sources."default-browser-id-5.0.0" - sources."define-data-property-1.1.4" - sources."define-lazy-prop-3.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."detect-node-2.1.0" - sources."dns-packet-5.6.1" - sources."ee-first-1.1.1" - sources."electron-to-chromium-1.5.26" - sources."encodeurl-2.0.0" - sources."enhanced-resolve-5.17.1" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" - sources."es-module-lexer-1.5.4" - sources."escalade-3.2.0" - sources."escape-html-1.0.3" - sources."eslint-scope-5.1.1" - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" - sources."etag-1.8.1" - sources."eventemitter3-4.0.7" - sources."events-3.3.0" - (sources."express-4.21.0" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-uri-3.0.1" - sources."faye-websocket-0.11.4" - sources."fill-range-7.1.1" - sources."finalhandler-1.3.1" - sources."follow-redirects-1.15.9" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.4" - sources."glob-parent-5.1.2" - sources."glob-to-regexp-0.4.1" - sources."gopd-1.0.1" - sources."graceful-fs-4.2.11" - sources."handle-thing-2.0.1" - sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbols-1.0.3" - sources."hasown-2.0.2" - (sources."hpack.js-2.1.6" // { - dependencies = [ - sources."readable-stream-2.3.8" - ]; - }) - sources."html-entities-2.5.2" - sources."http-deceiver-1.2.7" - sources."http-errors-2.0.0" - sources."http-parser-js-0.5.8" - sources."http-proxy-1.18.1" - sources."http-proxy-middleware-2.0.6" - sources."hyperdyperid-1.2.0" - sources."iconv-lite-0.4.24" - sources."inherits-2.0.4" - sources."ipaddr.js-2.2.0" - sources."is-binary-path-2.1.0" - sources."is-docker-3.0.0" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-inside-container-1.0.0" - sources."is-network-error-1.1.0" - sources."is-number-7.0.0" - sources."is-plain-obj-3.0.0" - sources."is-wsl-3.1.0" - sources."isarray-1.0.0" - sources."jest-worker-27.5.1" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-1.0.0" - sources."launch-editor-2.9.1" - sources."loader-runner-4.3.0" - sources."media-typer-0.3.0" - sources."memfs-4.12.0" - sources."merge-descriptors-1.0.3" - sources."merge-stream-2.0.0" - sources."methods-1.1.2" - sources."micromatch-4.0.8" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimalistic-assert-1.0.1" - sources."ms-2.0.0" - sources."multicast-dns-7.2.5" - sources."negotiator-0.6.3" - sources."neo-async-2.6.2" - sources."node-forge-1.3.1" - sources."node-gyp-build-4.8.2" - sources."node-releases-2.0.18" - sources."normalize-path-3.0.0" - sources."object-inspect-1.13.2" - sources."obuf-1.1.2" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."open-10.1.0" - sources."p-retry-6.2.0" - sources."parseurl-1.3.3" - sources."path-to-regexp-0.1.10" - sources."picocolors-1.1.0" - sources."picomatch-2.3.1" - sources."process-nextick-args-2.0.1" - (sources."proxy-addr-2.0.7" // { - dependencies = [ - sources."ipaddr.js-1.9.1" - ]; - }) - sources."punycode-2.3.1" - sources."qs-6.13.0" - sources."randombytes-2.1.0" - sources."range-parser-1.2.1" - (sources."raw-body-2.5.2" // { - dependencies = [ - sources."bytes-3.1.2" - ]; - }) - sources."readable-stream-3.6.2" - sources."readdirp-3.6.0" - sources."require-from-string-2.0.2" - sources."requires-port-1.0.0" - sources."retry-0.13.1" - sources."run-applescript-7.0.0" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."schema-utils-4.2.0" - sources."select-hose-2.0.0" - sources."selfsigned-2.4.1" - (sources."send-0.19.0" // { - dependencies = [ - sources."encodeurl-1.0.2" - sources."ms-2.1.3" - ]; - }) - sources."serialize-javascript-6.0.2" - (sources."serve-index-1.9.1" // { - dependencies = [ - sources."depd-1.1.2" - sources."http-errors-1.6.3" - sources."inherits-2.0.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.5.0" - ]; - }) - sources."serve-static-1.16.2" - sources."set-function-length-1.2.2" - sources."setprototypeof-1.2.0" - sources."shell-quote-1.8.1" - sources."side-channel-1.0.6" - sources."sockjs-0.3.24" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" - (sources."spdy-4.0.2" // { - dependencies = [ - sources."debug-4.3.7" - sources."ms-2.1.3" - ]; - }) - (sources."spdy-transport-3.0.0" // { - dependencies = [ - sources."debug-4.3.7" - sources."ms-2.1.3" - ]; - }) - sources."statuses-2.0.1" - sources."string_decoder-1.1.1" - sources."supports-color-8.1.1" - sources."tapable-2.2.1" - sources."terser-5.33.0" - (sources."terser-webpack-plugin-5.3.10" // { - dependencies = [ - sources."ajv-6.12.6" - sources."ajv-keywords-3.5.2" - sources."json-schema-traverse-0.4.1" - sources."schema-utils-3.3.0" - ]; - }) - sources."thingies-1.21.0" - sources."thunky-1.1.0" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."tree-dump-1.0.2" - sources."tslib-2.7.0" - sources."type-is-1.6.18" - sources."undici-types-6.19.8" - sources."unpipe-1.0.0" - sources."update-browserslist-db-1.1.0" - sources."uri-js-4.4.1" - sources."utf-8-validate-6.0.4" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-8.3.2" - sources."vary-1.1.2" - sources."watchpack-2.4.2" - sources."wbuf-1.7.3" - (sources."webpack-5.94.0" // { - dependencies = [ - sources."ajv-6.12.6" - sources."ajv-keywords-3.5.2" - sources."json-schema-traverse-0.4.1" - sources."schema-utils-3.3.0" - ]; - }) - sources."webpack-dev-middleware-7.4.2" - sources."webpack-sources-3.2.3" - sources."websocket-driver-0.7.4" - sources."websocket-extensions-0.1.4" - sources."ws-8.18.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Serves a webpack app. Updates the browser on changes."; - homepage = "https://github.com/webpack/webpack-dev-server#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; From 5a8f83664cab1edc8d22c73292fbdf15618c681d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 22:55:06 +0100 Subject: [PATCH 0798/1054] httping: 4.1.0 -> 4.2.0 Diff: https://github.com/folkertvanheusden/HTTPing/compare/refs/tags/v4.1.0...v4.2.0 Changelog: https://github.com/folkertvanheusden/HTTPing/releases/tag/v4.2.0 --- pkgs/by-name/ht/httping/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ht/httping/package.nix b/pkgs/by-name/ht/httping/package.nix index 1318c5d23614..ff034a6d62d8 100644 --- a/pkgs/by-name/ht/httping/package.nix +++ b/pkgs/by-name/ht/httping/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "httping"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "folkertvanheusden"; repo = "HTTPing"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-JtsPtrj/ZineBokEytbkZdAfjVLTkiaNcGtKVJlKm38="; + hash = "sha256-6PXus8lg+2L9RoRe4nPI1+2iYDKKEhVfJJZMoKWSCb0="; }; nativeBuildInputs = [ From 6cf39d3d7accf2dc57d636abffd92b24bbcf2dc1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 22:56:17 +0100 Subject: [PATCH 0799/1054] flexget: 3.11.49 -> 3.12.1 Diff: https://github.com/Flexget/Flexget/compare/refs/tags/v3.11.49...v3.12.1 Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.12.1 --- pkgs/by-name/fl/flexget/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index aa2c9a0d3288..853e3565abbc 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.49"; + version = "3.12.1"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-/c6nJNIo6gqeANftbtuOatU+JGYXdMQgrPI0/EdH9LI="; + hash = "sha256-rW5ZFxpVoRTy257mo2LoX5Af12ZMyIGVzFCPwF5OF/c="; }; # relax dep constrains, keep environment constraints From a58774a9689ebccc885404319f354ca1987e2bce Mon Sep 17 00:00:00 2001 From: Emmanuel Genga <84174227+genga898@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:04:58 +0300 Subject: [PATCH 0800/1054] gqmqtt: init at 0.2.0-alpha (#360312) gqmqtt: add updateScript --- pkgs/by-name/gq/gqmqtt/package.nix | 33 ++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/gq/gqmqtt/package.nix diff --git a/pkgs/by-name/gq/gqmqtt/package.nix b/pkgs/by-name/gq/gqmqtt/package.nix new file mode 100644 index 000000000000..55fb2c8d420c --- /dev/null +++ b/pkgs/by-name/gq/gqmqtt/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + nix-update-script, +}: + +buildGoModule rec { + pname = "gqmqtt"; + version = "0.2.0-alpha"; + + src = fetchFromGitHub { + owner = "klumw"; + repo = "gqmqtt"; + rev = "refs/tags/v${version}"; + hash = "sha256-4FV2Z3eow69v/Z6sfVfJew/N8ceiXX+JtvLidmiysPk="; + }; + + vendorHash = "sha256-4kT3dswD+Zlgal/kt3jOclDKkrBNXOZqvSPXg79TqX0="; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "GQ GMC-500+ USB serial to MQTT bridge"; + homepage = "https://github.com/klumw/gqmqtt"; + changelog = "https://github.com/klumw/gqmqtt/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "gqmqtt"; + }; +} From 839585c58c03248da4b9fa5cc5f8498accfeca0b Mon Sep 17 00:00:00 2001 From: Isaac Chua <2425983+isaacchua@users.noreply.github.com> Date: Thu, 5 Dec 2024 09:17:22 -0500 Subject: [PATCH 0801/1054] youtube-music: fix desktopName and startupWMClass --- pkgs/applications/audio/youtube-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index c6543cc5ef7d..8ed37540a4d7 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -78,8 +78,8 @@ stdenv.mkDerivation (finalAttrs: { name = "youtube-music"; exec = "youtube-music %u"; icon = "youtube-music"; - desktopName = "Youtube Music"; - startupWMClass = "Youtube Music"; + desktopName = "YouTube Music"; + startupWMClass = "YouTube Music"; categories = [ "AudioVideo" ]; }) ]; From d8840638d26b699b42aa13f28cf2ec550f345feb Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Dec 2024 23:14:38 +0100 Subject: [PATCH 0802/1054] mir: 2.18.3 -> 2.19.2 --- pkgs/servers/mir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 12e3019d5225..8fcc689ddd66 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -5,8 +5,8 @@ let in { mir = common { - version = "2.18.3"; - hash = "sha256-2PwLTWQeaVR80slZ6/BPr23gVahiDWXulFtdjc9ZUCs="; + version = "2.19.2"; + hash = "sha256-E6+FjYJUIgejpat1Kyl0B1JL+mnQd4rXjSQAPTX31qc="; }; mir_2_15 = common { From db2b768ef87dc4bac78b49b552b7982e49b17a45 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Dec 2024 23:15:08 +0100 Subject: [PATCH 0803/1054] miracle-wm: Fix compat with mir 2.19 --- pkgs/by-name/mi/miracle-wm/package.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index 5b2e897ae7e3..bbe9444f0489 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -30,18 +30,25 @@ stdenv.mkDerivation (finalAttrs: { version = "0.3.7"; src = fetchFromGitHub { - owner = "mattkae"; + owner = "miracle-wm-org"; repo = "miracle-wm"; rev = "v${finalAttrs.version}"; hash = "sha256-31S7Mfz3LIOAmDUl6jbr3kSP2BdLaM0M4xMZ8FHhLH0="; }; patches = [ - # Remove when https://github.com/mattkae/miracle-wm/pull/211 merged & in release + # Remove when version > 0.3.7 (fetchpatch { - name = "0001-miracle-wm-Dont-ignore-PKG_CONFIG_PATH.patch"; - url = "https://github.com/mattkae/miracle-wm/commit/a9fe6ed1e7dc605f72e18cdc2d19afb3c187be3a.patch"; - hash = "sha256-zzOwqUjyZGYIy/3BvOiedfCubrqaeglvsAzTXyq3wYU="; + name = "0001-miracle-wm-Dont-override-PKG_CONFIG_PATH.patch"; + url = "https://github.com/miracle-wm-org/miracle-wm/commit/0a8809d4362e1d3abbea6e29fd1234c8fa981bfb.patch"; + hash = "sha256-Fy/fDmV1uXRt4omxccpFkZb0vE8iHYSS9A7E+PEFBOM="; + }) + + # Remove when version > 0.3.7 + (fetchpatch { + name = "0002-miracle-wm-Fix-mir-2.19-support.patch"; + url = "https://github.com/miracle-wm-org/miracle-wm/commit/a9db8b539a5396e9df6f6f009cbabcbb053f2b05.patch"; + hash = "sha256-VxUVpwBSHuLzs0yEQ7gStpMnHRJJtZ/Shmjb2un3qI0="; }) ]; From b14e7f5fc29be74157917db7af3a7de64213f0bc Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Dec 2024 23:15:37 +0100 Subject: [PATCH 0804/1054] miriway: 24.10.1 -> 24.11.1 --- pkgs/by-name/mi/miriway/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/miriway/package.nix b/pkgs/by-name/mi/miriway/package.nix index fe41c1b313b2..830b8c28d7e2 100644 --- a/pkgs/by-name/mi/miriway/package.nix +++ b/pkgs/by-name/mi/miriway/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "24.10.1"; + version = "24.11.1"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-jpXsvr2HnfMCJh851oS+IiQLSmL9C1bnaG6IPSq5xrA="; + hash = "sha256-DphzqU0jT2NE2dSDuQf6BQIjXTwJuPiOjfxk9N9YmaQ="; }; postPatch = '' From b8704b00bcbb09d1037221d8b007e8d3777a7bb7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Dec 2024 23:26:00 +0100 Subject: [PATCH 0805/1054] update-python-libraries: fix helper script after by-name migration --- maintainers/scripts/update-python-libraries | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index 8717808daaf0..272b55e33d8f 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -1,3 +1,3 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=channel:nixpkgs-unstable -i bash -p "python3.withPackages (ps: with ps; [ packaging requests ])" -p nix-prefetch-git -exec python3 pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@ +exec python3 pkgs/by-name/up/update-python-libraries/update-python-libraries.py $@ From 8f2b01cb67cb35b8fee93fd68a21ca69a939479e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Dec 2024 23:26:45 +0100 Subject: [PATCH 0806/1054] update-python-libraries: migrate git revs to use tag --- .../up/update-python-libraries/update-python-libraries.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py index dd6dcb2c70ad..41e495d38229 100755 --- a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py +++ b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py @@ -486,7 +486,7 @@ def _update_package(path, target): if fetcher == "fetchFromGitHub": # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";` # in which no string value is meant to be substituted. However, we can just overwrite the previous value. - regex = r"(rev\s+=\s+[^;]*;)" + regex = r"((?:rev|tag)\s+=\s+[^;]*;)" regex = re.compile(regex) matches = regex.findall(text) n = len(matches) @@ -496,7 +496,7 @@ def _update_package(path, target): else: # forcefully rewrite rev, incase tagging conventions changed for a release match = matches[0] - text = text.replace(match, f'rev = "refs/tags/{prefix}${{version}}";') + text = text.replace(match, f'tag = "{prefix}${{version}}";') # incase there's no prefix, just rewrite without interpolation text = text.replace('"${version}";', "version;") From 80cdb176ad6faf4be7fb9557ecd7e728eab37d39 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 5 Dec 2024 22:29:23 +0000 Subject: [PATCH 0807/1054] tailscale: 1.76.6 -> 1.78.0 Changes: https://tailscale.com/changelog#2024-12-05 --- pkgs/by-name/ta/tailscale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index 47a2dd94c399..9ec4d43a0c76 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -15,7 +15,7 @@ }: let - version = "1.76.6"; + version = "1.78.0"; in buildGo123Module { pname = "tailscale"; @@ -27,7 +27,7 @@ buildGo123Module { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-c44Fz/cYGN2nsjlaKln8ozjjS5jHSO/X9RMnHa37tJM="; + hash = "sha256-AujYfsPrLT0D6POge/pcA6dtWpQ4I6vI5op7zqzJ/+g="; }; patches = [ @@ -39,7 +39,7 @@ buildGo123Module { }) ]; - vendorHash = "sha256-xCZ6YMJ0fqVzO+tKbCzF0ftV05NOB+lJbJBovLqlrtQ="; + vendorHash = "sha256-0VB7q9HKd5/QKaWBMpCYycRRiNTWCEjUMc3g3z6agc8="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ] ++ [ installShellFiles ]; From 9234025c07ae98bd8e052ead0915e4a60143d22a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Dec 2024 23:30:22 +0100 Subject: [PATCH 0808/1054] OWNERS: update python update script ownership --- ci/OWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/OWNERS b/ci/OWNERS index 5cc815b326c2..b8699826ebd7 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -157,6 +157,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza # Python-related code and docs /doc/languages-frameworks/python.section.md @mweinelt @natsukium /maintainers/scripts/update-python-libraries @mweinelt @natsukium +/pkgs/by-name/up/update-python-libraries @mweinelt @natsukium /pkgs/development/interpreters/python @mweinelt @natsukium /pkgs/top-level/python-packages.nix @natsukium /pkgs/top-level/release-python.nix @natsukium From e4b06f587ee4317ed44d4ebc1a4e9c6f3022f07c Mon Sep 17 00:00:00 2001 From: John Wang <32222098+jzw2@users.noreply.github.com> Date: Thu, 5 Dec 2024 23:36:16 +0100 Subject: [PATCH 0809/1054] sptlrx: 1.1.0 -> 1.2.2 (#360405) Update pkgs/by-name/sp/sptlrx/package.nix Co-authored-by: seth --- pkgs/by-name/sp/sptlrx/package.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sp/sptlrx/package.nix b/pkgs/by-name/sp/sptlrx/package.nix index b385898202c2..391ebb01a457 100644 --- a/pkgs/by-name/sp/sptlrx/package.nix +++ b/pkgs/by-name/sp/sptlrx/package.nix @@ -2,19 +2,26 @@ buildGoModule rec { pname = "sptlrx"; - version = "1.1.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "raitonoberu"; repo = pname; rev = "v${version}"; - hash = "sha256-6GbefTWrhH6RdASmSrugd4xESkwqFVF5qwFmf0JUDTY="; + hash = "sha256-b8ALhEjolH0RH+I9HVQeOagPBi2isLNUxqKdj5u2O9s="; }; - vendorHash = "sha256-Ll5jUjpx4165BAE86/z95i4xa8fdKlfxqrUc/gDLqJ0="; + vendorHash = "sha256-pExSQcYjqliZZg/91t52yk6UJ4QCbpToMpONIFUNkwc="; ldflags = [ "-s" "-w" ]; + checkFlags = + let + # Requires network access + skippedTests = [ "TestGetIndex" ]; + in + [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; + passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { @@ -26,7 +33,8 @@ buildGoModule rec { meta = with lib; { description = "Spotify lyrics in your terminal"; homepage = "https://github.com/raitonoberu/sptlrx"; - changelog = "https://github.com/raitonoberu/sptlrx/releases/tag/v${version}"; + changelog = + "https://github.com/raitonoberu/sptlrx/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ MoritzBoehme ]; mainProgram = "sptlrx"; From bc85e2eac5598a2c43048946623643a5531a5b7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 23:50:45 +0100 Subject: [PATCH 0810/1054] python312Packages.msgraph-sdk: 1.13.0 -> 1.14.0 Diff: https://github.com/microsoftgraph/msgraph-sdk-python/compare/refs/tags/v1.13.0...v1.14.0 Changelog: https://github.com/microsoftgraph/msgraph-sdk-python/blob/v1.14.0/CHANGELOG.md --- pkgs/development/python-modules/msgraph-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 4eedc33e07c7..8b44541cd221 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.13.0"; + version = "1.14.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-1f7Uj38IjI1wdWWzdAaOvoDtddukUhtH8xFKOYPzBdM="; + hash = "sha256-qCrBd1RIIjVJQyWf7srdFHNQc8TYh3zDtq/nepbk6tE="; }; build-system = [ flit-core ]; From 979c64655bbfa8adf9743cb81e6afeda43370937 Mon Sep 17 00:00:00 2001 From: Jeff Spiers Date: Thu, 5 Dec 2024 15:53:56 -0700 Subject: [PATCH 0811/1054] joplin-desktop: fix unpacking on x86_64-darwin with 7zz (#361912) --- pkgs/by-name/jo/joplin-desktop/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index 557be27e277c..378252cc5bf5 100644 --- a/pkgs/by-name/jo/joplin-desktop/package.nix +++ b/pkgs/by-name/jo/joplin-desktop/package.nix @@ -66,11 +66,19 @@ let nativeBuildInputs = [ _7zz ]; - sourceRoot = "Joplin.app"; + unpackPhase = '' + runHook preUnpack + 7zz x -x'!Joplin ${version}/Applications' $src + runHook postUnpack + ''; + + sourceRoot = if stdenv.hostPlatform.isx86_64 then "Joplin ${version}" else "."; installPhase = '' - mkdir -p $out/Applications/Joplin.app - cp -R . $out/Applications/Joplin.app + runHook preInstall + mkdir -p $out/Applications + cp -R Joplin.app $out/Applications + runHook postInstall ''; }; in From 8cd32243b55b849a283f99fdbbcab979feffe114 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Dec 2024 23:55:07 +0100 Subject: [PATCH 0812/1054] python311Packages.pytelegrambotapi: 4.23.0 -> 4.24.0 Diff: https://github.com/eternnoir/pyTelegramBotAPI/compare/refs/tags/4.23.0...4.24.0 Changelog: https://github.com/eternnoir/pyTelegramBotAPI/releases/tag/4.24.0 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 77d33a7d9b79..94b2bfa71b9b 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.23.0"; + version = "4.24.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-R/RbkiKkhcZd17hgDJnEpr3OCVMvn744YM+lmzSXKWs="; + hash = "sha256-/QzLF6q3ygMLElLd8qMZ97Bv1KMOl8Dctv5QGjiRCKo="; }; build-system = [ hatchling ]; From abb5090d1ef1f151a20ed3165e7a433348ec3cdf Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Fri, 6 Dec 2024 06:56:28 +0800 Subject: [PATCH 0813/1054] mangayomi: init at 0.3.75 --- pkgs/by-name/ma/mangayomi/cargokit.patch | 90 + pkgs/by-name/ma/mangayomi/package.nix | 179 ++ pkgs/by-name/ma/mangayomi/pubspec.lock.json | 2268 +++++++++++++++++++ 3 files changed, 2537 insertions(+) create mode 100644 pkgs/by-name/ma/mangayomi/cargokit.patch create mode 100644 pkgs/by-name/ma/mangayomi/package.nix create mode 100644 pkgs/by-name/ma/mangayomi/pubspec.lock.json diff --git a/pkgs/by-name/ma/mangayomi/cargokit.patch b/pkgs/by-name/ma/mangayomi/cargokit.patch new file mode 100644 index 000000000000..9a0aa35c0ddf --- /dev/null +++ b/pkgs/by-name/ma/mangayomi/cargokit.patch @@ -0,0 +1,90 @@ +--- old/rust_builder/cargokit/cmake/cargokit.cmake 2024-11-08 13:36:13.345889693 +0000 ++++ new/rust_builder/cargokit/cmake/cargokit.cmake 2024-11-08 13:45:26.019632176 +0000 +@@ -17,83 +17,22 @@ + function(apply_cargokit target manifest_dir lib_name any_symbol_name) + + set(CARGOKIT_LIB_NAME "${lib_name}") +- set(CARGOKIT_LIB_FULL_NAME "${CMAKE_SHARED_MODULE_PREFIX}${CARGOKIT_LIB_NAME}${CMAKE_SHARED_MODULE_SUFFIX}") +- if (CMAKE_CONFIGURATION_TYPES) +- set(CARGOKIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$") +- set(OUTPUT_LIB "${CMAKE_CURRENT_BINARY_DIR}/$/${CARGOKIT_LIB_FULL_NAME}") +- else() +- set(CARGOKIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}") +- set(OUTPUT_LIB "${CMAKE_CURRENT_BINARY_DIR}/${CARGOKIT_LIB_FULL_NAME}") +- endif() +- set(CARGOKIT_TEMP_DIR "${CMAKE_CURRENT_BINARY_DIR}/cargokit_build") +- +- if (FLUTTER_TARGET_PLATFORM) +- set(CARGOKIT_TARGET_PLATFORM "${FLUTTER_TARGET_PLATFORM}") +- else() +- set(CARGOKIT_TARGET_PLATFORM "windows-x64") +- endif() +- +- set(CARGOKIT_ENV +- "CARGOKIT_CMAKE=${CMAKE_COMMAND}" +- "CARGOKIT_CONFIGURATION=$" +- "CARGOKIT_MANIFEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${manifest_dir}" +- "CARGOKIT_TARGET_TEMP_DIR=${CARGOKIT_TEMP_DIR}" +- "CARGOKIT_OUTPUT_DIR=${CARGOKIT_OUTPUT_DIR}" +- "CARGOKIT_TARGET_PLATFORM=${CARGOKIT_TARGET_PLATFORM}" +- "CARGOKIT_TOOL_TEMP_DIR=${CARGOKIT_TEMP_DIR}/tool" +- "CARGOKIT_ROOT_PROJECT_DIR=${CMAKE_SOURCE_DIR}" +- ) +- +- if (WIN32) +- set(SCRIPT_EXTENSION ".cmd") +- set(IMPORT_LIB_EXTENSION ".lib") +- else() +- set(SCRIPT_EXTENSION ".sh") +- set(IMPORT_LIB_EXTENSION "") +- execute_process(COMMAND chmod +x "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}") +- endif() +- +- # Using generators in custom command is only supported in CMake 3.20+ +- if (CMAKE_CONFIGURATION_TYPES AND ${CMAKE_VERSION} VERSION_LESS "3.20.0") +- foreach(CONFIG IN LISTS CMAKE_CONFIGURATION_TYPES) +- add_custom_command( +- OUTPUT +- "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG}/${CARGOKIT_LIB_FULL_NAME}" +- "${CMAKE_CURRENT_BINARY_DIR}/_phony_" +- COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV} +- "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake +- VERBATIM +- ) +- endforeach() +- else() +- add_custom_command( +- OUTPUT +- ${OUTPUT_LIB} +- "${CMAKE_CURRENT_BINARY_DIR}/_phony_" +- COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV} +- "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake +- VERBATIM +- ) +- endif() +- +- +- set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/_phony_" PROPERTIES SYMBOLIC TRUE) + + if (TARGET ${target}) + # If we have actual cmake target provided create target and make existing + # target depend on it +- add_custom_target("${target}_cargokit" DEPENDS ${OUTPUT_LIB}) ++ add_custom_target("${target}_cargokit" DEPENDS @output_lib@) + add_dependencies("${target}" "${target}_cargokit") +- target_link_libraries("${target}" PRIVATE "${OUTPUT_LIB}${IMPORT_LIB_EXTENSION}") ++ target_link_libraries("${target}" PRIVATE @output_lib@) + if(WIN32) + target_link_options(${target} PRIVATE "/INCLUDE:${any_symbol_name}") + endif() + else() + # Otherwise (FFI) just use ALL to force building always +- add_custom_target("${target}_cargokit" ALL DEPENDS ${OUTPUT_LIB}) ++ add_custom_target("${target}_cargokit" ALL DEPENDS @output_lib@) + endif() + + # Allow adding the output library to plugin bundled libraries +- set("${target}_cargokit_lib" ${OUTPUT_LIB} PARENT_SCOPE) ++ set("${target}_cargokit_lib" @output_lib@ PARENT_SCOPE) + + endfunction() diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix new file mode 100644 index 000000000000..8cead8d79bed --- /dev/null +++ b/pkgs/by-name/ma/mangayomi/package.nix @@ -0,0 +1,179 @@ +{ + lib, + fetchFromGitHub, + flutter324, + pkg-config, + webkitgtk_4_1, + mpv, + libass, + ffmpeg, + libplacebo, + libunwind, + shaderc, + vulkan-loader, + lcms, + libdovi, + libdvdnav, + libdvdread, + mujs, + libbluray, + lua, + rubberband, + libuchardet, + zimg, + alsa-lib, + openal, + pipewire, + libpulseaudio, + libcaca, + libdrm, + mesa, + libXScrnSaver, + nv-codec-headers-11, + libXpresent, + libva, + libvdpau, + rustPlatform, + stdenv, + xdg-user-dirs, + zenity, + copyDesktopItems, + makeDesktopItem, + replaceVars, +}: +let + pname = "mangayomi"; + version = "0.3.75"; + src = fetchFromGitHub { + owner = "kodjodevf"; + repo = "mangayomi"; + tag = "v${version}"; + hash = "sha256-kVAtUXEysaCJSLobXlgAgK59pgLq8Ze/XDqQNNdKdzg="; + }; + rustDep = rustPlatform.buildRustPackage { + inherit pname version src; + + sourceRoot = "${src.name}/rust"; + + cargoHash = "sha256-b4PRFe8FgP/PXHwSw2qmderPRFCBC1ISQuf8uZcsxpY="; + + passthru.libraryPath = "lib/librust_lib_mangayomi.so"; + }; +in +flutter324.buildFlutterApplication { + inherit pname version src; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + customSourceBuilders = { + rust_lib_mangayomi = + { version, src, ... }: + stdenv.mkDerivation rec { + pname = "rust_lib_mangayomi"; + inherit version src; + inherit (src) passthru; + + patches = [ + (replaceVars ./cargokit.patch { + output_lib = "${rustDep}/${rustDep.passthru.libraryPath}"; + }) + ]; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; + }; + }; + + gitHashes = { + desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM="; + flutter_qjs = "sha256-m+Z0bCswylfd1E2Y6X6bdPivkSlXUxO4J0Icbco+/0A="; + media_kit_libs_windows_video = "sha256-SYVVOR6vViAsDH5MclInJk8bTt/Um4ccYgYDFrb5LBk="; + media_kit_native_event_loop = "sha256-SYVVOR6vViAsDH5MclInJk8bTt/Um4ccYgYDFrb5LBk="; + media_kit_video = "sha256-SYVVOR6vViAsDH5MclInJk8bTt/Um4ccYgYDFrb5LBk="; + }; + + nativeBuildInputs = [ + pkg-config + copyDesktopItems + ]; + + buildInputs = [ + webkitgtk_4_1 + mpv + libass + ffmpeg + libplacebo + libunwind + shaderc + vulkan-loader + lcms + libdovi + libdvdnav + libdvdread + mujs + libbluray + lua + rubberband + libuchardet + zimg + alsa-lib + openal + pipewire + libpulseaudio + libcaca + libdrm + mesa + libXScrnSaver + libXpresent + nv-codec-headers-11 + libva + libvdpau + ]; + + desktopItems = [ + (makeDesktopItem { + name = "mangayomi"; + exec = "mangayomi"; + icon = "mangayomi"; + genericName = "Mangayomi"; + desktopName = "Mangayomi"; + categories = [ + "Utility" + ]; + keywords = [ + "Manga" + "Anime" + "BitTorrent" + ]; + }) + ]; + + postInstall = '' + install -Dm644 assets/app_icons/icon-red.png $out/share/pixmaps/mangayomi.png + ''; + + extraWrapProgramArgs = '' + --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" \ + --prefix PATH : "${ + lib.makeBinPath [ + xdg-user-dirs + zenity + ] + }" + ''; + + meta = { + changelog = "https://github.com/kodjodevf/mangayomi/releases/tag/v${version}"; + description = "Read manga and stream anime from a variety of sources including BitTorrent"; + homepage = "https://github.com/kodjodevf/mangayomi"; + mainProgram = "mangayomi"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ aucub ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ma/mangayomi/pubspec.lock.json b/pkgs/by-name/ma/mangayomi/pubspec.lock.json new file mode 100644 index 000000000000..a2f9c0042a36 --- /dev/null +++ b/pkgs/by-name/ma/mangayomi/pubspec.lock.json @@ -0,0 +1,2268 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "72.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" + }, + "analyzer": { + "dependency": "direct overridden", + "description": { + "name": "analyzer", + "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.7.0" + }, + "analyzer_plugin": { + "dependency": "transitive", + "description": { + "name": "analyzer_plugin", + "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.3" + }, + "antlr4": { + "dependency": "transitive", + "description": { + "name": "antlr4", + "sha256": "752b4a6e4ad97953652a2b2bbf5377f46c94b579d3372b50080c7e5858234a05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.13.2" + }, + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.0" + }, + "asn1lib": { + "dependency": "transitive", + "description": { + "name": "asn1lib", + "sha256": "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.8" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "autotrie": { + "dependency": "transitive", + "description": { + "name": "autotrie", + "sha256": "55da6faefb53cfcb0abb2f2ca8636123fb40e35286bb57440d2cf467568188f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "bot_toast": { + "dependency": "direct main", + "description": { + "name": "bot_toast", + "sha256": "6b93030a99a98335b8827ecd83021e92e885ffc61d261d3825ffdecdd17f3bdf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.3" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "build_cli_annotations": { + "dependency": "transitive", + "description": { + "name": "build_cli_annotations", + "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.13" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.2" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "change_case": { + "dependency": "transitive", + "description": { + "name": "change_case", + "sha256": "99cfdf2018c627c8a3af5a23ea4c414eb69c75c31322d23b9660ebc3cf30b514", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "charcode": { + "dependency": "transitive", + "description": { + "name": "charcode", + "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.1" + }, + "collection": { + "dependency": "direct overridden", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+2" + }, + "crypto": { + "dependency": "direct main", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "custom_lint_core": { + "dependency": "transitive", + "description": { + "name": "custom_lint_core", + "sha256": "02450c3e45e2a6e8b26c4d16687596ab3c4644dd5792e3313aa9ceba5a49b7f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "custom_lint_visitor": { + "dependency": "transitive", + "description": { + "name": "custom_lint_visitor", + "sha256": "8aeb3b6ae2bb765e7716b93d1d10e8356d04e0ff6d7592de6ee04e0dd7d6587d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0+6.7.0" + }, + "dart_eval": { + "dependency": "direct main", + "description": { + "name": "dart_eval", + "sha256": "bbad8246a99a3c61925e19b3d2c2bd6311f8186fb4642a16bf3d22153b3ade55", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.7" + }, + "dartx": { + "dependency": "transitive", + "description": { + "name": "dartx", + "sha256": "8b25435617027257d43e6508b5fe061012880ddfdaa75a71d607c3de2a13d244", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "desktop_webview_window": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "no_texture", + "resolved-ref": "109f1739727a71d8da60696143f5af91061faab2", + "url": "https://github.com/Predidit/linux_webview_window.git" + }, + "source": "git", + "version": "0.2.4" + }, + "directed_graph": { + "dependency": "transitive", + "description": { + "name": "directed_graph", + "sha256": "3718b9f697a8e73890dea3d93edb6d58b63778996306b4b19c575710e3e2523d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.4" + }, + "draggable_menu": { + "dependency": "direct main", + "description": { + "name": "draggable_menu", + "sha256": "1a748cea94fa64263e7708a98f5bc9d0fa560bfaffd521df4d607ea4393bfbd8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.4.1" + }, + "encrypt": { + "dependency": "direct main", + "description": { + "name": "encrypt", + "sha256": "62d9aa4670cc2a8798bab89b39fc71b6dfbacf615de6cf5001fb39f7e4a996a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.3" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "exception_templates": { + "dependency": "transitive", + "description": { + "name": "exception_templates", + "sha256": "517f7c770da690073663f867ee2057ae2f4ffb28edae9da9faa624aa29ac76eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "expandable_text": { + "dependency": "direct main", + "description": { + "name": "expandable_text", + "sha256": "7d03ea48af6987b20ece232678b744862aa3250d4a71e2aaf1e4af90015d76b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "expressions": { + "dependency": "transitive", + "description": { + "name": "expressions", + "sha256": "308a621b602923dd8a0cf3072793b24850d06453eb49c6b698cbda41a282e904", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.5+2" + }, + "extended_image": { + "dependency": "direct main", + "description": { + "name": "extended_image", + "sha256": "613875dc319f17546ea07499b5f0774755709a19a36dfde812e5eda9eb7a5c8c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.7" + }, + "extended_image_library": { + "dependency": "transitive", + "description": { + "name": "extended_image_library", + "sha256": "9a94ec9314aa206cfa35f16145c3cd6e2c924badcc670eaaca8a3a8063a68cd7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.5" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "direct main", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "ffigen": { + "dependency": "direct main", + "description": { + "name": "ffigen", + "sha256": "3e12e80ccb6539bb3917217bb6f32709220efb737de0d0fa8736da0b7cb507da", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.0" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "16dc141db5a2ccc6520ebb6a2eb5945b1b09e95085c021d9f914f8ded7f1465c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.4" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flex_color_scheme": { + "dependency": "direct main", + "description": { + "name": "flex_color_scheme", + "sha256": "32914024a4f404d90ff449f58d279191675b28e7c08824046baf06826e99d984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.1" + }, + "flex_seed_scheme": { + "dependency": "direct overridden", + "description": { + "name": "flex_seed_scheme", + "sha256": "fb66cdb8ca89084e79efcad2bc2d9deb144666875116f08cdd8d9f8238c8b3ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_code_editor": { + "dependency": "direct main", + "description": { + "name": "flutter_code_editor", + "sha256": "505ad56dcc8a7be4b782c8113574571bc4b9723499b0c1f385b3e2c3fae11f5d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2" + }, + "flutter_highlight": { + "dependency": "direct main", + "description": { + "name": "flutter_highlight", + "sha256": "7b96333867aa07e122e245c033b8ad622e4e3a42a1a2372cbb098a2541d8782c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "flutter_inappwebview": { + "dependency": "direct main", + "description": { + "name": "flutter_inappwebview", + "sha256": "a8f5c9dd300a8cc7fde7bb902ae57febe95e9269424e4d08d5a1a56214e1e6ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.2.0-beta.2" + }, + "flutter_inappwebview_android": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_android", + "sha256": "2427e89d9c7b00cc756f800932d7ab8f3272d3fbc71544e1aedb3dbc17dae074", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0-beta.2" + }, + "flutter_inappwebview_internal_annotations": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_internal_annotations", + "sha256": "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "flutter_inappwebview_ios": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_ios", + "sha256": "7ff65d7408e453f9a4ff38f74673aeec8cae824cba8276b4b77350262bfe356a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0-beta.2" + }, + "flutter_inappwebview_macos": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_macos", + "sha256": "be8b8ab0100c94ec9fc079a4d48b2bc8dd1a8b4c2647da34f1d3dae93cd5f88a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0-beta.2" + }, + "flutter_inappwebview_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_platform_interface", + "sha256": "2c99bf767900ba029d825bc6f494d30169ee83cdaa038d86e85fe70571d0a655", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0-beta.2" + }, + "flutter_inappwebview_web": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_web", + "sha256": "6c4bb61ea9d52e51d79ea23da27c928d0430873c04ad380df39c1ef442b11f4e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0-beta.2" + }, + "flutter_inappwebview_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_windows", + "sha256": "0ff241f814b7caff63b9632cf858b6d3d9c35758040620a9745e5f6e9dd94d74", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0-beta.2" + }, + "flutter_launcher_icons": { + "dependency": "direct dev", + "description": { + "name": "flutter_launcher_icons", + "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.1" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.23" + }, + "flutter_qjs": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "main", + "resolved-ref": "6b70858b18d53203f5024edd7e24fee4af8b921a", + "url": "https://github.com/kodjodevf/flutter_qjs.git" + }, + "source": "git", + "version": "0.0.1" + }, + "flutter_riverpod": { + "dependency": "direct main", + "description": { + "name": "flutter_riverpod", + "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "flutter_rust_bridge": { + "dependency": "direct main", + "description": { + "name": "flutter_rust_bridge", + "sha256": "fb9d3c9395eae3c71d4fe3ec343b9f30636c9988150c8bb33b60047549b34e3d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.0" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_auth_2": { + "dependency": "direct main", + "description": { + "name": "flutter_web_auth_2", + "sha256": "4d3d2fd3d26bf1a26b3beafd4b4b899c0ffe10dc99af25abc58ffe24e991133c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "flutter_web_auth_2_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_web_auth_2_platform_interface", + "sha256": "e8669e262005a8354389ba2971f0fc1c36188481234ff50d013aaf993f30f739", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "font_awesome_flutter": { + "dependency": "direct main", + "description": { + "name": "font_awesome_flutter", + "sha256": "d3a89184101baec7f4600d58840a764d2ef760fe1c5a20ef9e6b0e9b24a07a3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.8.0" + }, + "freezed": { + "dependency": "direct dev", + "description": { + "name": "freezed", + "sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.7" + }, + "freezed_annotation": { + "dependency": "direct main", + "description": { + "name": "freezed_annotation", + "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "go_router": { + "dependency": "direct main", + "description": { + "name": "go_router", + "sha256": "8ae664a70174163b9f65ea68dd8673e29db8f9095de7b5cd00e167c621f4fef5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.6.0" + }, + "google_fonts": { + "dependency": "direct main", + "description": { + "name": "google_fonts", + "sha256": "b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.2.1" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "grouped_list": { + "dependency": "direct main", + "description": { + "name": "grouped_list", + "sha256": "c52551bc17699e304634d4653b824a1aa7c6b1d3a2c1a0da1a80839f867353fb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "highlight": { + "dependency": "direct main", + "description": { + "name": "highlight", + "sha256": "5353a83ffe3e3eca7df0abfb72dcf3fa66cc56b953728e7113ad4ad88497cf21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "hive": { + "dependency": "transitive", + "description": { + "name": "hive", + "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.5" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_client_helper": { + "dependency": "transitive", + "description": { + "name": "http_client_helper", + "sha256": "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "http_interceptor": { + "dependency": "direct main", + "description": { + "name": "http_interceptor", + "sha256": "288c6ded4a2c66de2730a16b30cbd29d05d042a5e61304d9b4be0e16378f4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "infinite_listview": { + "dependency": "transitive", + "description": { + "name": "infinite_listview", + "sha256": "f6062c1720eb59be553dfa6b89813d3e8dd2f054538445aaa5edaddfa5195ce6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "iregexp": { + "dependency": "transitive", + "description": { + "name": "iregexp", + "sha256": "143859dcaeecf6f683102786762d70a47ef8441a0d2287a158172d32d38799cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "isar": { + "dependency": "direct main", + "description": { + "name": "isar", + "sha256": "99165dadb2cf2329d3140198363a7e7bff9bbd441871898a87e26914d25cf1ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0+1" + }, + "isar_flutter_libs": { + "dependency": "direct main", + "description": { + "name": "isar_flutter_libs", + "sha256": "bc6768cc4b9c61aabff77152e7f33b4b17d2fc93134f7af1c3dd51500fe8d5e8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0+1" + }, + "isar_generator": { + "dependency": "direct dev", + "description": { + "name": "isar_generator", + "sha256": "76c121e1295a30423604f2f819bc255bc79f852f3bc8743a24017df6068ad133", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0+1" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.7" + }, + "js_packer": { + "dependency": "direct main", + "description": { + "name": "js_packer", + "sha256": "f45ffa90165a810d7134f0b96b54068e4aac9d80a8b181eafa3978ec6dbc66a3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.5" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_path": { + "dependency": "direct main", + "description": { + "name": "json_path", + "sha256": "7a06bbb1cfad390b20fb7a2ca5e67d9ba59633879c6d71142b80fbf61c3b66f6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.4" + }, + "json_view": { + "dependency": "direct main", + "description": { + "name": "json_view", + "sha256": "905c69f9e69d1eab5406b87ab6c10c3706c04c70c6a4959621bd2b43c2d27374", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "lazy_memo": { + "dependency": "transitive", + "description": { + "name": "lazy_memo", + "sha256": "dcb30b4184a6d767e1d779d74ce784d752d38313b8fb4bad6b659ae7af4bb34d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.3" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.5" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "linked_scroll_controller": { + "dependency": "transitive", + "description": { + "name": "linked_scroll_controller", + "sha256": "e6020062bcf4ffc907ee7fd090fa971e65d8dfaac3c62baf601a3ced0b37986a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "maybe_just_nothing": { + "dependency": "transitive", + "description": { + "name": "maybe_just_nothing", + "sha256": "0c06326e26d08f6ed43247404376366dc4d756cef23a4f1db765f546224c35e0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.3" + }, + "media_kit": { + "dependency": "direct main", + "description": { + "name": "media_kit", + "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11" + }, + "media_kit_libs_android_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_android_video", + "sha256": "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.6" + }, + "media_kit_libs_ios_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_ios_video", + "sha256": "b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "media_kit_libs_linux": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_linux", + "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "media_kit_libs_macos_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_macos_video", + "sha256": "f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "media_kit_libs_video": { + "dependency": "direct main", + "description": { + "name": "media_kit_libs_video", + "sha256": "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "media_kit_libs_windows_video": { + "dependency": "direct overridden", + "description": { + "path": "libs/windows/media_kit_libs_windows_video", + "ref": "73c14623332003ce47f49b91528c73843e8ddcd2", + "resolved-ref": "73c14623332003ce47f49b91528c73843e8ddcd2", + "url": "https://github.com/media-kit/media-kit.git" + }, + "source": "git", + "version": "1.0.10" + }, + "media_kit_native_event_loop": { + "dependency": "direct overridden", + "description": { + "path": "media_kit_native_event_loop", + "ref": "73c14623332003ce47f49b91528c73843e8ddcd2", + "resolved-ref": "73c14623332003ce47f49b91528c73843e8ddcd2", + "url": "https://github.com/media-kit/media-kit.git" + }, + "source": "git", + "version": "1.0.9" + }, + "media_kit_video": { + "dependency": "direct main", + "description": { + "path": "media_kit_video", + "ref": "73c14623332003ce47f49b91528c73843e8ddcd2", + "resolved-ref": "73c14623332003ce47f49b91528c73843e8ddcd2", + "url": "https://github.com/media-kit/media-kit.git" + }, + "source": "git", + "version": "1.2.5" + }, + "meta": { + "dependency": "direct overridden", + "description": { + "name": "meta", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.16.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "mocktail": { + "dependency": "transitive", + "description": { + "name": "mocktail", + "sha256": "890df3f9688106f25755f26b1c60589a92b3ab91a22b8b224947ad041bf172d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "numberpicker": { + "dependency": "direct main", + "description": { + "name": "numberpicker", + "sha256": "4c129154944b0f6b133e693f8749c3f8bfb67c4d07ef9dcab48b595c22d1f156", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.1" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.12" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "permission_handler": { + "dependency": "direct main", + "description": { + "name": "permission_handler", + "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.3.1" + }, + "permission_handler_android": { + "dependency": "transitive", + "description": { + "name": "permission_handler_android", + "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.13" + }, + "permission_handler_apple": { + "dependency": "transitive", + "description": { + "name": "permission_handler_apple", + "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.4.5" + }, + "permission_handler_html": { + "dependency": "transitive", + "description": { + "name": "permission_handler_html", + "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3+5" + }, + "permission_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "permission_handler_platform_interface", + "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.3" + }, + "permission_handler_windows": { + "dependency": "transitive", + "description": { + "name": "permission_handler_windows", + "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "photo_view": { + "dependency": "direct main", + "description": { + "name": "photo_view", + "sha256": "1fc3d970a91295fbd1364296575f854c9863f225505c28c46e0a03e48960c75e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.0" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pointycastle": { + "dependency": "transitive", + "description": { + "name": "pointycastle", + "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.9.1" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "pseudom": { + "dependency": "direct main", + "description": { + "name": "pseudom", + "sha256": "3df7b5aa28adc8e035820db8954e34466aa94353a02e28fd72e54d0ed68b0ecf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "quiver": { + "dependency": "transitive", + "description": { + "name": "quiver", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "quote_buffer": { + "dependency": "transitive", + "description": { + "name": "quote_buffer", + "sha256": "c4cd07e55ed1b1645a1cc74278a03b2a642c9f6ea3c0528d51827fdd320acf87", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.6" + }, + "rfc_6901": { + "dependency": "transitive", + "description": { + "name": "rfc_6901", + "sha256": "df1bbfa3d023009598f19636d6114c6ac1e0b7bb7bf6a260f0e6e6ce91416820", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "riverpod": { + "dependency": "transitive", + "description": { + "name": "riverpod", + "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "riverpod_analyzer_utils": { + "dependency": "transitive", + "description": { + "name": "riverpod_analyzer_utils", + "sha256": "c6b8222b2b483cb87ae77ad147d6408f400c64f060df7a225b127f4afef4f8c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.8" + }, + "riverpod_annotation": { + "dependency": "direct main", + "description": { + "name": "riverpod_annotation", + "sha256": "e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "riverpod_generator": { + "dependency": "direct dev", + "description": { + "name": "riverpod_generator", + "sha256": "63546d70952015f0981361636bf8f356d9cfd9d7f6f0815e3c07789a41233188", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.3" + }, + "rust_lib_mangayomi": { + "dependency": "direct main", + "description": { + "path": "rust_builder", + "relative": true + }, + "source": "path", + "version": "0.0.1" + }, + "rxdart": { + "dependency": "transitive", + "description": { + "name": "rxdart", + "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.28.0" + }, + "safe_local_storage": { + "dependency": "transitive", + "description": { + "name": "safe_local_storage", + "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "screen_brightness": { + "dependency": "transitive", + "description": { + "name": "screen_brightness", + "sha256": "ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2+1" + }, + "screen_brightness_android": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_android", + "sha256": "3df10961e3a9e968a5e076fe27e7f4741fa8a1d3950bdeb48cf121ed529d0caf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0+2" + }, + "screen_brightness_ios": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_ios", + "sha256": "99adc3ca5490b8294284aad5fcc87f061ad685050e03cf45d3d018fe398fd9a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "screen_brightness_macos": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_macos", + "sha256": "64b34e7e3f4900d7687c8e8fb514246845a73ecec05ab53483ed025bd4a899fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0+1" + }, + "screen_brightness_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_platform_interface", + "sha256": "b211d07f0c96637a15fb06f6168617e18030d5d74ad03795dd8547a52717c171", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "screen_brightness_windows": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_windows", + "sha256": "9261bf33d0fc2707d8cf16339ce25768100a65e70af0fcabaf032fc12408ba86", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.9" + }, + "scrollable_positioned_list": { + "dependency": "direct main", + "description": { + "name": "scrollable_positioned_list", + "sha256": "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.8" + }, + "share_plus": { + "dependency": "direct main", + "description": { + "name": "share_plus", + "sha256": "9c9bafd4060728d7cdb2464c341743adbd79d327cb067ec7afb64583540b47c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.2" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "c57c0bbfec7142e3a0f55633be504b796af72e60e3c791b44d5a017b985f7a48", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "state_notifier": { + "dependency": "transitive", + "description": { + "name": "state_notifier", + "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "super_sliver_list": { + "dependency": "direct main", + "description": { + "name": "super_sliver_list", + "sha256": "b1e1e64d08ce40e459b9bb5d9f8e361617c26b8c9f3bb967760b0f436b6e3f56", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.0+3" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "time": { + "dependency": "transitive", + "description": { + "name": "time", + "sha256": "370572cf5d1e58adcb3e354c47515da3f7469dac3a95b447117e728e7be6f461", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "tuple": { + "dependency": "transitive", + "description": { + "name": "tuple", + "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "universal_platform": { + "dependency": "transitive", + "description": { + "name": "universal_platform", + "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "uri_parser": { + "dependency": "transitive", + "description": { + "name": "uri_parser", + "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.14" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.5" + }, + "volume_controller": { + "dependency": "transitive", + "description": { + "name": "volume_controller", + "sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.8" + }, + "wakelock_plus": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus", + "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.8" + }, + "wakelock_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus_platform_interface", + "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.8.0" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.9" + }, + "window_to_front": { + "dependency": "transitive", + "description": { + "name": "window_to_front", + "sha256": "7aef379752b7190c10479e12b5fd7c0b9d92adc96817d9e96c59937929512aee", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "xpath_selector": { + "dependency": "transitive", + "description": { + "name": "xpath_selector", + "sha256": "6d8295565a34a6e2821a0721592e584c70421e52a0f54955e0c8e41963db7c90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "xpath_selector_html_parser": { + "dependency": "direct main", + "description": { + "name": "xpath_selector_html_parser", + "sha256": "ebc562a07832a4062a2bc1c238fd59a81d31d841f15460caeed412ce078af9e0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "xxh3": { + "dependency": "transitive", + "description": { + "name": "xxh3", + "sha256": "cbeb0e1d10f4c6bf67b650f395eac0cc689425b5efc2ba0cc3d3e069a0beaeec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "yaml_edit": { + "dependency": "transitive", + "description": { + "name": "yaml_edit", + "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + } + }, + "sdks": { + "dart": ">=3.5.4 <4.0.0", + "flutter": ">=3.24.0" + } +} From b6a73a110fcc6307546aca76a2d3bff7b7117d1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Dec 2024 00:11:19 +0100 Subject: [PATCH 0814/1054] python312Packages.upb-lib: 0.5.8 -> 0.5.9 Diff: https://github.com/gwww/upb-lib/compare/refs/tags/0.5.8...0.5.9 Changelog: https://github.com/gwww/upb-lib/releases/tag/0.5.9 --- pkgs/development/python-modules/upb-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix index b19508b01754..0dde8e7401e5 100644 --- a/pkgs/development/python-modules/upb-lib/default.nix +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.5.8"; + version = "0.5.9"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "upb-lib"; rev = "refs/tags/${version}"; - hash = "sha256-YCJl3cIaNmRQ5+GbIDcAvDhI0R4r2AWG2Ba1zmnfbMA="; + hash = "sha256-GnNzKU4mqBu2pUOju+4+HMLsTupd8s+nAAieixkBCDk="; }; build-system = [ poetry-core ]; From 77fb5441bfe1839802c1c2406043e76fe6a87ab7 Mon Sep 17 00:00:00 2001 From: surfaceflinger Date: Fri, 6 Dec 2024 00:13:03 +0100 Subject: [PATCH 0815/1054] graphene-hardened-malloc: add updateScript (#360468) * graphene-hardened-malloc: add updateScript * graphene-hardened-malloc: 2024040900 -> 2024120400 --- pkgs/by-name/gr/graphene-hardened-malloc/package.nix | 5 +++-- pkgs/by-name/gr/graphene-hardened-malloc/update.sh | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100755 pkgs/by-name/gr/graphene-hardened-malloc/update.sh diff --git a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix index aca52d75dc5b..5759f7ef2094 100644 --- a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix +++ b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "graphene-hardened-malloc"; - version = "2024040900"; + version = "2024120400"; src = fetchFromGitHub { owner = "GrapheneOS"; repo = "hardened_malloc"; rev = finalAttrs.version; - hash = "sha256-1j7xzhuhK8ZRAJm9dJ95xiTIla7lh3LBiWc/+x/kjp0="; + hash = "sha256-VzP7JimAbFcp1HrSS3GArSRhxHaa1s49kFP22iDHt+8="; }; nativeCheckInputs = [ python3 ]; @@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; passthru = { + updateScript = ./update.sh; ld-preload-tests = stdenv.mkDerivation { name = "${finalAttrs.pname}-ld-preload-tests"; inherit (finalAttrs) src; diff --git a/pkgs/by-name/gr/graphene-hardened-malloc/update.sh b/pkgs/by-name/gr/graphene-hardened-malloc/update.sh new file mode 100755 index 000000000000..67ca22cacb82 --- /dev/null +++ b/pkgs/by-name/gr/graphene-hardened-malloc/update.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i bash -p bash cacert curl common-updater-scripts +# shellcheck shell=bash +set -eu -o pipefail + +host="https://releases.grapheneos.org" +read -ra metadata <<< "$(curl -s "$host/caiman-stable")" +version=${metadata[0]} + +update-source-version graphene-hardened-malloc "$version" From eec5a8bdb875d23a797445cac9a888ec916d0997 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 5 Dec 2024 23:16:16 +0000 Subject: [PATCH 0816/1054] nixos-rebuild: add thiagokokada as maintainer --- pkgs/os-specific/linux/nixos-rebuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix index 12c5856edb26..ee07f6cce4f7 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -62,7 +62,7 @@ substitute { description = "Rebuild your NixOS configuration and switch to it, on local hosts and remote"; homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/os-specific/linux/nixos-rebuild"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.Profpatsch ]; + maintainers = with lib.maintainers; [ Profpatsch thiagokokada ]; mainProgram = "nixos-rebuild"; }; } From 2d50bdc0afdf47043ee65c1ddb8c96e87b48aba0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 27 Nov 2024 07:52:27 +0100 Subject: [PATCH 0817/1054] python312Packages.pylamarzocco: 1.2.3 -> 1.2.11 Changelog: https://github.com/zweckj/pylamarzocco/releases/tag/v1.2.11 Renamed from lmcloud --- .../python-modules/{lmcloud => pylamarzocco}/default.nix | 8 ++++---- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/development/python-modules/{lmcloud => pylamarzocco}/default.nix (89%) diff --git a/pkgs/development/python-modules/lmcloud/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix similarity index 89% rename from pkgs/development/python-modules/lmcloud/default.nix rename to pkgs/development/python-modules/pylamarzocco/default.nix index ce50a769ced9..c749212aa0b9 100644 --- a/pkgs/development/python-modules/lmcloud/default.nix +++ b/pkgs/development/python-modules/pylamarzocco/default.nix @@ -14,8 +14,8 @@ }: buildPythonPackage rec { - pname = "lmcloud"; - version = "1.2.3"; + pname = "pylamarzocco"; + version = "1.2.11"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zweckj"; repo = "pylamarzocco"; - rev = "refs/tags/v.${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-iRxn4xAP5b/2byeWbYm6mQwAu1TUmJgOVEqm/bZT9Xw="; }; @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to interface with La Marzocco's cloud"; homepage = "https://github.com/zweckj/pylamarzocco"; - changelog = "https://github.com/zweckj/pylamarzocco/releases/tag/v.${version}"; + changelog = "https://github.com/zweckj/pylamarzocco/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1eff1b03fab4..7c18c3d69dd2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -325,6 +325,7 @@ mapAliases ({ linear_operator = linear-operator; # added 2024-01-07 livestreamer = throw "'livestreamer' has been removed, as it unmaintained. A currently maintained fork is 'streamlink'."; # added 2023-11-14 livestreamer-curses = throw "'livestreamer-curses' has been removed as it, and livestreamer itself are unmaintained."; # added 2023-11-14 + lmcloud = pylamarzocco; # added 2024-11-26 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b493f35e4161..136c94c73d82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7583,8 +7583,6 @@ self: super: with self; { lm-format-enforcer = callPackage ../development/python-modules/lm-format-enforcer { }; - lmcloud = callPackage ../development/python-modules/lmcloud { }; - lmdb = callPackage ../development/python-modules/lmdb { inherit (pkgs) lmdb; }; @@ -11836,6 +11834,8 @@ self: super: with self; { pylama = callPackage ../development/python-modules/pylama { }; + pylamarzocco = callPackage ../development/python-modules/pylamarzocco { }; + pylast = callPackage ../development/python-modules/pylast { }; pylatex = callPackage ../development/python-modules/pylatex { }; From 9b260257ff2bd75531188161e368a7749cea5b27 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Dec 2024 00:18:04 +0100 Subject: [PATCH 0818/1054] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index fafe4e209d66..af28371ac6d1 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2299,14 +2299,13 @@ hassil home-assistant-intents ifaddr - lmcloud mutagen pymicro-vad pyserial pyspeex-noise pyudev zeroconf - ]; + ]; # missing inputs: lmcloud "lametric" = ps: with ps; [ demetriek ]; @@ -5458,7 +5457,6 @@ "kostal_plenticore" "kraken" "kulersky" - "lamarzocco" "lametric" "landisgyr_heat_meter" "lastfm" From 092aef6491b107a45c5460fc00d0d4f9a9d6b6fa Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Fri, 6 Dec 2024 07:27:19 +0800 Subject: [PATCH 0819/1054] pdfium-binaries: 6721 -> 6872 (#359931) * pdfium-binaries: 6721 -> 6858 * pdfium-binaries: 6858 -> 6872 --- pkgs/by-name/pd/pdfium-binaries/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix index 71ccbc8d27a1..33896a852698 100644 --- a/pkgs/by-name/pd/pdfium-binaries/package.nix +++ b/pkgs/by-name/pd/pdfium-binaries/package.nix @@ -4,7 +4,7 @@ stdenv, }: let - version = "6721"; + version = "6872"; src = let inherit (stdenv.hostPlatform) system; @@ -16,10 +16,10 @@ let aarch64-darwin = "mac-arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-SHCYdw3X8Uy9CgT8SN90FKdPKIk6VZFjIb6NYfOgoCo="; - aarch64-linux = "sha256-RqyzxQ2RnBuoFBAxJVC8x/XDpJJWdJ45dJXV/Yzh7pM="; - x86_64-darwin = "sha256-7XuBlG2pUtSN5kdcTTLbijEHHX5IU5kTj1aW8ZHHS2M="; - aarch64-darwin = "sha256-ZNsQkay8ZF2RQ6dKJ24GawIthjFgB5TUa08LNKpZv1A="; + x86_64-linux = "sha256-JhAW1Ot4ncLiEz/Y83D/capJ+H46GybYnWHpMChX6F0="; + aarch64-linux = "sha256-/8o+v8fIXYK8N7xdC14/fWk3LOr13xyjadMXJgploek="; + x86_64-darwin = "sha256-nVu3JhvjnqhCpNDSBzzZA1PHbT2y5b+kEeu4ZPqgf4Q="; + aarch64-darwin = "sha256-IyoeuNno+Y8nLi1u9tjl75ZJiULrnKyShe3oaSY9GF4="; }; in fetchzip { From 44010ed604ab453ab0ad908aaf46b10186cd5cfc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Dec 2024 00:28:35 +0100 Subject: [PATCH 0820/1054] python312Packages.skyboxremote: init at 0.0.6 Module for controlling a sky box https://pypi.org/project/skyboxremote/ --- .../python-modules/skyboxremote/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/skyboxremote/default.nix diff --git a/pkgs/development/python-modules/skyboxremote/default.nix b/pkgs/development/python-modules/skyboxremote/default.nix new file mode 100644 index 000000000000..9fcb6ac61f9b --- /dev/null +++ b/pkgs/development/python-modules/skyboxremote/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + flit-core, + pyspark, + pytest-cov-stub, + pytest-mock, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "skyboxremote"; + version = "0.0.6"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-GgRUMGnU91UQm9LNctYhHfRmfFujfc8fXc9KSwLrNBM="; + }; + + build-system = [ flit-core ]; + + optional-dependencies = { + spark = [ + pyspark + ]; + }; + + nativeCheckInputs = [ + pytest-cov-stub + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "skyboxremote" ]; + + meta = { + description = "Module for controlling a sky box"; + homepage = "https://pypi.org/project/skyboxremote/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e97f3474650c..291a30d7572c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14728,6 +14728,8 @@ self: super: with self; { skybellpy = callPackage ../development/python-modules/skybellpy { }; + skyboxremote = callPackage ../development/python-modules/skyboxremote { }; + skyfield = callPackage ../development/python-modules/skyfield { }; skytemple-dtef = callPackage ../development/python-modules/skytemple-dtef { }; From 8e770757c6d06d6ea864d2bec6f40132e0764b84 Mon Sep 17 00:00:00 2001 From: surfaceflinger Date: Fri, 6 Dec 2024 00:35:58 +0100 Subject: [PATCH 0821/1054] jazz2: 2.9.1 -> 3.0.0 (#360909) Diff: https://github.com/deathkiller/jazz2-native/compare/2.9.1...3.0.0 --- pkgs/by-name/ja/jazz2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix index 170194342cb3..9dbb1c4fb319 100644 --- a/pkgs/by-name/ja/jazz2/package.nix +++ b/pkgs/by-name/ja/jazz2/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jazz2"; - version = "2.9.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "deathkiller"; repo = "jazz2-native"; rev = finalAttrs.version; - hash = "sha256-q/08lQ+HW2obWc8YAAEorKkNWy1d2uWeufOC5TVKpN4="; + hash = "sha256-t1bXREL/WWnYnSfCyAY5tus/Bq5V4HVHg9s7oltGoIg="; }; patches = [ ./nocontent.patch ]; From 08e8952e1ab13d2f1b84ee5d0c735f306fb99cd8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Dec 2024 00:38:09 +0100 Subject: [PATCH 0822/1054] python312Packages.pynordpool: init at 0.2.2 Python API for Nordpool https://github.com/gjohansson-ST/pynordpool --- .../python-modules/pynordpool/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/pynordpool/default.nix diff --git a/pkgs/development/python-modules/pynordpool/default.nix b/pkgs/development/python-modules/pynordpool/default.nix new file mode 100644 index 000000000000..7a67a715d96a --- /dev/null +++ b/pkgs/development/python-modules/pynordpool/default.nix @@ -0,0 +1,40 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "pynordpool"; + version = "0.2.2"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "gjohansson-ST"; + repo = "pynordpool"; + rev = "refs/tags/v${version}"; + hash = "sha256-JoH9ROT/npBd8BTEuynsF9gbE0jJgYLFPiwFv0s9sH4="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ aiohttp ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "pynordpool" ]; + + meta = { + description = "Python api for Nordpool"; + homepage = "https://github.com/gjohansson-ST/pynordpool"; + changelog = "https://github.com/gjohansson-ST/pynordpool/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e97f3474650c..8383dd5581e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10518,6 +10518,8 @@ self: super: with self; { pynotifier = callPackage ../development/python-modules/pynotifier { }; + pynordpool = callPackage ../development/python-modules/pynordpool { }; + pynslookup = callPackage ../development/python-modules/pynslookup { }; pynuki = callPackage ../development/python-modules/pynuki { }; From 3ac4e337e1e49d95451f42847ce253d6f5c16f8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Nov 2024 09:21:04 +0000 Subject: [PATCH 0823/1054] treesheets: 0-unstable-2024-09-08 -> 0-unstable-2024-11-24 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index a696ab541280..a68c8772f26a 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2024-09-08"; + version = "0-unstable-2024-11-24"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "8db448f67710194d64211ac467ffd2d456854432"; - hash = "sha256-SM62ymN5HXRiyXayoWQaGXLCGEDbHcKMJdPLXDv5dv8="; + rev = "4b27fa43bbd5db0c2a5db2a942002f71d6fdc752"; + hash = "sha256-uKFh4sdcp6CsgJQrX6H9NQhPvOQ3U2PeS+xyDTqwkvo="; }; nativeBuildInputs = [ From 72d4d09d23d2412125ecd3c29a31e2078fec18dd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:46:45 +0100 Subject: [PATCH 0824/1054] treesheets: fix darwin build --- pkgs/applications/office/treesheets/default.nix | 17 ++++++----------- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index a68c8772f26a..90df4c1342f5 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -5,8 +5,7 @@ , ninja , wrapGAppsHook3 , makeWrapper -, wxGTK -, Cocoa +, wxGTK32 , unstableGitUpdater }: @@ -29,19 +28,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - wxGTK - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa + wxGTK32 ]; env.NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\""; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - shopt -s extglob - mkdir -p $out/{share/treesheets,bin} - mv $out/!(share) $out/share/treesheets - makeWrapper $out/{share/treesheets,bin}/treesheets \ - --chdir $out/share/treesheets + mkdir -p $out/{Applications,bin} + mv $out/TreeSheets.app $out/Applications + makeWrapper $out/Applications/TreeSheets.app/Contents/MacOS/TreeSheets $out/bin/TreeSheets ''; passthru = { @@ -52,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Free Form Data Organizer"; - mainProgram = "treesheets"; + mainProgram = "TreeSheets"; longDescription = '' The ultimate replacement for spreadsheets, mind mappers, outliners, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e921cb61a4d6..b17e312e92f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15851,10 +15851,7 @@ with pkgs; wlroots = wlroots_0_18; }; - treesheets = callPackage ../applications/office/treesheets { - wxGTK = wxGTK32; - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + treesheets = callPackage ../applications/office/treesheets { }; trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; From 7e495fadb205b0b29a79746601d8d8ebc8122089 Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Fri, 6 Dec 2024 00:53:32 +0100 Subject: [PATCH 0825/1054] gotemplate: 3.11.0 -> 3.12.0 --- pkgs/by-name/go/gotemplate/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/go/gotemplate/package.nix b/pkgs/by-name/go/gotemplate/package.nix index 5e7fa9f94d31..0ab99a16e379 100644 --- a/pkgs/by-name/go/gotemplate/package.nix +++ b/pkgs/by-name/go/gotemplate/package.nix @@ -1,18 +1,18 @@ { lib, - buildGo123Module, + buildGoModule, fetchFromGitHub, }: -buildGo123Module rec { +buildGoModule rec { pname = "gotemplate"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "coveooss"; repo = "gotemplate"; rev = "refs/tags/v${version}"; - hash = "sha256-ohF9NemIXTTzguQ2VfqFt9zeiE4Co+dVux9Kw5cDobs="; + hash = "sha256-XcSlQ0Gw+EW2sJK+M2Sp9pcSSy2wsdRZ3MeFewhx7nw="; }; vendorHash = "sha256-iNH0YmmZ/Qlc7WDoIbORd+uVg0rbQVKL6hX7YvbL0BE="; @@ -21,12 +21,12 @@ buildGo123Module rec { # see https://github.com/coveooss/gotemplate/issues/262 ldflags = [ "-X main.version=${version}" ]; - meta = with lib; { + meta = { description = "CLI for go text/template"; mainProgram = "gotemplate"; changelog = "https://github.com/coveooss/gotemplate/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ giorgiga ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.giorgiga ]; }; } From 01c804f466426a3961537c0d693e1a4fab80828d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 00:33:15 +0000 Subject: [PATCH 0826/1054] bore-cli: 0.5.1 -> 0.5.2 --- pkgs/tools/networking/bore-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix index d182fd22b5e1..a29c58734ade 100644 --- a/pkgs/tools/networking/bore-cli/default.nix +++ b/pkgs/tools/networking/bore-cli/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "bore-cli"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "ekzhang"; repo = "bore"; rev = "v${version}"; - hash = "sha256-i7JVE1Y982QUNocd56gHbhRr5rBWqTv1YT5uDwpAlA8="; + hash = "sha256-Wkhcv8q/dGRJqG7ArsnsPsRBnXdScGedwxunbOzAjyY="; }; - cargoHash = "sha256-PZDie/lBextHu8EV/butg2pJZFfizeOEdD21I3XFoHk="; + cargoHash = "sha256-vwvDtzShlQQO/oAnjbqDIP3fUdcH1kEmFR7fyV+uYbY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security From fb93e0b7c9b3140af69bcd3bbee5393801a2cffe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 00:45:38 +0000 Subject: [PATCH 0827/1054] phpPackages.phpstan: 2.0.2 -> 2.0.3 --- pkgs/development/php-packages/phpstan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index f77c7803fd88..1a7b4e3ff790 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpstan"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-sLta3LnGtbJ4CMzQ+GRhI13orBvo4Q/kEtCDWcJRSI4="; + hash = "sha256-jTyKR1sgRdGTEIhQWlAH1/0gbq5dObxXmLiEcp7+I7c="; }; - vendorHash = "sha256-t9KTZUj3FYH9lpQikesZpq180HqQB8hqE0xyneFgbRA="; + vendorHash = "sha256-U4J/uHZjCH8S33RdnStzfWW3RrbOPpX5jMC6FTkBYHE="; composerStrictValidation = false; meta = { From 0e3c98fe7b385f02a36ad651c6f82ec90d9bd842 Mon Sep 17 00:00:00 2001 From: Jerry Starke <42114389+JerrySM64@users.noreply.github.com> Date: Fri, 6 Dec 2024 01:47:47 +0100 Subject: [PATCH 0828/1054] linuxKernel.kernels.linux_lqx: 6.12.1-lqx1 -> 6.12.2-lqx3 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 47a8ac0151a8..5855e765209c 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -12,9 +12,9 @@ let }; # ./update-zen.py lqx lqx = { - version = "6.12.1"; #lqx - suffix = "lqx1"; #lqx - sha256 = "1q8rdghkgq0kn530pxncwsrfqlf3xfn4mdvxysdizyfn71vmrz8f"; #lqx + version = "6.12.2"; #lqx + suffix = "lqx3"; #lqx + sha256 = "18ibc0dz70vxb61mzdhbhbjg0kfxgcsrl3zdki0cqlhcvfxwk19h"; #lqx isLqx = true; }; }; From 661900b39980b7e890a6efb587630d2019e6a88e Mon Sep 17 00:00:00 2001 From: sodiboo Date: Tue, 3 Dec 2024 01:11:39 +0100 Subject: [PATCH 0829/1054] zed-editor: remove unused clang from build closure --- pkgs/by-name/ze/zed-editor/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index dbd4d52eeaaf..bba685e3dbd3 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -2,7 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - clang, cmake, copyDesktopItems, curl, @@ -122,7 +121,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ - clang cmake copyDesktopItems curl From c3e0876a96cc4267ac4f4145aa82073f7e1fa83d Mon Sep 17 00:00:00 2001 From: sodiboo Date: Tue, 3 Dec 2024 01:11:52 +0100 Subject: [PATCH 0830/1054] mchprs: remove unused clang from build closure --- pkgs/by-name/mc/mchprs/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/mc/mchprs/package.nix b/pkgs/by-name/mc/mchprs/package.nix index 88d09149c6de..df27432843f3 100644 --- a/pkgs/by-name/mc/mchprs/package.nix +++ b/pkgs/by-name/mc/mchprs/package.nix @@ -7,7 +7,6 @@ sqlite, zlib, stdenv, - clang, darwin, }: @@ -31,7 +30,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - clang rustPlatform.bindgenHook ]; From ae045ab274b0aa5e1fa4fb7dd697e96b93e04a7c Mon Sep 17 00:00:00 2001 From: sodiboo Date: Tue, 3 Dec 2024 01:16:03 +0100 Subject: [PATCH 0831/1054] stratovirt: remove unused libclang from build closure --- pkgs/by-name/st/stratovirt/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stratovirt/package.nix b/pkgs/by-name/st/stratovirt/package.nix index a1f3fb53e043..695a021a26da 100644 --- a/pkgs/by-name/st/stratovirt/package.nix +++ b/pkgs/by-name/st/stratovirt/package.nix @@ -1,6 +1,6 @@ { lib, rustPlatform, fetchgit , pkg-config, pixman, libcap_ng, cyrus_sasl -, libpulseaudio, libclang, gtk3, libusbgx, alsa-lib +, libpulseaudio, gtk3, libusbgx, alsa-lib , linuxHeaders, libseccomp }: @@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec { gtk3 libusbgx alsa-lib - libclang linuxHeaders libseccomp ]; From ab01eb03709541a7e5dbdf5c7a73c0b366a2665a Mon Sep 17 00:00:00 2001 From: sodiboo Date: Tue, 3 Dec 2024 01:41:32 +0100 Subject: [PATCH 0832/1054] solana-validator: remove unused libclang from build closure --- pkgs/applications/blockchains/solana-validator/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/solana-validator/default.nix b/pkgs/applications/blockchains/solana-validator/default.nix index 5b18f5fc4cc4..de66bc1c6d57 100644 --- a/pkgs/applications/blockchains/solana-validator/default.nix +++ b/pkgs/applications/blockchains/solana-validator/default.nix @@ -10,7 +10,6 @@ , zlib , protobuf , openssl -, libclang , libcxx , rocksdb_8_3 , rustfmt @@ -75,7 +74,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config protobuf rustfmt perl rustPlatform.bindgenHook ]; buildInputs = - [ openssl zlib libclang hidapi ] ++ (lib.optionals stdenv.hostPlatform.isLinux [ udev ]) + [ openssl zlib hidapi ] ++ (lib.optionals stdenv.hostPlatform.isLinux [ udev ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security System Libsystem libcxx ]; strictDeps = true; From 173c0f319447041408f8a826c22032f56d227571 Mon Sep 17 00:00:00 2001 From: sodiboo Date: Tue, 3 Dec 2024 02:33:49 +0100 Subject: [PATCH 0833/1054] tplay: remove unused libclang from build closure --- pkgs/by-name/tp/tplay/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/tp/tplay/package.nix b/pkgs/by-name/tp/tplay/package.nix index 1de2fe2e4daf..e3ef32f48869 100644 --- a/pkgs/by-name/tp/tplay/package.nix +++ b/pkgs/by-name/tp/tplay/package.nix @@ -7,7 +7,6 @@ ffmpeg, openssl, alsa-lib, - libclang, opencv, makeWrapper, }: @@ -42,7 +41,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl.dev alsa-lib.dev - (lib.getLib libclang) ffmpeg.dev opencv ]; From cebe48a77cf549ac990fc299af6b03e9ca3f0a9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 00:57:53 +0000 Subject: [PATCH 0834/1054] ndcurves: 1.4.1 -> 2.0.0 --- pkgs/by-name/nd/ndcurves/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nd/ndcurves/package.nix b/pkgs/by-name/nd/ndcurves/package.nix index cc58991bb325..f61f5a1d179f 100644 --- a/pkgs/by-name/nd/ndcurves/package.nix +++ b/pkgs/by-name/nd/ndcurves/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ndcurves"; - version = "1.4.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "loco-3d"; repo = "ndcurves"; rev = "v${finalAttrs.version}"; - hash = "sha256-XJ3VSSGKSJ+x3jc4408PGHTYg3nC7o/EeFnbKBELefs="; + hash = "sha256-dDH2XpnlBlhG5Q8N9Aljxvf/K9jFuiAx0lyBIcXNOZE="; }; outputs = [ From 239c4467200aa9dc29cd2ffac75e33a984915678 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Dec 2024 02:01:09 +0100 Subject: [PATCH 0835/1054] python39: 3.9.20 -> 3.9.21 https://docs.python.org/release/3.9.21/whatsnew/changelog.html --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index abed1fe0a685..486893326eb6 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -46,10 +46,10 @@ in { sourceVersion = { major = "3"; minor = "9"; - patch = "20"; + patch = "21"; suffix = ""; }; - hash = "sha256-aygSee/YUpTS1pk+FzmDpXRkwBM5Vvu7VTbslka+rww="; + hash = "sha256-MSb1lZLJsNeYWEdV8r97CB+hyjXOem/qmAEI11KgW7E="; inherit passthruFun; }; From ce5d74fbbafd709e0f75f55462c8f6ba622d0b79 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Dec 2024 02:01:53 +0100 Subject: [PATCH 0836/1054] python310: 3.10.15 -> 3.10.16 https://docs.python.org/release/3.10.16/whatsnew/changelog.html --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 486893326eb6..5b09e4bf97b3 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -58,10 +58,10 @@ in { sourceVersion = { major = "3"; minor = "10"; - patch = "15"; + patch = "16"; suffix = ""; }; - hash = "sha256-qrCVCBdzUXJgGHmHLZN8HkkopXxAmuAjaew9kdzOvnk="; + hash = "sha256-v7JJYJmQIgSRobkoUKBxNe0IMeQXOM9oHWPPAbKo+9E="; inherit passthruFun; }; From 08239ae70716a9d11d13a3ea73f405b2e6a4289c Mon Sep 17 00:00:00 2001 From: Benjamin Manuel Date: Fri, 15 Nov 2024 19:17:49 -0600 Subject: [PATCH 0837/1054] copacetic: init at 0.9.0 --- pkgs/by-name/co/copacetic/package.nix | 68 +++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 pkgs/by-name/co/copacetic/package.nix diff --git a/pkgs/by-name/co/copacetic/package.nix b/pkgs/by-name/co/copacetic/package.nix new file mode 100644 index 000000000000..188f3341b9b3 --- /dev/null +++ b/pkgs/by-name/co/copacetic/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + nix-update-script, + installShellFiles, + versionCheckHook, +}: +buildGoModule rec { + pname = "copacetic"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "project-copacetic"; + repo = "copacetic"; + rev = "refs/tags/v${version}"; + hash = "sha256-hvSbjkqrd//thUex2It31Z4Vrj1u07WEAQFAnWiPo6M="; + }; + + vendorHash = "sha256-eefYbB88wXQME8ehm/ieVBtOmmtxHkZSsjE05yeQ7Gw="; + + nativeBuildInputs = [ installShellFiles ]; + + CGO_ENABLED = "0"; + ldflags = [ + "-s" + "-w" + "-X github.com/project-copacetic/copacetic/pkg/version.GitVersion=${version}" + "-X main.version=${version}" + ]; + + checkFlags = + let + # Skip tests that require network access + skippedTests = [ + "TestNewClient/custom_buildkit_addr" + "TestPatch" + "TestPlugins/docker.io" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + + postInstall = + '' + mv $out/bin/copacetic $out/bin/copa + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd copa \ + --bash <($out/bin/copa completion bash) \ + --fish <($out/bin/copa completion fish) \ + --zsh <($out/bin/copa completion zsh) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://project-copacetic.github.io/copacetic/"; + description = "Tool for directly patching vulnerabilities in container images"; + license = lib.licenses.asl20; + mainProgram = "copa"; + maintainers = with lib.maintainers; [ bmanuel ]; + }; +} From 54862bcdfbe7832ed98c2771ab1ad4cff1541ce3 Mon Sep 17 00:00:00 2001 From: Jerry Starke <42114389+JerrySM64@users.noreply.github.com> Date: Fri, 6 Dec 2024 02:09:15 +0100 Subject: [PATCH 0838/1054] linuxKernel.kernels.linux_zen: 6.12.1-zen1 -> 6.12.2-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 5855e765209c..cf6d71ef6528 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -5,9 +5,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.12.1"; #zen + version = "6.12.2"; #zen suffix = "zen1"; #zen - sha256 = "18aws41zlayv4xd6489jzrhr8b3kwmrx2q1b50g67v4rsp02sb4p"; #zen + sha256 = "0a6anmfm6495j6lwlywr62ghpwdvbdn54bl5baya5jz7vfqc1ghj"; #zen isLqx = false; }; # ./update-zen.py lqx From 1566a6b69c47881ba65dac0a42637399de4890ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 01:19:18 +0000 Subject: [PATCH 0839/1054] phpExtensions.tideways: 5.14.0 -> 5.16.2 --- pkgs/development/php-packages/tideways/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/php-packages/tideways/default.nix b/pkgs/development/php-packages/tideways/default.nix index 41f764062555..d63e98750dea 100644 --- a/pkgs/development/php-packages/tideways/default.nix +++ b/pkgs/development/php-packages/tideways/default.nix @@ -23,7 +23,7 @@ in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-php"; extensionName = "tideways"; - version = "5.14.0"; + version = "5.16.2"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -43,15 +43,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-x86_64.tar.gz"; - hash = "sha256-jhTlHkdBqnI+HmEPbawpI0z3tIHUJdTwutLsmA5uBsw="; + hash = "sha256-bSLBk4VWRvErmSqXOEFE0N0K06+NRLmsJ76HegFYah8="; }; "aarch64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-arm64.tar.gz"; - hash = "sha256-HkYyie3FUIvRwFZ2H/0BuHB+tqrSWSGZYTIAa5HtO6s="; + hash = "sha256-nXTk0DlGSEq0bp4+Hls3+epV6JY4H50D6IO/M3evFpE="; }; "aarch64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-macos-arm.tar.gz"; - hash = "sha256-qspHSImQHRVPjcSjeARFBdNgYPD3mOoqktA08X8jGqg="; + hash = "sha256-IqQ0gtLAx8lVBccaDsum81FmkYXHKQ5zf27F2Y+H45g="; }; }; From e3382c257c3fd8a1d127d028851b333f1c8bb623 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 6 Dec 2024 10:25:08 +0900 Subject: [PATCH 0840/1054] crystal: add fish completions fish completion was introduced in version 1.6.0 so this guard is required, now supporting 1.2.2 https://github.com/crystal-lang/crystal/commit/98a15ee1ab90c2590d43529ea527c6ffc0ce318d --- pkgs/development/compilers/crystal/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 39745f61faca..bb28612bff96 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -220,6 +220,8 @@ let install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal + # fish completion was introduced since 1.6.0 + test -f etc/completion.fish && install -Dm644 etc/completion.fish $out/share/fish/vendor_completions.d/crystal.fish install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1 From 273369477b58d268795c8de4343eb79d62a978cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 01:29:16 +0000 Subject: [PATCH 0841/1054] phpExtensions.blackfire: 1.92.28 -> 1.92.29 --- .../tools/misc/blackfire/php-probe.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index eee55e34faeb..4e280e5f3bdd 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -15,47 +15,47 @@ let phpMajor = lib.versions.majorMinor php.version; inherit (stdenv.hostPlatform) system; - version = "1.92.28"; + version = "1.92.29"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-zJ6SOBGLzu3C47P9BrQCQjPVSpZq3PPLPfhXjL7Rnns="; - "8.2" = "sha256-jiHmAs2O047sjOzOTk/k2VQXBz6OT+kBlTElW3TSZjU="; - "8.3" = "sha256-yop48pyCT/904Sh9hQTCVagc38giLDDZJebtdTRQV3w="; + "8.1" = "sha256-82QSfFeXkE6+jQZpQ53RtSrQkk4fKmFUdMxpjPyoH+I="; + "8.2" = "sha256-DdmXnMeE4FXdi8fDCeApwHnmoLZK5x7F5aDzi2PAoPk="; + "8.3" = "sha256-cx+BesBkumuKThWGQWjgz1IvRo4iem/PlFH8V1kGRt0="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-wK/P+4K0fmyzIsrp360TaNSxiols5KVIvMY6ABdXN+s="; - "8.2" = "sha256-jJId/K7+27UbCMeWwT1Z0sMOe6Uj2Gw6FgBTv794rwQ="; - "8.3" = "sha256-Am8UKQCxAn2up4laZ/u55vVKIJSdunuc85amSWQg8wI="; + "8.1" = "sha256-jJm0DL4nXPW0jW6w+bhRolWGvQEzcKKp3t7Aj6Yyh4E="; + "8.2" = "sha256-PcEzgoj+mnpK9CpHFW74lOrjoqbd9FBRO+ewplEkAlc="; + "8.3" = "sha256-Iv7y86hQd53j3I5MSmMQkq67Yv4sGPcS0Ljo7TigNUk="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-JtEKfZnPqWCBUUHrhlnc/My+zllVySiJlsgdSYP3s5A="; - "8.2" = "sha256-FMd17GarNGlCO5a9X4I1SVo0qKIjsBaJMtLCcoi/uvk="; - "8.3" = "sha256-ZFckNiN0cAQEoc7m53MH/fiTNrWTLzIDzjpvsSbd0Xo="; + "8.1" = "sha256-mgaaU/XpdLx1cYR/Dg09BCeMvV/Hfum0/9P2prHr/08="; + "8.2" = "sha256-QxIp4DCe5yqs32T0G8L1im5UHpJYcmVbHzJAAt/fa7o="; + "8.3" = "sha256-esR9wZ2I5gTGmBQgPqdDPkPGJED/stoZQUpUiWp0cNY="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-fI1ACatqdKQJqh5fBWC1ikLUEsXfqegJlJWUDQYiI2w="; - "8.2" = "sha256-BhSL2ee1viVKoS3R1F/kuHgzyojDk3Pxrvor/xQ3b+4="; - "8.3" = "sha256-fZk0n/nUSOyQNXhUObGwZj0n7MBM7RS86ShKkEfRDws="; + "8.1" = "sha256-LkbqZytdpaLU7eVwnI3dBY+a6+diMtKot/8PH1E9UpY="; + "8.2" = "sha256-IwFFVZ+ED/SVvl+Qj7F0BQ2yoLmbBKYHCzMPXlcffPY="; + "8.3" = "sha256-tcgfKgFnx8Cc3OvFWVObqV9nwH+F1ts1+TNfMTf/AI0="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-YglriIPnixhsg1wlLHyu17CUETVEPOenu41Gq7maewU="; - "8.2" = "sha256-zvucvA2w1gQMApud2ozIK5BY4noSUooruRXjevELeBw="; - "8.3" = "sha256-hMRZHO4sVZCVHBifyVAD2b59Be8teqx+/QKH+ytQKuI="; + "8.1" = "sha256-X+uLHJDA7wzXq0r+ZJu+XCxK8Lna2TKA+BhncFT7Jzw="; + "8.2" = "sha256-x8ejkI7qGUeii2Q6rWIOpLhgOTRQnh484asxo9un6aY="; + "8.3" = "sha256-FSh8fJv6+inpw7xdRIsU7cNLr5OyzLt0kAjeKa1aJX0="; }; }; }; From 596eb73570b148e04e7228b76d3e9458b3978e29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 01:40:48 +0000 Subject: [PATCH 0842/1054] gnome-online-accounts-gtk: 3.50.4 -> 3.50.5 --- pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix b/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix index 7604d279b940..12e7dd52defe 100644 --- a/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix +++ b/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts-gtk"; - version = "3.50.4"; + version = "3.50.5"; src = fetchFromGitHub { owner = "xapp-project"; repo = "gnome-online-accounts-gtk"; rev = finalAttrs.version; - hash = "sha256-kgDeAH6Dj4+23dW649JR0XwvDqTiz5Tknsc4IfpQFWM="; + hash = "sha256-E4gZsPLOCK15xG5MiwN5sNQs/3KEkzC57I5moqcGy20="; }; nativeBuildInputs = [ From 555b648374a6bb9328ee849d77f7e56f36f226e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 01:41:35 +0000 Subject: [PATCH 0843/1054] witness: 0.6.0 -> 0.7.0 --- pkgs/by-name/wi/witness/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wi/witness/package.nix b/pkgs/by-name/wi/witness/package.nix index 1a24742e8a36..50e347a09124 100644 --- a/pkgs/by-name/wi/witness/package.nix +++ b/pkgs/by-name/wi/witness/package.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "witness"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "in-toto"; repo = "witness"; rev = "v${version}"; - sha256 = "sha256-ao9mxN5cMGopCRXUkJRTNJemizzibdw0Q+oAhKjUyHA="; + sha256 = "sha256-eHAEaecL4bJUZfFiXK3NqgTZU9l6b46WI/vDBuAqCUw="; }; - vendorHash = "sha256-pDMvtSavifWfxJqfiOef0CyT8KtU8BUjEFwReElkEeM="; + vendorHash = "sha256-AZRY8N88dUKAybdstSTRB8sirx4L4ZmiffQ7Qwlpb/8="; nativeBuildInputs = [ installShellFiles ]; From 81e6459faa779904cc0c50b6d7a6bcd5104c90aa Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 6 Dec 2024 10:43:06 +0900 Subject: [PATCH 0844/1054] dprint: add shell completions The completion feature was introduced in version 0.39.0 - https://github.com/dprint/dprint/releases/tag/0.39.0 - https://github.com/dprint/dprint/commit/717546b0d7268f3b95b0047ca4a941cc94125dc2 --- pkgs/by-name/dp/dprint/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index 5cf6abe3633c..6cfb7183c78e 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -3,6 +3,7 @@ stdenv, fetchCrate, rustPlatform, + installShellFiles, testers, nix-update-script, dprint, @@ -23,6 +24,18 @@ rustPlatform.buildRustPackage rec { # every commit upstream on GitHub Actions doCheck = false; + nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + installShellFiles + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + export DPRINT_CACHE_DIR="$(mktemp -d)" + installShellCompletion --cmd dprint \ + --bash <($out/bin/dprint completions bash) \ + --zsh <($out/bin/dprint completions zsh) \ + --fish <($out/bin/dprint completions fish) + ''; + passthru = { tests.version = testers.testVersion { inherit version; From 10004864a1ffadca85919664266c87f560749605 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 01:48:52 +0000 Subject: [PATCH 0845/1054] hypnotix: 4.6 -> 4.7 --- pkgs/by-name/hy/hypnotix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hypnotix/package.nix b/pkgs/by-name/hy/hypnotix/package.nix index c38b2f5c703f..7b616ff53981 100644 --- a/pkgs/by-name/hy/hypnotix/package.nix +++ b/pkgs/by-name/hy/hypnotix/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "4.6"; + version = "4.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-wDzHCrZTbfIb9dpRoh5qYKQNjONOv34FYdOr4svOLEw="; + hash = "sha256-e5vz5bCypzbofps+VW2UrKMsRBl7edeF8Ky00muCub4="; }; patches = [ From 6012143d23a75e538f9697182a4c8926aba24f87 Mon Sep 17 00:00:00 2001 From: Zane Dufour Date: Thu, 5 Dec 2024 20:51:38 -0500 Subject: [PATCH 0846/1054] argocd: 2.12.6 -> 2.13.1; add fish completions (#358264) Diff: https://github.com/argoproj/argo-cd/compare/v2.12.6...v2.13.1 --- pkgs/by-name/ar/argocd/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index 3fbe1924e956..85a15d028f54 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -1,18 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, stdenv }: buildGoModule rec { pname = "argocd"; - version = "2.12.6"; + version = "2.13.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-Lu0RUCSOrNNQ17CZGv/+ic3jPz4+3433JjwnjVzYzF4="; + hash = "sha256-0qL9CnEwEp7sJK7u6EKHVFY/hH8lTb182HZ3r+9nIyQ="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-8BX0QErfe2mxTbIToNgZ3U9OtpIy887936U68Qr+3W0="; + vendorHash = "sha256-p+9Q9VOdN7v7iK5oaO5f+B1iyOwVdk672zQsYsrb398="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 @@ -27,10 +27,10 @@ buildGoModule rec { "-X ${package_url}.gitCommit=${src.rev}" "-X ${package_url}.gitTag=${src.rev}" "-X ${package_url}.gitTreeState=clean" - "-X ${package_url}.kubectlVersion=v0.24.2" + "-X ${package_url}.kubectlVersion=v0.31.2" # NOTE: Update kubectlVersion when upgrading this package with - # https://github.com/argoproj/argo-cd/blob/v${version}/go.mod#L95 - # Per https://github.com/argoproj/argo-cd/blob/master/Makefile#L18 + # https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22k8s.io%2Fkubectl%22+path%3Ago.mod&type=code + # Per https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22KUBECTL_VERSION%3D%22+path%3AMakefile&type=code # Will need a way to automate it :P ]; @@ -48,9 +48,10 @@ buildGoModule rec { $out/bin/argocd version --client | grep ${src.rev} > /dev/null ''; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd argocd \ --bash <($out/bin/argocd completion bash) \ + --fish <($out/bin/argocd completion fish) \ --zsh <($out/bin/argocd completion zsh) ''; From e7be80fdcdb00cf59c778c4a39ecb75f58615426 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 01:52:26 +0000 Subject: [PATCH 0847/1054] radicle-httpd: 0.17.1 -> 0.18.0 --- pkgs/by-name/ra/radicle-httpd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index 58d1533e980c..3cc50a87bf12 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -13,19 +13,19 @@ }: rustPlatform.buildRustPackage rec { pname = "radicle-httpd"; - version = "0.17.1"; + version = "0.18.0"; env.RADICLE_VERSION = version; # You must update the radicle-explorer source hash when changing this. src = fetchgit { url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git"; rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}"; - hash = "sha256-AhiIpNVDL4XYIQ89aYu8Cp2nKhIPYCzyrcG5hw9xsmE="; + hash = "sha256-VHfiL0BSJsYS8QgMf+LEa6HvYoc+dxawTcwB4d6sTg8="; sparseCheckout = [ "radicle-httpd" ]; }; sourceRoot = "${src.name}/radicle-httpd"; - cargoHash = "sha256-TwK2QsoKVWYXn4mZEERQCnMOY4F9+wzjLBtvhH69wAs="; + cargoHash = "sha256-LmUZCu10RsuA8Lu3FjWcV8MzjX5FxBCV6+4zG0GEN2c="; nativeBuildInputs = [ asciidoctor From f6520224079287ebc07dfc00ea17b21f9a08a5af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 01:56:35 +0000 Subject: [PATCH 0848/1054] python312Packages.molecule: 24.9.0 -> 24.12.0 --- pkgs/development/python-modules/molecule/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index 5d935550d3c8..52c46d557cb3 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "molecule"; - version = "24.9.0"; + version = "24.12.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-hUjtoTwxoepBugeGsp3eRmz7gSYXwleSFRM1sXpBD2M="; + hash = "sha256-ckP/WOC4FZqiz0ZbqWBdZX8dYUYXJkMHvvWzJRhGev4="; }; nativeBuildInputs = [ From 50d2d70cbabdcfe330474e82bc5be10112d560c3 Mon Sep 17 00:00:00 2001 From: StayBlue Date: Thu, 24 Oct 2024 23:24:43 -0700 Subject: [PATCH 0849/1054] maintainers: add StayBlue --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6e50e5d0e96f..78f15ad34947 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21101,6 +21101,12 @@ github = "stasjok"; githubId = 1353637; }; + StayBlue = { + name = "StayBlue"; + email = "blue@spook.rip"; + github = "StayBlue"; + githubId = 23127866; + }; steamwalker = { email = "steamwalker@xs4all.nl"; github = "steamwalker"; From 608e99e3d330675d58d0bdda43c0080dc18dca2a Mon Sep 17 00:00:00 2001 From: Yifei Sun Date: Thu, 5 Dec 2024 20:58:43 -0500 Subject: [PATCH 0850/1054] tailscale: 1.78.0 -> 1.78.1 --- pkgs/by-name/ta/tailscale/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index 9ec4d43a0c76..a58d312c02b8 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -15,7 +15,7 @@ }: let - version = "1.78.0"; + version = "1.78.1"; in buildGo123Module { pname = "tailscale"; @@ -27,7 +27,7 @@ buildGo123Module { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-AujYfsPrLT0D6POge/pcA6dtWpQ4I6vI5op7zqzJ/+g="; + hash = "sha256-HHLGvxB3MMmmOUNLr2ivouLDO/Lo2FJYRYzoCE2fUDk="; }; patches = [ From f3b8df42ef12484fb141a1b63f4a87557f2f6b70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 02:03:37 +0000 Subject: [PATCH 0851/1054] containerlab: 0.59.0 -> 0.60.0 --- pkgs/by-name/co/containerlab/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix index ab1980449c29..7a631ff16160 100644 --- a/pkgs/by-name/co/containerlab/package.nix +++ b/pkgs/by-name/co/containerlab/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "containerlab"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-4YSnAoQkjDpSRBMqYW8D3TzipE5Co892y5PXkcz+8xA="; + hash = "sha256-+Xq4/cRtTYqbexajHtILAZvy0NWLn9UMxR1ksg0/JuY="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-PJQrQn7QPtUSzdlf2BYY8ARcmH6pzZgpl1oQbc98M4Y="; + vendorHash = "sha256-YX2JDDZ1jx32zfFj/2fY61zqxPIzmwntN+7kiGDxxV4="; ldflags = [ "-s" From 7e78a8175508307cee39bd1c069378723b02d833 Mon Sep 17 00:00:00 2001 From: StayBlue Date: Thu, 24 Oct 2024 23:25:19 -0700 Subject: [PATCH 0852/1054] argon: init at 2.0.21 --- pkgs/by-name/ar/argon/package.nix | 45 +++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/ar/argon/package.nix diff --git a/pkgs/by-name/ar/argon/package.nix b/pkgs/by-name/ar/argon/package.nix new file mode 100644 index 000000000000..46c6364dc70f --- /dev/null +++ b/pkgs/by-name/ar/argon/package.nix @@ -0,0 +1,45 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + udev, + zstd, + stdenv, +}: +rustPlatform.buildRustPackage rec { + pname = "argon"; + version = "2.0.21"; + + src = fetchFromGitHub { + owner = "argon-rbx"; + repo = "argon"; + rev = "refs/tags/${version}"; + hash = "sha256-msKrPLB+38PU7LEw92xEqFy6JxwMjttBaobIOhU7eWw="; + }; + + cargoHash = "sha256-yXhEgZYtYhrSpwPbL+yi9gaLVVV8sBlF8m3ADUC4kLk="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ + zstd + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + udev + ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + meta = { + description = "Full featured tool for Roblox development"; + homepage = "https://github.com/argon-rbx/argon"; + changelog = "https://github.com/argon-rbx/argon/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ StayBlue ]; + mainProgram = "argon"; + }; +} From 701b2a94cf6218e049528d7c69eaa724da57fe48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 02:12:14 +0000 Subject: [PATCH 0853/1054] python312Packages.cvelib: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/cvelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix index b55279325b17..b6541db48f17 100644 --- a/pkgs/development/python-modules/cvelib/default.nix +++ b/pkgs/development/python-modules/cvelib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "cvelib"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = "cvelib"; rev = "refs/tags/${version}"; - hash = "sha256-yDsnw7jw1NDs3dy5RUY4a+dWZzORyFG9kpR4WaJNbEE="; + hash = "sha256-voUBd4JQLk1Ik7JrhFYnY06AucVTj7WwAjDfjOTSENo="; }; postPatch = '' From 0b5368a9421b28a4d4c09c2360de66d0d72ca6b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 02:25:19 +0000 Subject: [PATCH 0854/1054] twig-language-server: 0.5.1 -> 0.6.0 --- pkgs/by-name/tw/twig-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tw/twig-language-server/package.nix b/pkgs/by-name/tw/twig-language-server/package.nix index 6be0f51ad55c..c45f53ec4e27 100644 --- a/pkgs/by-name/tw/twig-language-server/package.nix +++ b/pkgs/by-name/tw/twig-language-server/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "twig-language-server"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "kaermorchen"; repo = "twig-language-server"; rev = "refs/tags/v${version}"; - hash = "sha256-bW0siZudzqk/4XgVH6nNCOrpJ6WHTCZoHJC+aXnE5mM="; + hash = "sha256-7czd7KZ/r+jGFxwPSxWkmb27wOkN4CNRVZjeVTMrk9g="; }; - npmDepsHash = "sha256-zbMjfdIXQf6oz6em0vkyvroijCb2MUioZjvZjkbuKc8="; + npmDepsHash = "sha256-Ci+F6k7hXYod+hDUy+XPqVQ7FnsxRG61VhDO86N44mY="; installPhase = '' runHook preInstall From b1371135b5db3fcf728114d92d5bd0218109598a Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 26 Jul 2024 03:00:09 +0800 Subject: [PATCH 0855/1054] lib.strings.concatMapAttrsStringSep: init --- lib/default.nix | 2 +- lib/strings.nix | 37 +++++++++++++++++++++++++++++++++++++ lib/tests/misc.nix | 6 ++++++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index 5b742b195d34..83ce7a6d7ea9 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -100,7 +100,7 @@ let length head tail elem elemAt isList; inherit (self.strings) concatStrings concatMapStrings concatImapStrings stringLength substring isString replaceStrings - intersperse concatStringsSep concatMapStringsSep + intersperse concatStringsSep concatMapStringsSep concatMapAttrsStringSep concatImapStringsSep concatLines makeSearchPath makeSearchPathOutput makeLibraryPath makeIncludePath makeBinPath optionalString hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape diff --git a/lib/strings.nix b/lib/strings.nix index d9a2d786ed28..5ea86e0d7e07 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -269,6 +269,43 @@ rec { f: list: concatStringsSep sep (lib.imap1 f list); + /** + Like [`concatMapStringsSep`](#function-library-lib.strings.concatMapStringsSep) + but takes an attribute set instead of a list. + + # Inputs + + `sep` + : Separator to add between item strings + + `f` + : Function that takes each key and value and return a string + + `attrs` + : Attribute set to map from + + # Type + + ``` + concatMapAttrsStringSep :: String -> (String -> Any -> String) -> AttrSet -> String + ``` + + # Examples + + :::{.example} + ## `lib.strings.concatMapAttrsStringSep` usage example + + ```nix + concatMapAttrsStringSep "\n" (name: value: "${name}: foo-${value}") { a = "0.1.0"; b = "0.2.0"; } + => "a: foo-0.1.0\nb: foo-0.2.0" + ``` + + ::: + */ + concatMapAttrsStringSep = + sep: f: attrs: + concatStringsSep sep (lib.attrValues (lib.mapAttrs f attrs)); + /** Concatenate a list of strings, adding a newline at the end of each one. Defined as `concatMapStrings (s: s + "\n")`. diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 72b3d630b8da..6357cc3ec1cf 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -39,6 +39,7 @@ let composeManyExtensions concatLines concatMapAttrs + concatMapAttrsStringSep concatMapStrings concatStrings concatStringsSep @@ -328,6 +329,11 @@ runTests { expected = "a,b,c"; }; + testConcatMapAttrsStringSepExamples = { + expr = concatMapAttrsStringSep "\n" (name: value: "${name}: foo-${value}") { a = "0.1.0"; b = "0.2.0"; }; + expected = "a: foo-0.1.0\nb: foo-0.2.0"; + }; + testConcatLines = { expr = concatLines ["a" "b" "c"]; expected = "a\nb\nc\n"; From 037a7cbe01b02a296a524bff989d13295fdd5ea8 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 26 Jul 2024 03:15:06 +0800 Subject: [PATCH 0856/1054] apptainer: singularity: use lib.concatMapAttrsStringSep Use concatMapAttrsStringSep helper function from the standard library instead of the locally-improvised one. --- pkgs/applications/virtualization/singularity/generic.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 12a9039cb016..a84cc4ad540e 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -102,10 +102,6 @@ in }@args: let - concatMapStringAttrsSep = - sep: f: attrs: - lib.concatMapStringsSep sep (name: f name attrs.${name}) (lib.attrNames attrs); - addShellDoubleQuotes = s: lib.escapeShellArg ''"'' + s + lib.escapeShellArg ''"''; in (buildGoModule { @@ -210,7 +206,7 @@ in patchShebangs --build "$configureScript" makeit e2e scripts mlocal/scripts # Patching the hard-coded defaultPath by prefixing the packages in defaultPathInputs - ${concatMapStringAttrsSep "\n" (fileName: originalDefaultPaths: '' + ${lib.concatMapAttrsStringSep "\n" (fileName: originalDefaultPaths: '' substituteInPlace ${lib.escapeShellArg fileName} \ ${ lib.concatMapStringsSep " \\\n " ( From 226b3704236a049fc0aef7f123ac40a8275ea6f9 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 4 Aug 2024 14:37:26 +0800 Subject: [PATCH 0857/1054] tests.overriding: simplify implementation with lib.concatMapStringAttrsSep --- pkgs/test/overriding.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix index a9fa482e4e58..8fc7274c27c2 100644 --- a/pkgs/test/overriding.nix +++ b/pkgs/test/overriding.nix @@ -158,5 +158,5 @@ stdenvNoCC.mkDerivation { passthru = { inherit tests; }; buildCommand = '' touch $out - '' + lib.concatStringsSep "\n" (lib.attrValues (lib.mapAttrs (name: t: "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${name} success') || (echo '${name} fail' && exit 1)") tests)); + '' + lib.concatMapAttrsStringSep "\n" (name: t: "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${name} success') || (echo '${name} fail' && exit 1)") tests; } From b994f1fa5aa1d6f1491c5d6fc436bf986b624204 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 6 Dec 2024 12:19:37 +0900 Subject: [PATCH 0858/1054] lima: make sure it does not use pname for reponame Co-authored-by: OTABI Tomoya --- pkgs/applications/virtualization/lima/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index a9a297ced97d..0460467ea204 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "lima-vm"; - repo = pname; + repo = "lima"; rev = "v${version}"; sha256 = "sha256-LNsxMrbEgdosGDDUNvMZq/hpP5azNiIHjKTp0Iw/PC0="; }; From d90d79a605f255261c8c68ff92d34f64116cdddb Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 6 Dec 2024 12:20:43 +0900 Subject: [PATCH 0859/1054] lima: prefer hash rather than sha256 in fetchFromGitHub Co-authored-by: OTABI Tomoya --- pkgs/applications/virtualization/lima/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 0460467ea204..8538104effab 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { owner = "lima-vm"; repo = "lima"; rev = "v${version}"; - sha256 = "sha256-LNsxMrbEgdosGDDUNvMZq/hpP5azNiIHjKTp0Iw/PC0="; + hash = "sha256-LNsxMrbEgdosGDDUNvMZq/hpP5azNiIHjKTp0Iw/PC0="; }; vendorHash = "sha256-taozyQBJvkCsJAaOHg1gFK4qOnepRbzIn4jHzxfAn6A="; From 47eb6c12259084c0380cf20efdf9b7d3be1ac783 Mon Sep 17 00:00:00 2001 From: RodEsp <1084688+RodEsp@users.noreply.github.com> Date: Thu, 5 Dec 2024 22:26:08 -0500 Subject: [PATCH 0860/1054] warp-terminal: 0.2024.11.19.08.02.stable_03 -> 0.2024.12.03.08.02.stable_04 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 48a4a92c919f..7091625bf816 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-N1CvHYWhwi75+eelp3UPrqnigRTg1LWKhmVDNXv96LA=", - "version": "0.2024.11.19.08.02.stable_03" + "hash": "sha256-utxgI+fpobY9z06TpbXHcSpR7d6o1XLbfP/OwkoYbZQ=", + "version": "0.2024.12.03.08.02.stable_04" }, "linux_x86_64": { - "hash": "sha256-vxK9GFYYFZK3NIIejh6dAK3sKkpAR4cyOSC/t2Aodg8=", - "version": "0.2024.11.19.08.02.stable_03" + "hash": "sha256-MNwO08xL3MtrB/3I0ObTa9hIK5GgeeXFKb0PDUld1EA=", + "version": "0.2024.12.03.08.02.stable_04" }, "linux_aarch64": { - "hash": "sha256-eADShsB0/kKNMzBP1/JZ0Kofh2iTQtsxFz2N1H+hxY0=", - "version": "0.2024.11.19.08.02.stable_03" + "hash": "sha256-gMfRNNI0aVQ6ePt5hOLu/DDkrHQJMePj7hRaJA5pTbU=", + "version": "0.2024.12.03.08.02.stable_04" } } From 9ce07d21c7204db61915652c93ad837fac085fd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 04:17:10 +0000 Subject: [PATCH 0861/1054] mendeley: 2.122.1 -> 2.127.1 --- pkgs/applications/office/mendeley/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index ebf251849ed1..25ee02de209f 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -7,13 +7,13 @@ let pname = "mendeley"; - version = "2.122.1"; + version = "2.127.1"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-9/QGBUcMjZaV/R9Ox0RaNsLChICoMG9qdFRXM9XCF2w="; + hash = "sha256-VtGtv9orfOn/DLIrnUdV/fGZeP1ZpC6b5h/IG8RzaOg="; }; appimageContents = appimageTools.extractType2 { From 5e3bd16ee85823e3a7c37a5a12fe126198f4819d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 19 Nov 2024 10:49:01 +1000 Subject: [PATCH 0862/1054] stylua: 0.20.0 -> 2.0.1 Diff: https://github.com/JohnnyMorganz/StyLua/compare/v0.20.0...v2.0.1 https://github.com/johnnymorganz/stylua/blob/v2.0.0/CHANGELOG.md https://github.com/johnnymorganz/stylua/blob/v2.0.1/CHANGELOG.md --- pkgs/by-name/st/stylua/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix index b81b1f281b65..bb7bd8e99a7f 100644 --- a/pkgs/by-name/st/stylua/package.nix +++ b/pkgs/by-name/st/stylua/package.nix @@ -2,21 +2,21 @@ , rustPlatform , fetchFromGitHub # lua54 implies lua52/lua53 -, features ? [ "lua54" "luau" ] +, features ? [ "lua54" "luajit" "luau" ] }: rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.20.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bqUmLtJLjImWqe06CeIWIU4FP+/Vxszp2yKMosVeyZM="; + sha256 = "sha256-/gCg1mJ4BDmgZ+jdWvns9CkhymWP3jdTqS7Z4n4zsO8="; }; - cargoHash = "sha256-EMHt9oskPJCeAu/5VG6PaMt/4NTmNOaFTM5TMOy0BV8="; + cargoHash = "sha256-A1J1n/KsnZyB9pZFGcMojNU9FFGxk8p6TxlRNW6EwCs="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' From 64101f5ffbcf87463a2fcf6fef20a407c9eef4d8 Mon Sep 17 00:00:00 2001 From: Nicola Squartini Date: Fri, 6 Dec 2024 06:31:10 +0100 Subject: [PATCH 0863/1054] kopia: add shell completion scripts (#360216) --- pkgs/by-name/ko/kopia/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ko/kopia/package.nix b/pkgs/by-name/ko/kopia/package.nix index f718fb7a15fa..b530dff0065c 100644 --- a/pkgs/by-name/ko/kopia/package.nix +++ b/pkgs/by-name/ko/kopia/package.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, gitUpdater, testers, kopia }: +{ lib, buildGoModule, fetchFromGitHub, gitUpdater, installShellFiles, stdenv, testers, kopia }: buildGoModule rec { pname = "kopia"; @@ -20,6 +20,14 @@ buildGoModule rec { "-X github.com/kopia/kopia/repo.BuildInfo=${src.rev}" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd kopia \ + --bash <($out/bin/kopia --completion-script-bash) \ + --zsh <($out/bin/kopia --completion-script-zsh) + ''; + passthru = { updateScript = gitUpdater { rev-prefix = "v"; }; tests = { From 77136f2adecba7afa81fb7a63b66c0e221ebe35d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 05:36:17 +0000 Subject: [PATCH 0864/1054] ledger-live-desktop: 2.89.1 -> 2.92.1 --- pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index 22191d32471f..ac4e142078d4 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.89.1"; + version = "2.92.1"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-PPoQnXDVf6Q6QPVE41guJL1vu7rW7mZdpRZjRME3Ue8="; + hash = "sha256-X4jJ7vDoU1CyZQm9Grghn6Rv+7OILE79PbN77BUhzG0="; }; appimageContents = appimageTools.extractType2 { From 8c39875ae3f7a7d88f59051c352e0e4f702e5d80 Mon Sep 17 00:00:00 2001 From: Dave Aitken Date: Fri, 6 Dec 2024 05:38:25 +0000 Subject: [PATCH 0865/1054] nixos/github-runner: use bashInteractive instead of bash (#339875) Some github actions that use `bash` expect interactive features to be available. One such action is the [use-nix-shell](https://github.com/rrbutani/use-nix-shell-action) action. I couldn't find a way to override this even with `cfg.extraPackages`, due to the way the path is ordered. --- .../services/continuous-integration/github-runner/service.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/github-runner/service.nix b/nixos/modules/services/continuous-integration/github-runner/service.nix index ab2ebb7a498d..e3a926db8b25 100644 --- a/nixos/modules/services/continuous-integration/github-runner/service.nix +++ b/nixos/modules/services/continuous-integration/github-runner/service.nix @@ -52,7 +52,7 @@ with lib; } // cfg.extraEnvironment; path = (with pkgs; [ - bash + bashInteractive coreutils git gnutar From cfc007382b8baa07a172e20f0af1e5914a1a46be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 03:24:03 +0000 Subject: [PATCH 0866/1054] basex: 11.4 -> 11.6 --- pkgs/by-name/ba/basex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/basex/package.nix b/pkgs/by-name/ba/basex/package.nix index 02f7ca06de3d..887435a47a3e 100644 --- a/pkgs/by-name/ba/basex/package.nix +++ b/pkgs/by-name/ba/basex/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "basex"; - version = "11.4"; + version = "11.6"; src = fetchurl { url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip"; - hash = "sha256-gArcTVD4OoXWB6r9I8q2EXuwCRmbLFE1sO2yfo3AWCQ="; + hash = "sha256-JGf+eBBlzbg0UYQqpx/IjGhjOKWCvl5rfnYpYE+JWM4="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; From 2b413270b507de57324c8d04c789a40c147913c4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 2 Dec 2024 15:23:02 +0100 Subject: [PATCH 0867/1054] =?UTF-8?q?ocamlPackages.js=5Fof=5Focaml:=205.8.?= =?UTF-8?q?2=20=E2=86=92=205.9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/tools/ocaml/js_of_ocaml/compiler.nix | 12 ++++++++---- pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 4 ++-- pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 54067eb63d21..15fa959c90fa 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,16 +1,20 @@ -{ lib, fetchurl, buildDunePackage +{ lib, fetchurl, ocaml, buildDunePackage , cmdliner, yojson, ppxlib, findlib , menhir, menhirLib, sedlex +, version ? if lib.versionAtLeast ocaml.version "4.11" then "5.9.1" else "5.8.2" }: -buildDunePackage rec { +buildDunePackage { pname = "js_of_ocaml-compiler"; - version = "5.8.2"; + inherit version; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - hash = "sha256-ciAZS9L5sU2VgVOlogZ1A1nXtJ3hL+iNdFDThc7L8Eo="; + hash = { + "5.9.1" = "sha256-aMlcYIcdjpyaVMgvNeLtUEE7y0QPIg0LNRayoe4ccwc="; + "5.8.2" = "sha256-ciAZS9L5sU2VgVOlogZ1A1nXtJ3hL+iNdFDThc7L8Eo="; + }."${version}"; }; nativeBuildInputs = [ menhir ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 71e35f749e83..0ee5e4452947 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,5 +1,5 @@ { buildDunePackage, js_of_ocaml-compiler -, ppxlib, uchar +, ppxlib }: buildDunePackage { @@ -9,7 +9,7 @@ buildDunePackage { buildInputs = [ ppxlib ]; - propagatedBuildInputs = [ js_of_ocaml-compiler uchar ]; + propagatedBuildInputs = [ js_of_ocaml-compiler ]; meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 90d92415a9fc..5f25fca582be 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -1,5 +1,5 @@ { buildDunePackage, js_of_ocaml-compiler, js_of_ocaml-ppx -, js_of_ocaml, ocaml_lwt, lwt_log +, js_of_ocaml, lwt, lwt_log }: buildDunePackage { @@ -9,7 +9,7 @@ buildDunePackage { buildInputs = [ js_of_ocaml-ppx ]; - propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ]; + propagatedBuildInputs = [ js_of_ocaml lwt lwt_log ]; meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } From 521bd4db8e5c98f34af2f0e8c523cc02a0627704 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 06:07:03 +0000 Subject: [PATCH 0868/1054] python312Packages.google-cloud-dlp: 3.23.0 -> 3.25.1 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 8c8b720c097d..5aad5fed6900 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.23.0"; + version = "3.25.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_dlp"; inherit version; - hash = "sha256-NKH24p2jfjhbs73jHB/lWDk5P1Uin/Mp5TANR3fquzg="; + hash = "sha256-6R4CSOyB+beTUPNtj8wQc7uQmMUxhyO8lebV0PDu1Lg="; }; build-system = [ setuptools ]; From 33edad5d40ffaf748052b7ea85509c7264cf3162 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Fri, 6 Dec 2024 17:08:30 +1100 Subject: [PATCH 0869/1054] vsce/python: fix `pythonUseFixed` --- .../editors/vscode/extensions/ms-python.python/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index c27830e2cac3..19f8a59e37ec 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -48,7 +48,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { + lib.optionalString pythonUseFixed '' # Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`. substituteInPlace "./package.json" \ - --replace "\"default\": \"python\"" "\"default\": \"${python3.interpreter}\"" + --replace-fail "\"default\":\"python\"" "\"default\":\"${python3.interpreter}\"" ''; passthru.updateScript = writeScript "update" '' From ac3c4a9fa08f501ad7a847999f2e70e7595f6348 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Dec 2024 07:43:42 +0100 Subject: [PATCH 0870/1054] python312Packages.tokenizers: 0.20.3 -> 0.21.0 Diff: https://github.com/huggingface/tokenizers/compare/refs/tags/v0.20.3...v0.21.0 Changelog: https://github.com/huggingface/tokenizers/releases/tag/v0.21.0 --- .../python-modules/tokenizers/default.nix | 34 ++++++++----------- pkgs/top-level/python-packages.nix | 4 +-- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 0a357801915c..81d9c74792be 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, linkFarm, fetchurl, buildPythonPackage, @@ -8,23 +7,21 @@ python, # nativeBuildInputs - pkg-config, - setuptools-rust, - rustPlatform, cargo, + pkg-config, + rustPlatform, rustc, + setuptools-rust, # buildInputs openssl, - libiconv, - Security, # dependencies huggingface-hub, - numpy, # tests datasets, + numpy, pytestCheckHook, requests, tiktoken, @@ -74,14 +71,14 @@ let in buildPythonPackage rec { pname = "tokenizers"; - version = "0.20.3"; + version = "0.21.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "tokenizers"; - rev = "refs/tags/v${version}"; - hash = "sha256-NPH++kPPaSPR3jm6mfh+4aep6stj0I4bA24kFtaJSKU="; + tag = "v${version}"; + hash = "sha256-G65XiVlvJXOC9zqcVr9vWamUnpC0aa4kyYkE2v1K2iY="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -91,35 +88,32 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-S2AfsKBtitEfprp9vjTyCl772IBe/wqwqYVnnAEK3LE="; + hash = "sha256-5cw63ydyhpMup2tOe/hpG2W6YZ+cvT75MJBkE5Wap4s="; }; sourceRoot = "${src.name}/bindings/python"; maturinBuildFlags = [ "--interpreter ${python.executable}" ]; nativeBuildInputs = [ + cargo pkg-config - setuptools-rust rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook - cargo rustc + setuptools-rust ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - Security - ]; + buildInputs = [ + openssl + ]; dependencies = [ huggingface-hub - numpy ]; nativeCheckInputs = [ datasets + numpy pytestCheckHook requests tiktoken diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b493f35e4161..3b574c37cb3c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16063,9 +16063,7 @@ self: super: with self; { token-bucket = callPackage ../development/python-modules/token-bucket { }; - tokenizers = callPackage ../development/python-modules/tokenizers { - inherit (pkgs.darwin.apple_sdk.frameworks) Security; - }; + tokenizers = callPackage ../development/python-modules/tokenizers { }; tokenize-rt = callPackage ../development/python-modules/tokenize-rt { }; From a32211bb76f82e3a58586fb8230ab0588924277e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Dec 2024 00:38:28 +0100 Subject: [PATCH 0871/1054] python312Packages.transformers: 4.46.3 -> 4.47.0 Diff: https://github.com/huggingface/transformers/compare/refs/tags/v4.46.3...v4.47.0 Changelog: https://github.com/huggingface/transformers/releases/tag/v4.47.0 --- pkgs/development/python-modules/transformers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index f00f7aa9474a..06508471a619 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -58,14 +58,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.46.3"; + version = "4.47.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; - rev = "refs/tags/v${version}"; - hash = "sha256-unQ1BypPv3fcFLCq4yoyat4pNy4ub5kgKfQRnfhuaGI="; + tag = "v${version}"; + hash = "sha256-TQQ+w+EH/KWLE7iaaAHGxfE74hCiLXcqlIr1TIBFGvo="; }; build-system = [ setuptools ]; From 5a787efe66e825b7ad4bc3e2a451dba002202ebf Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 6 Dec 2024 10:12:31 +0300 Subject: [PATCH 0872/1054] linux_6_12: 6.12.2 -> 6.12.3 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index d29ae01c13e7..a3721a4a1462 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,7 +28,7 @@ "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532" }, "6.12": { - "version": "6.12.2", - "hash": "sha256:12rx83ryh1i1n79h05zgx1mn60s9fc0p7gh560gpp1ryqw80f7mv" + "version": "6.12.3", + "hash": "sha256:1bnycpkzcd6qdz4m5rx00wvkh9hs50q8c4aa93mg2l3xfz60k668" } } From d35f40d3b310c95a2a46f3d58e30d7e043954e7e Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 6 Dec 2024 08:33:10 +0100 Subject: [PATCH 0873/1054] fluxus: drop --- pkgs/by-name/fl/fluxus/fix-build.patch | 100 ------------------------- pkgs/by-name/fl/fluxus/package.nix | 77 ------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 177 deletions(-) delete mode 100644 pkgs/by-name/fl/fluxus/fix-build.patch delete mode 100644 pkgs/by-name/fl/fluxus/package.nix diff --git a/pkgs/by-name/fl/fluxus/fix-build.patch b/pkgs/by-name/fl/fluxus/fix-build.patch deleted file mode 100644 index b44327520e65..000000000000 --- a/pkgs/by-name/fl/fluxus/fix-build.patch +++ /dev/null @@ -1,100 +0,0 @@ -scons does not use os environment by default: - https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html - -nixpkgs' cc-wrapper on the other hand relies on various NIX_* variables -to be passed through like NIX_CFLAGS_COMPILE_BEFORE. - -While at it ported to python3-style print(). ---- a/SConstruct -+++ b/SConstruct -@@ -6,7 +6,7 @@ - # application, then calls the sconscripts for libfluxus and - # the fluxus Racket modules - --import os, os.path, sys, commands, subprocess -+import os, os.path, sys, subprocess - - MajorVersion = "0" - MinorVersion = "19" -@@ -100,6 +100,7 @@ IncludePaths = [ - paranoid = ' -W -Wcast-qual -Wwrite-strings -Wcast-align -Wpointer-arith -Wconversion -Wredundant-decls -Wunreachable-code -Winline -Wlarger-than-256' - - env = Environment(CCFLAGS = '-ggdb -pipe -Wall -O3 -ffast-math -Wno-unused -fPIC -pthread', -+ ENV = os.environ, - VERSION_NUM = FluxusVersion) - env.MergeFlags(ARGUMENTS.get('CCFLAGS', '').split()) - env.MergeFlags(ARGUMENTS.get('LDFLAGS', '').split()) -@@ -229,9 +230,9 @@ if env['PLATFORM'] == 'posix': - # Make sure we have these libraries availible - - if not GetOption('clean'): -- print '--------------------------------------------------------' -- print 'Fluxus: Configuring Build Environment' -- print '--------------------------------------------------------' -+ print('--------------------------------------------------------') -+ print('Fluxus: Configuring Build Environment') -+ print('--------------------------------------------------------') - # detect ode precision - if not GetOption('clean'): - try: -@@ -240,27 +241,27 @@ if not GetOption('clean'): - if isinstance(ode_str[0], str): - env.MergeFlags(ode_str[0]) - except: -- print 'WARNING: unable to run ode-config, cannot detect ODE precision' -+ print('WARNING: unable to run ode-config, cannot detect ODE precision') - - conf = Configure(env) - - # check Racket and OpenAL frameworks on osx - if env['PLATFORM'] == 'darwin': - if not conf.CheckHeader('scheme.h'): -- print "ERROR: 'racket3m' must be installed!" -+ print("ERROR: 'racket3m' must be installed!") - Exit(1) - if racket_framework: - LibList = filter(lambda x: x[0] != 'racket3m', LibList) - # OpenAL should be installed everywhere - if not conf.CheckHeader('OpenAL/al.h'): -- print "ERROR: 'OpenAL' must be installed!" -+ print("ERROR: 'OpenAL' must be installed!") - Exit(1) - - # all libraries are required, and some of them require each other, - # hence the order is important, and autoadd=1 - for (lib,headers) in LibList: - if not conf.CheckLibWithHeader(lib, headers, 'C', autoadd = 1): -- print "ERROR: '%s' must be installed!" % (lib) -+ print("ERROR: '%s' must be installed!" % (lib)) - Exit(1) - - if not conf.CheckFunc("dInitODE2"): -@@ -334,7 +335,7 @@ if not GetOption('clean'): - ]) - - if raco_status != 0: -- print "ERROR: Failed to run command 'raco'" -+ print("ERROR: Failed to run command 'raco'") - Exit(1) - - -@@ -377,8 +378,8 @@ if not GetOption('clean') and static_modules: - - app_env['LIBS'].remove("pthread") - app_env['LIBS'].remove("dl") -- app_env['LIBS'].remove("ode") -- app_env['LIBS'].remove("sndfile") -+ app_env['LIBS'].remove("ode") -+ app_env['LIBS'].remove("sndfile") - - # now go through the rest of the libs, removing them from - # the environment at the same time -@@ -425,7 +426,7 @@ SConscript(dirs = build_dirs, - if not GetOption('clean'): - helpmap_status = subprocess.call(["racket", "makehelpmap.scm"], cwd="docs/helpmap") - if helpmap_status != 0: -- print "ERROR: Failed to build 'docs/helpmap'" -+ print("ERROR: Failed to build 'docs/helpmap'") - Exit(1) - - ################################################################################ diff --git a/pkgs/by-name/fl/fluxus/package.nix b/pkgs/by-name/fl/fluxus/package.nix deleted file mode 100644 index dfa518c5c574..000000000000 --- a/pkgs/by-name/fl/fluxus/package.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, alsa-lib -, fftw -, libglut -, freetype -, glew -, libjack2 -, libjpeg -, liblo -, libsndfile -, libtiff -, ode -, openal -, openssl -, racket_7_9 -, scons -}: -let - racket = racket_7_9; -in -stdenv.mkDerivation { - pname = "fluxus"; - version = "0.19"; - src = fetchFromGitLab { - owner = "nebogeo"; - repo = "fluxus"; - rev = "ba9aee218dd4a9cfab914ad78bdb6d59e9a37400"; - sha256 = "0mwghpgq4n1khwlmgscirhmcdhi6x00c08q4idi2zcqz961bbs28"; - }; - - buildInputs = [ - alsa-lib - fftw - libglut - freetype - glew - libjack2 - libjpeg - liblo - libsndfile - libtiff - ode - openal - openssl - racket_7_9 - ]; - nativeBuildInputs = [ scons ]; - - patches = [ ./fix-build.patch ]; - postPatch = '' - substituteInPlace src/Unicode.cpp \ - --replace "(byte)" "(unsigned char)" - ''; - sconsFlags = [ - "RacketPrefix=${racket}" - "RacketInclude=${racket}/include/racket" - "RacketLib=${racket}/lib/racket" - "DESTDIR=build" - ]; - configurePhase = '' - sconsFlags+=" Prefix=$out" - ''; - installPhase = '' - mkdir -p $out - cp -r build$out/* $out/ - ''; - - meta = with lib; { - description = "Livecoding environment for 3D graphics, sound, and games"; - license = licenses.gpl2; - homepage = "http://www.pawfal.org/fluxus/"; - maintainers = [ maintainers.brainrape ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 61f8f88d0745..7008fdc51075 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -388,6 +388,7 @@ mapAliases { flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter322 = throw "flutter322 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter323 = throw "flutter323 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 + fluxus = throw "fluxus has been removed because it hasn't been updated in 9 years and depended on insecure Racket 7.9"; # Added 2024-12-06 foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17 forgejo-actions-runner = forgejo-runner; # Added 2024-04-04 From 67d1a8ce898485739fd19ff78b96a255819dbbb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 07:45:06 +0000 Subject: [PATCH 0874/1054] epic5: 3.0.1 -> 3.0.2 --- pkgs/by-name/ep/epic5/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ep/epic5/package.nix b/pkgs/by-name/ep/epic5/package.nix index f4f2ca6b2ac2..b53f6b761e48 100644 --- a/pkgs/by-name/ep/epic5/package.nix +++ b/pkgs/by-name/ep/epic5/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "epic5"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { url = "https://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-${finalAttrs.version}.tar.xz"; - hash = "sha256-F7lnxh5Yh08HdeH9CwYH+FxktjJYwaxNQInoETUqOUU="; + hash = "sha256-QiD9Lx4IxbR+w0NFw5cANqN9cvu1QR45wQ87zlV8FNU="; }; buildInputs = From 20993a11e3b309f6ab96160c2ec22996774fa386 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 6 Dec 2024 08:33:36 +0100 Subject: [PATCH 0875/1054] racket_7_9: drop --- .../interpreters/racket/racket_7_9.nix | 150 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 - 3 files changed, 1 insertion(+), 153 deletions(-) delete mode 100644 pkgs/development/interpreters/racket/racket_7_9.nix diff --git a/pkgs/development/interpreters/racket/racket_7_9.nix b/pkgs/development/interpreters/racket/racket_7_9.nix deleted file mode 100644 index c82d232e11a4..000000000000 --- a/pkgs/development/interpreters/racket/racket_7_9.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - makeFontsConf, - cacert, - cairo, - coreutils, - fontconfig, - freefont_ttf, - glib, - gmp, - gtk3, - libedit, - libffi, - libiconv, - libGL, - libGLU, - libjpeg, - libpng, - libtool, - mpfr, - openssl, - pango, - poppler, - readline, - sqlite, - disableDocs ? false, - CoreFoundation, - gsettings-desktop-schemas, - wrapGAppsHook3, -}: - -let - - fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; - - libPath = lib.makeLibraryPath [ - cairo - fontconfig - glib - gmp - gtk3 - gsettings-desktop-schemas - libedit - libGL - libGLU - libjpeg - libpng - mpfr - openssl - pango - poppler - readline - sqlite - ]; -in - -stdenv.mkDerivation rec { - pname = "racket"; - version = "7.9"; # always change at once with ./minimal.nix - - src = - (lib.makeOverridable ( - { name, sha256 }: - fetchurl { - url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - inherit sha256; - } - )) - { - name = "${pname}-${version}"; - sha256 = "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m"; - }; - - FONTCONFIG_FILE = fontsConf; - LD_LIBRARY_PATH = libPath; - NIX_LDFLAGS = lib.concatStringsSep " " [ - (lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isDarwin) "-lgcc_s") - (lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation") - ]; - - nativeBuildInputs = [ - cacert - wrapGAppsHook3 - ]; - - buildInputs = - [ - fontconfig - libffi - libtool - sqlite - gsettings-desktop-schemas - gtk3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - CoreFoundation - ]; - - preConfigure = '' - unset AR - for f in src/lt/configure src/cs/c/configure src/bc/src/string.c; do - substituteInPlace "$f" --replace /usr/bin/uname ${coreutils}/bin/uname - done - mkdir src/build - cd src/build - - gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${LD_LIBRARY_PATH}) - ''; - - shared = if stdenv.hostPlatform.isDarwin then "dylib" else "shared"; - configureFlags = - [ - "--enable-${shared}" - "--enable-lt=${libtool}/bin/libtool" - ] - ++ lib.optionals disableDocs [ "--disable-docs" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-xonx" ]; - - configureScript = "../configure"; - - enableParallelBuilding = false; - - meta = with lib; { - description = "Programmable programming language"; - longDescription = '' - Racket is a full-spectrum programming language. It goes beyond - Lisp and Scheme with dialects that support objects, types, - laziness, and more. Racket enables programmers to link - components written in different dialects, and it empowers - programmers to create new, project-specific dialects. Racket's - libraries support applications from web servers and databases to - GUIs and charts. - ''; - homepage = "https://racket-lang.org/"; - license = with licenses; [ - asl20 # or - mit - ]; - maintainers = [ ]; - platforms = [ - "x86_64-darwin" - "x86_64-linux" - "aarch64-linux" - ]; - broken = stdenv.hostPlatform.isDarwin; # No support yet for setting FFI lookup path - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7008fdc51075..6c830c0e561d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1080,6 +1080,7 @@ mapAliases { ### R ### rabbitvcs = throw "rabbitvcs has been removed from nixpkgs, because it was broken"; # Added 2024-07-15 + racket_7_9 = throw "Racket 7.9 has been removed because it is insecure. Consider using 'racket' instead."; # Added 2024-12-06 radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17 radicale2 = throw "'radicale2' was removed because it was broken. Use 'radicale' (version 3) instead"; # Added 2024-11-29 radicale3 = radicale; # Added 2024-11-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7748ec44227..b0c770e1c057 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7541,9 +7541,6 @@ with pkgs; racket = callPackage ../development/interpreters/racket { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; - racket_7_9 = callPackage ../development/interpreters/racket/racket_7_9.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation; - }; racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { }; rakudo = callPackage ../development/interpreters/rakudo { }; From a2cd533bdc01c0629178d9613cf3861b370ef59a Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 6 Dec 2024 08:48:14 +0100 Subject: [PATCH 0876/1054] nixos/doc/rl-2505: release notes for fluxus, racket_7_9 --- nixos/doc/manual/release-notes/rl-2505.section.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index d98e9aa36425..a708a22fb550 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -48,6 +48,10 @@ - `nodePackages.webpack-dev-server` has been removed, as it should be installed in projects that use it instead. +- `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead. + +- `fluxus` has been removed, as it depends on `racket_7_9` and had no updates in 9 years. + - The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses. - `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel. From abe6f1d91b142594f165e07929b8d49dc7bf9520 Mon Sep 17 00:00:00 2001 From: Sergei Volkov Date: Thu, 5 Dec 2024 08:23:17 +0100 Subject: [PATCH 0877/1054] sqlline: init at 1.12 --- pkgs/by-name/sq/sqlline/package.nix | 55 +++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 pkgs/by-name/sq/sqlline/package.nix diff --git a/pkgs/by-name/sq/sqlline/package.nix b/pkgs/by-name/sq/sqlline/package.nix new file mode 100644 index 000000000000..440187d1f060 --- /dev/null +++ b/pkgs/by-name/sq/sqlline/package.nix @@ -0,0 +1,55 @@ +{ + lib, + maven, + fetchFromGitHub, + makeWrapper, + jre, + docbook_xml_dtd_42, +}: + +maven.buildMavenPackage rec { + pname = "sqlline"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "julianhyde"; + repo = "sqlline"; + tag = "sqlline-${version}"; + hash = "sha256-rUlGtMgTfhciQVif0KaUcuY28wh+PrHsKen8qODom24="; + }; + + mvnHash = "sha256-9qDzc6TRn9Yv3/nTATZgP6J+PTZEZCN1et/3GrRb7X4="; + + nativeBuildInputs = [ + makeWrapper + docbook_xml_dtd_42 + ]; + + mvnParameters = "-DskipTests"; + + # Patch the DOCTYPE declaration in manual.xml + postPatch = '' + substituteInPlace src/docbkx/manual.xml \ + --replace-fail "https://docbook.org/xml/4.2/docbookx.dtd" "${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd" \ + --replace-fail 'PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"' 'PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"' + ''; + + buildOffline = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D target/sqlline-${version}-jar-with-dependencies.jar $out/share/java/sqlline-${version}.jar + makeWrapper ${jre}/bin/java $out/bin/sqlline \ + --add-flags "-jar $out/share/java/sqlline-${version}.jar" + runHook postInstall + ''; + + meta = { + description = "Shell for issuing SQL to relational databases via JDBC"; + homepage = "https://github.com/julianhyde/sqlline"; + mainProgram = "sqlline"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ taranarmo ]; + }; +} From 2c5f0b0e5f1f065a13eafe944bf305ac0e96b7f7 Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 6 Dec 2024 16:50:05 +0800 Subject: [PATCH 0878/1054] deepin.deepin-turbo: remove --- pkgs/desktops/deepin/default.nix | 2 +- .../deepin/misc/deepin-turbo/default.nix | 41 ------------------- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/desktops/deepin/misc/deepin-turbo/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 21f585da53b3..c86e77e2b9af 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -105,13 +105,13 @@ let #### MISC deepin-desktop-base = callPackage ./misc/deepin-desktop-base { }; - deepin-turbo = callPackage ./misc/deepin-turbo { }; } // lib.optionalAttrs config.allowAliases { dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27 dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23 dde-dock = throw "The 'deepin.dde-dock' is no longer maintained. Please use 'deepin.dde-tray-loader' instead."; # added 2024-08-28 deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23 + deepin-turbo = throw "The 'deepin.deepin-turbo' package was removed as it is outdated and no longer relevant."; # added 2024-12-06 go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31 go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31 go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31 diff --git a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix deleted file mode 100644 index d6ed1a723334..000000000000 --- a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, -}: - -stdenv.mkDerivation rec { - pname = "deepin-turbo"; - version = "0.0.6.3"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-t6/Ws/Q8DO0zBzrUr/liD61VkxbOv4W4x6VgMWr+Ozk="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ dtkwidget ]; - - postPatch = '' - substituteInPlace src/{booster-dtkwidget/CMakeLists.txt,booster-desktop/{CMakeLists.txt,desktop.conf},booster-generic/CMakeLists.txt} --replace "/usr" "$out" - ''; - - meta = with lib; { - description = "Daemon that helps to launch dtk applications faster"; - homepage = "https://github.com/linuxdeepin/deepin-turbo"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} From b3ae859368264ccfd5cd6effc9898e7535d6d8da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 09:43:10 +0000 Subject: [PATCH 0879/1054] python312Packages.publicsuffixlist: 1.0.2.20241203 -> 1.0.2.20241205 --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 76c0347248be..a7fbf07ef01b 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20241203"; + version = "1.0.2.20241205"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rx0kVdLEFHTVH2TDZBUC8X/BtpUhEK8bpr4Fg8y/IvA="; + hash = "sha256-1h6Zdt9TA/7os/Qe3kK8slJUTmErHhEyXlzW+OsB5Yg="; }; build-system = [ setuptools ]; From 896813431f304440e4d92a3ead4f4291c77c05f0 Mon Sep 17 00:00:00 2001 From: Cryo Date: Fri, 6 Dec 2024 17:50:09 +0800 Subject: [PATCH 0880/1054] maintainers: add cryo --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 367ff308844a..35559aef1530 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4668,6 +4668,13 @@ name = "Carl Richard Theodor Schneider"; keys = [ { fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; } ]; }; + cryo = { + email = "cryo@disroot.org"; + github = "cry0ice"; + githubId = 176274027; + name = "Cryo"; + keys = [ { fingerprint = "2CF7 F8E8 2258 5751 2591 F97F 4B12 E34A 25A9 AB35"; } ]; + }; Cryolitia = { name = "Cryolitia PukNgae"; email = "Cryolitia@gmail.com"; From 0a1505336a29255df9f10bcc8b5bde513664b8fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 09:24:47 +0000 Subject: [PATCH 0881/1054] gh: 2.63.0 -> 2.63.2 --- pkgs/by-name/gh/gh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index 8ee42672be39..f99e8f777d3f 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gh"; - version = "2.63.0"; + version = "2.63.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-r60mqFMvgZ39hBjehHrjqDsCzznyQDcXJmqIrn62Jvw="; + hash = "sha256-MxgwnRTIJFpYhZZhyc59ZAzgi6ud7mHpdSIImMlkwtg="; }; - vendorHash = "sha256-vdyArSBBF6ImYbwzAJCWbLihCtJuvxN6ooymwj32ywQ="; + vendorHash = "sha256-UCEtvEpfoyJs5lpoAfMehg5cFQ3XlESRT8XFIwvyYas="; nativeBuildInputs = [ installShellFiles ]; From 781e0616520410bd919aef1964fdfd12faf76d33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 10:12:01 +0000 Subject: [PATCH 0882/1054] cargo-sort: 1.0.9 -> 1.1.0 --- pkgs/by-name/ca/cargo-sort/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-sort/package.nix b/pkgs/by-name/ca/cargo-sort/package.nix index 53f941e788d0..51994805f3dd 100644 --- a/pkgs/by-name/ca/cargo-sort/package.nix +++ b/pkgs/by-name/ca/cargo-sort/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-sort"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "devinr528"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw="; + sha256 = "sha256-AUtue1xkhrhlF7PtqsCQ9rdhV0/0i85DWrp7YL9SAYk="; }; - cargoHash = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU="; + cargoHash = "sha256-y6lLwk40hmFQKDU7sYz3+QQzdn5eGoEX7izmloK22dg="; meta = with lib; { description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically"; From 0c657ff633897bd8be5e29b45a00d48b577bf8ce Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Fri, 6 Dec 2024 11:39:05 +0100 Subject: [PATCH 0883/1054] vimPlugins.lazy-nvim, vimPlugins.LazyVim: update on 2024-12-06 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 87de33eff6ef..a6b06aa7dc53 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -185,12 +185,12 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-12-02"; + version = "2024-12-05"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "4a626a81372df74c3ea33b435e91b127ef55a796"; - sha256 = "0y0569j9yiqk08paa5ic58r2gvk06iy3211sgl41fkfg00dk362v"; + rev = "b2f750558a3737879f8151e741e7a3988886e37f"; + sha256 = "0jz611zvsvilvf8gb9wky70jcp7pnla5yf48qfcn9sa3arm7666h"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -5764,12 +5764,12 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-11-20"; + version = "2024-12-05"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "56ead98e05bb37a4ec28930a54d836d033cf00f2"; - sha256 = "0fcb6zrxbrj0nnkbb7cilqsjr500rv43r5w9nbk9apvjcjx8rkg0"; + rev = "3388a26417c48b15d5266d954f62a4d47fe99490"; + sha256 = "15is61zfs4nkhjcdcg036fvv6rdd1kgyr6k704rcn77717m6ix6s"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; From bce3c80f903de3772113617b9af8f36f0fb01fdd Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 6 Dec 2024 11:25:05 +0100 Subject: [PATCH 0884/1054] nixos/release-notes: Fix broken option links Replace `option.html` with `options.html`, which is the actual filename. --- nixos/doc/manual/release-notes/rl-2205.section.md | 2 +- nixos/doc/manual/release-notes/rl-2411.section.md | 12 ++++++------ nixos/doc/manual/release-notes/rl-2505.section.md | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 2f869b07e072..c21e36403161 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -109,7 +109,7 @@ In addition to numerous new and upgraded packages, this release has the followin - [Maddy](https://maddy.email/), a free an open source mail server. Available as [services.maddy](#opt-services.maddy.enable). -- [matrix-conduit](https://conduit.rs/), a simple, fast and reliable chat server powered by matrix. Available as [services.matrix-conduit](option.html#opt-services.matrix-conduit.enable). +- [matrix-conduit](https://conduit.rs/), a simple, fast and reliable chat server powered by matrix. Available as [services.matrix-conduit](options.html#opt-services.matrix-conduit.enable). - [Moosefs](https://moosefs.com), fault tolerant petabyte distributed file system. Available as [moosefs](#opt-services.moosefs.master.enable). diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 15dbea0b1283..84c2f6fe344a 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -173,11 +173,11 @@ - [Suricata](https://suricata.io/), a free and open source, mature, fast and robust network threat detection engine. Available as [services.suricata](options.html#opt-services.suricata.enable). -- [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld.enable). +- [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](options.html#opt-services.playerctld.enable). -- [Glance](https://github.com/glanceapp/glance), a self-hosted dashboard that puts all your feeds in one place. Available as [services.glance](option.html#opt-services.glance.enable). +- [Glance](https://github.com/glanceapp/glance), a self-hosted dashboard that puts all your feeds in one place. Available as [services.glance](options.html#opt-services.glance.enable). -- [Apache Tika](https://github.com/apache/tika), a toolkit that detects and extracts metadata and text from over a thousand different file types. Available as [services.tika](option.html#opt-services.tika.enable). +- [Apache Tika](https://github.com/apache/tika), a toolkit that detects and extracts metadata and text from over a thousand different file types. Available as [services.tika](options.html#opt-services.tika.enable). - [Misskey](https://misskey-hub.net/en/), an interplanetary microblogging platform. Available as [services.misskey](options.html#opt-services.misskey.enable). @@ -199,7 +199,7 @@ - [ToDesk](https://www.todesk.com/linux.html), a remote desktop application. Available as [services.todesk](#opt-services.todesk.enable). -- [Dependency Track](https://dependencytrack.org/), an intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain. Available as [services.dependency-track](option.html#opt-services.dependency-track.enable). +- [Dependency Track](https://dependencytrack.org/), an intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain. Available as [services.dependency-track](options.html#opt-services.dependency-track.enable). - [Immich](https://github.com/immich-app/immich), a self-hosted photo and video backup solution. Available as [services.immich](#opt-services.immich.enable). @@ -215,9 +215,9 @@ - [Swapspace](https://github.com/Tookmund/Swapspace), a dynamic swap space manager that turns your unused free space into swap automatically. Available as [services.swapspace](#opt-services.swapspace.enable). -- [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](option.html#opt-services.zapret.enable). +- [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](options.html#opt-services.zapret.enable). -- [Glances](https://github.com/nicolargo/glances), an open-source system cross-platform monitoring tool. Available as [services.glances](option.html#opt-services.glances). +- [Glances](https://github.com/nicolargo/glances), an open-source system cross-platform monitoring tool. Available as [services.glances](options.html#opt-services.glances). ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index d98e9aa36425..32f60ddcf7d9 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -12,15 +12,15 @@ -- [Kimai](https://www.kimai.org/), a web-based multi-user time-tracking application. Available as [services.kimai](option.html#opt-services.kimai). +- [Kimai](https://www.kimai.org/), a web-based multi-user time-tracking application. Available as [services.kimai](options.html#opt-services.kimai). - [Omnom](https://github.com/asciimoo/omnom), a webpage bookmarking and snapshotting service. Available as [services.omnom](options.html#opt-services.omnom.enable). - [Traccar](https://www.traccar.org/), a modern GPS Tracking Platform. Available as [services.traccar](#opt-services.traccar.enable). -- [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](#opt-services.amazon-cloudwatch-agent.enable). +- [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](options.html#opt-services.amazon-cloudwatch-agent.enable). -- [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](#opt-services.agorakit.enable). +- [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](options.html#opt-services.agorakit.enable). From 4f8eb8d6b372addadd81c837afa027c6ff7fd15b Mon Sep 17 00:00:00 2001 From: Volker Diels-Grabsch Date: Fri, 29 Nov 2024 01:22:26 +0100 Subject: [PATCH 0885/1054] ocamlPackages.reason-react: init at 0.15.0 --- .../ocaml-modules/reason-react/default.nix | 23 ++++++++++++++ .../ocaml-modules/reason-react/ppx.nix | 31 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 +++ 3 files changed, 58 insertions(+) create mode 100644 pkgs/development/ocaml-modules/reason-react/default.nix create mode 100644 pkgs/development/ocaml-modules/reason-react/ppx.nix diff --git a/pkgs/development/ocaml-modules/reason-react/default.nix b/pkgs/development/ocaml-modules/reason-react/default.nix new file mode 100644 index 000000000000..340b0c1c27b1 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-react/default.nix @@ -0,0 +1,23 @@ +{ + buildDunePackage, + melange, + reason, + reason-react-ppx, +}: + +buildDunePackage { + pname = "reason-react"; + inherit (reason-react-ppx) version src; + nativeBuildInputs = [ + reason + melange + ]; + buildInputs = [ + reason-react-ppx + melange + ]; + doCheck = true; + meta = reason-react-ppx.meta // { + description = "Reason bindings for React.js"; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-react/ppx.nix b/pkgs/development/ocaml-modules/reason-react/ppx.nix new file mode 100644 index 000000000000..16068a1e6358 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-react/ppx.nix @@ -0,0 +1,31 @@ +{ + buildDunePackage, + fetchurl, + lib, + ppxlib, +}: + +let + version = "0.15.0"; +in +buildDunePackage { + pname = "reason-react-ppx"; + inherit version; + minimalOCamlVersion = "4.14"; + src = fetchurl { + url = "https://github.com/reasonml/reason-react/releases/download/${version}/reason-react-${version}.tbz"; + hash = "sha256-+pPJo/b50vp4pAC/ygI1LHB5O0pDJ1xpcQZOdFP8Q80="; + }; + buildInputs = [ + ppxlib + ]; + doCheck = false; # Needs to run in reason-react, see default.nix + meta = { + description = "React.js JSX PPX"; + homepage = "https://github.com/reasonml/reason-react"; + license = lib.licenses.mit; + maintainers = [ + lib.maintainers.vog + ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 35cb14aff535..85ef3bb1ce10 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1650,6 +1650,10 @@ let reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { }); + reason-react = callPackage ../development/ocaml-modules/reason-react { }; + + reason-react-ppx = callPackage ../development/ocaml-modules/reason-react/ppx.nix { }; + rebez = callPackage ../development/ocaml-modules/rebez { }; reperf = callPackage ../development/ocaml-modules/reperf { }; From f57ae5aba93b06a1ea0a08f552c74702dad5f2fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 10:48:38 +0000 Subject: [PATCH 0886/1054] intel-compute-runtime: 24.39.31294.12 -> 24.45.31740.9 --- pkgs/by-name/in/intel-compute-runtime/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index 872281f6c9d0..0eb33e124569 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "24.39.31294.12"; + version = "24.45.31740.9"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - hash = "sha256-7GNtAo20DgxAxYSPt6Nh92nuuaS9tzsQGH+sLnsvBKU="; + hash = "sha256-b7mHIet+zgbS0JfJLKvt9+xILWeuA2rvTAeXetlFz/w="; }; nativeBuildInputs = [ cmake pkg-config ]; From c769b4d2fb9cef6475a42a98d9aa6b3900321401 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 11:24:01 +0000 Subject: [PATCH 0887/1054] weaver: 0.10.0 -> 0.11.0 --- pkgs/by-name/we/weaver/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index 7734b0d6f585..d50644d1c215 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "weaver"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "weaver"; rev = "v${version}"; - hash = "sha256-hSoMt+4D1bpENBD9NmuVBLDUOJkau5Sk2OHS5RyDRYQ="; + hash = "sha256-xb6u9+cZ7p3b2S+I/mQtBfc7XsVlbeLSMHY3fhS+8/8="; }; - cargoHash = "sha256-4rHDulSsFvKly5M5bo1AtEAl280N/hxhznTngCxw36Y="; + cargoHash = "sha256-+Swg1ROVO2lVctF7j6Nibx+WPpE2KAdZSeowinXjnmo="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; [ SystemConfiguration ] From 13ba4d646c8861b160deddc19fe3aed6d2bb9400 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 10:06:44 +0000 Subject: [PATCH 0888/1054] kdiff3: 1.11.4 -> 1.11.5 --- pkgs/tools/text/kdiff3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 69aa0f50e665..f296460e96eb 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kdiff3"; - version = "1.11.4"; + version = "1.11.5"; src = fetchurl { url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz"; - hash = "sha256-rt573JqpZ1rukP0qNScFLtMbMJGNQuaQelksunzmp8M="; + hash = "sha256-Qg8Ys7lolpigXhAvikFxkEkHTaaPlslL4Y0bgpfutUU="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; From 28e73148eabc0e288beb3c296b9b82a61244b2fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 11:52:27 +0000 Subject: [PATCH 0889/1054] xournalpp: 1.2.4 -> 1.2.5 --- pkgs/applications/graphics/xournalpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 64ce75717edb..84b619911d9b 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "xournalpp"; repo = "xournalpp"; rev = "v${version}"; - hash = "sha256-72e47fVP0c8KioRHUqyEQIUgrLm+xMPE2Mm6+2v7pZk="; + hash = "sha256-Hm3NDVELOnwjg6NiV5VBbt/15slHAgOVZLTV3zBMkLI="; }; postPatch = '' From 55da4621f54e2f078b49019609b851e886443c0c Mon Sep 17 00:00:00 2001 From: Bastian Asmussen Date: Fri, 6 Dec 2024 13:05:38 +0100 Subject: [PATCH 0890/1054] docker-init: v1.3.0 -> v1.4.0 --- pkgs/by-name/do/docker-init/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/docker-init/package.nix b/pkgs/by-name/do/docker-init/package.nix index 1b3a3d1add58..0f2da4e6811b 100644 --- a/pkgs/by-name/do/docker-init/package.nix +++ b/pkgs/by-name/do/docker-init/package.nix @@ -6,8 +6,8 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "docker-init"; - version = "v1.3.0"; - tag = "157355"; + version = "v1.4.0"; + tag = "175267"; src = fetchurl { url = "https://desktop.docker.com/linux/main/amd64/${finalAttrs.tag}/docker-desktop-x86_64.pkg.tar.zst"; @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "docker-init"; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - badPlatforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ BastianAsmussen ]; }; From 889f246473030f57bdf42ec23e50b64d78d1947d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 29 Nov 2024 21:45:27 +0800 Subject: [PATCH 0891/1054] clash-rs: set mainProgram to clash --- pkgs/by-name/cl/clash-rs/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index cfec62f8a8c7..ec2edfa543b9 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -34,8 +34,12 @@ rustPlatform.buildRustPackage rec { doCheck = false; # test failed - doInstallCheck = true; + postInstall = '' + # Align with upstream + ln -s "$out/bin/clash-rs" "$out/bin/clash" + ''; + doInstallCheck = true; versionCheckProgramArg = "--version"; nativeInstallCheckInputs = [ @@ -45,7 +49,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Custom protocol, rule based network proxy software"; homepage = "https://github.com/Watfaq/clash-rs"; - mainProgram = "clash-rs"; + mainProgram = "clash"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aucub ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; From e8151e1869500d65d3a65a6aaaa793e17a8b3fa9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 12:13:36 +0000 Subject: [PATCH 0892/1054] gitlab-release-cli: 0.19.0 -> 0.20.0 --- pkgs/by-name/gi/gitlab-release-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-release-cli/package.nix b/pkgs/by-name/gi/gitlab-release-cli/package.nix index 61e2d5d84161..7c96905353b0 100644 --- a/pkgs/by-name/gi/gitlab-release-cli/package.nix +++ b/pkgs/by-name/gi/gitlab-release-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gitlab-release-cli"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "release-cli"; rev = "v${version}"; - hash = "sha256-AEDao1tehg15SmluHlivG/I+Y9Gcxjj7KUEGAmOZ1aY="; + hash = "sha256-6h9hVk1x3zkhvZrEu5XUjLRIFj+VXF8qtd3AAdVmyE0="; }; vendorHash = "sha256-UwDMRsWbk8rEv2d5FssIzCLby68YZULoxd3/JGLsCQU="; From 2160e7db923d9ded9787975891de5dfd07192961 Mon Sep 17 00:00:00 2001 From: Gary Guo Date: Fri, 6 Dec 2024 12:16:04 +0000 Subject: [PATCH 0893/1054] zulip: build package from source (#279545) Currently this uses AppImage which comes with its own electron and then we run it under FHS. This is not ideal since: * it suffers from "too many electrons" issue * we are relying upstream to bump electron version for bugfixes Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- pkgs/by-name/zu/zulip/package.nix | 75 +++++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix index 453a0caa999c..9604662d77d0 100644 --- a/pkgs/by-name/zu/zulip/package.nix +++ b/pkgs/by-name/zu/zulip/package.nix @@ -1,35 +1,74 @@ { lib -, fetchurl -, appimageTools +, fetchFromGitHub +, buildNpmPackage +, electron_32 +, makeDesktopItem +, makeShellWrapper +, copyDesktopItems }: -let +buildNpmPackage rec { pname = "zulip"; version = "5.11.1"; - src = fetchurl { - url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-t5qBm5+kTdeRMvcHpNbS5mp184UG/IqgJrtj7Ntcbb0="; - name="${pname}-${version}.AppImage"; + src = fetchFromGitHub { + owner = "zulip"; + repo = "zulip-desktop"; + rev = "v${version}"; + hash = "sha256-ELuQ/K5QhtS4QiTR35J9VtYNe1qBrS56Ay6mtcGL+FI="; }; - appimageContents = appimageTools.extractType2 { - inherit pname version src; + npmDepsHash = "sha256-13Rlqa7TC2JUq6q1b2U5X3EXpOJGZ62IeF163/mTo68="; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; }; -in appimageTools.wrapType2 { - inherit pname version src; + nativeBuildInputs = [ + makeShellWrapper + copyDesktopItems + ]; - runScript = "appimage-exec.sh -w ${appimageContents} -- \${NIXOS_OZONE_WL:+\${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}"; + dontNpmBuild = true; + buildPhase = '' + runHook preBuild - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/zulip.desktop $out/share/applications/zulip.desktop - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/zulip.png \ - $out/share/icons/hicolor/512x512/apps/zulip.png - substituteInPlace $out/share/applications/zulip.desktop \ - --replace-fail 'Exec=AppRun' 'Exec=${pname}' + npm run pack -- \ + -c.electronDist=${electron_32}/libexec/electron \ + -c.electronVersion=${electron_32.version} + + runHook postBuild ''; + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/lib/zulip" + cp -r dist/*-unpacked/resources/app.asar* "$out/share/lib/zulip/" + + install -m 444 -D app/resources/zulip.png $out/share/icons/hicolor/512x512/apps/zulip.png + + makeShellWrapper '${lib.getExe electron_32}' "$out/bin/zulip" \ + --add-flags "$out/share/lib/zulip/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}" \ + --inherit-argv0 + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "zulip"; + exec = "zulip %U"; + icon = "zulip"; + desktopName = "Zulip"; + comment = "Zulip Desktop Client for Linux"; + categories = [ "Chat" "Network" "InstantMessaging" ]; + startupWMClass = "Zulip"; + terminal = false; + }) + ]; + meta = with lib; { description = "Desktop client for Zulip Chat"; homepage = "https://zulip.com"; From 3cfec09792b139a8054143a4fbd53d37fd78953b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 6 Dec 2024 13:24:33 +0100 Subject: [PATCH 0894/1054] lua-language-server: 3.13.2 -> 3.13.3 --- pkgs/by-name/lu/lua-language-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix index 6ff338eb8a80..3a6abac16f2b 100644 --- a/pkgs/by-name/lu/lua-language-server/package.nix +++ b/pkgs/by-name/lu/lua-language-server/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.13.2"; + version = "3.13.3"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-JOIlEBNEXzYFO2gC3s9R2Y5aK0av6Kl0gQDWN7Kw7uk="; + hash = "sha256-pAmNzc9GlkUB3FxYXiBqbS9Ym2wg3lBLbBKio6WezyQ="; fetchSubmodules = true; }; From bb8a04411c86b1087f8a3d18f6e6d606d0ba2fed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Dec 2024 23:47:31 +0100 Subject: [PATCH 0895/1054] python312Packages.boto3-stubs: 1.35.72 -> 1.35.74 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 1c157dd5b4fa..4533064cfe85 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.35.72"; + version = "1.35.74"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-mKCERaYFYGUNjV0etGTuvACfTOTcdhPU4HKjS6uXNgw="; + hash = "sha256-8R3OCB0TZdQeE8FstfhiD3uG2MQJPoAdENliKRdKdgc="; }; build-system = [ setuptools ]; From 8f4f4b728717746b7cffebc82593c32cecc43544 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Dec 2024 23:47:35 +0100 Subject: [PATCH 0896/1054] python312Packages.botocore-stubs: 1.35.72 -> 1.35.73 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 5418807a9b68..88691558797e 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.35.72"; + version = "1.35.73"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-bdIERxT6J4JNSbSejnjNlR9Eo8w8vcSBFNgac7e+DTI="; + hash = "sha256-6aILCiliFnS0YiX9uIvwCgvKUhZBPXF4lbdbot1jxsw="; }; nativeBuildInputs = [ setuptools ]; From 48baa494a0b318a9841663abbbe77893bb842e31 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Dec 2024 15:04:46 +0100 Subject: [PATCH 0897/1054] python312Packages.botocore-stubs: 1.35.73 -> 1.35.74 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 88691558797e..64ba877ad6e1 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.35.73"; + version = "1.35.74"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-6aILCiliFnS0YiX9uIvwCgvKUhZBPXF4lbdbot1jxsw="; + hash = "sha256-GvQr94Cr7eWsh/i71/t+uSK3BGotq/N0zNlLqoVelWA="; }; nativeBuildInputs = [ setuptools ]; From 2a25904a7217cad9dc813ae3b3cb0fa5816bc16d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Dec 2024 13:30:39 +0100 Subject: [PATCH 0898/1054] python312Packages.boto3-stubs: 1.35.74 -> 1.35.76 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 4533064cfe85..8bd3465629c6 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.35.74"; + version = "1.35.76"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-8R3OCB0TZdQeE8FstfhiD3uG2MQJPoAdENliKRdKdgc="; + hash = "sha256-MhCbagyXIL98LjiWVUecbatO4zxiLizydGyeXsUnuuM="; }; build-system = [ setuptools ]; From da92d1a5e3f55516b657e835b2f25ba97db8f313 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Dec 2024 13:30:42 +0100 Subject: [PATCH 0899/1054] python312Packages.botocore-stubs: 1.35.74 -> 1.35.76 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 64ba877ad6e1..231f69f75aee 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.35.74"; + version = "1.35.76"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-GvQr94Cr7eWsh/i71/t+uSK3BGotq/N0zNlLqoVelWA="; + hash = "sha256-yXegSUgdUKFL8tsO8VAgt2c0/2KNS44Od7jRxlMYNp4="; }; nativeBuildInputs = [ setuptools ]; From c278fa738d8c15265d25c53dbab5a12934c58ed3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 12:36:04 +0000 Subject: [PATCH 0900/1054] cnspec: 11.33.0 -> 11.33.1 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 6c2ea87aeb8f..6cab660451e0 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.33.0"; + version = "11.33.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-RAMA+tBgOL9PeRGD2O3aeNGca1FsNiDV0lx0SlJl77c="; + hash = "sha256-zMv2Um8pw5unoy6h2aApDLGWy2SSJjkD2bbqYi1AxKU="; }; proxyVendor = true; - vendorHash = "sha256-T+eGhpjLwAmCKmgONLQ0HDF6qTyFXG+dbNN9doUyC3k="; + vendorHash = "sha256-n9PdtuKHm6gqVudf49PakK6fChHZfiGYr9eTPkSBfV8="; subPackages = [ "apps/cnspec" ]; From 4140c07b02e12280697fb03a8b3655eb2ee3400a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 12:37:09 +0000 Subject: [PATCH 0901/1054] oxker: 0.8.0 -> 0.9.0 --- pkgs/by-name/ox/oxker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ox/oxker/package.nix b/pkgs/by-name/ox/oxker/package.nix index fba55f73ca7c..8204fb59fab3 100644 --- a/pkgs/by-name/ox/oxker/package.nix +++ b/pkgs/by-name/ox/oxker/package.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.8.0"; + version = "0.9.0"; src = fetchCrate { inherit pname version; - hash = "sha256-5FZDHKYv3/ZEzb0tsI7wxydDU0p7zwfhSG2i4UScf6s="; + hash = "sha256-XY3LwDagxSi1yeAfqhnbtNRBqJxp0BkhaYZM/T59tGw="; }; - cargoHash = "sha256-7SMIN6Nu9W6t27+YoCbJt0HCkNhw/ZU6pn6qRYvrgT8="; + cargoHash = "sha256-SeNrVw1m0B9CV31Pa41YinviWbEdiw50sdcrQpndiCI="; meta = with lib; { description = "Simple tui to view & control docker containers"; From d23cf6671fea16c8a5d9f134b911a4db8796c631 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 12:41:38 +0000 Subject: [PATCH 0902/1054] oras: 1.2.0 -> 1.2.1 --- pkgs/by-name/or/oras/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/oras/package.nix b/pkgs/by-name/or/oras/package.nix index add83c4480a1..eb9279d845ea 100644 --- a/pkgs/by-name/or/oras/package.nix +++ b/pkgs/by-name/or/oras/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oras"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "oras-project"; repo = "oras"; rev = "v${version}"; - hash = "sha256-uqbHyp7eB7uttBlWpWxkCDGHtLkViYPEsIXuMGZ6LuM="; + hash = "sha256-M9YQUQHMt+CsTp/zDsPM2mwaUGYwjgBW1RY6j5jpYDk="; }; - vendorHash = "sha256-QGh3utM+9yPRGN/6IrPbXzyXA6yUNKQuOdVWglFeySw="; + vendorHash = "sha256-I1iFayzNcU2K8YMTfMFU0PEZAjKGhCuJLEi7cwy/XW0="; nativeBuildInputs = [ installShellFiles ]; From 7ad1c658a7057813b1058aa33c8e2d9f74604da8 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 6 Dec 2024 11:18:29 +0900 Subject: [PATCH 0903/1054] crystal: prefer installShellCompletion and installManPage --- pkgs/development/compilers/crystal/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index bb28612bff96..0468bca709a7 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -25,6 +25,7 @@ , pcre2 , pcre , pkg-config +, installShellFiles , readline , tzdata , which @@ -166,7 +167,7 @@ let strictDeps = true; - nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ]; + nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm installShellFiles ]; buildInputs = [ boehmgc (if lib.versionAtLeast version "1.8" then pcre2 else pcre) @@ -218,17 +219,18 @@ let cp -r docs/* $out/share/doc/crystal/api/ cp -r samples $out/share/doc/crystal/ - install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal - install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal - # fish completion was introduced since 1.6.0 - test -f etc/completion.fish && install -Dm644 etc/completion.fish $out/share/fish/vendor_completions.d/crystal.fish + installShellCompletion --cmd ${finalAttrs.meta.mainProgram} etc/completion.* - install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1 + installManPage man/crystal.1 install -Dm644 -t $out/share/licenses/crystal LICENSE README.md mkdir -p $out ln -s $bin/bin $out/bin + ln -s $bin/share/bash-completion $out/share/bash-completion + ln -s $bin/share/zsh $out/share/zsh + # fish completion was introduced in 1.6.0 + test -f etc/completion.fish && ln -s $bin/share/fish $out/share/fish ln -s $lib $out/lib runHook postInstall From c4cfde7078eea20623955dc3909ba481e279fae8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Dec 2024 13:46:07 +0100 Subject: [PATCH 0904/1054] python312Packages.samsungtvws: 2.7.0 -> 2.7.2 Diff: https://github.com/xchwarze/samsung-tv-ws-api/compare/refs/tags/v2.7.0...v2.7.2 Changelog: https://github.com/xchwarze/samsung-tv-ws-api/releases/tag/v2.7.2 --- pkgs/development/python-modules/samsungtvws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index db35c0a269de..bab6de96b59b 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "samsungtvws"; - version = "2.7.0"; + version = "2.7.2"; format = "setuptools"; disabled = isPy27; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "xchwarze"; repo = "samsung-tv-ws-api"; rev = "refs/tags/v${version}"; - hash = "sha256-HwpshNwWZQ5dIS7IaJJ5VaE1bERcX79B/Mu4ISkyDJo="; + hash = "sha256-CU59Kg8kSEE71x6wifCKCaVFdaMftodtkrAOpD+qvWY="; }; propagatedBuildInputs = [ From ccbc75e3e9e8ebdacec5f62dde49eedab1ddbc18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 12:52:11 +0000 Subject: [PATCH 0905/1054] delly: 1.3.1 -> 1.3.2 --- pkgs/by-name/de/delly/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/delly/package.nix b/pkgs/by-name/de/delly/package.nix index 7c6445bcfd02..bb6845b30a12 100644 --- a/pkgs/by-name/de/delly/package.nix +++ b/pkgs/by-name/de/delly/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "delly"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "dellytools"; repo = "delly"; rev = "v${finalAttrs.version}"; - hash = "sha256-RqiZzbFsj8g6kptpztW7EsYYzIyHgM9kOCIsq1PiPD8="; + hash = "sha256-nMMEQwsaRidv5MMbGF2s1wuRQX2COvWsJA67N8HiCZA="; }; postPatch = lib.optionalString stdenv.cc.isClang '' From 16be790812b5ccd4d386b1d86229ad36e093969f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Dec 2024 13:56:32 +0100 Subject: [PATCH 0906/1054] fwupd: 2.0.2 -> 2.0.3 Diff: https://github.com/fwupd/fwupd/compare/2.0.2...2.0.3 Changelog: https://github.com/fwupd/fwupd/releases/tag/2.0.3 --- pkgs/by-name/fw/fwupd/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 941ee4dfc9b4..27a6c479d394 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -5,7 +5,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, gi-docgen, pkg-config, gobject-introspection, @@ -118,7 +117,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "2.0.2"; + version = "2.0.3"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -135,8 +134,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "fwupd"; repo = "fwupd"; - rev = finalAttrs.version; - hash = "sha256-rmMb109SJVWDGT4z5GOA4V9O0cDMptTpwx0TXdGWjvk="; + tag = finalAttrs.version; + hash = "sha256-M0FZ5fyufm6h+/IyhajxpcjrGANKkyFzWKmn4EzLxKY="; }; patches = [ From 2f66cc6748b51bd22c7758157b36f1c2ab6f7693 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 12:57:59 +0000 Subject: [PATCH 0907/1054] abcmidi: 2024.10.10 -> 2024.12.06 --- pkgs/by-name/ab/abcmidi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ab/abcmidi/package.nix b/pkgs/by-name/ab/abcmidi/package.nix index 5ee24ad3af0b..c1cf87173637 100644 --- a/pkgs/by-name/ab/abcmidi/package.nix +++ b/pkgs/by-name/ab/abcmidi/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abcmidi"; - version = "2024.10.10"; + version = "2024.12.06"; src = fetchFromGitHub { owner = "sshlien"; repo = "abcmidi"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-dAxr1RJrYppt/Gw6ZF3fL0lDhwJNG5v75M6VA1okrtw="; + hash = "sha256-uSmkRoAy2tCvSy/jE0wxg2nhiQRF62zCwnr41YpRkXE="; }; meta = { From c14b69704a9ebe5b0e26d9e2d439dc48d5a00d36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 12:59:28 +0000 Subject: [PATCH 0908/1054] knot-dns: 3.4.2 -> 3.4.3 --- pkgs/by-name/kn/knot-dns/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix index 301841747bf8..406da681ee02 100644 --- a/pkgs/by-name/kn/knot-dns/package.nix +++ b/pkgs/by-name/kn/knot-dns/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "d835285c1057d45effa1479cfe1f107a50e83d11c1c6d36f270deda88799883e"; + sha256 = "sha256-+xU/B4BfRnnoNvFDp09c0gSuccOsvqerBe+OASxukFw="; }; outputs = [ "bin" "out" "dev" ]; From 44082b371a42f9e0b2250eff14233abfeab29964 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 13:09:58 +0000 Subject: [PATCH 0909/1054] python312Packages.globus-sdk: 3.48.0 -> 3.49.0 --- pkgs/development/python-modules/globus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index d24794e0d17d..7e1cc1c7f737 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.48.0"; + version = "3.49.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-NYDmDhsgYNMZZDiSZ5ZtRauTzzckjqtETbfs8OvkgE4="; + hash = "sha256-gqY26EoVUgpNQ83Egmnb/mBnLcB6MmFNs4W7ZsZziK0="; }; build-system = [ setuptools ]; From a2420d6b98174a77b054494a636b0a691a378483 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Thu, 5 Dec 2024 15:03:16 +0100 Subject: [PATCH 0910/1054] maintainers: update GitHub names It is important to have a usable mapping of maintainers -> GH handles to ping maintainers for reviews or bugs. This PR updates all outdated GitHub names based on the provided ID (note: I only fixed the casing up to JanLikar). The script is added in a follow-up commit. For the affected entries, I checked that the ID is correct by looking at one of their PRs. --- maintainers/maintainer-list.nix | 167 ++++++++++++++++---------------- 1 file changed, 84 insertions(+), 83 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3f2ff2f871c9..8db90a1226cd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -85,7 +85,7 @@ }; _0qq = { email = "0qqw0qqw@gmail.com"; - github = "0qq"; + github = "0xKDI"; githubId = 64707304; name = "Dmitry Kulikov"; }; @@ -155,7 +155,7 @@ }; _1000teslas = { name = "Kevin Tran"; - github = "1000teslas"; + github = "sledgehammervampire"; githubId = 47207223; }; _13r0ck = { @@ -219,7 +219,7 @@ }; _404wolf = { email = "wolfmermelstein@gmail.com"; - github = "404wolf"; + github = "404Wolf"; githubId = 108041238; name = "Wolf Mermelstein"; }; @@ -792,7 +792,7 @@ }; ajgrf = { email = "a@ajgrf.com"; - github = "ajgrf"; + github = "axgfn"; githubId = 10733175; name = "Alex Griffin"; }; @@ -805,7 +805,7 @@ }; ajwhouse = { email = "adam@ajwh.chat"; - github = "ajwhouse"; + github = "adam-dakota"; githubId = 56616368; name = "Adam House"; }; @@ -1229,7 +1229,7 @@ }; amanse = { email = "amansetiarjp@gmail.com"; - github = "amanse"; + github = "Amanse"; githubId = 13214574; name = "Aman Setia"; }; @@ -1315,6 +1315,7 @@ }; amozeo = { email = "wroclaw223@outlook.com"; + github = "amozeo"; githubId = 37040543; name = "Wroclaw"; }; @@ -1394,7 +1395,7 @@ }; andreasfelix = { email = "fandreas@physik.hu-berlin.de"; - github = "andreasfelix"; + github = "felix-andreas"; githubId = 24651767; name = "Felix Andreas"; }; @@ -1710,7 +1711,7 @@ }; aprl = { email = "aprl@acab.dev"; - github = "cutestnekoaqua"; + github = "CutestNekoAqua"; githubId = 30842467; name = "April John"; }; @@ -1787,13 +1788,13 @@ }; argrat = { email = "n.bertazzo@protonmail.com"; - github = "argrat"; + github = "argo-v5"; githubId = 98821629; name = "Nicolò Bertazzo"; }; arian-d = { email = "arianxdehghani@gmail.com"; - github = "arian-d"; + github = "Arian-D"; githubId = 40076285; name = "Arian Dehghani"; }; @@ -2022,7 +2023,7 @@ }; aspulse = { email = "contact@aspulse.dev"; - github = "aspulse"; + github = "AsPulse"; githubId = 84216737; name = "AsPulse / あすぱる"; keys = [ { fingerprint = "C919 E69E A7C0 E147 9E0F C26E 1EDA D0C6 70BD 062D"; } ]; @@ -2036,7 +2037,7 @@ }; astavie = { email = "astavie@pm.me"; - github = "astavie"; + github = "Astavie"; githubId = 7745457; name = "Astavie"; }; @@ -2292,7 +2293,7 @@ }; axertheaxe = { email = "axertheaxe@proton.me"; - github = "axertheaxe"; + github = "AxerTheAxe"; githubId = 99703210; name = "Katherine Jamison"; }; @@ -2425,7 +2426,7 @@ }; balssh = { email = "george.bals25@gmail.com"; - github = "balssh"; + github = "Balssh"; githubId = 82440615; name = "George Bals"; }; @@ -2654,7 +2655,7 @@ ben9986 = { name = "Ben Carmichael"; email = "ben9986.unvmn@passinbox.com"; - github = "ben9986"; + github = "Ben9986"; githubId = 38633150; keys = [ { fingerprint = "03C7 A587 74B3 F0E8 CE1F 4F8E ABBC DD77 69BC D3B0"; } ]; }; @@ -2863,7 +2864,7 @@ }; bhasherbel = { email = "nixos.maintainer@bhasher.com"; - github = "bhasherbel"; + github = "BhasherBEL"; githubId = 45831883; name = "Brieuc Dubois"; }; @@ -3017,7 +3018,7 @@ }; blusk = { email = "bluskript@gmail.com"; - github = "Bluskript"; + github = "bluskript"; githubId = 52386117; name = "Blusk"; }; @@ -3373,7 +3374,7 @@ }; ByteSudoer = { email = "bytesudoer@gmail.com"; - github = "bytesudoer"; + github = "ByteSudoer"; githubId = 88513682; name = "ByteSudoer"; }; @@ -3549,7 +3550,7 @@ }; campadrenalin = { email = "campadrenalin@gmail.com"; - github = "campadrenalin"; + github = "MaddieM4"; githubId = 289492; name = "Philip Horger"; }; @@ -3887,7 +3888,7 @@ }; cherrykitten = { email = "contact@cherrykitten.dev"; - github = "cherrykitten"; + github = "CherryKitten"; githubId = 20300586; matrix = "@sammy:cherrykitten.dev"; name = "CherryKitten"; @@ -4018,7 +4019,7 @@ }; chrispwill = { email = "chris@chrispwill.com"; - github = "chrispwill"; + github = "ChrisPWill"; githubId = 271099; name = "Chris Williams"; }; @@ -4110,7 +4111,7 @@ }; citadelcore = { email = "alex@arctarus.co.uk"; - github = "VertexA115"; + github = "RealityAnomaly"; githubId = 5567402; name = "Alex Zero"; keys = [ { fingerprint = "A0AA 4646 B8F6 9D45 4553 5A88 A515 50ED B450 302C"; } ]; @@ -4376,7 +4377,7 @@ colamaroro = { name = "Corentin Rondier"; email = "github@rondier.io"; - github = "colamaroro"; + github = "COLAMAroro"; githubId = 12484955; matrix = "@colamaroro:lovelyrad.io"; }; @@ -4416,7 +4417,7 @@ }; coloquinte = { email = "gabriel.gouvine_nix@m4x.org"; - github = "coloquinte"; + github = "Coloquinte"; githubId = 4102525; name = "Gabriel Gouvine"; }; @@ -4472,7 +4473,7 @@ connorbaker = { email = "connor.baker@tweag.io"; matrix = "@connorbaker:matrix.org"; - github = "connorbaker"; + github = "ConnorBaker"; name = "Connor Baker"; githubId = 3880346; }; @@ -4597,7 +4598,7 @@ }; crem = { email = "max@alstercaminer.com"; - github = "MaxCaminer"; + github = "ItsCrem"; githubId = 16345077; name = "crem"; }; @@ -4635,7 +4636,7 @@ croissong = { email = "jan.moeller0@pm.me"; name = "Jan Möller"; - github = "Croissong"; + github = "croissong"; githubId = 4162215; keys = [ { fingerprint = "CE97 9DEE 904C 26AA 3716 78C2 96A4 38F9 EE72 572F"; } ]; }; @@ -5132,7 +5133,7 @@ }; dawoox = { email = "contact@antoinebellanger.fr"; - github = "dawoox"; + github = "Dawoox"; githubId = 48325941; name = "Dawoox"; }; @@ -5230,7 +5231,7 @@ declan = { name = "Declan Rixon"; email = "declan.fraser.rixon@gmail.com"; - github = "DeclanRixon"; + github = "DeclanBaggins"; githubId = 57464835; }; deeengan = { @@ -5248,7 +5249,7 @@ }; deekahy = { email = "Lennart.Diego.Kahn@gmail.com"; - github = "deekahy"; + github = "DeeKahy"; githubId = 97156953; name = "Lennart Diego Kahn"; }; @@ -5349,7 +5350,7 @@ }; demine = { email = "riches_tweaks0o@icloud.com"; - github = "demine0"; + github = "Demine0"; githubId = 51992962; name = "Nikita Demin"; }; @@ -5367,7 +5368,7 @@ }; denperidge = { email = "contact@denperidge.com"; - github = "denperidge"; + github = "Denperidge"; githubId = 27348469; name = "Cat"; }; @@ -5379,7 +5380,7 @@ }; derdennisop = { email = "dennish@wuitz.de"; - github = "derdennisop"; + github = "DerDennisOP"; githubId = 52411861; name = "Dennis"; }; @@ -5545,13 +5546,13 @@ }; dgollings = { email = "daniel.gollings+nixpkgs@gmail.com"; - github = "dgollings"; + github = "DGollings"; githubId = 2032823; name = "Daniel Gollings"; }; dgonyeo = { email = "derek@gonyeo.com"; - github = "dgonyeo"; + github = "cgonyeo"; githubId = 2439413; name = "Derek Gonyeo"; }; @@ -6099,7 +6100,7 @@ }; dwrege = { email = "email@dwrege.de"; - github = "dominicwrege"; + github = "DominicWrege"; githubId = 7389000; name = "Dominic Wrege"; }; @@ -6242,7 +6243,7 @@ }; edeneast = { email = "edenofest@gmail.com"; - github = "edeneast"; + github = "EdenEast"; githubId = 2746374; name = "edeneast"; }; @@ -6675,7 +6676,7 @@ }; ercao = { email = "vip@ercao.cn"; - github = "ercao"; + github = "O8888"; githubId = 51725284; name = "ercao"; keys = [ { fingerprint = "F3B0 36F7 B0CB 0964 3C12 D3C7 FFAB D125 7ECF 0889"; } ]; @@ -6697,7 +6698,7 @@ erethon = { email = "dgrig@erethon.com"; matrix = "@dgrig:erethon.com"; - github = "erethon"; + github = "Erethon"; githubId = 1254842; name = "Dionysis Grigoropoulos"; }; @@ -6931,7 +6932,7 @@ }; eveeifyeve = { name = "Eveeifyeve"; - github = "eveeifyeve"; + github = "Eveeifyeve"; githubId = 88671402; matrix = "@eveeifyeve:matrix.org"; email = "eveeg1971@gmail.com"; @@ -6982,7 +6983,7 @@ }; ewuuwe = { email = "ewu.uweq@pm.me"; - github = "ewuuwe"; + github = "EwuUwe"; githubId = 63652646; name = "Xaver Oswald"; }; @@ -7076,7 +7077,7 @@ }; fabianrig = { email = "fabianrig@posteo.de"; - github = "fabianrig"; + github = "FabianRig"; githubId = 88741530; name = "Fabian Rigoll"; }; @@ -7618,7 +7619,7 @@ name = "Christian Friedow"; }; friedrichaltheide = { - github = "friedrichaltheide"; + github = "FriedrichAltheide"; githubId = 11352905; name = "Friedrich Altheide"; }; @@ -8064,7 +8065,7 @@ name = "Priyanshu Tripathi"; email = "nixos@getpsyched.dev"; matrix = "@getpsyched:matrix.org"; - github = "getpsyched"; + github = "GetPsyched"; githubId = 43472218; }; getreu = { @@ -8127,7 +8128,7 @@ }; gigglesquid = { email = "jack.connors@protonmail.com"; - github = "gigglesquid"; + github = "GiggleSquid"; githubId = 3685154; name = "Jack connors"; keys = [ { fingerprint = "21DF 8034 B212 EDFF 9F19 9C19 F65B 7583 7ABF D019"; } ]; @@ -8639,7 +8640,7 @@ }; hannesgith = { email = "nix@h-h.win"; - github = "hannesgith"; + github = "HannesGitH"; githubId = 33062605; name = "Hannes Hattenbach"; }; @@ -8678,7 +8679,7 @@ harbiinger = { email = "theo.godin@protonmail.com"; matrix = "@hrbgr:matrix.org"; - github = "harbiinger"; + github = "Harbiinger"; githubId = 55398594; name = "Theo Godin"; }; @@ -8962,7 +8963,7 @@ }; hhydraa = { email = "hcurfman@keemail.me"; - github = "hhydraa"; + github = "hcur"; githubId = 58676303; name = "hhydraa"; }; @@ -9097,7 +9098,7 @@ }; hornwall = { email = "hannes@hornwall.me"; - github = "hornwall"; + github = "Hornwall"; githubId = 1064477; name = "Hannes Hornwall"; }; @@ -9203,7 +9204,7 @@ }; humancalico = { email = "humancalico@disroot.org"; - github = "humancalico"; + github = "akshatagarwl"; githubId = 51334444; name = "Akshat Agarwal"; }; @@ -9628,7 +9629,7 @@ iogamaster = { email = "iogamastercode+nixpkgs@gmail.com"; name = "IogaMaster"; - github = "iogamaster"; + github = "IogaMaster"; githubId = 67164465; }; ionutnechita = { @@ -9696,7 +9697,7 @@ istoph = { email = "chr@istoph.de"; name = "Christoph Hüffelmann"; - github = "istoph"; + github = "istof"; githubId = 114227790; }; istudyatuni = { @@ -10011,7 +10012,7 @@ janlikar = { name = "Jan Likar"; email = "jan.likar@protonmail.com"; - github = "janlikar"; + github = "JanLikar"; githubId = 4228250; }; jansol = { @@ -10070,7 +10071,7 @@ jayesh-bhoot = { name = "Jayesh Bhoot"; email = "jb@jayeshbhoot.com"; - github = "jyssh"; + github = "jbhoot"; githubId = 1915507; }; jayman2000 = { @@ -10248,7 +10249,7 @@ }; jedsek = { email = "jedsek@qq.com"; - github = "jedsek"; + github = "Jedsek"; githubId = 63626406; name = "Jedsek"; }; @@ -11841,7 +11842,7 @@ knarkzel = { email = "knarkzel@gmail.com"; name = "Knarkzel"; - github = "Knarkzel"; + github = "svelterust"; githubId = 85593302; }; knedlsepp = { @@ -12393,7 +12394,7 @@ name = "Jacob LeCoq"; email = "lecoqjacob@gmail.com"; githubId = 9278174; - github = "lecoqjacob"; + github = "bayou-brogrammer"; keys = [ { fingerprint = "C505 1E8B 06AC 1776 6875 1B60 93AF DAD0 10B3 CB8D"; } ]; }; ledif = { @@ -12485,7 +12486,7 @@ }; leonid = { email = "belyaev.l@northeastern.edu"; - github = "leonidbelyaev"; + github = "aeblyve"; githubId = 77865363; name = "Leonid Belyaev"; }; @@ -12591,7 +12592,7 @@ }; libjared = { email = "jared@perrycode.com"; - github = "libjared"; + github = "hypevhs"; githubId = 3746656; matrix = "@libjared:matrix.org"; name = "Jared Perry"; @@ -12648,7 +12649,7 @@ }; lillycham = { email = "lillycat332@gmail.com"; - github = "lillycat332"; + github = "lillycham"; githubId = 54189319; name = "Lilly Cham"; }; @@ -12801,7 +12802,7 @@ logo = { email = "logo4poop@protonmail.com"; matrix = "@logo4poop:matrix.org"; - github = "logo4poop"; + github = "l0go"; githubId = 24994565; name = "Isaac Silverstein"; }; @@ -12967,7 +12968,7 @@ }; lu15w1r7h = { email = "lwirth2000@gmail.com"; - github = "LU15W1R7H"; + github = "luiswirth"; githubId = 37505890; name = "Luis Wirth"; }; @@ -14812,7 +14813,7 @@ }; modderme123 = { email = "modderme123@gmail.com"; - github = "modderme123"; + github = "milomg"; githubId = 14153763; name = "modderme123"; }; @@ -15158,7 +15159,7 @@ }; mtrsk = { email = "marcos.schonfinkel@protonmail.com"; - github = "mtrsk"; + github = "schonfinkel"; githubId = 16356569; name = "Marcos Benevides"; }; @@ -15357,7 +15358,7 @@ Name = { name = "Name"; email = "lasagna@garfunkles.space"; - github = "namescode"; + github = "NamesCode"; githubId = 86119896; }; name-snrl = { @@ -15412,7 +15413,7 @@ name = "Nathan Bijnens"; }; nathanielbrough = { - github = "silvergasp"; + github = "nathaniel-brough"; githubId = 7277663; email = "nathaniel.brough@gmail.com"; name = "Nathaniel Brough"; @@ -15478,7 +15479,7 @@ nbsp = { email = "aoife@enby.space"; matrix = "@nbsp:enby.space"; - github = "enbyspace"; + github = "nbsp"; githubId = 57151943; name = "aoife cassidy"; }; @@ -15583,7 +15584,7 @@ }; nerdypepper = { email = "nerdy@peppe.rs"; - github = "nerdypepper"; + github = "oppiliappan"; githubId = 23743547; name = "Akshay Oppiliappan"; }; @@ -16591,7 +16592,7 @@ }; osener = { email = "ozan@ozansener.com"; - github = "osener"; + github = "ozanmakes"; githubId = 111265; name = "Ozan Sener"; }; @@ -16654,7 +16655,7 @@ }; oxapentane = { email = "blame@oxapentane.com"; - github = "oxapentane"; + github = "gshipunov"; githubId = 1297357; name = "Grigory Shipunov"; keys = [ { fingerprint = "DD09 98E6 CDF2 9453 7FC6 04F9 91FA 5E5B F9AA 901C"; } ]; @@ -16730,7 +16731,7 @@ }; paddygord = { email = "pgpatrickgordon@gmail.com"; - github = "avaunit02"; + github = "avagordon01"; githubId = 10776658; name = "Patrick Gordon"; }; @@ -16893,7 +16894,7 @@ }; patricksjackson = { email = "patrick@jackson.dev"; - github = "patricksjackson"; + github = "arcuru"; githubId = 160646; name = "Patrick Jackson"; }; @@ -16947,7 +16948,7 @@ }; pawelpacana = { email = "pawel.pacana@gmail.com"; - github = "pawelpacana"; + github = "mostlyobvious"; githubId = 116740; name = "Paweł Pacana"; }; @@ -17110,7 +17111,7 @@ }; petercommand = { email = "petercommand@gmail.com"; - github = "petercommand"; + github = "ptrcmd"; githubId = 1260660; name = "petercommand"; }; @@ -17197,7 +17198,7 @@ name = "Léo Lavaur"; email = "phdcybersec@pm.me"; - github = "phdcybersec"; + github = "leolavaur"; githubId = 82591009; keys = [ { fingerprint = "7756 E88F 3C6A 47A5 C5F0 CDFB AB54 6777 F93E 20BF"; } ]; }; @@ -18525,7 +18526,7 @@ realsnick = { name = "Ido Samuelson"; email = "ido.samuelson@gmail.com"; - github = "realsnick"; + github = "i-am-logger"; githubId = 1440852; }; reckenrode = { @@ -19679,7 +19680,7 @@ }; sanana = { email = "asya@waifu.club"; - github = "AsyaTheAbove"; + github = "lunabunja"; githubId = 40492846; keys = [ { fingerprint = "B766 7717 1644 5ABC DE82 94AA 4679 BF7D CC04 4783"; } ]; name = "sanana the skenana"; @@ -19819,7 +19820,7 @@ }; schinmai-akamai = { email = "schinmai@akamai.com"; - github = "schinmai-akamai"; + github = "tchinmai7"; githubId = 70169773; name = "Tarun Chinmai Sekar"; }; @@ -19892,7 +19893,7 @@ }; scoder12 = { name = "Spencer Pogorzelski"; - github = "Scoder12"; + github = "spencerpogo"; githubId = 34356756; }; scolobb = { @@ -20730,7 +20731,7 @@ }; smironov = { email = "grrwlf@gmail.com"; - github = "grwlf"; + github = "sergei-mironov"; githubId = 4477729; name = "Sergey Mironov"; }; @@ -22119,7 +22120,7 @@ }; therealr5 = { email = "rouven@rfive.de"; - github = "therealr5"; + github = "rouven0"; githubId = 72568063; name = "Rouven Seifert"; keys = [ { fingerprint = "1169 87A8 DD3F 78FF 8601 BF4D B95E 8FE6 B11C 4D09"; } ]; @@ -22556,7 +22557,7 @@ tomsiewert = { email = "tom@siewert.io"; matrix = "@tom:frickel.earth"; - github = "tomsiewert"; + github = "sinuscosinustan"; githubId = 8794235; name = "Tom Siewert"; }; @@ -23459,7 +23460,7 @@ }; voidless = { email = "julius.schmitt@yahoo.de"; - github = "voidIess"; + github = "bratorange"; githubId = 45292658; name = "Julius Schmitt"; }; From 2361852cc5bf244ea6ef67caaf186b7b0f846b53 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Thu, 5 Dec 2024 17:05:10 +0100 Subject: [PATCH 0911/1054] maintainers/scripts: add check-maintainer-usernames Co-authored-by: Sandro --- .../check-maintainer-usernames/.gitignore | 1 + .../check-maintainer-usernames/Cargo.toml | 9 ++++ .../check-maintainer-usernames/src/main.rs | 42 +++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 maintainers/scripts/check-maintainer-usernames/.gitignore create mode 100644 maintainers/scripts/check-maintainer-usernames/Cargo.toml create mode 100644 maintainers/scripts/check-maintainer-usernames/src/main.rs diff --git a/maintainers/scripts/check-maintainer-usernames/.gitignore b/maintainers/scripts/check-maintainer-usernames/.gitignore new file mode 100644 index 000000000000..ea8c4bf7f35f --- /dev/null +++ b/maintainers/scripts/check-maintainer-usernames/.gitignore @@ -0,0 +1 @@ +/target diff --git a/maintainers/scripts/check-maintainer-usernames/Cargo.toml b/maintainers/scripts/check-maintainer-usernames/Cargo.toml new file mode 100644 index 000000000000..9edbb3281c00 --- /dev/null +++ b/maintainers/scripts/check-maintainer-usernames/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "check-maintainers" +version = "0.1.0" +edition = "2021" + +[dependencies] +octocrab = "0.42.1" +serde_json = "1.0.133" +tokio = { version = "1.41.1", features = ["fs", "macros", "rt-multi-thread"] } diff --git a/maintainers/scripts/check-maintainer-usernames/src/main.rs b/maintainers/scripts/check-maintainer-usernames/src/main.rs new file mode 100644 index 000000000000..02058ab008c7 --- /dev/null +++ b/maintainers/scripts/check-maintainer-usernames/src/main.rs @@ -0,0 +1,42 @@ +use std::{env, error::Error, io::{self, Write}}; + +use tokio::fs; + +#[tokio::main] +async fn main() { + real_main().await.unwrap(); +} + +async fn real_main() -> Result<(), Box> { + let gh = octocrab::OctocrabBuilder::default() + .personal_token(env::var("GITHUB_PAT").expect("no GITHUB_PAT configured")) + .build()?; + + // first run: nix-instantiate -A lib.maintainers --eval --strict --json > maintainers.json + let data: serde_json::Value = serde_json::from_str(&fs::read_to_string("maintainers.json").await?)?; + + let data = data.as_object().unwrap(); + let total = data.len(); + for (i, (maintainer_name, v)) in data.iter().enumerate() { + print!("\r{i}/{total}"); + io::stdout().flush()?; + let Some(github_id) = v.get("githubId") else { + println!("\rWARN: no id for {maintainer_name}"); + continue; + }; + let Some(github) = v.get("github") else { + println!("\rWARN: no username for {maintainer_name}"); + continue; + }; + let Ok(name) = gh.users_by_id(github_id.as_u64().unwrap()).profile().await else { + println!("\rWARN: error fetching {maintainer_name}"); + continue; + }; + let name = name.login; + if name.to_ascii_lowercase() != github.as_str().unwrap().to_ascii_lowercase() { + println!("\rERR: {maintainer_name} has github = {github}, but username really is '{name}'"); + } + } + + Ok(()) +} From 3c19fbca2429a44edfca6030174be1f8665c7bd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 13:43:57 +0000 Subject: [PATCH 0912/1054] k0sctl: 0.19.2 -> 0.19.4 --- pkgs/by-name/k0/k0sctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix index f22d0b97e5f5..8ce83a38f217 100644 --- a/pkgs/by-name/k0/k0sctl/package.nix +++ b/pkgs/by-name/k0/k0sctl/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.19.2"; + version = "0.19.4"; src = fetchFromGitHub { owner = "k0sproject"; repo = "k0sctl"; rev = "refs/tags/v${version}"; - hash = "sha256-TdnZZ27j++o9I4Zup4PmM2VAHwn8BPBG/CwxTUy0BWU="; + hash = "sha256-6zh5zd+EJpG7A4PLepBrzQKJekInkXq64XGnZS1xE7s="; }; - vendorHash = "sha256-Hl/eSFbwFiuSaaPh5blWFfz6m4VNrS5mYL8ehQlb90I="; + vendorHash = "sha256-EZ3TljEPpbpi9MZQWhmKYujXARAXawGAXez4KtRWYao="; ldflags = [ "-s" From 7e3d4971b90316bbc8f03a3ba34d9b8119dd55f6 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 25 Nov 2024 10:15:42 -0400 Subject: [PATCH 0913/1054] dafny: fix build with strictDeps --- pkgs/by-name/da/dafny/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/da/dafny/package.nix b/pkgs/by-name/da/dafny/package.nix index 2e3b0c1e911e..6119aaf63741 100644 --- a/pkgs/by-name/da/dafny/package.nix +++ b/pkgs/by-name/da/dafny/package.nix @@ -42,7 +42,7 @@ buildDotnetModule rec { ''; dotnet-sdk = dotnetCorePackages.sdk_6_0; - buildInputs = [ jdk11 ]; + nativeBuildInputs = [ jdk11 ]; nugetDeps = ./deps.nix; # Build just these projects. Building Source/Dafny.sln includes a bunch of From 194de8cdd3d912ff8ad6c9ed2fdb67a016151581 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 25 Nov 2024 21:25:05 -0400 Subject: [PATCH 0914/1054] github-runner: fix build with strictDeps --- pkgs/by-name/gi/github-runner/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 9b71405f3354..8e961ec2bd58 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -1,5 +1,7 @@ { + bash, buildDotnetModule, + coreutils, darwin, dotnetCorePackages, fetchFromGitHub, @@ -111,12 +113,17 @@ buildDotnetModule rec { [ which git + # needed for `uname` + coreutils ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; - buildInputs = [ (lib.getLib stdenv.cc.cc) ]; + buildInputs = [ + (lib.getLib stdenv.cc.cc) + bash + ]; dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; From 122f86cec61e73778b7bfc3b177777ab6471ebaf Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 26 Nov 2024 10:58:28 -0400 Subject: [PATCH 0915/1054] tagger: fix build with strictDeps --- pkgs/by-name/ta/tagger/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tagger/package.nix b/pkgs/by-name/ta/tagger/package.nix index a8074cef4074..fa4074b8a524 100644 --- a/pkgs/by-name/ta/tagger/package.nix +++ b/pkgs/by-name/ta/tagger/package.nix @@ -31,11 +31,11 @@ buildDotnetModule rec { nativeBuildInputs = [ blueprint-compiler - libadwaita ]; buildInputs = [ chromaprint + libadwaita ]; runtimeDeps = [ From 32890ed46eafb32a1d8df9ca7353905c317a6c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 6 Dec 2024 14:54:43 +0100 Subject: [PATCH 0916/1054] knot-dns: add .meta.changelog It can be handy for r-ryantm pull requests. --- pkgs/by-name/kn/knot-dns/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix index 406da681ee02..6412fd6a35c4 100644 --- a/pkgs/by-name/kn/knot-dns/package.nix +++ b/pkgs/by-name/kn/knot-dns/package.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Authoritative-only DNS server from .cz domain registry"; homepage = "https://knot-dns.cz"; + changelog = "https://gitlab.nic.cz/knot/knot-dns/-/releases/v${version}"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.vcunat ]; From cb29290646fd4df5e2b72f8f060b5bcd344772a0 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Fri, 6 Dec 2024 15:00:24 +0100 Subject: [PATCH 0917/1054] openresty: make postgres module optional Enables users who don't need it to easily disable it. Defaults to on to not regress any users. Signed-off-by: Christoph Heiss --- pkgs/servers/http/openresty/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 65191c6d713a..0073fae047be 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -5,6 +5,7 @@ , perl , postgresql , nixosTests +, withPostgres ? true , ... }@args: @@ -37,7 +38,7 @@ callPackage ../nginx/generic.nix args rec { patchShebangs configure bundle/ ''; - configureFlags = [ "--with-http_postgres_module" ]; + configureFlags = lib.optional withPostgres [ "--with-http_postgres_module" ]; postInstall = '' ln -s $out/luajit/bin/luajit-2.1.ROLLING $out/bin/luajit-openresty From 895b69405c103f218ca5bed47efbb0ef71bb577f Mon Sep 17 00:00:00 2001 From: js6pak Date: Sun, 24 Nov 2024 22:40:41 +0100 Subject: [PATCH 0918/1054] dotnet: make wrappers usable as DOTNET_ROOT This simplifies the code a bit and makes it possible to use dotnetCorePackages.combinePackages as dotnet-runtime again. Partial revert of ddd08e404f21d39ae6592ae359f416e7b0fd8462. --- .../dotnet/build-dotnet-module/hooks/default.nix | 3 +-- pkgs/by-name/dy/dyalog/package.nix | 2 +- pkgs/by-name/ne/netcoredbg/package.nix | 2 +- pkgs/by-name/pr/pre-commit/package.nix | 2 +- pkgs/development/compilers/dotnet/combine-packages.nix | 4 ++-- pkgs/development/compilers/dotnet/wrapper.nix | 6 +++--- pkgs/test/dotnet/use-dotnet-from-env/default.nix | 4 ++-- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix index e589804fbe32..1110e01f7dd9 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -52,8 +52,7 @@ { name = "dotnet-fixup-hook"; substitutions = { - # this is used for DOTNET_ROOT, so we need unwrapped - dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime.unwrapped else null; + dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime else null; wrapperPath = lib.makeBinPath [ which coreutils ]; }; } diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index 310ec6a8bc34..a0c7be275547 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -32,7 +32,7 @@ let dyalogHome = "$out/lib/dyalog"; - makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnet-sdk_8.unwrapped}/share/dotnet"; + makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnet-sdk_8}/share/dotnet"; licenseUrl = "https://www.dyalog.com/uploads/documents/Developer_Software_Licence.pdf"; diff --git a/pkgs/by-name/ne/netcoredbg/package.nix b/pkgs/by-name/ne/netcoredbg/package.nix index 48d62500e116..6b9773cb60db 100644 --- a/pkgs/by-name/ne/netcoredbg/package.nix +++ b/pkgs/by-name/ne/netcoredbg/package.nix @@ -36,7 +36,7 @@ let cmakeFlags = [ "-DCORECLR_DIR=${coreclr-src}/src/coreclr" - "-DDOTNET_DIR=${dotnet-sdk.unwrapped}/share/dotnet" + "-DDOTNET_DIR=${dotnet-sdk}/share/dotnet" "-DBUILD_MANAGED=0" ]; }; diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index c5c62a54499f..a35ffa3072dd 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -93,7 +93,7 @@ buildPythonApplication rec { VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 LANG=en_US.UTF-8 # Resolve `.NET location: Not found` errors for dotnet tests - export DOTNET_ROOT="${dotnet-sdk.unwrapped}/share/dotnet" + export DOTNET_ROOT="${dotnet-sdk}/share/dotnet" export HOME=$(mktemp -d) diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 2b5554b2eb94..aefc77906974 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -20,7 +20,7 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' ];`''; (buildEnv { name = "dotnet-core-combined"; - paths = map (x: x.unwrapped) dotnetPackages; + paths = dotnetPackages; pathsToLink = map (x: "/share/dotnet/${x}") [ "host" "packs" @@ -34,7 +34,7 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' postBuild = '' mkdir -p "$out"/share/dotnet - cp "${cli.unwrapped}"/share/dotnet/dotnet $out/share/dotnet + cp "${cli}"/share/dotnet/dotnet $out/share/dotnet cp -R "${cli}"/nix-support "$out"/ mkdir "$out"/bin ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index 3e492491afd7..fe09151fb8fe 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -46,8 +46,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p "$out"/bin "$out"/share/dotnet + mkdir -p "$out"/bin "$out"/share ln -s "$src"/bin/* "$out"/bin + ln -s "$src"/share/dotnet "$out"/share runHook postInstall ''; @@ -125,8 +126,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ) ( lib.optionalString (runtime != null) '' - # TODO: use runtime here - export DOTNET_ROOT=${runtime.unwrapped}/share/dotnet + export DOTNET_ROOT=${runtime}/share/dotnet '' + run ); diff --git a/pkgs/test/dotnet/use-dotnet-from-env/default.nix b/pkgs/test/dotnet/use-dotnet-from-env/default.nix index 2fedc633b176..6aa3d3bab590 100644 --- a/pkgs/test/dotnet/use-dotnet-from-env/default.nix +++ b/pkgs/test/dotnet/use-dotnet-from-env/default.nix @@ -21,7 +21,7 @@ let removeReferencesTo ]; postFixup = (oldAttrs.postFixup or "") + '' - remove-references-to -t ${dotnet-runtime.unwrapped} "$out/bin/Application" + remove-references-to -t ${dotnet-runtime} "$out/bin/Application" ''; }); @@ -46,7 +46,7 @@ in use-dotnet-root-env = testers.testEqualContents { assertion = "buildDotnetModule uses DOTNET_ROOT from environment in wrapper"; expected = runtimeVersionFile; - actual = runCommand "use-dotnet-from-env-root-test" { env.DOTNET_ROOT = "${dotnet-runtime.unwrapped}/share/dotnet"; } '' + actual = runCommand "use-dotnet-from-env-root-test" { env.DOTNET_ROOT = "${dotnet-runtime}/share/dotnet"; } '' ${appWithoutFallback}/bin/Application >"$out" ''; }; From 791b829b32ddc145b6a3e3f47dbde729f99f3f69 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 1 Dec 2024 21:33:38 -0400 Subject: [PATCH 0919/1054] dotnetCorePackages.combinePackages: use wrapper --- .../compilers/dotnet/combine-packages.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index aefc77906974..b745a40e878f 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -4,6 +4,7 @@ dotnetPackages: makeWrapper, lib, symlinkJoin, + callPackage, }: # TODO: Rethink how we determine and/or get the CLI. # Possible options raised in #187118: @@ -12,14 +13,15 @@ dotnetPackages: # 3. Something else? let cli = builtins.head dotnetPackages; + mkWrapper = callPackage ./wrapper.nix { }; in assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' You must include at least one package, e.g `with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ];`''; -(buildEnv { - name = "dotnet-core-combined"; +mkWrapper "sdk" (buildEnv { + name = "dotnet-combined"; paths = dotnetPackages; pathsToLink = map (x: "/share/dotnet/${x}") [ "host" @@ -43,6 +45,8 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' ln -s ${cli.man} $man ''; passthru = { + pname = "dotnet"; + version = "combined"; inherit (cli) icu; versions = lib.catAttrs "version" dotnetPackages; @@ -53,9 +57,4 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' }; inherit (cli) meta; -}).overrideAttrs - ({ - outputs = [ - "out" - ] ++ lib.optional (cli ? man) "man"; - }) +}) From 74fc7ef8c2f9f2e5ad7269df154357c783daecb6 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 6 Dec 2024 22:02:40 +0800 Subject: [PATCH 0920/1054] timeshift: 24.06.3 -> 24.06.5 --- pkgs/applications/backup/timeshift/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 534145c19cbe..86d6794051ef 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "24.06.3"; + version = "24.06.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - hash = "sha256-npYiUSAPzr6g29ilQ1JELxqR1VbOR7TNMkdx37n92kk="; + hash = "sha256-2qNLgUZLMcfoemdLvvjdkR7Ln5loSKGqbd402y5Id8k="; }; patches = [ From 3e65feb9c7e1538beacd0aad078f31dc57f9c8b6 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Fri, 6 Dec 2024 13:59:05 +0000 Subject: [PATCH 0921/1054] rosegarden: 22.12.1 -> 24.12 changelog: https://rosegardenmusic.com/wiki/dev:24.12 --- .../applications/audio/rosegarden/default.nix | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 57a7ca82254a..855a53287bf1 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -7,27 +7,36 @@ , pkg-config , qttools , wrapQtAppsHook +, alsa-lib , dssi , fftwSinglePrec +, flac +, glib , ladspaH , ladspaPlugins , libjack2 -, alsa-lib , liblo +, libmpg123 +, libopus , libsamplerate , libsndfile +, libsysprof-capture +, libvorbis +, lilv +, lv2 , lirc , lrdf +, libogg , qtbase }: stdenv.mkDerivation rec { pname = "rosegarden"; - version = "22.12.1"; + version = "24.12"; src = fetchurl { - url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2"; - sha256 = "sha256-fqeif37lxJeBcI+cYVpRkZuJImSlmeZO3yzSNzPZkgY="; + url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.xz"; + sha256 = "sha256-fz9mE2sJrxS9mZjkreTWIE1Fiv0WlHiP1tyzqW6/Fcw="; }; postPhase = '' @@ -37,18 +46,31 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makedepend perl pkg-config qttools wrapQtAppsHook ]; buildInputs = [ + alsa-lib dssi fftwSinglePrec + flac + glib ladspaH ladspaPlugins libjack2 liblo + libmpg123 + libogg + libopus libsamplerate libsndfile + libsysprof-capture + libvorbis + lilv + lv2 lirc lrdf qtbase - alsa-lib + ]; + + cmakeFlags = [ + "-DLILV_INCLUDE_DIR=${lilv.dev}/include/lilv-0" ]; meta = with lib; { From f924e6357195aa2a35d2858b6ac2ae06211e562e Mon Sep 17 00:00:00 2001 From: John Garcia Date: Fri, 6 Dec 2024 14:07:34 +0000 Subject: [PATCH 0922/1054] rosegarden: format with nixfmt --- .../applications/audio/rosegarden/default.nix | 72 ++++++++++--------- 1 file changed, 40 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 855a53287bf1..7e936b5a7d43 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -1,33 +1,34 @@ -{ lib -, stdenv -, fetchurl -, cmake -, makedepend -, perl -, pkg-config -, qttools -, wrapQtAppsHook -, alsa-lib -, dssi -, fftwSinglePrec -, flac -, glib -, ladspaH -, ladspaPlugins -, libjack2 -, liblo -, libmpg123 -, libopus -, libsamplerate -, libsndfile -, libsysprof-capture -, libvorbis -, lilv -, lv2 -, lirc -, lrdf -, libogg -, qtbase +{ + lib, + stdenv, + fetchurl, + cmake, + makedepend, + perl, + pkg-config, + qttools, + wrapQtAppsHook, + alsa-lib, + dssi, + fftwSinglePrec, + flac, + glib, + ladspaH, + ladspaPlugins, + libjack2, + liblo, + libmpg123, + libopus, + libsamplerate, + libsndfile, + libsysprof-capture, + libvorbis, + lilv, + lv2, + lirc, + lrdf, + libogg, + qtbase, }: stdenv.mkDerivation rec { @@ -43,7 +44,14 @@ stdenv.mkDerivation rec { substituteInPlace src/CMakeLists.txt --replace svnheader svnversion ''; - nativeBuildInputs = [ cmake makedepend perl pkg-config qttools wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + makedepend + perl + pkg-config + qttools + wrapQtAppsHook + ]; buildInputs = [ alsa-lib @@ -69,7 +77,7 @@ stdenv.mkDerivation rec { qtbase ]; - cmakeFlags = [ + cmakeFlags = [ "-DLILV_INCLUDE_DIR=${lilv.dev}/include/lilv-0" ]; From 7d4576b814746ee0395ae50f064d9c1a70989d00 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 6 Dec 2024 22:10:48 +0800 Subject: [PATCH 0923/1054] timeshift: fix meta.longDescription (the wrapper part) --- pkgs/applications/backup/timeshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix index 85a3295fb064..53bcc5a373bf 100644 --- a/pkgs/applications/backup/timeshift/default.nix +++ b/pkgs/applications/backup/timeshift/default.nix @@ -25,8 +25,8 @@ in meta = oldAttrs.meta // { description = oldAttrs.meta.description; longDescription = oldAttrs.meta.longDescription + '' - This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and (optionally) btrfs. - If you want to use the commands provided by the system, override the propagatedBuildInputs or use timeshift-minimal instead + This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and btrfs. + If you want to use the commands provided by the system, use timeshift-minimal instead. ''; }; }) From 91fe162f69988fa51263a6e9f76dfb9d1f21af09 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Fri, 6 Dec 2024 14:13:43 +0000 Subject: [PATCH 0924/1054] rosegarden: move to pkgs/by-name --- .../default.nix => by-name/ro/rosegarden/package.nix} | 10 ++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-) rename pkgs/{applications/audio/rosegarden/default.nix => by-name/ro/rosegarden/package.nix} (95%) diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/by-name/ro/rosegarden/package.nix similarity index 95% rename from pkgs/applications/audio/rosegarden/default.nix rename to pkgs/by-name/ro/rosegarden/package.nix index 7e936b5a7d43..9acf3eec527d 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/by-name/ro/rosegarden/package.nix @@ -6,8 +6,7 @@ makedepend, perl, pkg-config, - qttools, - wrapQtAppsHook, + qt5, alsa-lib, dssi, fftwSinglePrec, @@ -28,7 +27,6 @@ lirc, lrdf, libogg, - qtbase, }: stdenv.mkDerivation rec { @@ -49,8 +47,8 @@ stdenv.mkDerivation rec { makedepend perl pkg-config - qttools - wrapQtAppsHook + qt5.qttools + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -74,7 +72,7 @@ stdenv.mkDerivation rec { lv2 lirc lrdf - qtbase + qt5.qtbase ]; cmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb418e73c0b0..1ab2f3957255 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5107,8 +5107,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.libs) simd; }; - rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; - rosenpass = callPackage ../tools/networking/rosenpass { }; rosenpass-tools = callPackage ../tools/networking/rosenpass/tools.nix { }; From 38b5139ea0856c5bc0571dbeb279ecc87eff7a8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 14:17:41 +0000 Subject: [PATCH 0925/1054] villain: 2.2.0 -> 2.2.1 --- pkgs/by-name/vi/villain/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/villain/package.nix b/pkgs/by-name/vi/villain/package.nix index ab40f15b50ae..9345a5f7023c 100644 --- a/pkgs/by-name/vi/villain/package.nix +++ b/pkgs/by-name/vi/villain/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "villain"; - version = "2.2.0"; + version = "2.2.1"; pyproject = false; src = fetchFromGitHub { owner = "t3l3machus"; repo = "Villain"; - rev = "v${version}"; - hash = "sha256-7qZ91WEzQg9k9V/FlREW4YLlEnloeVkisDO8q/+bheo="; + rev = "refs/tags/V${version}"; + hash = "sha256-eIPxidBBVmjt/E1F8G3zPwteB1qsk3a5LD69CiNVApY="; }; nativeBuildInputs = [ makeWrapper ]; From 81ab50ae91c3843686678294ce3088b369f73d8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 13:19:08 +0000 Subject: [PATCH 0926/1054] python312Packages.django-import-export: 4.1.1 -> 4.3.3 --- .../python-modules/django-import-export/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index d2d65daa6689..5cce017a0833 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -7,7 +7,6 @@ fetchFromGitHub, psycopg2, python, - pythonOlder, pytz, setuptools-scm, tablib, @@ -15,23 +14,20 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.1.1"; + version = "4.3.3"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "django-import-export"; repo = "django-import-export"; rev = "refs/tags/${version}"; - hash = "sha256-kD/9cpFqjipP3onMHCfimu0ffzGQAoEspjc4IfyuZak="; + hash = "sha256-1vb8a0ntp5ikWrJ3aI4KsGlraXRoFa7o+sP2sJpFbVc="; }; pythonRelaxDeps = [ "tablib" ]; build-system = [ setuptools-scm ]; - dependencies = [ diff-match-patch django From f6bdeca7a72b7e2069e099d18df3921d2234e8ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 13:52:46 +0000 Subject: [PATCH 0927/1054] python312Packages.ihm: 1.7 -> 1.8 --- pkgs/development/python-modules/ihm/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index 1d07533f536a..29cb68253625 100644 --- a/pkgs/development/python-modules/ihm/default.nix +++ b/pkgs/development/python-modules/ihm/default.nix @@ -4,30 +4,27 @@ fetchFromGitHub, setuptools, swig, - wheel, msgpack, pytestCheckHook, }: buildPythonPackage rec { pname = "ihm"; - version = "1.7"; + version = "1.8"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; rev = "refs/tags/${version}"; - hash = "sha256-jQm8Xl2yyR+y1Leyz8naT1rFJpgK5XdUd7YgnhDuBWo="; + hash = "sha256-Uz/4Egd7swY4kDl6FR564eiaYEdY9IUoz2Lv5pJ1C30="; }; - nativeBuildInputs = [ - setuptools - swig - wheel - ]; + nativeBuildInputs = [ swig ]; - propagatedBuildInputs = [ msgpack ]; + build-system = [ setuptools ]; + + dependencies = [ msgpack ]; nativeCheckInputs = [ pytestCheckHook ]; From f28ecbe89ad9011c0ab45a42a6ed361db2f084e9 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 6 Dec 2024 12:50:49 +0900 Subject: [PATCH 0928/1054] lima: prefer version testing in installCheckPhase rather than passthru.tests.version --- pkgs/applications/virtualization/lima/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 8538104effab..74a75ce57871 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -7,7 +7,6 @@ qemu, sigtool, makeWrapper, - testers, nix-update-script, apple-sdk_15, lima, @@ -72,14 +71,19 @@ buildGoModule rec { ''; doInstallCheck = true; + # Workaround for: "panic: $HOME is not defined" at https://github.com/lima-vm/lima/blob/v1.0.2/pkg/limayaml/defaults.go#L52 + # Don't use versionCheckHook for this package. It cannot inject environment variables. installCheckPhase = '' + if [[ "$(HOME="$(mktemp -d)" "$out/bin/limactl" --version | cut -d ' ' -f 3)" == "${version}" ]]; then + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi USER=nix $out/bin/limactl validate templates/default.yaml ''; - passthru = { - tests.version = testers.testVersion { package = lima; }; - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/lima-vm/lima"; From 1b59a4564376ee10ae5b45e1e955608bded318b0 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 6 Dec 2024 09:43:40 -0500 Subject: [PATCH 0929/1054] zizmor: 0.5.0 -> 0.7.0 Diff: https://github.com/woodruffw/zizmor/compare/v0.5.0...v0.7.0 Changelog: https://github.com/woodruffw/zizmor/releases/tag/v0.7.0 --- pkgs/by-name/zi/zizmor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index 2431c176a55d..199823473dbe 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "zizmor"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "woodruffw"; repo = "zizmor"; rev = "v${version}"; - hash = "sha256-dYM8Zkri0H/olODF2weOqdVg1NcPltzu1PZ92IbGLVE="; + hash = "sha256-fZD8wXKS8bGh6P+KS2VM3pCuEDIEeNrK5iAykxzC/2Q="; }; - cargoHash = "sha256-18DWe1MHABz1SMg72NcYTSCGvevchqZ3asb8+lg5MwE="; + cargoHash = "sha256-n9VLK9i7YayiLD8pnEns19vbtlEktjFutYoKwpXgBCw="; buildInputs = [ openssl ]; From 7ad421a9a998a0623bc4500146d822113944ee6c Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Fri, 6 Dec 2024 14:52:31 +0000 Subject: [PATCH 0930/1054] home-assistant-custom-components.solis-sensor: 3.7.1 -> 3.7.2 --- .../home-assistant/custom-components/solis-sensor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix index c79635fae926..173c3220a6fb 100644 --- a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "hultenvp"; domain = "solis"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "hultenvp"; repo = "solis-sensor"; rev = "v${version}"; - hash = "sha256-oJXbDuHT5temcei3ea1cUsqVB70am6WZjHbIehnZs6k="; + hash = "sha256-8+KzZCfBYvXO73SrMXLGCUjecxKn49hz0wCXWCUBULU="; }; dependencies = [ aiofiles ]; From f1c12935ad8f17f54d9db8139560d50ff6500020 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Dec 2024 15:56:37 +0100 Subject: [PATCH 0931/1054] python312Packages.libknot: 3.4.2 -> 3.4.3 --- pkgs/development/python-modules/libknot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index 0b5d85130e7a..28c9d3cfda69 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.4.2"; + version = "3.4.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pydgUTdCHsa2Je8wfiTvK0WmXUez5JY1GNPLNAzRwtc="; + hash = "sha256-Sm3WHZdCpz0F/tpGQc7tvpjcxfPc2cMAyc0rVjm6i04="; }; postPatch = '' From deb0f4238b313b4a01c8fd8cb2429797cba3d7f5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Dec 2024 15:56:45 +0100 Subject: [PATCH 0932/1054] prometheus-knot-exporter: 3.4.2 -> 3.4.3 --- pkgs/servers/monitoring/prometheus/knot-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index cbd46b2cd143..55c62327a0df 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.4.2"; + version = "3.4.3"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-oZYBojtP4h/cl2YkKJ54JT8PTZpzvbZVbaFAEL1sAE8="; + hash = "sha256-wMUVxhYFZzMUGijyS6sPWxSofqO6qvTt9i2hI+gwlwU="; }; nativeBuildInputs = [ From b59e28cd3cfb7b74b68bd3efced46905ebbb469f Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 6 Dec 2024 16:10:28 +0100 Subject: [PATCH 0933/1054] pnpm: 9.14.4 -> 9.15.0 Signed-off-by: Sefa Eyeoglu --- pkgs/development/tools/pnpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 860fcb1cc0a4..e6225bcd8296 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -12,8 +12,8 @@ let hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY="; }; "9" = { - version = "9.14.4"; - hash = "sha256-JqcmtjO2KaP6vaAG9pauQmCVSjYyyAVBEteuiXeeX5o="; + version = "9.15.0"; + hash = "sha256-Caj+MaNP2nBjVGgGGfQAL0zO9trf+TJA0k72yDHw/Sg="; }; }; From 7354b62568e2bc4f1152a28fdc7eea07f4e2c3b3 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:14:04 +0000 Subject: [PATCH 0934/1054] google-chrome: 131.0.6778.85 -> 131.0.6778.108 --- pkgs/by-name/go/google-chrome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 264895de9a7a..29b9e77b7c28 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -166,11 +166,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "131.0.6778.85"; + version = "131.0.6778.108"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-Cn0fg6WI1kFdk8s0LCksMCMLSDkPImXBDNK+hNMlMpQ="; + hash = "sha256-DU9qaMnn7gM/8VR4lsetWlkYu/Gs5+i/9JPYY2sbCi0="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -266,11 +266,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "131.0.6778.86"; + version = "131.0.6778.109"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/neljlxhync4hvd3scdidzwcaj4_131.0.6778.86/GoogleChrome-131.0.6778.86.dmg"; - hash = "sha256-EIX74r86/J8dgz585O7dcx0pv/OlR3ZNLiUe6E/V2C8="; + url = "http://dl.google.com/release2/chrome/adhpt2otqvd2vrh5vbgwgtydt7gq_131.0.6778.109/GoogleChrome-131.0.6778.109.dmg"; + hash = "sha256-9pKGJa7UiDx1QPnWk0ONDQukUdRAPGz1PeYd7UoReoQ="; }; dontPatch = true; From e690cce817d1ae223581c9fe45fd92f2e4f0a148 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 15:22:38 +0000 Subject: [PATCH 0935/1054] vulkan-caps-viewer: 3.43 -> 4.00 --- pkgs/tools/graphics/vulkan-caps-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index 8b5dff5f5e33..7519d1f0109e 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.43"; + version = "4.00"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; rev = version; - hash = "sha256-GwE/E8GgVIeZtCefLNvacDUxI2C+Uf8zgpOQ1NpiSmM="; + hash = "sha256-fliiNeZPEP4uNMRDgG093fvU01ZTxwv08YLGwBooOLA="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. # To help us, they've put it in a git-submodule. # The result will work with any vulkan-loader version. From a3fbadd7538b15ebb28fd71d0b33d437d61e9c6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 15:44:11 +0000 Subject: [PATCH 0936/1054] vimPlugins.blink-cmp: 0.7.1 -> 0.7.3 --- pkgs/applications/editors/vim/plugins/blink-cmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix index 3d061ddb45cc..d78502333229 100644 --- a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix +++ b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix @@ -7,12 +7,12 @@ nix-update-script, }: let - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.cmp"; rev = "refs/tags/v${version}"; - hash = "sha256-IHl+XIldo2kculpbiOuLIJ6RJbFODiRlQU4x8hvE7pI="; + hash = "sha256-nxiODLKgGeXzN5sqkLWU0PcsuSSB1scSzTC5qyCxLCI="; }; libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; blink-fuzzy-lib = rustPlatform.buildRustPackage { From 29d7565e1bf51275ec74db901f24008cf56c03ea Mon Sep 17 00:00:00 2001 From: Gary Guo Date: Fri, 6 Dec 2024 15:59:15 +0000 Subject: [PATCH 0937/1054] zulip: expand platforms to all Linux --- pkgs/by-name/zu/zulip/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix index 453a0caa999c..24676f81c7c3 100644 --- a/pkgs/by-name/zu/zulip/package.nix +++ b/pkgs/by-name/zu/zulip/package.nix @@ -35,7 +35,7 @@ in appimageTools.wrapType2 { homepage = "https://zulip.com"; license = licenses.asl20; maintainers = with maintainers; [ andersk ]; - platforms = [ "x86_64-linux" ]; + platforms = lib.platforms.linux; mainProgram = "zulip"; }; } From b5c0139ca0dba9c5d0a3e3b6e7ad96175d67d7df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 16:05:53 +0000 Subject: [PATCH 0938/1054] python312Packages.snowflake-connector-python: 3.12.3 -> 3.12.4 --- .../python-modules/snowflake-connector-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index f20779b9b6d4..f913ee43a2ff 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.12.3"; + version = "3.12.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "snowflakedb"; repo = "snowflake-connector-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Rv4/zGoSBA3Pdu67d96sgZLgZae6yfpLsJzwsm2A690="; + hash = "sha256-6poMWKQB/NR40W39KDJwBgYGeAHsr4f1GJhPxYiTc1k="; }; build-system = [ From adf2b41bfc5902e7295e810bddf943d564c8da10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 16:06:23 +0000 Subject: [PATCH 0939/1054] gitu: 0.26.0 -> 0.27.0 --- pkgs/by-name/gi/gitu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index db382be54fe7..8985cd349fd5 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-rHlehYdyBYyhP/kFciFW0vmaewtXYuypaHMzqyMDXYA="; + hash = "sha256-/g+hjQQhu771yqLhx4THaNCJKShXB7RoxiS9bQDUijU="; }; - cargoHash = "sha256-b0Z1SOprsVe8Sg4X0ooOahE9yrP65CV1otZ3nXFvPHo="; + cargoHash = "sha256-cK7TjrP2KW3w7UFr+6pUIjeesPaJKs4lXorw98zwuD4="; nativeBuildInputs = [ pkg-config From 7bdb5641a3b813f61fc646c543611c0c5d5ce9fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 16:11:07 +0000 Subject: [PATCH 0940/1054] pmtiles: 1.22.1 -> 1.22.2 --- pkgs/by-name/pm/pmtiles/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index 964386dfbb4c..056a5fa2dbd0 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pmtiles"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; rev = "v${version}"; - hash = "sha256-b473V082jM8d0XRn4tPzVGLryFNHn5Cab3IkNWve49s="; + hash = "sha256-TEQDjtSMJFZAYCoYXHmJxpxadYyd5DTo7HUhjglLRG8="; }; - vendorHash = "sha256-QDGs0L29W4QQBeIH1Z23nI/FYdu95kLnOAIZEWPOMWw="; + vendorHash = "sha256-KRjMEH17cvSjtRP/qYeWRFUo6f6v1ZxEd+H3xvZ1udQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ]; From f2e100dfc1e14cb00c172bc9dd6365dac141a308 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 7 Dec 2024 00:17:13 +0800 Subject: [PATCH 0941/1054] rygel: remove unused gtk3 buildInputs --- pkgs/by-name/ry/rygel/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index 2f90692003fc..ecb63fe7a9ce 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -33,6 +33,7 @@ tinysparql, shared-mime-info, gnome, + rygel, }: stdenv.mkDerivation (finalAttrs: { @@ -78,9 +79,11 @@ stdenv.mkDerivation (finalAttrs: { gupnp-dlna libgee libsoup_3 - gtk3 libmediaart pipewire + # Move this to withGtk when it's not unconditionally included + # https://gitlab.gnome.org/GNOME/rygel/-/issues/221 + # https://gitlab.gnome.org/GNOME/rygel/-/merge_requests/27 libX11 sqlite systemd @@ -116,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: { packageName = "rygel"; versionPolicy = "odd-unstable"; }; + noGtk = rygel.override { withGtk = false; }; }; meta = with lib; { From 07cb36c3f9ce61818c616b90c4e89025e63f6716 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 6 Dec 2024 18:33:16 +0200 Subject: [PATCH 0942/1054] yt-dlp: 2024.12.3 -> 2024.12.6 Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2024.12.06 Diff: https://github.com/yt-dlp/yt-dlp/compare/2024.12.03...2024.12.06 --- pkgs/by-name/yt/yt-dlp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index 7da4db2e7af3..f25fc13ed613 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.12.3"; + version = "2024.12.6"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-Nav/UcV2IDMQPyMwugqKH0jEOIpBOi2M3JuEZC/o7dQ="; + hash = "sha256-dD2+CB6ocb4/X/CD4s2V2oZt6nc/xwrmsQmDjPv3KsQ="; }; build-system = with python3Packages; [ From ff688dd2b2d4e43818bf866dea3262719f7e3706 Mon Sep 17 00:00:00 2001 From: Tobias Langendorf Date: Wed, 4 Dec 2024 22:03:40 +0100 Subject: [PATCH 0943/1054] jujutsu: 0.23.0 -> 0.24.0 --- pkgs/by-name/ju/jujutsu/package.nix | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 7c9d024cecd3..9e51be435988 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -21,7 +21,7 @@ }: let - version = "0.23.0"; + version = "0.24.0"; in rustPlatform.buildRustPackage { @@ -32,10 +32,10 @@ rustPlatform.buildRustPackage { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - hash = "sha256-NCeD+WA3uVl4l/KKFDtdG8+vpm10Y3rEAf8kY6SP0yo="; + hash = "sha256-XsD4P2UygZFcnlV2o3E/hRRgsGjwKw1r9zniEeAk758"; }; - cargoHash = "sha256-lnfh9zMMZfHhYY7kgmxuqZwoEQxiInjmHjzLabbUijU="; + cargoHash = "sha256-9JwRdeHo8JkwRQwPA+UsIEWar4gYQS4SIM/uj1TU2yg"; nativeBuildInputs = [ installShellFiles @@ -77,14 +77,6 @@ rustPlatform.buildRustPackage { "jj-cli" ]; - checkFlags = [ - # flaky test fixed upstream in 0.24+; the actual feature works reliably, - # it's just a false caching issue inside the test. skip it to allow the - # binary cache to be populated. https://github.com/martinvonz/jj/issues/4784 - "--skip" - "test_shallow_commits_lack_parents" - ]; - env = { # Disable vendored libraries. ZSTD_SYS_USE_PKG_CONFIG = "1"; @@ -101,9 +93,9 @@ rustPlatform.buildRustPackage { installManPage ./jj.1 installShellCompletion --cmd jj \ - --bash <(${jj} util completion bash) \ - --fish <(${jj} util completion fish) \ - --zsh <(${jj} util completion zsh) + --bash <(COMPLETE=bash ${jj}) \ + --fish <(COMPLETE=fish ${jj}) \ + --zsh <(COMPLETE=zsh ${jj}) ''; passthru = { From fe76ffc48a47c11e5124c5f021fa3a6e91a04d70 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Dec 2024 16:44:39 +0000 Subject: [PATCH 0944/1054] python312Packages.pycrdt: 0.10.7 -> 0.10.8 Changelog: https://github.com/jupyter-server/pycrdt/releases/tag/0.10.8 Diff: https://github.com/jupyter-server/pycrdt/compare/0.10.7...0.10.8 --- pkgs/development/python-modules/pycrdt/Cargo.lock | 2 +- pkgs/development/python-modules/pycrdt/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 329061f5c082..3ed87e9cc77a 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -245,7 +245,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.10.7" +version = "0.10.8" dependencies = [ "pyo3", "yrs", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 701616a3922a..553393f3a1d6 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.10.7"; + version = "0.10.8"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; - rev = "refs/tags/${version}"; - hash = "sha256-Yb8ZFfJ/chF6+DUq7kLAxeRH9tuOCD2KiXxFG7ljQwg="; + tag = version; + hash = "sha256-5ukP2J9Mm7yRVXZ6x5VbArF5GDxQvRvOpKEwiySzPV8="; }; postPatch = '' From 3cb2fa6e0014502d57d681d5561f2db1e2db5917 Mon Sep 17 00:00:00 2001 From: Tyler Langlois Date: Thu, 5 Dec 2024 08:57:14 -0700 Subject: [PATCH 0945/1054] vagrant: 2.4.1 -> 2.4.3 I'm including the steps I took to update this package to help the next committer. Time permitting, this should probably be codified as a formal update script: 1. Clone the upstream hashicorp/vagrant repository 2. Check out the desired version tag 3. Run `bundle lock` within the repository to generate `Gemfile.lock` 4. Run `bundix` to generate a `gemset.nix` 5. Move `gemset.nix` to overwrite this package's `gemset.nix` 6. Remove the self-referential `vagrant` attribute of the gemset 7. Clone vagrant-libvirt/vagrant-libvirt and check out the desired tag (probably latest release tag) 8. (Maybe optional?) because `bundle lock` lacks the ability to exclude groups; comment out groups unrelated to a release like `development` and `test, otherwise dependency conflicts with vagrant's `gemset.nix` are likely. 9. Run `bundle lock` within the repository to generate `Gemfile.lock` 10. Run `bundix` to generate a `gemset.nix` 11. Move `gemset.nix` to overwrite this package's `gemset_libvirt.nix` 12. Edit the `vagrant-libvirt` gem attribute to change its source to rubygems and not a relative path Aside from these specific steps, the normal package update steps apply (update version, set hash to `lib.fakeHash`, get the updated hash to replace the old). --- pkgs/by-name/va/vagrant/gemset.nix | 305 ++++++++++++++++----- pkgs/by-name/va/vagrant/gemset_libvirt.nix | 197 +++++++++---- pkgs/by-name/va/vagrant/package.nix | 5 +- 3 files changed, 380 insertions(+), 127 deletions(-) diff --git a/pkgs/by-name/va/vagrant/gemset.nix b/pkgs/by-name/va/vagrant/gemset.nix index d69322bc17c7..bb44c6feeb73 100644 --- a/pkgs/by-name/va/vagrant/gemset.nix +++ b/pkgs/by-name/va/vagrant/gemset.nix @@ -1,33 +1,43 @@ { + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; bcrypt_pbkdf = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; + sha256 = "04rb3rp9bdxn1y3qiflfpj7ccwb8ghrfbydh5vfz1l9px3fpg41g"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; bigdecimal = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.6"; + version = "3.1.8"; }; builder = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; type = "gem"; }; - version = "3.2.4"; + version = "3.3.0"; }; childprocess = { groups = ["default"]; @@ -44,20 +54,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; date = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp"; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; type = "gem"; }; - version = "3.3.4"; + version = "3.4.1"; }; diff-lcs = { groups = ["default" "development"]; @@ -84,20 +94,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; + sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kmmwgjzlrnc3nnrdnw1z67c95nbw0hv54a73yj8jw6pcvl9585x"; + sha256 = "00p5fww0bakph4p9skc7ypjqbqc8crnw31nrmpdm8j4rr5kp4jb0"; type = "gem"; }; - version = "0.109.0"; + version = "1.2.2"; }; fake_ftp = { groups = ["development"]; @@ -109,25 +119,48 @@ }; version = "0.3.0"; }; + faraday = { + dependencies = ["faraday-net_http" "json" "logger"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vxaw0mg8avqivdj0lzj19nxf652ri208grsdf0361flyn5i5wi3"; + type = "gem"; + }; + version = "2.12.1"; + }; + faraday-net_http = { + dependencies = ["net-http"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1"; + type = "gem"; + }; + version = "3.4.0"; + }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; google-protobuf = { + dependencies = ["bigdecimal" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r"; + sha256 = "1zzlmsv7djpgn6hxp5r1jg7f4nx368j0ccq6pipq1ncplnvbffij"; type = "gem"; }; - version = "3.25.3"; + version = "4.29.1"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -135,10 +168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zrxnv9s2q39f2nh32x7nbfi8lpwzmmn3ji4adglg8dlfr1xrz16"; + sha256 = "1xyinc2zaw25r3x774mni66im1b22l9zpbsqdgdb4g4zxcd5srcl"; type = "gem"; }; - version = "1.13.0"; + version = "1.16.0"; }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; @@ -146,20 +179,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ndyis4hyq5wyypvy5j2pxaax73k9xd9cdsc5hyvpk3vbnn26rdb"; + sha256 = "0z5x8f9k2m656imi59jrd49d8inbnzpcnylz0ijj1ly0ihdi3apd"; type = "gem"; }; - version = "1.56.2"; + version = "1.68.1"; }; grpc-tools = { groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pwwsmw402y8f8l3s3v433lx1f3cahzh2bj3i6jhkg1z87z83pqm"; + sha256 = "12wbiq7s1qc6dv35p8c5vay627c6mqm9p1dimv2nz2m6r5f1057v"; type = "gem"; }; - version = "1.62.0"; + version = "1.68.1"; }; gssapi = { dependencies = ["ffi"]; @@ -193,6 +226,16 @@ }; version = "0.1.5"; }; + hashie = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x"; + type = "gem"; + }; + version = "5.0.0"; + }; httpclient = { groups = ["default"]; platforms = []; @@ -209,20 +252,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.6"; }; ipaddr = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p98v9b6rn5ma04qwvzs0nrg0hmnwpm70s9jshzdsrkqapcw4sh2"; + sha256 = "0wmgwqv6c1kq8cxbxddllnrlh5jjmjw73i1sqbnvq55zzn3l0zyb"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kvbzh8530pp3qf63zvx9hnb708x7plv9wfn5ibns3h3knnvs3kw"; + type = "gem"; + }; + version = "2.9.0"; + }; + jwt = { + dependencies = ["base64"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rba9mji57sfa1kjhj0bwff1377vj0i8yx2rd39j5ik4vp60gzam"; + type = "gem"; + }; + version = "2.9.3"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -255,37 +319,47 @@ }; version = "1.1.10"; }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q9jm4pzqxk92dq9a1y7gjwcw3dcsm1mnsdhi9ms5hw1dpnprzlx"; + type = "gem"; + }; + version = "1.6.2"; + }; logging = { dependencies = ["little-plugger" "multi_json"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02"; + sha256 = "1jqcq2yxh973f3aw63nd3wxhqyhkncz3pf8v2gs3df0iqair725s"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0"; }; mime-types = { - dependencies = ["mime-types-data"]; + dependencies = ["logger" "mime-types-data"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; + sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg"; type = "gem"; }; - version = "3.5.2"; + version = "3.6.0"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zpn5brxdf5akh7ij511bkrd30fxd7697shmxxszahqj9m62zvn5"; + sha256 = "0a7fq0wn2fdv57dsxfmjyzsjhxprh56k0zg3c4nm9il4s3v0mzig"; type = "gem"; }; - version = "3.2024.0206"; + version = "3.2024.1203"; }; multi_json = { groups = ["default"]; @@ -297,16 +371,38 @@ }; version = "1.15.0"; }; + multi_xml = { + dependencies = ["bigdecimal"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06x61ca5j84nyhr1mwh9r436yiphnc5hmacb3gwqyn5gd0611kjg"; + type = "gem"; + }; + version = "0.7.1"; + }; net-ftp = { dependencies = ["net-protocol" "time"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pi67ywf8yvv18vr8kvyb1igdv8nsjafyy9c86fny5wvi10qcwqv"; + sha256 = "0kw7g0j35fla8438s90m72b3xr0mqnpgm910qcwrgnvyg903xmi8"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.8"; + }; + net-http = { + dependencies = ["uri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; + type = "gem"; + }; + version = "0.6.0"; }; net-protocol = { dependencies = ["timeout"]; @@ -346,10 +442,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w"; + sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p"; type = "gem"; }; - version = "7.2.1"; + version = "7.3.0"; }; nori = { dependencies = ["bigdecimal"]; @@ -357,10 +453,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12wfv36jzc0978ij5c56nnfh5k8ax574njawigs98ysmp1x5s2ql"; + sha256 = "0qb84bbi74q0zgs09sdkq750jf2ri3lblbry0xi4g1ard4rwsrk1"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; + }; + oauth2 = { + dependencies = ["faraday" "jwt" "multi_xml" "rack" "snaky_hash" "version_gem"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yzpaghh8kwzgmvmrlbzf36ks5s2hf34rayzw081dp2jrzprs7xj"; + type = "gem"; + }; + version = "2.0.9"; + }; + ostruct = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + type = "gem"; + }; + version = "0.6.1"; }; pairing_heap = { groups = ["default"]; @@ -372,15 +489,25 @@ }; version = "3.1.0"; }; + rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cd13019gnnh2c0a3kj27ij5ibk72v0bmpypqv4l6ayw8g5cpyyk"; + type = "gem"; + }; + version = "3.1.8"; + }; rake = { groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.1.0"; + version = "13.2.1"; }; rake-compiler = { dependencies = ["rake"]; @@ -388,10 +515,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vhdkwblhzp4wp1jh95qiibly2zsnmg3659r6d5xp1mzgd9ghxji"; + sha256 = "0xlifh25mhlrigj020nya10s37dbkhc0rlqlf0ld88rxrdg1057k"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.8"; }; rb-fsevent = { groups = ["default"]; @@ -409,10 +536,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.1"; }; rb-kqueue = { dependencies = ["ffi"]; @@ -430,10 +557,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.9"; }; rgl = { dependencies = ["pairing_heap" "rexml" "stream"]; @@ -463,10 +590,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k252n7s80bvjvpskgfm285a3djjjqyjcarlh3aq7a4dx2s94xsm"; + sha256 = "001kazj244cb6fbkmh7ap74csbr78717qaskqzqpir1q8xpdmywl"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -474,10 +601,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bhhjzwdk96vf3gq3rs7mln80q27fhq82hda3r15byb24b34h7b2"; + sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.3"; }; rspec-its = { dependencies = ["rspec-core" "rspec-expectations"]; @@ -485,10 +612,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zafd70gxly5i0s00nky14sj2n92dnj3xpj83ysl3c2wx0119ad"; + sha256 = "1xjikikx2sn9b7nbaza60xq7livjw9kp3a6gwbv5xz9zjd7k2164"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -496,30 +623,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rkzkcfk2x0qjr5fxw6ib4wpjy0hqbziywplnp6pg3bm2l98jnkk"; + sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.2"; }; rspec-support = { groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; + sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf"; type = "gem"; }; - version = "3.13.1"; + version = "3.13.2"; }; rubyntlm = { + dependencies = ["base64"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; + sha256 = "1x8l0d1v88m40mby4jvgal46137cv8gga2lk7zlrxqlsp41380a7"; type = "gem"; }; - version = "0.6.3"; + version = "0.6.5"; }; rubyzip = { groups = ["default"]; @@ -531,6 +659,17 @@ }; version = "2.3.2"; }; + snaky_hash = { + dependencies = ["hashie" "version_gem"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cfwvdcr46pk0c7m5aw2w3izbrp1iba0q7l21r37mzpwaz0pxj0s"; + type = "gem"; + }; + version = "2.0.1"; + }; stream = { groups = ["default"]; platforms = []; @@ -557,20 +696,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c15v19hyxjcfzaviqlwhgajgyrrlb0pjilza6mkv49bhspy6av6"; + sha256 = "0qgarmdyqypzsaanf4w9vqrd9axrcrjqilxwrfmxp954102kcpq3"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.1"; }; timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg"; + sha256 = "06fcniirx82hrljzfn5wb3634n8648v8qgy006jzgclfz5gjvjla"; type = "gem"; }; - version = "0.4.1"; + version = "0.4.2"; + }; + uri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09qyg6a29cfgd46qid8qvx4sjbv596v19ym73xvhanbyxd6500xk"; + type = "gem"; + }; + version = "1.0.2"; }; vagrant-spec = { dependencies = ["childprocess" "log4r" "rspec" "thor"]; @@ -586,15 +735,25 @@ version = "0.0.1"; }; vagrant_cloud = { - dependencies = ["excon" "log4r" "rexml"]; + dependencies = ["excon" "log4r" "oauth2" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jhwciki5i8hjbgv2f1p544bi92s9wdsfrjympzslysdzk95djpg"; + sha256 = "07w7zv93pzpxjsq16z2d15irkl117x2h572bmd0gqhqd50da3lc6"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.2"; + }; + version_gem = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08a6agx7xk1f6cr9a95dq42vl45si2ln21h33b96li59sv3555y6"; + type = "gem"; + }; + version = "1.1.4"; }; wdm = { groups = ["default"]; @@ -611,21 +770,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl"; type = "gem"; }; - version = "1.7.0"; + version = "1.9.1"; }; winrm = { - dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; + dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rexml" "rubyntlm"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; + sha256 = "01jxpshw5kx5ha21ymaaj14vibv5bvm0dd80ccc6xl3jaxy7cszg"; type = "gem"; }; - version = "2.3.6"; + version = "2.3.9"; }; winrm-elevated = { dependencies = ["erubi" "winrm" "winrm-fs"]; diff --git a/pkgs/by-name/va/vagrant/gemset_libvirt.nix b/pkgs/by-name/va/vagrant/gemset_libvirt.nix index d31b76a4e7f8..cc9b49f42d9f 100644 --- a/pkgs/by-name/va/vagrant/gemset_libvirt.nix +++ b/pkgs/by-name/va/vagrant/gemset_libvirt.nix @@ -1,38 +1,58 @@ { builder = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; type = "gem"; }; - version = "3.2.4"; + version = "3.3.0"; + }; + diff-lcs = { + groups = ["default" "development" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; + type = "gem"; + }; + version = "1.5.1"; + }; + diffy = { + groups = ["default" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19xaz5qmw0kg1rdsjh13vk7674bpcmjy6cnddx1cvl80vgkvjr22"; + type = "gem"; + }; + version = "3.4.3"; }; excon = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rv2hq29lx2337214a1p2qy70fi77ch6p0p77nw9h6x84q028qr0"; + sha256 = "00p5fww0bakph4p9skc7ypjqbqc8crnw31nrmpdm8j4rr5kp4jb0"; type = "gem"; }; - version = "0.92.3"; + version = "1.2.2"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06m6hxq8vspx9h9bgc2s19m56jzasvl45vblrfv1q5h1qg1k6amw"; + sha256 = "1rjv4iqr64arxv07bh84zzbr1y081h21592b5zjdrk937al8mq1z"; type = "gem"; }; - version = "2.3.0"; + version = "2.6.0"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -43,18 +63,18 @@ }; fog-libvirt = { dependencies = ["fog-core" "fog-json" "fog-xml" "json" "ruby-libvirt"]; - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-z0VkRqFk3JU02ULQ+xQbywekzrJgz1YPDul//Ov5ajU="; + sha256 = "036ajdyj4fxnhqf108jgzjkpiknnr6dg7mrapn8jsagqdr2a2k21"; type = "gem"; }; - version = "0.11.0"; + version = "0.13.1"; }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -64,7 +84,7 @@ version = "0.1.4"; }; formatador = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -74,48 +94,58 @@ version = "1.1.0"; }; json = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; + sha256 = "1kvbzh8530pp3qf63zvx9hnb708x7plv9wfn5ibns3h3knnvs3kw"; type = "gem"; }; - version = "2.6.1"; + version = "2.9.0"; + }; + logger = { + groups = ["default" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q9jm4pzqxk92dq9a1y7gjwcw3dcsm1mnsdhi9ms5hw1dpnprzlx"; + type = "gem"; + }; + version = "1.6.2"; }; mime-types = { - dependencies = ["mime-types-data"]; - groups = ["default"]; + dependencies = ["logger" "mime-types-data"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg"; type = "gem"; }; - version = "3.4.1"; + version = "3.6.0"; }; mime-types-data = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; + sha256 = "0a7fq0wn2fdv57dsxfmjyzsjhxprh56k0zg3c4nm9il4s3v0mzig"; type = "gem"; }; - version = "3.2022.0105"; + version = "3.2024.1203"; }; mini_portile2 = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-RrLSRMxv8BqJv2EnRpDAn9vcpHqErp6sOQOegSMa7nw="; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.8"; }; multi_json = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -126,68 +156,122 @@ }; nokogiri = { dependencies = ["mini_portile2" "racc"]; - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-INyAC4++TE9LWxZOaqOrgqNxvLJ+toXBZpYcNN2KItc="; + sha256 = "18ajyy4d16q4ahnrfmj6d6z9ak21mnbn4wblx2vddck3lvwlpkny"; type = "gem"; }; - version = "1.15.2"; + version = "1.16.8"; + }; + parallel = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; + type = "gem"; + }; + version = "1.26.3"; + }; + parallel_tests = { + dependencies = ["parallel"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04i61bkra454var9dc79ak3yffl13mbqx8xv2rvidx9n7ins9cyn"; + type = "gem"; + }; + version = "4.7.2"; }; racc = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-r2QSSDb908AOgwcD1/hz6l3qvekj83AGo59aXg2hY4c="; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.1"; + }; + rake = { + groups = ["development" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; + type = "gem"; + }; + version = "13.2.1"; }; rexml = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.2.5"; + version = "3.3.9"; }; - xml-simple = { - groups = ["default"]; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["development" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-0hEx5RnIbxpbwrbS1X1G5pmOR/GO0kmyXK2GQz29aV0="; + sha256 = "001kazj244cb6fbkmh7ap74csbr78717qaskqzqpir1q8xpdmywl"; type = "gem"; }; - version = "1.1.9"; + version = "3.13.2"; }; - diffy = { - groups = ["default"]; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["development" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-NrQv++UTjdxWGCEHwkrY1rBm7P0odoKfOR46SZPYmuE="; + sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; type = "gem"; }; - version = "3.4.2"; + version = "3.13.3"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["development" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; + type = "gem"; + }; + version = "3.13.2"; + }; + rspec-support = { + groups = ["default" "development" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf"; + type = "gem"; + }; + version = "3.13.2"; }; ruby-libvirt = { - groups = ["default"]; + groups = ["default" "plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rnmbfhdz270fky0cm8w1i73gkrnlf3s1hdkm5yxjkdbvapwvjsd"; + sha256 = "0r0igmwr22pi3dkkg1p79hjf8mr178qnz83q8fnaj87x7zk3qfyg"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.4"; }; vagrant-libvirt = { - dependencies = ["fog-core" "fog-libvirt" "nokogiri" "rexml" "xml-simple" "diffy"]; - groups = ["default"]; + dependencies = ["diffy" "fog-core" "fog-libvirt" "nokogiri" "rexml" "xml-simple"]; + groups = ["plugins"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -196,4 +280,15 @@ }; version = "0.12.2"; }; + xml-simple = { + dependencies = ["rexml"]; + groups = ["default" "plugins"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb9plyl71mdbjr4kllfy53qx6g68ryxblmnq9dilvy837jk24fj"; + type = "gem"; + }; + version = "1.1.9"; + }; } diff --git a/pkgs/by-name/va/vagrant/package.nix b/pkgs/by-name/va/vagrant/package.nix index 60d28318930a..6754a39fad4e 100644 --- a/pkgs/by-name/va/vagrant/package.nix +++ b/pkgs/by-name/va/vagrant/package.nix @@ -6,9 +6,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.4.1"; + version = "2.4.3"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - hash = "sha256-Gc+jBuP/rl3b8wUE9hoaMSSqmodyGxMKFAmNTqH+v4k="; + hash = "sha256-ZQWdSCV5lBL8XUnOvCFwJAFk+tw30q2lRTHR93qeZ2I="; deps = bundlerEnv rec { name = "${pname}-${version}"; @@ -118,6 +118,5 @@ in buildRubyGem rec { license = licenses.bsl11; maintainers = with maintainers; [ tylerjl ]; platforms = with platforms; linux ++ darwin; - broken = true; # build fails on darwin and linux }; } From 9d9f4b50b446c1c93a861b2bbdb5d64187680abc Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 6 Dec 2024 18:58:53 +0200 Subject: [PATCH 0946/1054] Revert "splice.nix: make `pkgs` `splicedPackages`" --- pkgs/development/beam-modules/default.nix | 3 ++- pkgs/development/beam-modules/lib.nix | 5 ++++- pkgs/development/interpreters/perl/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 10 +++++++--- pkgs/top-level/splice.nix | 2 -- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index b5a4188a0b2a..23649ca76f26 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,6 +1,7 @@ -{ lib, pkgs, erlang }: +{ lib, __splicedPackages, erlang }: let + pkgs = __splicedPackages; inherit (lib) makeExtensible; lib' = pkgs.callPackage ./lib.nix { }; diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index 1b021cf93472..2d93b28cda6b 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -1,5 +1,8 @@ -{ pkgs, lib }: +{ __splicedPackages, lib }: +let + pkgs = __splicedPackages; +in rec { /* Similar to callPackageWith/callPackage, but without makeOverridable diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 1080f02f6e4d..8fd99172be10 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -19,7 +19,11 @@ let # - adds spliced package sets to the package set ({ stdenv, pkgs, perl, callPackage, makeScopeWithSplicing' }: let perlPackagesFun = callPackage ../../../top-level/perl-packages.nix { - inherit stdenv pkgs; + # allow 'perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig; }; }' like in python3Packages + # most perl packages aren't called with callPackage so it's not possible to override their arguments individually + # the conditional is because the // above won't be applied to __splicedPackages and hopefully no one is doing that when cross-compiling + pkgs = if stdenv.buildPlatform != stdenv.hostPlatform then pkgs.__splicedPackages else pkgs; + inherit stdenv; perl = self; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dfde3a30b4a..13db753ede4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5393,7 +5393,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); + tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { + pkgs = pkgs.__splicedPackages; + }); tokei = callPackage ../development/tools/misc/tokei { inherit (darwin.apple_sdk.frameworks) Security; @@ -5754,7 +5756,7 @@ with pkgs; yarn-berry = callPackage ../development/tools/yarn-berry { }; - yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { }; + yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; }; inherit (yarn2nix-moretea) yarn2nix @@ -6461,6 +6463,7 @@ with pkgs; idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules { idris-no-deps = haskellPackages.idris; + pkgs = pkgs.__splicedPackages; }); idris = idrisPackages.with-packages [ idrisPackages.base ] ; @@ -16944,7 +16947,8 @@ with pkgs; openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; openraPackages_2019 = import ../games/openra_2019 { - inherit lib pkgs; + inherit lib; + pkgs = pkgs.__splicedPackages; }; openra_2019 = openraPackages_2019.engines.release; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index e9e1ba02bf81..3b600c22f60e 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -151,8 +151,6 @@ in newScope = extra: lib.callPackageWith (pkgsForCall // extra); - pkgs = if actuallySplice then splicedPackages // { recurseForDerivations = false; } else pkgs; - # prefill 2 fields of the function for convenience makeScopeWithSplicing = lib.makeScopeWithSplicing splicePackages pkgs.newScope; makeScopeWithSplicing' = lib.makeScopeWithSplicing' { inherit splicePackages; inherit (pkgs) newScope; }; From 8a1be565fc42ad76d944de52e2e1a78954984658 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Fri, 6 Dec 2024 17:59:47 +0100 Subject: [PATCH 0947/1054] amdvlk: 2024.Q4.1.3 -> 2024.Q4.2 2024.Q4.2 was released: https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-2024.Q4.2 --- pkgs/by-name/am/amdvlk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix index 7d5884c03d80..f002e8450277 100644 --- a/pkgs/by-name/am/amdvlk/package.nix +++ b/pkgs/by-name/am/amdvlk/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amdvlk"; - version = "2024.Q4.1"; + version = "2024.Q4.2"; src = fetchRepoProject { name = "amdvlk-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${finalAttrs.version}"; - hash = "sha256-x1g4VKXbkYM2S0tfXWFESyHwalNwH813mtwWjCQK2ew="; + hash = "sha256-16eHtdxoSCVEPQNvi7Kuo7CP4yddMsZqpuRsWobEOnw="; }; buildInputs = From a5f52e17341caceab5764b3f3daa7fe7badb25c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Dec 2024 18:26:19 +0100 Subject: [PATCH 0948/1054] checkov: 3.2.330 -> 3.2.332 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.330...3.2.332 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.332 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 3e9f1cc4c60f..5d455705a1bb 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.330"; + version = "3.2.332"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-rMovncMrVpvj60WWdU5mBTpR2QVF2DLso1TUGjl3m38="; + hash = "sha256-O4stCuRm847mULyCSs+HXSBLsHIcXxtxXuUVysgd5/o="; }; patches = [ ./flake8-compat-5.x.patch ]; From cb51162e00dbc318e2c547f07df6dafc94bbf4dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 17:26:36 +0000 Subject: [PATCH 0949/1054] pytr: 0.3.0 -> 0.3.1 --- pkgs/by-name/py/pytr/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix index 6c1e92a9419a..e4fbe4052e67 100644 --- a/pkgs/by-name/py/pytr/package.nix +++ b/pkgs/by-name/py/pytr/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "pytr"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; src = fetchFromGitHub { owner = "pytr-org"; repo = "pytr"; rev = "refs/tags/v${version}"; - hash = "sha256-sMDWL0lA5iJ2v2dhUIhMgSZ1vk7LjkNMYZGiJRpd3XY="; + hash = "sha256-OFONjJXKkfb6+bQx5fhsadjm9WG62FISznnWL9IEY7I="; }; build-system = with python3Packages; [ From a4f40e4a286766354a1a7d6ea571058fe6417549 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Dec 2024 18:29:13 +0100 Subject: [PATCH 0950/1054] python312Packages.velbus-aio: 2024.10.0 -> 2024.11.1 Diff: https://github.com/Cereal2nd/velbus-aio/compare/refs/tags/2024.10.0...2024.11.1 Changelog: https://github.com/Cereal2nd/velbus-aio/releases/tag/2024.11.1 --- pkgs/development/python-modules/velbus-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 72803dfd6074..f43ff25f6555 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2024.10.0"; + version = "2024.11.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "velbus-aio"; rev = "refs/tags/${version}"; - hash = "sha256-4hMUh/0/srYIPed647Sh7H7DIp2oV7LN9srzLr0Qxps="; + hash = "sha256-hYtZgr5HJj1zjiCXBK63086ke/oWhO9CyIvnN/JUPm4="; fetchSubmodules = true; }; From 2ea653e5689c9e6e85d3496e677f81bb4cbb946e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 17:35:03 +0000 Subject: [PATCH 0951/1054] python312Packages.posthog: 3.7.0 -> 3.7.4 --- pkgs/development/python-modules/posthog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index fdd93de663bf..d9562f0dd1f3 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "posthog"; - version = "3.7.0"; + version = "3.7.4"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-1evqG/rdHBs0bAHM+bIHyT4tFE6tAE+aJyu5r0QqAMk="; + hash = "sha256-43ySHV2Idssd5YonzhyIpet98vinpQ4O2AKUiAlYahY="; }; build-system = [ setuptools ]; From 1b7d1024fbf6600677402cd9f112f401dd2a7ced Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 17:40:56 +0000 Subject: [PATCH 0952/1054] orbiton: 2.68.2 -> 2.68.4 --- pkgs/by-name/or/orbiton/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix index 9b72f34fd761..9bf7ec4b1d5e 100644 --- a/pkgs/by-name/or/orbiton/package.nix +++ b/pkgs/by-name/or/orbiton/package.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.68.2"; + version = "2.68.4"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-aCGdBG3AqD8PJHIHhie0KELQNRcD8JQfmjM2bDEjFbo="; + hash = "sha256-VEYeC3gtjBxkDYH/fEsdKtIInB8E2pcHokinspdj10Q="; }; vendorHash = null; From 206ea9fae6ae1020eee7d3e8b6b7049620e1edcb Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Fri, 6 Dec 2024 09:44:01 -0800 Subject: [PATCH 0953/1054] signalbackup-tools: 20241119 -> 20241205 Diff: https://github.com/bepaald/signalbackup-tools/compare/20241119...20241205 --- pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 8541b9fd668a..ab9d02099628 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20241119"; + version = "20241205"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-HZNjkOuJOoOSPmJHu6QTYzyxgS4dSC6lWB++xF4rRnI="; + hash = "sha256-e6T40FMM24wsVOZDE8lFeE5WKjpAFoG0M05E8oHiZeo="; }; nativeBuildInputs = [ From b3eca67865e2aecc2105f7277ee73daaa5e05756 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Fri, 6 Dec 2024 19:15:26 +0100 Subject: [PATCH 0954/1054] nixos/openresty: fix build with nginx modules (#362348) When adding modules to openresty, by either - using `.override { modules = [ ..]; }` directly - adding them to `services.nginx.additionalModules` or - enabling e.g. something like `services.nginx.recommendedZstdSettings` the build will then fail, as the actual `nginx` binary lands in `nginx/bin/nginx` for openresty, and is only symlinked to `bin/nginx` (and `bin/openresty`, for that matter). This breaks the post-install script for nginx when removing references to the aforementioned modules, since `remove-references-to` skips symlinks. Thus, just read the symlink before in this case. `readlink -fn` will read the symlink if it is one, otherwise just returns the path itself. The phase is also moved after the package-specific postInstall phase, at that might move binaries around or create symlinks - as is the case for openresty. Can be easily reproduced using e.g.: $ nix build --impure -E 'with import ./. {}; openresty.override { modules = [ nginxModules.zstd ]; }' -L Signed-off-by: Christoph Heiss --- pkgs/servers/http/nginx/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 0d38e49d6276..23f42fa49df4 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -206,8 +206,8 @@ stdenv.mkDerivation { postInstall = let - noSourceRefs = lib.concatMapStrings (m: "remove-references-to -t ${m.src} $out/bin/nginx\n") modules; - in noSourceRefs + postInstall; + noSourceRefs = lib.concatMapStrings (m: "remove-references-to -t ${m.src} $(readlink -fn $out/bin/nginx)\n") modules; + in postInstall + noSourceRefs; passthru = { inherit modules; From 2acc732b6a1db992c83649b829319a3c467f300b Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Fri, 16 Feb 2024 22:26:55 +0100 Subject: [PATCH 0955/1054] nixos/prometheus: add mqtt-exporter Signed-off-by: Christoph Heiss --- .../monitoring/prometheus/exporters.nix | 1 + .../monitoring/prometheus/exporters/mqtt.nix | 140 ++++++++++++++++++ 2 files changed, 141 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/mqtt.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index be7d2f1b6b35..26a59c317d8e 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -58,6 +58,7 @@ let "mikrotik" "modemmanager" "mongodb" + "mqtt" "mysqld" "nats" "nextcloud" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mqtt.nix b/nixos/modules/services/monitoring/prometheus/exporters/mqtt.nix new file mode 100644 index 000000000000..d1d6fcf6e2de --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/mqtt.nix @@ -0,0 +1,140 @@ +{ + config, + lib, + pkgs, + options, + utils, +}: + +let + inherit (lib) + mkIf + mkEnableOption + mkOption + types + ; + cfg = config.services.prometheus.exporters.mqtt; + toConfigBoolean = x: if x then "True" else "False"; + toConfigList = builtins.concatStringsSep ","; +in +{ + # https://github.com/kpetremann/mqtt-exporter/tree/master?tab=readme-ov-file#configuration + port = 9000; + extraOpts = { + keepFullTopic = mkEnableOption "Keep entire topic instead of the first two elements only. Usecase: Shelly 3EM"; + logLevel = mkOption { + type = types.enum [ + "CRITICAL" + "ERROR" + "WARNING" + "INFO" + "DEBUG" + ]; + default = "INFO"; + example = "DEBUG"; + description = "Logging level"; + }; + logMqttMessage = mkEnableOption "Log MQTT original message, only if `LOG_LEVEL` is set to DEBUG."; + mqttIgnoredTopics = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "Lists of topics to ignore. Accepts wildcards."; + }; + mqttAddress = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "IP or hostname of MQTT broker."; + }; + mqttPort = mkOption { + type = types.port; + default = 1883; + description = "TCP port of MQTT broker."; + }; + mqttTopic = mkOption { + type = types.str; + default = "#"; + description = "Topic path to subscribe to."; + }; + mqttKeepAlive = mkOption { + type = types.int; + default = 60; + example = 30; + description = "Keep alive interval to maintain connection with MQTT broker."; + }; + mqttUsername = mkOption { + type = types.nullOr types.str; + default = null; + example = "mqttexporter"; + description = "Username which should be used to authenticate against the MQTT broker."; + }; + mqttV5Protocol = mkEnableOption "Force to use MQTT protocol v5 instead of 3.1.1."; + mqttClientId = mkOption { + type = types.nullOr types.str; + default = null; + description = "Set client ID manually for MQTT connection"; + }; + mqttExposeClientId = mkEnableOption "Expose the client ID as a label in Prometheus metrics."; + prometheusPrefix = mkOption { + type = types.str; + default = "mqtt_"; + description = "Prefix added to the metric name."; + }; + topicLabel = mkOption { + type = types.str; + default = "topic"; + description = "Define the Prometheus label for the topic."; + }; + zigbee2MqttAvailability = mkEnableOption "Normalize sensor name for device availability metric added by Zigbee2MQTT."; + zwaveTopicPrefix = mkOption { + type = types.str; + default = "zwave/"; + description = "MQTT topic used for Zwavejs2Mqtt messages."; + }; + esphomeTopicPrefixes = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "MQTT topic used for ESPHome messages."; + }; + hubitatTopicPrefixes = mkOption { + type = types.listOf types.str; + default = [ "hubitat/" ]; + description = "MQTT topic used for Hubitat messages."; + }; + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + example = [ "/run/secrets/mqtt-exporter" ]; + description = '' + File to load as environment file. Useful for e.g. setting `MQTT_PASSWORD` + without putting any secrets into the Nix store. + ''; + }; + }; + serviceOpts = { + environment = { + KEEP_FULL_TOPIC = toConfigBoolean cfg.keepFullTopic; + LOG_LEVEL = cfg.logLevel; + LOG_MQTT_MESSAGE = toConfigBoolean cfg.logMqttMessage; + MQTT_IGNORED_TOPIC = toConfigList cfg.mqttIgnoredTopics; + MQTT_ADDRESS = cfg.mqttAddress; + MQTT_PORT = toString cfg.mqttPort; + MQTT_TOPIC = cfg.mqttTopic; + MQTT_KEEPALIVE = toString cfg.mqttKeepAlive; + MQTT_USERNAME = cfg.mqttUsername; + MQTT_V5_PROTOCOL = toConfigBoolean cfg.mqttV5Protocol; + MQTT_CLIENT_ID = mkIf (cfg.mqttClientId != null) cfg.mqttClientId; + PROMETHEUS_ADDRESS = cfg.listenAddress; + PROMETHEUS_PORT = toString cfg.port; + PROMETHEUS_PREFIX = cfg.prometheusPrefix; + TOPIC_LABEL = cfg.topicLabel; + ZIGBEE2MQTT_AVAILABILITY = toConfigBoolean cfg.zigbee2MqttAvailability; + ZWAVE_TOPIC_PREFIX = cfg.zwaveTopicPrefix; + ESPHOME_TOPIC_PREFIXES = toConfigList cfg.esphomeTopicPrefixes; + HUBITAT_TOPIC_PREFIXES = toConfigList cfg.hubitatTopicPrefixes; + }; + serviceConfig = { + EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; + ExecStart = lib.getExe pkgs.mqtt-exporter; + }; + }; +} From efbb8bd9045469daef47e23163912a2af39c7810 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Fri, 16 Feb 2024 23:10:46 +0100 Subject: [PATCH 0956/1054] nixos/tests/prometheus-exporters: add tests for mqtt-exporter Signed-off-by: Christoph Heiss --- nixos/tests/prometheus-exporters.nix | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 4aacd8e5a849..6ea841b4d9ea 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -804,6 +804,38 @@ let ''; }; + mqtt = { + exporterConfig = { + enable = true; + environmentFile = pkgs.writeText "mqtt-exporter-envfile" '' + MQTT_PASSWORD=testpassword + ''; + }; + metricProvider = { + services.mosquitto = { + enable = true; + listeners = [{ + users.exporter = { + acl = [ "read #" ]; + passwordFile = pkgs.writeText "mosquitto-password" "testpassword"; + }; + }]; + }; + systemd.services.prometheus-mqtt-exporter ={ + wants = [ "mosquitto.service" ]; + after = [ "mosquitto.service" ]; + }; + }; + exporterTest = '' + wait_for_unit("mosquitto.service") + wait_for_unit("prometheus-mqtt-exporter.service") + wait_for_open_port(9000) + succeed( + "curl -sSf http://localhost:9000/metrics | grep '^python_info'" + ) + ''; + }; + mysqld = { exporterConfig = { enable = true; From 345d36a3e58a56296c900a5c8edb34ee06cc287c Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 17 Feb 2024 16:46:29 +0100 Subject: [PATCH 0957/1054] nixos/prometheus-mqtt-exporter: add release notes entry Signed-off-by: Christoph Heiss --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 4b0525444f28..0db6aded4ea9 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -22,6 +22,8 @@ - [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](options.html#opt-services.agorakit.enable). +- [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable). + ## Backward Incompatibilities {#sec-release-25.05-incompatibilities} From fd39bbae626b449f1737983ddcaeb77a4fb889bf Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 6 Dec 2024 19:44:40 +0100 Subject: [PATCH 0958/1054] chocolate-doom: 3.0.1 -> 3.1.0 (#361411) * chocolate-doom: format with `nixfmt-rfc-style` * chocolate-doom: refactor * chocolate-doom: update homepage * chocolate-doom: add mainProgram * chocolate-doom: add myself as maintainer * chocolate-doom: 3.0.1 -> 3.1.0 * chocolate-doom: remove hydraPlatforms * chocolate-doom: add `meta.changelog` * chocolate-doom: add missing dependencies --- pkgs/by-name/ch/chocolate-doom/package.nix | 64 +++++++++++++--------- 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/ch/chocolate-doom/package.nix b/pkgs/by-name/ch/chocolate-doom/package.nix index 7eb282402042..677fed32aea1 100644 --- a/pkgs/by-name/ch/chocolate-doom/package.nix +++ b/pkgs/by-name/ch/chocolate-doom/package.nix @@ -1,31 +1,29 @@ -{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net -, fetchFromGitHub, fetchpatch, python3 }: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + libpng, + libsamplerate, + pkg-config, + python3, + SDL2, + SDL2_mixer, + SDL2_net, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chocolate-doom"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "chocolate-doom"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "1zlcqhd49c5n8vaahgaqrc2y10z86xng51sbd82xm3rk2dly25jp"; + repo = "chocolate-doom"; + rev = "refs/tags/chocolate-doom-${finalAttrs.version}"; + hash = "sha256-yDPfqCuzRbDhOQisIDAGo2bmmMjT+0lds5xc9C2pqoU="; }; - patches = [ - # Pull upstream patch to fix builx against gcc-10: - # https://github.com/chocolate-doom/chocolate-doom/pull/1257 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/chocolate-doom/chocolate-doom/commit/a8fd4b1f563d24d4296c3e8225c8404e2724d4c2.patch"; - sha256 = "1dmbygn952sy5n8qqp0asg11pmygwgygl17lrj7i0fxa0nrhixhj"; - }) - ]; - - outputs = [ "out" "man" ]; - postPatch = '' - sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am patchShebangs --build man/{simplecpp,docgen} ''; @@ -35,15 +33,31 @@ stdenv.mkDerivation rec { # for documentation python3 ]; - buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; + + buildInputs = [ + libpng + libsamplerate + SDL2 + SDL2_mixer + SDL2_net + ]; + + outputs = [ + "out" + "man" + ]; + enableParallelBuilding = true; + strictDeps = true; + meta = { - homepage = "http://chocolate-doom.org/"; + homepage = "https://www.chocolate-doom.org"; + changelog = "https://github.com/chocolate-doom/chocolate-doom/releases/tag/chocolate-doom-${finalAttrs.version}"; description = "Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s"; + mainProgram = "chocolate-doom"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - hydraPlatforms = lib.platforms.linux; # darwin times out - maintainers = [ ]; + maintainers = with lib.maintainers; [ Gliczy ]; }; -} +}) From 88f9f6f54e6788004a12bb7d2905d4fd1d880584 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 6 Dec 2024 19:46:58 +0100 Subject: [PATCH 0959/1054] signal-desktop: 7.34.0 -> 7.35.0 (#361881) * signal-desktop: 7.34.0 -> 7.35.0 * signal-desktop(darwin): 7.34.0 -> 7.35.0 --- pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix | 4 ++-- pkgs/by-name/si/signal-desktop/signal-desktop.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix index 8638555e2192..9552f9e258fa 100644 --- a/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix +++ b/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "signal-desktop"; - version = "7.34.0"; + version = "7.35.0"; src = fetchurl { url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg"; - hash = "sha256-UfyD2R78SkvAn7PppOfAK/zzPPpRVdI3y2T/F07ad1E="; + hash = "sha256-+ZzZp3/koitwtHyUmcgltcYo91KfDfQzOjnOzTJJu6c="; }; sourceRoot = "."; diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop.nix b/pkgs/by-name/si/signal-desktop/signal-desktop.nix index bb6a2193eccf..2b91d4166037 100644 --- a/pkgs/by-name/si/signal-desktop/signal-desktop.nix +++ b/pkgs/by-name/si/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.34.0"; + version = "7.35.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-q0vv96esQ6LRVVwxSQDh4BdbOZrc+caB+TRDWKfDlZ8="; + hash = "sha256-cQ7bwgRjlI2idnHtl7EZyBfjcPz52s8+E7UpLxn4FEg="; } From a8f699a5730ad69748b67c4f8aef78a23f4767d3 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 6 Dec 2024 19:49:54 +0100 Subject: [PATCH 0960/1054] komikku: 1.64.0 -> 1.65.0 (#362524) * komikku: 1.64.0 -> 1.65.0 * komikku: remove infinitivewitch as maintainer Their account seem to have been deleted. * komikku: add myself to maintainers --- pkgs/by-name/ko/komikku/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index aa277cba9aa5..cdb2a4969747 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.64.0"; + version = "1.65.0"; format = "other"; @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-EpKLez5gTHCSJYGvDqmzj6YO1dIugZKrEP4zE2G5TxA="; + hash = "sha256-U+ekx6ON3mLaTqaQ6PYe9bGVWMyq9PXZyv+rQ1cd1n0="; }; nativeBuildInputs = [ @@ -112,7 +112,7 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://codeberg.org/valos/Komikku/releases/tag/v${version}"; maintainers = with lib.maintainers; [ chuangzhu - infinitivewitch + Gliczy ]; }; } From 96df5142416ca89bda7cf75a8b6ef68ea9403f13 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Fri, 6 Dec 2024 20:26:32 +0100 Subject: [PATCH 0961/1054] lazyjournal: init at 0.4.0 --- pkgs/by-name/la/lazyjournal/package.nix | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/la/lazyjournal/package.nix diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix new file mode 100644 index 000000000000..6abbef38687b --- /dev/null +++ b/pkgs/by-name/la/lazyjournal/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +let + version = "0.4.0"; +in +buildGoModule { + pname = "lazyjournal"; + inherit version; + + src = fetchFromGitHub { + owner = "Lifailon"; + repo = "lazyjournal"; + tag = version; + hash = "sha256-Ce5xodkWgMMRRqsKLZNt0cNspsUFXTHQHXmQbphOS2w="; + }; + + vendorHash = "sha256-jh99+zlhr4ogig4Z2FFO6SZ2qTBkOUuiXo5iNk0VTi0="; + + ldflags = [ + "-s" + "-w" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "TUI for journalctl, file system logs, as well as Docker and Podman containers"; + homepage = "https://github.com/Lifailon/lazyjournal"; + license = with lib.licenses; [ mit ]; + platforms = with lib.platforms; unix ++ windows; + maintainers = with lib.maintainers; [ pluiedev ]; + mainProgram = "lazyjournal"; + }; +} From 674835a9d98fd037c8f6ce1c954b5e07e56b0832 Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 6 Dec 2024 20:24:46 +0100 Subject: [PATCH 0962/1054] chromium: remove ofborg maintainer ping workaround, use CODEOWNERS The workaround to have ofborg ping chromium and ungoogled-chromium maintainers when a change was only made to the upstream-info relied on string context. That string context was provided by the upstream-info being a nix file, not a json file, and then holding on to that string context using awkward attribute merges. It was intended as a quick fix until the handling of this would improve in ofborg itself and worked great. That was until very recently when we switched from the chromium release tarball to git source fetching in 8dd2f1add978a4747a5962f2874b8ad20f86b01c. Part of that change included going back from upstream-info.nix to upstream-info.json and with that losing the string context and the base on which this workaround used to work. But this is fine. A lot has happened in the meantime. CODEOWNERS was reimplemented and no longer requires every user listed in it to have write permissions to the repository (commit bit). Meaning we can accept that ofborg pings no longer work and instead rely on CODEOWNERS exclusively. It should, however, be noted that CODEOWNERS provide less granularity than ofborg, meaning we can no longer differentiate between ungoogled-chromium and chromium or even chromedriver. Previously, implementing the workaround that is now essentially reverted: 68c59791fb6644ac733d99d0147b09bce4cb8319 --- ci/OWNERS | 4 ++-- pkgs/applications/networking/browsers/chromium/browser.nix | 2 ++ pkgs/applications/networking/browsers/chromium/common.nix | 7 +------ pkgs/applications/networking/browsers/chromium/default.nix | 6 ------ 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/ci/OWNERS b/ci/OWNERS index b8699826ebd7..2ffee66285cf 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -207,8 +207,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza # Browsers /pkgs/applications/networking/browsers/firefox @mweinelt -/pkgs/applications/networking/browsers/chromium @emilylange -/nixos/tests/chromium.nix @emilylange +/pkgs/applications/networking/browsers/chromium @emilylange @networkException +/nixos/tests/chromium.nix @emilylange @networkException # Certificate Authorities pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index d4259c2895ad..bdedac20c5eb 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -84,6 +84,8 @@ mkChromiumDerivation (base: rec { homepage = if ungoogled then "https://github.com/ungoogled-software/ungoogled-chromium" else "https://www.chromium.org/"; + # Maintainer pings for this derivation are highly unreliable. + # If you add yourself as maintainer here, please also add yourself as CODEOWNER. maintainers = with lib.maintainers; if ungoogled then [ networkexception emilylange ] else [ networkexception emilylange ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4a16de319a1e..c0a661a86038 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -663,12 +663,7 @@ let } // lib.optionalAttrs (!isElectron) { inherit chromiumDeps npmDeps; }; - } - # overwrite `version` with the exact same `version` from the same source, - # except it internally points to `upstream-info.nix` for - # `builtins.unsafeGetAttrPos`, which is used by ofborg to decide - # which maintainers need to be pinged. - // builtins.removeAttrs upstream-info (builtins.filter (e: e != "version") (builtins.attrNames upstream-info)); + }; # Remove some extraAttrs we supplied to the base attributes already. in stdenv.mkDerivation (base // removeAttrs extraAttrs [ diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 4f0255210d31..296c35021280 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -178,9 +178,3 @@ in stdenv.mkDerivation { inherit sandboxExecutableName; }; } -# the following is a complicated and long-winded variant of -# `inherit (chromium.browser) version`, with the added benefit -# that it keeps the pointer to upstream-info.nix for -# builtins.unsafeGetAttrPos, which is what ofborg uses to -# decide which maintainers need to be pinged. -// builtins.removeAttrs chromium.browser (builtins.filter (e: e != "version") (builtins.attrNames chromium.browser)) From dd7d0b79b508f175c0a1be4bd5e984ae8a79fba7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 20:38:24 +0000 Subject: [PATCH 0963/1054] dbeaver-bin: 24.2.3 -> 24.3.0 --- pkgs/by-name/db/dbeaver-bin/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index c9cc55579986..854f9688a796 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "24.2.3"; + version = "24.3.0"; src = let @@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-TvDpoEcnZBS8ORggFwLM80FXsJ8EXKvRSPUn+VtNTk8="; - aarch64-linux = "sha256-59khU3VQzpNeZv69pbeeE4ZAFajyI5gUUw9baOWPIFM="; - x86_64-darwin = "sha256-/YyN5daeoxq0oii6qYRpZ8cb43u6n8HuVc2JqVOhrxs="; - aarch64-darwin = "sha256-Stb76QpLnpmpBYDm+6fgkcx+TlY8hVkNtvGgdMWbaHg="; + x86_64-linux = "sha256-7tmz6ThT6oH2eMRl5XTf1+nr/ufDlp4BvGyKFICiTRw="; + aarch64-linux = "sha256-idnTeh37Ew6fg1gdJaoFF+wpgoShcJZokmWsid6g3ow="; + x86_64-darwin = "sha256-P1XseM1Al7y1JFVe/8VCIE84nMT4l9KF+Ik+rHjrv20="; + aarch64-darwin = "sha256-Xl4D8qTwB0tccuXqon4DApOOM95swxbfwSTD8gqc7jo="; }; in fetchurl { From 9bde82f503b18120f1b04c1b76076ab23abd45c1 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Fri, 6 Dec 2024 23:54:58 +0300 Subject: [PATCH 0964/1054] decasify: drop obsolete workaround for fetchCargoTarball triggering configure --- pkgs/by-name/de/decasify/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/de/decasify/package.nix b/pkgs/by-name/de/decasify/package.nix index ce832d4d10d9..c45c48185103 100644 --- a/pkgs/by-name/de/decasify/package.nix +++ b/pkgs/by-name/de/decasify/package.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname version src; nativeBuildInputs = [ zstd ]; - # so the cargo fetcher won't try to run the `./configure` script - dontConfigure = true; hash = "sha256-bD8MYufI87j//7dIAnCzmp4yoOaT81Zv1i7rjWpjPlc="; }; From 5017d412385266a90430d3a07853dedb0dd5f664 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Fri, 6 Dec 2024 23:56:31 +0300 Subject: [PATCH 0965/1054] git-warp-time: drop obsolete workaround for fetchCargoTarball triggering configure --- pkgs/by-name/gi/git-warp-time/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/gi/git-warp-time/package.nix b/pkgs/by-name/gi/git-warp-time/package.nix index 332b462d9e8d..ff50317d8ec8 100644 --- a/pkgs/by-name/gi/git-warp-time/package.nix +++ b/pkgs/by-name/gi/git-warp-time/package.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname version src; nativeBuildInputs = [ zstd ]; - # so the cargo fetcher won't try to run the `./configure` script - dontConfigure = true; hash = "sha256-bmClqtH1xU2KOKVbCOrgN14jpLKiA2ZMzWwrOiufwnQ="; }; From 5edc28dbabaae835c1ad7e3c97984c44e8d9828a Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Fri, 6 Dec 2024 23:56:43 +0300 Subject: [PATCH 0966/1054] sile: drop obsolete workaround for fetchCargoTarball triggering configure --- pkgs/by-name/si/sile/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index dd3c31e2ac92..e3fb2bd1e7f7 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -39,8 +39,6 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname version src; nativeBuildInputs = [ zstd ]; - # so the cargo fetcher won't try to run the `./configure` script - dontConfigure = true; hash = "sha256-iPkXEUC4U1m/ComIDo/J5kwkmM1QdowioNtnSnmMhJ0="; }; From 5d029a72b3ac5f013580075ce33027224c406516 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 7 Dec 2024 00:00:13 +0300 Subject: [PATCH 0967/1054] sile: mark broken on darwin Known issue on upstream since v0.15.6, see: https://github.com/sile-typesetter/sile/issues/2189 --- pkgs/by-name/si/sile/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index e3fb2bd1e7f7..8fb9f4e89e0b 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -167,6 +167,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { + broken = stdenv.isDarwin; description = "Typesetting system"; longDescription = '' SILE is a typesetting system; its job is to produce beautiful From 05c78a8045d67279a3b2a6e2510fb81375b931ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Dec 2024 14:50:14 -0800 Subject: [PATCH 0968/1054] python312Packages.hahomematic: 2024.11.8 -> 2024.12.0 Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2024.11.8...2024.12.0 Changelog: https://github.com/danielperna84/hahomematic/blob/refs/tags/2024.12.0/changelog.md --- pkgs/development/python-modules/hahomematic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 8f36797f2619..63a93a7ed5b7 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.11.8"; + version = "2024.12.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -25,14 +25,14 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-fDHt9D2Lr3yVLhWYar4ANeq3W4A1lhAxSLTjWqJzJNE="; + hash = "sha256-RLgJiapsRM8dMA4+T2S6DkSFjo+YBmVVpo1mOVKJ7EI="; }; __darwinAllowLocalNetworking = true; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==75.1.0" "setuptools" \ + --replace-fail "setuptools==75.6.0" "setuptools" \ ''; build-system = [ setuptools ]; From 7e81a7f76dc141fab4dff07d6b750b4ea589c18b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Dec 2024 14:50:22 -0800 Subject: [PATCH 0969/1054] home-assistant-custom-components.homematicip_local: 1.72.0 -> 1.73.0 Diff: https://github.com/danielperna84/custom_homematic/compare/refs/tags/1.72.0...1.73.0 Changelog: https://github.com/danielperna84/custom_homematic/blob/1.73.0/changelog.md --- .../custom-components/homematicip_local/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix index a06c1896d66b..de8574900e0d 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "danielperna84"; domain = "homematicip_local"; - version = "1.72.0"; + version = "1.73.0"; src = fetchFromGitHub { owner = "danielperna84"; repo = "custom_homematic"; rev = "refs/tags/${version}"; - hash = "sha256-K46rlurJCFliCphoIdE2z9Zhpo8sJ4Wq/+xSfHJoPRc="; + hash = "sha256-1ssmaX6G03i9KYgjCRMZqOG2apEZ0069fQnmVy2BVhA="; }; dependencies = [ From da61cc23b502e83459619f540c34466faa4444b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 22:55:29 +0000 Subject: [PATCH 0970/1054] ad-miner: 1.6.1 -> 1.7.0 --- pkgs/by-name/ad/ad-miner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix index b1aaf615c6e5..738b17374dfa 100644 --- a/pkgs/by-name/ad/ad-miner/package.nix +++ b/pkgs/by-name/ad/ad-miner/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ad-miner"; - version = "1.6.1"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "Mazars-Tech"; repo = "AD_Miner"; rev = "refs/tags/v${version}"; - hash = "sha256-/TIG1UUfLct9MxCmahWk7F6KlypNan+zk/02zVpPV+w="; + hash = "sha256-Uzt7tKRj+iq4UR0gUpfhiTzMjecVBcp7jsXC7lSADeg="; }; # All requirements are pinned From 015328399ec733874282b9bc8855bca7db650e73 Mon Sep 17 00:00:00 2001 From: Golbinex <2061409-Golbinex@users.noreply.gitlab.com> Date: Mon, 18 Nov 2024 21:00:39 +0100 Subject: [PATCH 0971/1054] home-assistant-custom-lovelace-modules.vacuum-card: init at 2.10.1 --- .../custom-lovelace-modules/default.nix | 2 + .../vacuum-card/default.nix | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100755 pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/default.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix index f71bf6271f85..96e1eca0692f 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix @@ -39,6 +39,8 @@ universal-remote-card = callPackage ./universal-remote-card { }; + vacuum-card = callPackage ./vacuum-card { }; + valetudo-map-card = callPackage ./valetudo-map-card { }; weather-card = callPackage ./weather-card { }; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/default.nix new file mode 100755 index 000000000000..7caf03b226a0 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage rec { + pname = "vacuum-card"; + version = "2.10.1"; + + src = fetchFromGitHub { + owner = "denysdovhan"; + repo = "vacuum-card"; + rev = "v${version}"; + hash = "sha256-NJeD6YhXmNNBuhRWjK74sTrxzXyGSbehm5lz05sNA3Y="; + }; + + npmDepsHash = "sha256-x+pq58chBSgFVGr9Xtka5/MH/AHV0zMpyKfA/kEEXBM="; + + installPhase = '' + runHook preInstall + + mkdir $out + cp dist/vacuum-card.js $out + + runHook postInstall + ''; + + passthru.entrypoint = "vacuum-card.js"; + + meta = with lib; { + description = "Vacuum cleaner card for Home Assistant Lovelace UI"; + homepage = "https://github.com/denysdovhan/vacuum-card"; + license = licenses.mit; + maintainers = with maintainers; [ baksa ]; + platforms = platforms.all; + }; +} From ff1502b97d8902e4b4f0bd21b8ba024fbcbec9d0 Mon Sep 17 00:00:00 2001 From: Cryo Date: Sat, 7 Dec 2024 07:13:34 +0800 Subject: [PATCH 0972/1054] chsrc: init at 0.1.9 --- .../ch/chsrc/disable-static-compiling.patch | 14 ++++++ pkgs/by-name/ch/chsrc/package.nix | 46 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 pkgs/by-name/ch/chsrc/disable-static-compiling.patch create mode 100644 pkgs/by-name/ch/chsrc/package.nix diff --git a/pkgs/by-name/ch/chsrc/disable-static-compiling.patch b/pkgs/by-name/ch/chsrc/disable-static-compiling.patch new file mode 100644 index 000000000000..470deb32e9c9 --- /dev/null +++ b/pkgs/by-name/ch/chsrc/disable-static-compiling.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 99065da..2415738 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,9 +16,6 @@ endif + ifeq ($(CC), clang) + CFLAGS += $(CLANG_FLAGS) + endif +-ifeq ($(shell uname), Linux) +- CFLAGS += -static +-endif + + Target = chsrc + diff --git a/pkgs/by-name/ch/chsrc/package.nix b/pkgs/by-name/ch/chsrc/package.nix new file mode 100644 index 000000000000..d59c2823ee20 --- /dev/null +++ b/pkgs/by-name/ch/chsrc/package.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchFromGitHub, + stdenv, + texinfo, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "chsrc"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "RubyMetric"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-MwT6SuDisJ2ynxlOqAUA8WjhrTeUcyoAMArehnby8Yw="; + }; + + nativeBuildInputs = [ texinfo ]; + + patches = [ + ./disable-static-compiling.patch + ]; + + installPhase = '' + runHook preInstall + install -Dm755 chsrc $out/bin/chsrc + install -Dm644 doc/chsrc.1 -t $out/share/man/man1/ + makeinfo doc/chsrc.texi --output=chsrc.info + install -Dm 644 chsrc.info -t $out/share/info/ + runHook postInstall + ''; + + meta = { + description = "Change Source everywhere for every software"; + homepage = "https://chsrc.run/"; + changelog = "https://github.com/RubyMetric/chsrc/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ + gpl3Plus + mit + ]; + maintainers = with lib.maintainers; [ cryo ]; + platforms = lib.platforms.all; + mainProgram = "chsrc"; + }; +}) From f1426205cee60dc3f98da50eac5dbf4411ace3a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 00:15:59 +0100 Subject: [PATCH 0973/1054] python312Packages.hass-nabucasa: 0.83.0 -> 0.86.0 Diff: https://github.com/nabucasa/hass-nabucasa/compare/refs/tags/0.83.0...0.86.0 Changelog: https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.86.0 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index bfe31c016bc3..cda1aa486143 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.83.0"; + version = "0.86.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = "hass-nabucasa"; rev = "refs/tags/${version}"; - hash = "sha256-1l0nLSY+r5ujYo3pHzicqnmZ49OH8elVLGpK3lqCaTo="; + hash = "sha256-ySo0G/Zh+KQMocMxrvUua704gt2tWQMlArqxBS/C9hs="; }; pythonRelaxDeps = [ "acme" ]; From 2943e975f3c2971f623e52662f807809e08e07cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 00:17:45 +0100 Subject: [PATCH 0974/1054] python312Packages.aioesphomeapi: 27.0.1 -> 28.0.0 Diff: https://github.com/esphome/aioesphomeapi/compare/refs/tags/v27.0.1...v28.0.0 Changelog: https://github.com/esphome/aioesphomeapi/releases/tag/v28.0.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 461fe2c4ff43..c682fde87681 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "27.0.1"; + version = "28.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-bcwChHWH621UoGHkP+xPNzmj+Uh18rWgkMSrtW9zFF8="; + hash = "sha256-vMqDxg2BV9/g5FquejnT/Rsvwjhdh01K2LxiT355p1U="; }; build-system = [ From 4c0bbe324e862584eb738f4317bd4f27555f8dde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 19:39:53 +0000 Subject: [PATCH 0975/1054] terraform-providers.hcloud: 1.48.1 -> 1.49.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0972fcfdc0ff..4b81ad550b89 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -552,13 +552,13 @@ "vendorHash": "sha256-TZxiDRVZPfg3jSflZsSbVaVcfUNqJ2U+ymHIm01pgkI=" }, "hcloud": { - "hash": "sha256-td1R2Xeo1QfsNJOwE7cCuzF5OjW4XUQJOVd0LPAXfuE=", + "hash": "sha256-nkp4XTFRBSxqRAURL0O4H/l7oDF/OEXmew0MkmyQryc=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.48.1", + "rev": "v1.49.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-t9nXq30jRSlx9gMR+s8irDVdSE5tg9ZvMp47HZwEm7w=" + "vendorHash": "sha256-TFH5tHOTRNPUMGYeYQ1ZbM6FjcojYnkB2NwnQOacTvg=" }, "helm": { "hash": "sha256-8cYhbxbjTfloDd3cLYNPv98TzeC0XVrb4DQ2ScZDYvI=", From ab29891a1995da35290337b51b073cb08f76429b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 19:44:28 +0000 Subject: [PATCH 0976/1054] terraform-providers.incus: 0.1.4 -> 0.2.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4b81ad550b89..865cd6f166cd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -651,13 +651,13 @@ "vendorHash": null }, "incus": { - "hash": "sha256-VHoEUcFwsERC3EKfobTEoWOxuiOEBzEaWXL+mzlTe44=", + "hash": "sha256-Dva5bFyJpxifsQl62xnjvqEQ5SknUmCLfGX4fFx5FAE=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v0.1.4", + "rev": "v0.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-7MQi9gJU0RAm9jTiY/YjkEU5QsxSX2lbUC7qvT20mes=" + "vendorHash": "sha256-xr54yCVGOJbj0612wiljUkx1wEOSuXB1qrGbF/vCwN8=" }, "infoblox": { "hash": "sha256-x5WGCYvsXby2O8J15fvoRNsYnBCaYdjx6LuDkYAfIlU=", From a01ee2f7f3e0f33f6738b6f49d24d3653a415682 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 20:56:31 +0000 Subject: [PATCH 0977/1054] terraform-providers.spacelift: 1.16.1 -> 1.19.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 865cd6f166cd..7cb96fefb515 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1174,13 +1174,13 @@ "vendorHash": "sha256-YFV+qXD78eajSeagJPgPu+qIktx1Vh/ZT0fUPOBuZyo=" }, "spacelift": { - "hash": "sha256-HJ+QlbmMvn45l9KjmVzoK/jETIosOSlcLtw4B1kdEIo=", + "hash": "sha256-RWrhVeXPEgFYFGh34vFargTrZH+3CxY36+i0lmFSjXg=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.16.1", + "rev": "v1.19.0", "spdx": "MIT", - "vendorHash": "sha256-m/J390su2nUpYMXrrYcOfKSjZb5Y23+g24rroLRss4U=" + "vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs=" }, "spotinst": { "hash": "sha256-Yq52eCxT+XWoTONcLTDlIpy/jnU76JajsoqKYXFK8AM=", From cc6febd78974a2ffd90c1258b892ac8030bae12f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 00:22:31 +0100 Subject: [PATCH 0978/1054] python312Packages.aioopenexchangerates: 0.6.17 -> 0.6.18 Diff: https://github.com/MartinHjelmare/aioopenexchangerates/compare/refs/tags/v0.6.17...v0.6.18 Changelog: https://github.com/MartinHjelmare/aioopenexchangerates/blob/v0.6.18/CHANGELOG.md --- .../python-modules/aioopenexchangerates/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index 02740ccaae7a..42d9511e216e 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.6.17"; + version = "0.6.18"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-TxYmj5OS9x50QxAOwsFMbM15bhrHTmBTEsRlFoG3Kyc="; + hash = "sha256-/iSL+Beny7q9RtdbVIfiMmAwH5wS90ADQszBL7Ooq3o="; }; pythonRelaxDeps = [ "pydantic" ]; From 291591157d1e42092b8eed4bcec0e2b76d7e233e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 00:23:06 +0100 Subject: [PATCH 0979/1054] python312Packages.aiortm: 0.9.38 -> 0.9.42 Diff: https://github.com/MartinHjelmare/aiortm/compare/refs/tags/v0.9.38...v0.9.42 Changelog: https://github.com/MartinHjelmare/aiortm/blob/v0.9.42/CHANGELOG.md --- pkgs/development/python-modules/aiortm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index d53f571a0011..b1db4644a133 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.9.38"; + version = "0.9.42"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-Qc972Pl+XdgWukgEpTBhsidPvbcPPPWOkqQk24x2ugo="; + hash = "sha256-4UN96ZpXssCsYh/UmCaPud+bqgw9ckqofyifvIohBBk="; }; pythonRelaxDeps = [ "typer" ]; From 2d3107bd028f9b730f422b0506f57c4a8482a11b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 00:24:33 +0100 Subject: [PATCH 0980/1054] python312Packages.asyncmy: 0.2.9 -> 0.2.10 Diff: https://github.com/long2ice/asyncmy/compare/refs/tags/v0.2.9...v0.2.10 --- pkgs/development/python-modules/asyncmy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncmy/default.nix b/pkgs/development/python-modules/asyncmy/default.nix index 54c5ad8fd37b..33c501910019 100644 --- a/pkgs/development/python-modules/asyncmy/default.nix +++ b/pkgs/development/python-modules/asyncmy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "asyncmy"; - version = "0.2.9"; + version = "0.2.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "long2ice"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BjjC8pvvQfnvaExhei+F4a2eryHiRbI527BZFLpJk2w="; + hash = "sha256-HQZmt22yPYaWfJzL20+jBc855HR4dVW983Z0LrN1Xa0="; }; nativeBuildInputs = [ From 0d02317114092677683463029686bb6e9515d4a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 00:25:08 +0100 Subject: [PATCH 0981/1054] python312Packages.autoslot: 2022.12.1 -> 2024.12.1 Diff: https://github.com/cjrh/autoslot/compare/refs/tags/v2022.12.1...v2024.12.1 --- pkgs/development/python-modules/autoslot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autoslot/default.nix b/pkgs/development/python-modules/autoslot/default.nix index 55059da486a0..0df019c1c46d 100644 --- a/pkgs/development/python-modules/autoslot/default.nix +++ b/pkgs/development/python-modules/autoslot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "autoslot"; - version = "2022.12.1"; + version = "2024.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cjrh"; repo = "autoslot"; rev = "refs/tags/v${version}"; - hash = "sha256-fG4rRwRubJt2aXChEsMybEKal6LscZI7GA2uwtK5Vtg="; + hash = "sha256-wYjsBrjvSZFHDt0HLrnS9Xwk8EHVQupfPSkQnUFmMAk="; }; postPatch = '' From 612abc0c6783081fa97050ca3835a80037d434ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 00:27:05 +0100 Subject: [PATCH 0982/1054] python312Packages.autoslot: refactor --- pkgs/development/python-modules/autoslot/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/autoslot/default.nix b/pkgs/development/python-modules/autoslot/default.nix index 0df019c1c46d..84c504bed8ca 100644 --- a/pkgs/development/python-modules/autoslot/default.nix +++ b/pkgs/development/python-modules/autoslot/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "autoslot"; version = "2024.12.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,13 +21,7 @@ buildPythonPackage rec { hash = "sha256-wYjsBrjvSZFHDt0HLrnS9Xwk8EHVQupfPSkQnUFmMAk="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'requires = ["flit"]' 'requires = ["flit_core"]' \ - --replace 'build-backend = "flit.buildapi"' 'build-backend = "flit_core.buildapi"' - ''; - - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; From cc2454d93246a037671e3d744d0de2389335ce25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 00:29:13 +0100 Subject: [PATCH 0983/1054] python312Packages.fastcore: 1.7.22 -> 1.7.23 Diff: https://github.com/fastai/fastcore/compare/refs/tags/1.7.22...1.7.23 Changelog: https://github.com/fastai/fastcore/blob/1.7.23/CHANGELOG.md --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 3adf0ad601ae..d65c75556af4 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.7.22"; + version = "1.7.23"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-llD7hDZStgCUfp06byGLtLPgDqiK7BAMw9kLNzOGUec="; + hash = "sha256-YsZBPcGWKxE5Cl3HCmB2ZDecFuQa5Q5aTEbZ5ijmB24="; }; build-system = [ setuptools ]; From de0efdf77900f1eb3aaaad840067f10465d0d1ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 00:32:27 +0100 Subject: [PATCH 0984/1054] python312Packages.openrgb-python: 0.3.2 -> 0.3.3 Changelog: https://github.com/jath03/openrgb-python/releases/tag/v0.3.3 --- pkgs/development/python-modules/openrgb-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openrgb-python/default.nix b/pkgs/development/python-modules/openrgb-python/default.nix index 48ac9a55aedc..da2282506af1 100644 --- a/pkgs/development/python-modules/openrgb-python/default.nix +++ b/pkgs/development/python-modules/openrgb-python/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "openrgb-python"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-euWcot6OfGOSzueA3B4L3h+G2Gv97ZZUiSTABQh8kSc="; + hash = "sha256-XQnxYfs7VouABBNBg7mXT3XGfbEP3PNZzVO8TlTpSUc="; }; build-system = [ setuptools ]; From b0fed75a832881dbb280306e818685fb94f693b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 00:33:06 +0100 Subject: [PATCH 0985/1054] python312Packages.pontos: 24.9.0 -> 24.12.0 Diff: https://github.com/greenbone/pontos/compare/refs/tags/v24.9.0...v24.12.0 Changelog: https://github.com/greenbone/pontos/releases/tag/v24.12.0 --- pkgs/development/python-modules/pontos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index aeae266c62b0..677b7f7a3c71 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "24.9.0"; + version = "24.12.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "pontos"; rev = "refs/tags/v${version}"; - hash = "sha256-CgO88I2M8RGpYyJchXZtqxIBjNaULSqnDgfFCUQDFUw="; + hash = "sha256-+zlc23NRTDtPRaRnnvlf0tb3kkk+0TYPxACBUR/JWvw="; }; build-system = [ poetry-core ]; From d1caef8c5b77511547065c8debcae056f68ad637 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 00:36:06 +0100 Subject: [PATCH 0986/1054] python312Packages.id: 1.4.0 -> 1.5.0 Diff: di/id@refs/tags/v1.4.0...v1.5.0 Changelog: https://github.com/di/id/blob/1.5.0/CHANGELOG.md --- pkgs/development/python-modules/id/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/id/default.nix b/pkgs/development/python-modules/id/default.nix index 7ca8930f4fc4..85e9742c98db 100644 --- a/pkgs/development/python-modules/id/default.nix +++ b/pkgs/development/python-modules/id/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, flit-core, pretend, - pydantic, pytestCheckHook, pythonOlder, requests, @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "id"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,15 +20,12 @@ buildPythonPackage rec { owner = "di"; repo = "id"; rev = "refs/tags/v${version}"; - hash = "sha256-lmUBy0hJAxfF65RcBP7tTizrg8j2Zypu4sKgOUQCYh8="; + hash = "sha256-6Vkbs/i1roAtPGwLxdM+XKDrMTo0+NfVpAUpw6GPg9U="; }; build-system = [ flit-core ]; - dependencies = [ - pydantic - requests - ]; + dependencies = [ requests ]; nativeCheckInputs = [ pretend From 411d15dc68efe762249f2f8bf97a7ff6c990652b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 00:37:19 +0100 Subject: [PATCH 0987/1054] python312Packages.weconnect: 0.60.5 -> 0.60.6 Diff: https://github.com/tillsteinbach/WeConnect-python/compare/refs/tags/v0.60.5...v0.60.6 Changelog: https://github.com/tillsteinbach/WeConnect-python/releases/tag/v0.60.6 --- pkgs/development/python-modules/weconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 109457308110..8494688eaefe 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.60.5"; + version = "0.60.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-vWnqitYGh68PM9IM2qKJG3g0JrVfIA+s9Ngh8jpNJKg="; + hash = "sha256-sSO+e6pZj7pkkfWF2z5THaD6MrPBX7f1M3nRIoqRC2s="; }; postPatch = '' From 301b8fe9acddd568dfe4c09569cb263318bf83f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 09:56:17 +0100 Subject: [PATCH 0988/1054] python312Packages.llama-cloud: 0.1.4 -> 0.1.5 --- pkgs/development/python-modules/llama-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index 1da515654a97..124729c16842 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.4"; + version = "0.1.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-bwFVl5vZYWCVHLgSxIg28frOA3vHnM/Y0YWxjvTJ+vg="; + hash = "sha256-jOHbNnVKakbIURVh28BAouibpMoc9O37bOOCpSQPbLY="; }; build-system = [ poetry-core ]; From 6abf35936b466edc4db48c899fe8144924f53a19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 09:58:12 +0100 Subject: [PATCH 0989/1054] python312Packages.llama-index-core: 0.11.23 -> 0.12.1 Diff: https://github.com/run-llama/llama_index/compare/refs/tags/v0.11.23...v0.12.1 Changelog: https://github.com/run-llama/llama_index/blob/0.12.1/CHANGELOG.md --- pkgs/development/python-modules/llama-index-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index ca094727e083..680f3533f4ff 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.11.23"; + version = "0.12.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-DMdU8LT1IGTHM8EsCX44MvGv+luOsKnPSI7yRR5ULPo="; + hash = "sha256-1BYqY2dZD6U2tTMubsjQ2zmdtLt7R9tuKzjfsNN/o4A="; }; sourceRoot = "${src.name}/${pname}"; From bd7864fb6cc62b03c705b782b5a30314d576be25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 09:59:11 +0100 Subject: [PATCH 0990/1054] python312Packages.llama-index-vector-stores-qdrant: 0.3.3 -> 0.4.0 --- .../llama-index-vector-stores-qdrant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index 92fe05098613..6f7b1003892b 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.3.3"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-YpecQB3OHi7id/Mvu73dn+gcXjXzVZR5+Sr0KwkIbDs="; + hash = "sha256-hv6cxCSKNtjUfZYNk2oxrJi10wAL4kxZeTx3v1ejlKc="; }; build-system = [ poetry-core ]; From 0fe6cbc6facf19893035e194dc1a55f0dc9bbf32 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 09:59:59 +0100 Subject: [PATCH 0991/1054] python312Packages.llama-index-vector-stores-postgres: 0.2.6 -> 0.3.0 --- .../llama-index-vector-stores-postgres/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index 517aeb8fa773..936a7cb2fbcd 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.2.6"; + version = "0.3.0"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-x6KOZMZ5W8F8FATH3ZAwAeyrZ/rvjzrEooaFgQsSATQ="; + hash = "sha256-UqXJz6sNGbKp4vlGqbR9R3RE6v63RSehjA65v20dan8="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; From 59bcfab931ed492ad5281c5bef0d8dc3f83c26d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:00:13 +0100 Subject: [PATCH 0992/1054] python312Packages.llama-index-vector-stores-google: 0.2.0 -> 0.3.0 --- .../llama-index-vector-stores-google/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix index aea4617dc992..ca7b63b1c078 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-google"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_google"; inherit version; - hash = "sha256-7BEgRLkhyCo0z3puoWcFRqa+xG6vQdkKFWvr9oz6xs4="; + hash = "sha256-6l4MFO7h5xJexN3Sf78F+OgzaKHNWxOffQvkqRhXEJw="; }; pythonRelaxDeps = [ "google-generativeai" ]; From 626b683a7123e1fc959fb355da62a3dc31fcd207 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:08:18 +0100 Subject: [PATCH 0993/1054] python312Packages.chromadb: 0.5.18 -> 0.5.20 Diff: https://github.com/chroma-core/chroma/compare/refs/tags/0.5.18...0.5.20 Changelog: https://github.com/chroma-core/chroma/releases/tag/0.5.20 --- pkgs/development/python-modules/chromadb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index f562bbcaf709..5bb9c0cbffe6 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pname = "chromadb"; - version = "0.5.18"; + version = "0.5.20"; pyproject = true; disabled = pythonOlder "3.9"; @@ -61,13 +61,13 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "chroma"; rev = "refs/tags/${version}"; - hash = "sha256-kJzBwUaA46HenwTn24AMy0xfgVmBtubJUujDS5/kYXs="; + hash = "sha256-DQHkgCHtrn9xi7Kp7TZ5NP1EtFtTH5QOvne9PUvxsWc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-iW68C3Vp9C1gR7hF2x4VhBIKWX9wlnT8jPj+zMRUC7w="; + hash = "sha256-vHH7Uq4Jf8/5Vc8oZ5nvAeq/dFVWywsQYbp7yJkfX7Q="; }; pythonRelaxDeps = [ From 07674991342243ebeac557b8693dc5efff148403 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:20:10 +0100 Subject: [PATCH 0994/1054] python312Packages.llama-index-vector-stores-chroma: 0.3.0 -> 0.4.0 --- .../llama-index-vector-stores-chroma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index ab6183c410d9..a4d902789899 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-VAWSFqI71r0dw69MWYbbOLKTNYawQujuEmOF16XeziM="; + hash = "sha256-xel5WR0JrckfCbCPsfUj08/jDu488T5T2ihUDK6nNmo="; }; build-system = [ poetry-core ]; From 7ac3e82e7f2933319e256eb59e8ce6eb3bb7ee41 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:20:28 +0100 Subject: [PATCH 0995/1054] python312Packages.llama-index-readers-weather: 0.2.0 -> 0.3.0 --- .../python-modules/llama-index-readers-weather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/pkgs/development/python-modules/llama-index-readers-weather/default.nix index 1eee073053bd..225cfb6c75b7 100644 --- a/pkgs/development/python-modules/llama-index-readers-weather/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-weather/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-readers-weather"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_weather"; inherit version; - hash = "sha256-m4EaV14tcH2I5veHdgGjBloKKAShJqsJGS9Ci8xRnMg="; + hash = "sha256-oGk2M/YaVm8pY4JDFOWGkKbDhEfd/OYBgWLSzV3peAQ="; }; build-system = [ poetry-core ]; From 25495a31da4475cba467b4ed9cf59154a86de17f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:20:40 +0100 Subject: [PATCH 0996/1054] python312Packages.llama-index-readers-txtai: 0.2.0 -> 0.3.0 --- .../python-modules/llama-index-readers-txtai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix index 6cf4a9fb87f4..4024b1c33f95 100644 --- a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-txtai"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_txtai"; inherit version; - hash = "sha256-jaCg3TeMkBKHtZRxpa5KrQb+uGP95qN1nWtrE08Oq98="; + hash = "sha256-N5FiwVZ+KWEQlcfVqHVcHJHzRb6Ct+iR2Dc+Wee7y+M="; }; build-system = [ poetry-core ]; From 9917a494deec3f0ba24e26b4a1b76e1542bbe324 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:20:52 +0100 Subject: [PATCH 0997/1054] python312Packages.llama-index-readers-twitter: 0.2.0 -> 0.3.0 --- .../python-modules/llama-index-readers-twitter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix index 51bc5d549976..6cc9844dcbc3 100644 --- a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-readers-twitter"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_twitter"; inherit version; - hash = "sha256-1bxg/tbv5NrMezm9OQUojiQGutv+yhWY4gkeUXb4z2o="; + hash = "sha256-I7xZQj/Kpwl6D0ltNuKI7TYoQVD9lBiM6I63C23hCwY="; }; build-system = [ poetry-core ]; From 5eccc27f85fc5bb8e404a05216dc0d90948cf228 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:21:19 +0100 Subject: [PATCH 0998/1054] python312Packages.llama-index-readers-llama-parse: 0.3.0 -> 0.4.0 --- .../llama-index-readers-llama-parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix index b9a879047a54..d06fd69723ec 100644 --- a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-readers-llama-parse"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_llama_parse"; inherit version; - hash = "sha256-pf6toIlXFNzEHWXdUSwcOM9w2K4ZlHz/grgNWOaqNn4="; + hash = "sha256-6Z7Fb0+FRtf9oafBriYWL7mst+vKw0O1q9tCNLRkTg8="; }; pythonRelaxDeps = [ "llama-parse" ]; From 0ca5eccb319787facd951e94960eb359c0c8a732 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:21:31 +0100 Subject: [PATCH 0999/1054] python312Packages.llama-index-readers-json: 0.2.0 -> 0.3.0 --- .../python-modules/llama-index-readers-json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-json/default.nix b/pkgs/development/python-modules/llama-index-readers-json/default.nix index 0fcc1da35ef2..f16f736469c2 100644 --- a/pkgs/development/python-modules/llama-index-readers-json/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-json/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-json"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_json"; inherit version; - hash = "sha256-Sxya3Iw75sl6mGmKvRMe9Y8bIWh4cfXQPYbCyAvhnvU="; + hash = "sha256-mS8nEK8LV1wVh0wV7W8EujLH7QcPagHI4P5cT0bHAJ4="; }; build-system = [ poetry-core ]; From 32fd961b84fe1add5845f51793760c5d69821ef0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:21:50 +0100 Subject: [PATCH 1000/1054] python312Packages.llama-index-readers-file: 0.3.0 -> 0.4.0 --- .../python-modules/llama-index-readers-file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index 1c040bd03e7b..a8d452f6e207 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-bGdfzS8FmaEx+J4cXtNSHd4xM4qbckp3IfXf1yQ+qNg="; + hash = "sha256-eCjewf63xT5tMUA4X4SZwOesdGJlKZOEcU3f0WP50Vo="; }; pythonRelaxDeps = [ From f0f1aca558b6eeb05d7e170fa96c02242ff4126f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:22:03 +0100 Subject: [PATCH 1001/1054] python312Packages.llama-index-readers-database: 0.2.0 -> 0.3.0 Changelog: https://github.com/run-llama/llama_index/blob/main/llama-index-integrations/readers/llama-index-readers-database/CHANGELOG.md --- .../python-modules/llama-index-readers-database/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-database/default.nix b/pkgs/development/python-modules/llama-index-readers-database/default.nix index b77afe7b8dda..45318049796f 100644 --- a/pkgs/development/python-modules/llama-index-readers-database/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-database/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-database"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_database"; inherit version; - hash = "sha256-/hI/3lCo0RpJ1yLJDFrnuQ565WoQQm9Sw7Sr4qp1fa0="; + hash = "sha256-AL5KoDBKKvN6rlXyvIEY1Dh0j6DyFLgSaWEk3nh6kRY="; }; build-system = [ poetry-core ]; From 931ddfd2ae9c40cba9357d908268ad9502d70b04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:23:10 +0100 Subject: [PATCH 1002/1054] python312Packages.llama-index-llms-openai: 0.2.16 -> 0.3.1 --- .../python-modules/llama-index-llms-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 3ac980fd6ac3..077e82001db7 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.2.16"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-fGZt0nBWwnigef9F1T8fv8jtNjdkqnuu7i4D30f5Byo="; + hash = "sha256-Uav9wN9sBS3aU4FPsz63ryRcgZgsApcs4n4pLT1CeD0="; }; pythonRemoveDeps = [ From 445745b737957a37266afaabb49cb297fc3b5ad2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:23:22 +0100 Subject: [PATCH 1003/1054] python312Packages.llama-index-llms-ollama: 0.3.6 -> 0.4.0 --- .../python-modules/llama-index-llms-ollama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index 106005841f1e..880d9665de8b 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.3.6"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-EoTvA98XH+/ulJ+NdenRzjo4Fy+ZAmmjjzkyj1qT6kc="; + hash = "sha256-OIUUK4EKRQjJc+mB46/tuQ6As1CJ9f6SRciM89AsVsM="; }; build-system = [ poetry-core ]; From c2b4b6f877ae673c6cf8030203a3cdd68be085e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:23:35 +0100 Subject: [PATCH 1004/1054] python312Packages.llama-index-indices-managed-llama-cloud: 0.4.0 -> 0.6.2 --- .../llama-index-indices-managed-llama-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index 7445ff6453ae..4fee480b015b 100644 --- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - version = "0.4.0"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_indices_managed_llama_cloud"; inherit version; - hash = "sha256-++v/eHaiGbarlokq58QyqSmRlfq49n1KSg6/baIQskI="; + hash = "sha256-SYSBxqmK/OXoFrx7f1JJ/pfBVV6ZfiPgV90XWlQ7ZR0="; }; build-system = [ poetry-core ]; From 770be765cf9202be56124829229834b7fc84e74b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:23:49 +0100 Subject: [PATCH 1005/1054] python312Packages.llama-index-graph-stores-neptune: 0.2.2 -> 0.3.0 --- .../llama-index-graph-stores-neptune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix index 81592cb086e7..741ce168bfdd 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neptune"; - version = "0.2.2"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neptune"; inherit version; - hash = "sha256-0dT1T5DJEXBvCilwf4YZVZ2H43piI6xkpUGGpKu8GsY="; + hash = "sha256-RWrFrV35djxEF9Nfh5Fz5VxQA7Jon7cmxDJXigx2dmQ="; }; build-system = [ poetry-core ]; From 11f3a49b2bf97023538872aca66f6b349a3aaa57 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:24:01 +0100 Subject: [PATCH 1006/1054] python312Packages.llama-index-graph-stores-neo4j: 0.3.5 -> 0.4.0 --- .../python-modules/llama-index-graph-stores-neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 9b16410ab4f4..17751e8aba9c 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.3.5"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-r3/bxG4EZmeJ5fa4mmE2OTlbvGN780rsze5HoKQssiY="; + hash = "sha256-XJQJaUCAvIAmLnyFuo81upmm9iMOD08iHm0/HZMHR1M="; }; build-system = [ poetry-core ]; From 6b69c4f77a59fd89cd59c803d70eb9590b4d1b44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:24:13 +0100 Subject: [PATCH 1007/1054] python312Packages.llama-index-graph-stores-nebula: 0.3.0 -> 0.4.0 --- .../llama-index-graph-stores-nebula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix index 65be86795ec7..9ebcbc778c63 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-nebula"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_nebula"; inherit version; - hash = "sha256-yT1jxJEnBKWcsHCgBPx8Ue+wkggdL9S2havmJtSYcD4="; + hash = "sha256-inkIF4LFaI8+zWa6jHK8TU+l19LiyUsbzzDTZTen0jY="; }; build-system = [ poetry-core ]; From de3d7e1b7b60a662c3cc099e08649ca0968c13dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:24:28 +0100 Subject: [PATCH 1008/1054] python312Packages.llama-index-embeddings-openai: 0.2.5 -> 0.3.0 --- .../python-modules/llama-index-embeddings-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix index 24d78be21ef9..b6f470614e6d 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-openai"; - version = "0.2.5"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_openai"; inherit version; - hash = "sha256-AEfdcddHBoZF7XKMKTEqqRtlu+TGFCGAA0xk38XG9ug="; + hash = "sha256-o31bpcyUejajzqpB38ZdcmqHP/s6J7e0lZKE9blE9hc="; }; build-system = [ poetry-core ]; From 6fee9b2698265f97a6c2c1f1bf2baa4f22ff55a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:24:41 +0100 Subject: [PATCH 1009/1054] python312Packages.llama-index-embeddings-ollama: 0.3.1 -> 0.4.0 --- .../python-modules/llama-index-embeddings-ollama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix index 3f309d4ec12d..7f3b749366e9 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-ollama"; - version = "0.3.1"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_ollama"; inherit version; - hash = "sha256-Wj51+hS+fisagpN0FsiAIE3JbhsdJibcW96T8CHntUA="; + hash = "sha256-6+czVEcPi2Bh1flhse5QcW1Uly7ylfslPj68OT1bNss="; }; build-system = [ poetry-core ]; From 10196932892f89f05db50aadc3628aa5b1a02307 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:25:42 +0100 Subject: [PATCH 1010/1054] python312Packages.llama-index-embeddings-huggingface: 0.3.1 -> 0.4.0 --- .../llama-index-embeddings-huggingface/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix index 935590283d85..0bff93ac2d06 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-huggingface"; - version = "0.3.1"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_huggingface"; inherit version; - hash = "sha256-eu9jJKGVdua5W/6SfDvU/BxXJe3Onya05dLu+ifAL9s="; + hash = "sha256-zo+LMLKc/4VAGrohGChftj+4FHpWtlbuIPfoUQyghaI="; }; build-system = [ poetry-core ]; From b9790e52bd954ab11ff8dafe14993a944aa6c0b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:26:06 +0100 Subject: [PATCH 1011/1054] python312Packages.llama-index-embeddings-google: 0.2.1 -> 0.3.0 --- .../python-modules/llama-index-embeddings-google/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix index 060b3f562c49..b8925cf0d1a5 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-google"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_google"; inherit version; - hash = "sha256-7L24jKB7uFs+4OIIsXdweJ3TRuP4SFjY/p97ocUfmL8="; + hash = "sha256-XS0ZYLxe7/ezeLEJE/lEUzcaIwN1TzS/bA5sCRyx/Lk="; }; pythonRelaxDeps = [ "google-generativeai" ]; From 66e137cacffc219595db7fe31ae4f3362c4dab83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:26:20 +0100 Subject: [PATCH 1012/1054] python312Packages.llama-index-embeddings-gemini: 0.2.2 -> 0.3.0 --- .../python-modules/llama-index-embeddings-gemini/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix index e16484b78d7e..2d1a6281b7cc 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-gemini"; - version = "0.2.2"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_gemini"; inherit version; - hash = "sha256-lVW12tWDqNQW+mijxcF98aOuNw006xTdv0Cm+yZ4H0o="; + hash = "sha256-vytKBvvNVbW1GpFS9+0ydkyUqih3UUGusRIp79hMjtI="; }; pythonRelaxDeps = [ "google-generativeai" ]; From e95e2179ee84886a18f18600d6fae56b8d091c4a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Dec 2024 00:58:53 +0100 Subject: [PATCH 1013/1054] python312Packages.llama-index-core: 0.12.1 -> 0.12.2 Diff: https://github.com/run-llama/llama_index/compare/refs/tags/v0.12.1...v0.12.2 Changelog: https://github.com/run-llama/llama_index/blob/0.12.2/CHANGELOG.md --- pkgs/development/python-modules/llama-index-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 680f3533f4ff..8661014d1e02 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-1BYqY2dZD6U2tTMubsjQ2zmdtLt7R9tuKzjfsNN/o4A="; + hash = "sha256-Zt97JZHp0MsHFtdrx6Xjqhz/jREWwevGSz8u9l5t8oI="; }; sourceRoot = "${src.name}/${pname}"; From 501ebee47f1626519efe4ed6552b8b93b40b6a78 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Dec 2024 00:59:56 +0100 Subject: [PATCH 1014/1054] python312Packages.llama-index-cli: 0.3.1 -> 0.4.0 --- pkgs/development/python-modules/llama-index-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix index d3229e4de03c..f590810b4b91 100644 --- a/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "llama-index-cli"; - version = "0.3.1"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_cli"; inherit version; - hash = "sha256-GJDdaHz0QPNlE2WlSeMDNjFiwWe4772Ho6oQBY1tXHc="; + hash = "sha256-1qsgE1mWKoo0Norto6Sbu+Z+ngCcWb2SXE+yvkrOOQY="; }; build-system = [ poetry-core ]; From 7fed8724d2f9fe3803352669f749210a54c2c778 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Dec 2024 01:00:17 +0100 Subject: [PATCH 1015/1054] python312Packages.llama-index-vector-stores-postgres: 0.3.0 -> 0.3.2 --- .../llama-index-vector-stores-postgres/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index 936a7cb2fbcd..bd0a8bf5f56a 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.3.0"; + version = "0.3.2"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-UqXJz6sNGbKp4vlGqbR9R3RE6v63RSehjA65v20dan8="; + hash = "sha256-Ny1hKQUwrzvb/GI2WRa80i0EsE92oqSEdj6hFBle6H8="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; From 4e8789601f3b845f04ca88f8119e4ab1f9db3150 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Dec 2024 01:00:33 +0100 Subject: [PATCH 1016/1054] python312Packages.llama-index-llms-ollama: 0.4.0 -> 0.4.1 --- .../python-modules/llama-index-llms-ollama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index 880d9665de8b..029a2d5d9275 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-OIUUK4EKRQjJc+mB46/tuQ6As1CJ9f6SRciM89AsVsM="; + hash = "sha256-MkLlJtsh3/TnuwQzAhN2BklrSQ8GOcJoDcwok9QWJw8="; }; build-system = [ poetry-core ]; From 0e0f7788233d980a281d384d155f9a971310c543 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Dec 2024 01:01:13 +0100 Subject: [PATCH 1017/1054] python312Packages.llama-index-indices-managed-llama-cloud: 0.6.2 -> 0.6.3 --- .../llama-index-indices-managed-llama-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index 4fee480b015b..98ab38e96010 100644 --- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_indices_managed_llama_cloud"; inherit version; - hash = "sha256-SYSBxqmK/OXoFrx7f1JJ/pfBVV6ZfiPgV90XWlQ7ZR0="; + hash = "sha256-8J5BgsvCor11roXOuxaBB1JH8NkbkxsJTKxDFThs6Ho="; }; build-system = [ poetry-core ]; From 5eef17f8999e26b0cfc84fd21d630fb7200764dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Dec 2024 01:01:44 +0100 Subject: [PATCH 1018/1054] python312Packages.llama-index-llms-openai: 0.3.1 -> 0.3.2 --- .../python-modules/llama-index-llms-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 077e82001db7..7460e068e619 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-Uav9wN9sBS3aU4FPsz63ryRcgZgsApcs4n4pLT1CeD0="; + hash = "sha256-ikQ6Vk59EneanwMMuC/jJDgD4hfXJBB2SsEW3UNVT+U="; }; pythonRemoveDeps = [ From e91b0011816f8dc91df41116aec4727a51a606ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Dec 2024 01:25:29 +0100 Subject: [PATCH 1019/1054] python312Packages.llama-index-multi-modal-llms-openai: 0.2.3 -> 0.3.0 --- .../llama-index-multi-modal-llms-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index 333780fc2f68..abee95a3ab98 100644 --- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - version = "0.2.3"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_multi_modal_llms_openai"; inherit version; - hash = "sha256-jrm38f85Vu8JeeIbyD5qiF5AmHtxmfGV5GUl0G465AI="; + hash = "sha256-cemDx3ccOQiOQFjNeAKSGTFaD7YxueErkD5TJDuaP9Y="; }; build-system = [ poetry-core ]; From 250f38e1d63a66a3eae485c70d2dbed42b77bd70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Dec 2024 01:25:45 +0100 Subject: [PATCH 1020/1054] python312Packages.llama-index-agent-openai: 0.3.4 -> 0.4.0 --- .../python-modules/llama-index-agent-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix index 4835a3240510..65dc94f89abe 100644 --- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-agent-openai"; - version = "0.3.4"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_agent_openai"; inherit version; - hash = "sha256-gONAjZcSG+vKP6P/0UtRKFhwwcPHPU7gTT0Yz+YEBGY="; + hash = "sha256-MdJnXb2ESJdW3QYqf/7TMLKr3KO3cV1RFnT1tQdeTdY="; }; pythonRelaxDeps = [ "llama-index-llms-openai" ]; From ada1261254f084f22d8fc86278625e5cd507173b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Dec 2024 01:25:59 +0100 Subject: [PATCH 1021/1054] python312Packages.llama-index-llms-openai-like: 0.2.0 -> 0.3.0 --- .../python-modules/llama-index-llms-openai-like/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix index fd6b916bec0a..f29fc7e2fc93 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai-like"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai_like"; inherit version; - hash = "sha256-0E7r8TZadpl557DevF3dXLHLx8oXXyeWABvUPLgx7Nw="; + hash = "sha256-Ah6D1kJAtGWH8i5XxgxTHe004Y12nIebTupIHIjJez0="; }; build-system = [ poetry-core ]; From efe65ae5063ee65cb28a13dec8b7828484f7ba4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Dec 2024 01:26:29 +0100 Subject: [PATCH 1022/1054] python312Packages.llama-index-readers-s3: 0.3.0 -> 0.4.0 --- .../python-modules/llama-index-readers-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/pkgs/development/python-modules/llama-index-readers-s3/default.nix index 1aab269de7c5..f7cf53876802 100644 --- a/pkgs/development/python-modules/llama-index-readers-s3/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-s3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-readers-s3"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_s3"; inherit version; - hash = "sha256-gTseRAdHZW2jzewN3rRC6B8yCgMu8H7Y3N6ZdH1D1nI="; + hash = "sha256-oCXpLZyIrZKNNDg8hkEh5xxXEqz7B1hLjE5OUwEIozg="; }; build-system = [ poetry-core ]; From e9a51c43beeb141ae53e3c75638c4abcd365f687 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Dec 2024 01:31:20 +0100 Subject: [PATCH 1023/1054] python312Packages.llama-index-program-openai: 0.2.0 -> 0.3.1 --- .../python-modules/llama-index-program-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-program-openai/default.nix b/pkgs/development/python-modules/llama-index-program-openai/default.nix index 62b9f6c2527f..c2f57b35edab 100644 --- a/pkgs/development/python-modules/llama-index-program-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-program-openai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-program-openai"; - version = "0.2.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_program_openai"; inherit version; - hash = "sha256-QTmTVUHAESV/v+uWYrO/Eje3Ke9LHI9N31tnidI3SsQ="; + hash = "sha256-YDmmzb/2LGOIwH6CoVf+Lt07vvDFrfKSrYVGv07HW4I="; }; pythonRelaxDeps = [ "llama-index-agent-openai" ]; From f94c54447acf2f9d692d87ad98628e85dc611416 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Dec 2024 01:34:54 +0100 Subject: [PATCH 1024/1054] python312Packages.llama-index-embeddings-ollama: relax ollama --- .../python-modules/llama-index-embeddings-ollama/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix index 7f3b749366e9..4fadcd0e8beb 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { hash = "sha256-6+czVEcPi2Bh1flhse5QcW1Uly7ylfslPj68OT1bNss="; }; + pythonRelaxDeps = [ "ollama" ]; + build-system = [ poetry-core ]; dependencies = [ From 190e90e9fe1500f3f9de89669d498dad7374ca8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Dec 2024 01:39:50 +0100 Subject: [PATCH 1025/1054] python312Packages.llama-index-question-gen-openai: 0.2.0 -> 0.3.0 --- .../llama-index-question-gen-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix index 7f7615953bba..38b6e5dc8568 100644 --- a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-question-gen-openai"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_question_gen_openai"; inherit version; - hash = "sha256-Pd4c7L1lEABjnCADHX6iMzQnaquxgcrED/Qk814QRl4="; + hash = "sha256-79O0aCMoCOnTR0ZwquqwDkG5D3X1LQyb+/ESB+CWPWI="; }; build-system = [ poetry-core ]; From ed65078227d933e1632b1748c2a200a2b0a96cbb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 00:44:26 +0100 Subject: [PATCH 1026/1054] python312Packages.llama-cloud: 0.1.5 -> 0.1.6 --- pkgs/development/python-modules/llama-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index 124729c16842..4a7322a5c9a7 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.5"; + version = "0.1.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-jOHbNnVKakbIURVh28BAouibpMoc9O37bOOCpSQPbLY="; + hash = "sha256-ISAPb91G4IRV00sTb2Rc5rjDgA4K4T2Ad5Excakh2lo="; }; build-system = [ poetry-core ]; From 36f4e01add1e7e1cf8fdcf7485a0e3aa3b568877 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 00:06:11 +0000 Subject: [PATCH 1027/1054] gpxsee: 13.26 -> 13.32 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 60bc8b579237..6212751184b0 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.26"; + version = "13.32"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-EIeUcSHJXpd1/90fAPrP9F/DVyZhkcZk8MJd9VO1D70="; + hash = "sha256-wz5cYZe7OHfIgoHrYRj0DKNFjYjb+CGlLnDItRNu+bk="; }; buildInputs = [ From 0631a11eede0340af3f3654c96fc441493f6dbef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 01:08:20 +0100 Subject: [PATCH 1028/1054] python312Packages.pylamarzocco: 1.2.11 -> 1.3.2 Diff: https://github.com/zweckj/pylamarzocco/compare/refs/tags/v1.2.11...v1.3.2 Changelog: https://github.com/zweckj/pylamarzocco/releases/tag/v1.3.2 --- .../python-modules/pylamarzocco/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix index c749212aa0b9..d3196bb45b64 100644 --- a/pkgs/development/python-modules/pylamarzocco/default.nix +++ b/pkgs/development/python-modules/pylamarzocco/default.nix @@ -1,21 +1,20 @@ { lib, - authlib, + aiohttp, + aioresponses, bleak, buildPythonPackage, fetchFromGitHub, - httpx, pytest-asyncio, pytestCheckHook, pythonOlder, setuptools, syrupy, - websockets, }: buildPythonPackage rec { pname = "pylamarzocco"; - version = "1.2.11"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,25 +23,24 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pylamarzocco"; rev = "refs/tags/v${version}"; - hash = "sha256-iRxn4xAP5b/2byeWbYm6mQwAu1TUmJgOVEqm/bZT9Xw="; + hash = "sha256-ngTVm1tfs42pXGIQh8Hy8d7UY3D/skCZkbKr6AACYH0="; }; build-system = [ setuptools ]; dependencies = [ - authlib + aiohttp bleak - httpx - websockets ]; nativeCheckInputs = [ + aioresponses pytest-asyncio pytestCheckHook syrupy ]; - pythonImportsCheck = [ "lmcloud" ]; + pythonImportsCheck = [ "pylamarzocco" ]; meta = with lib; { description = "Library to interface with La Marzocco's cloud"; From 30a17658ac99c5825fed38ceb4205678df9c2477 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 01:19:14 +0100 Subject: [PATCH 1029/1054] python312Packages.mypy-boto3-s3: 1.35.74 -> 1.35.76 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index e2b1c53c9607..16d1e163da33 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1162,8 +1162,8 @@ rec { "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.35.74" - "sha256-HmYmu4JNqjFaFLVif0aEbV5T9Wq8SYDNtm49S0lQyCo="; + buildMypyBoto3Package "s3" "1.35.76" + "sha256-bPHwNJhf5hB1TD5u8odJBimHDVCK2hO31h57mq60YQg="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.35.73" From f0ca7ba5581e0ea64d5a967d71114ce064f919bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 01:24:45 +0100 Subject: [PATCH 1030/1054] python312Packages.securesystemslib: 1.1.0 -> 1.2.0 Diff: https://github.com/secure-systems-lab/securesystemslib/compare/refs/tags/v1.1.0...v1.2.0 Changelog: https://github.com/secure-systems-lab/securesystemslib/blob/v1.2.0/CHANGELOG.md --- pkgs/development/python-modules/securesystemslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix index 7d1e431334bf..d4b29be0ffb4 100644 --- a/pkgs/development/python-modules/securesystemslib/default.nix +++ b/pkgs/development/python-modules/securesystemslib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "securesystemslib"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "secure-systems-lab"; repo = "securesystemslib"; rev = "refs/tags/v${version}"; - hash = "sha256-PDivKunqQcGnER4eyWtGE5gvbqvhavXF7n/O2rTFTkI="; + hash = "sha256-HAYsmsW5GKLmfq9FVVsME+tE7Qg0jx9YIWw1UQWwV2c="; }; build-system = [ hatchling ]; From b79e67eb6440063ea2672f37de8b5ff58d6ab5c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 09:24:38 +0100 Subject: [PATCH 1031/1054] python312Packages.sigstore-rekor-types: 0.0.13 -> 0.0.17 Diff: https://github.com/trailofbits/sigstore-rekor-types/compare/refs/tags/v0.0.13...v0.0.17 Changelog: https://github.com/trailofbits/sigstore-rekor-types/releases/tag/v0.0.17 --- .../python-modules/sigstore-rekor-types/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sigstore-rekor-types/default.nix b/pkgs/development/python-modules/sigstore-rekor-types/default.nix index 9aafd726976e..f29379975ae9 100644 --- a/pkgs/development/python-modules/sigstore-rekor-types/default.nix +++ b/pkgs/development/python-modules/sigstore-rekor-types/default.nix @@ -2,14 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, - flit-core, pydantic, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "sigstore-rekor-types"; - version = "0.0.13"; + version = "0.0.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,10 +18,10 @@ buildPythonPackage rec { owner = "trailofbits"; repo = "sigstore-rekor-types"; rev = "refs/tags/v${version}"; - hash = "sha256-vZNzNu0Ks0Xp/v406jVqPV9FuHgXORMa7NzmXeWoa+Q="; + hash = "sha256-mMjFmUjaYvfFCTAvhr4x8QJZSypGTkOmzP+OiVyyz5Y="; }; - build-system = [ flit-core ]; + build-system = [ setuptools ]; dependencies = [ pydantic ] ++ pydantic.optional-dependencies.email; From e889fb97d0642803dcd24e0307e08eeabd4bd61a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 01:37:07 +0100 Subject: [PATCH 1032/1054] python312Packages.sigstore: 3.5.1 -> 3.5.3 Diff: https://github.com/sigstore/sigstore-python/compare/refs/tags/v3.5.3...v3.5.3 Changelog: https://github.com/sigstore/sigstore-python/blob/3.5.3/CHANGELOG.md --- pkgs/development/python-modules/sigstore/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix index 88ad6bb5d2f4..99b9674dbb7e 100644 --- a/pkgs/development/python-modules/sigstore/default.nix +++ b/pkgs/development/python-modules/sigstore/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "sigstore-python"; - version = "3.5.1"; + version = "3.5.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,9 +36,11 @@ buildPythonPackage rec { owner = "sigstore"; repo = "sigstore-python"; rev = "refs/tags/v${version}"; - hash = "sha256-AMKe+R1sTXdxFAelJmRiEyDNe+T55KaGK3HUARqz3Tw="; + hash = "sha256-pAzS/LU5me3qoJo6EmuSFPDO/lqRDKIl5hjFiysWTdM="; }; + pythonRelaxDeps = [ "sigstore-rekor-types" ]; + build-system = [ flit-core ]; dependencies = [ From 3e191c86b4b0c3e28a75dc2e486432f8c5af9790 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 00:42:36 +0000 Subject: [PATCH 1033/1054] mint-l-theme: 1.9.8 -> 1.9.9 --- pkgs/by-name/mi/mint-l-theme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mint-l-theme/package.nix b/pkgs/by-name/mi/mint-l-theme/package.nix index 214ebb999785..b0836d514e2e 100644 --- a/pkgs/by-name/mi/mint-l-theme/package.nix +++ b/pkgs/by-name/mi/mint-l-theme/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-theme"; - version = "1.9.8"; + version = "1.9.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Jql4NJ8jugy0wi5yT+/Mr5fwxLog37w0VvHhxyMvMlk="; + hash = "sha256-umY14seqUjNugN6+wzMDIGbCiis/InseDwVR85PqrGs="; }; nativeBuildInputs = [ From 5d45a500ce076535b4d5341f16c6a43b3c6c5a15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 00:49:17 +0000 Subject: [PATCH 1034/1054] qtscrcpy: 2.2.1 -> 3.0.0 --- pkgs/by-name/qt/qtscrcpy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qt/qtscrcpy/package.nix b/pkgs/by-name/qt/qtscrcpy/package.nix index 3d9d733de46d..55790a81a51f 100644 --- a/pkgs/by-name/qt/qtscrcpy/package.nix +++ b/pkgs/by-name/qt/qtscrcpy/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "qtscrcpy"; - version = "2.2.1"; + version = "3.0.0"; src = (fetchFromGitHub { owner = "barry-ran"; repo = "QtScrcpy"; rev = "refs/tags/v${version}"; - hash = "sha256-PL/UvRNqvLaFuvSHbkJsaJ2nqRp5+ERM+rmlKVtbShk="; + hash = "sha256-RW+7aHcxFEO4H9SVKfAfuwY0IXwThxM29oVS5zhWbpY="; fetchSubmodules = true; }).overrideAttrs (_: { From 3b33901cff7b9aa5ba14100f09ec36628a4ae25a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 00:05:54 +0000 Subject: [PATCH 1035/1054] terraform-providers.archive: 2.6.0 -> 2.7.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7cb96fefb515..eec438606279 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -63,13 +63,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "archive": { - "hash": "sha256-Xm9BT8O18aTIa1h166dElYaTq4PlC4u7TgFgCfcC6jI=", + "hash": "sha256-q2Ougw8U6kapeGWBLhsvrRMW8/kGhE0eTV35kPHrN5g=", "homepage": "https://registry.terraform.io/providers/hashicorp/archive", "owner": "hashicorp", "repo": "terraform-provider-archive", - "rev": "v2.6.0", + "rev": "v2.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-b8yGtOUZezGRgURXigv8ySaxxHN/vCCDPgoDC5EBlok=" + "vendorHash": "sha256-51bLi7cqy7iUt9Aocog7OOKYWSdGbQEoZzasUpDuHu4=" }, "argocd": { "hash": "sha256-3a/g1SbgeMWFMNTY/sYrItyE1rRimdNro8nu9wPTf6M=", From d2428f7e442e2c1d8b2b83f83a823f07c5558dcd Mon Sep 17 00:00:00 2001 From: ben9986 <38633150+Ben9986@users.noreply.github.com> Date: Sat, 7 Dec 2024 01:43:54 +0000 Subject: [PATCH 1036/1054] onedrive: patch missed paths --- pkgs/by-name/on/onedrive/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix index 55857333e65e..1e553019ecfc 100644 --- a/pkgs/by-name/on/onedrive/package.nix +++ b/pkgs/by-name/on/onedrive/package.nix @@ -1,6 +1,7 @@ { lib, autoreconfHook, + coreutils, curl, fetchFromGitHub, installShellFiles, @@ -57,6 +58,9 @@ stdenv.mkDerivation (finalAttrs: { installShellCompletion --bash --name onedrive contrib/completions/complete.bash installShellCompletion --fish --name onedrive contrib/completions/complete.fish installShellCompletion --zsh --name _onedrive contrib/completions/complete.zsh + + substituteInPlace $out/lib/systemd/user/onedrive.service --replace-fail "/usr/bin/sleep" "${coreutils}/bin/sleep" + substituteInPlace $out/lib/systemd/system/onedrive@.service --replace-fail "/usr/bin/sleep" "${coreutils}/bin/sleep" ''; passthru = { From af6d0825caa50ed94722a01bf9ce97137a49a2f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 03:13:04 +0000 Subject: [PATCH 1037/1054] ttags: 0.4.1 -> 0.4.2 --- pkgs/by-name/tt/ttags/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tt/ttags/package.nix b/pkgs/by-name/tt/ttags/package.nix index b95bc53e2bea..c6bee9ae3369 100644 --- a/pkgs/by-name/tt/ttags/package.nix +++ b/pkgs/by-name/tt/ttags/package.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform, testers, ttags }: -let version = "0.4.1"; +let version = "0.4.2"; in rustPlatform.buildRustPackage { pname = "ttags"; inherit version; @@ -8,10 +8,10 @@ in rustPlatform.buildRustPackage { owner = "npezza93"; repo = "ttags"; rev = "${version}"; - hash = "sha256-yKg0KUA/Wa7B/sU1uxgGQR0Wat/bFv3ascqnUCdWKw0="; + hash = "sha256-z0IxGdveMtCXmCKD4jp/BEA6mtTl4CitIrVhM6BtHzA="; }; - cargoHash = "sha256-MZ9QRF5yNw+YtSEu+Qc/J3Ap7+nRDZT7aitunk+x38Y="; + cargoHash = "sha256-kyduUQcc3w5JyQICwTu9GdNRJF6H5353Ow05oKg6Ozg="; passthru.tests.version = testers.testVersion { package = ttags; From 45fe26aaf8847951df2c1c97e845bee0177ac57b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 03:19:08 +0000 Subject: [PATCH 1038/1054] minijinja: 2.4.0 -> 2.5.0 --- pkgs/by-name/mi/minijinja/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 7ebd3575944f..ca9ed7870579 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-8ZAc5ALhpPyFCCsC0f22fSZKRmevFLLFFC0drUuXxg4="; + hash = "sha256-rRNikxSgr3isXkp/2oqPQ3JkugxuLgYlcT5c+4yIYBc="; }; - cargoHash = "sha256-2aeRb5jNZbpzAgpne494BMr7rkDqZUJEpITtHbdmhxY="; + cargoHash = "sha256-ksdCvl8x6KfqNRnTeIKkL6nnr4d53wMv7pr2rupVkTI="; # The tests relies on the presence of network connection doCheck = false; From 8a97d662ddc24d839f19c5f4f9dba4ecf46d8f94 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Fri, 6 Dec 2024 22:13:50 +0900 Subject: [PATCH 1039/1054] nixos/hostapd: remove HT40- from default capabilities The current default configuration, automatic channel selection with the HT40- capability, is explicitly disallowed by an assertion in this module. This is a result of recent change to default to automatic channel selection in 1047f0a6bf88a7eb49a1a7380e17e2077eecec73. --- nixos/modules/services/networking/hostapd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 09f271999fc4..82ece277f187 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -300,7 +300,7 @@ in { capabilities = mkOption { type = types.listOf types.str; - default = ["HT40" "HT40-" "SHORT-GI-20" "SHORT-GI-40"]; + default = ["HT40" "SHORT-GI-20" "SHORT-GI-40"]; example = ["LDPC" "HT40+" "HT40-" "GF" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1"]; description = '' HT (High Throughput) capabilities given as a list of flags. From 5714c33244540bab6b0941da0b3379dc07f9336b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 17:59:30 +0000 Subject: [PATCH 1040/1054] python312Packages.sphinxcontrib-confluencebuilder: 2.7.1 -> 2.9.0 --- .../sphinxcontrib-confluencebuilder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index afbe62d9c989..1bd6de25631a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -12,15 +12,15 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.7.1"; + version = "2.9.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "sphinxcontrib_confluencebuilder"; inherit version; - hash = "sha256-Tj9m0TcPkg+FIWwYixahpox27Yn+0tXPppwb5EwmBk0="; + hash = "sha256-2lF8iS8c7KXDdXT2IuApFnx0g4syWmIP1y25W5DkkJA="; }; build-system = [ flit-core ]; From 9ded9ca8eb4d0359fe3c7e47e47495a4db2d7438 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 10:48:10 +0000 Subject: [PATCH 1041/1054] python312Packages.rdflib: 7.0.0 -> 7.1.1 --- .../python-modules/rdflib/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 72f6e8c8d485..4403778f3165 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -12,9 +12,6 @@ isodate, pyparsing, - # propagates <3.8 - importlib-metadata, - # extras: networkx networkx, @@ -30,25 +27,23 @@ buildPythonPackage rec { pname = "rdflib"; - version = "7.0.0"; - format = "pyproject"; + version = "7.1.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "RDFLib"; - repo = pname; + repo = "rdflib"; rev = "refs/tags/${version}"; - hash = "sha256-VCjvgXMun1Hs+gPeqjzLXbIX1NBQ5aMLz0aWlwsm0iY="; + hash = "sha256-/jRUV7H6JBWBv/gphjLjjifbEwMSxWke5STqkeSzwoE="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - isodate - html5lib + dependencies = [ pyparsing - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ] ++ lib.optionals (pythonOlder "3.11") [ isodate ]; optional-dependencies = { html = [ html5lib ]; From 3d73d0579187384901c0bd7c45f9b5281fa0e0a7 Mon Sep 17 00:00:00 2001 From: misuzu Date: Sat, 7 Dec 2024 08:04:46 +0200 Subject: [PATCH 1042/1054] time: fix implicit function declaration (#362226) --- pkgs/by-name/ti/time/package.nix | 5 ++++ .../time-1.9-implicit-func-decl-clang.patch | 24 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/by-name/ti/time/time-1.9-implicit-func-decl-clang.patch diff --git a/pkgs/by-name/ti/time/package.nix b/pkgs/by-name/ti/time/package.nix index 1df89b323838..2328d03e1870 100644 --- a/pkgs/by-name/ti/time/package.nix +++ b/pkgs/by-name/ti/time/package.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-+6zwyB5iQp3z4zvaTO44dWYE8Y4B2XczjiMwaj47Uh4="; }; + patches = [ + # fixes cross-compilation to riscv64-linux + ./time-1.9-implicit-func-decl-clang.patch + ]; + meta = { description = "Tool that runs programs and summarizes the system resources they use"; longDescription = '' diff --git a/pkgs/by-name/ti/time/time-1.9-implicit-func-decl-clang.patch b/pkgs/by-name/ti/time/time-1.9-implicit-func-decl-clang.patch new file mode 100644 index 000000000000..ca76b5a50050 --- /dev/null +++ b/pkgs/by-name/ti/time/time-1.9-implicit-func-decl-clang.patch @@ -0,0 +1,24 @@ +https://lists.gnu.org/archive/html/bug-time/2022-08/msg00001.html + +From c8deae54f92d636878097063b411af9fb5262ad3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 15 Aug 2022 07:24:24 -0700 +Subject: [PATCH] include string.h for memset() + +Fixes implicit function declaration warning e.g. + +resuse.c:103:3: error: call to undeclared library function 'memset' with type 'void *(void *, int, unsigned long)' + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-time/2022-08/msg00001.html] +Signed-off-by: Khem Raj +--- a/src/resuse.c ++++ b/src/resuse.c +@@ -22,6 +22,7 @@ + */ + + #include "config.h" ++#include + #include + #include + #include + From 51da93207ee529c3eff0e719e65edc3b2f705b52 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 7 Dec 2024 15:02:42 +0900 Subject: [PATCH 1043/1054] python312Packages.rdflib: use default pytestCheckHook --- pkgs/development/python-modules/rdflib/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 4403778f3165..6b52f646a78c 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -21,7 +21,7 @@ # tests pip, pytest-cov-stub, - pytest7CheckHook, + pytestCheckHook, setuptools, }: @@ -55,8 +55,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pip pytest-cov-stub - # Failed: DID NOT WARN. No warnings of type (,) were emitted. - pytest7CheckHook + pytestCheckHook setuptools ] ++ optional-dependencies.networkx ++ optional-dependencies.html; From 3dcd875c9a3623f2cdbc5f546698d5a36bacf97d Mon Sep 17 00:00:00 2001 From: con-f-use Date: Sat, 7 Dec 2024 07:17:42 +0100 Subject: [PATCH 1044/1054] cot: fixes for python312 (#362256) --- pkgs/development/python-modules/cot/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index fb3a138627ad..5f28ef159c4d 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -7,13 +7,14 @@ pyopenssl, pytest-mock, pytestCheckHook, - pythonAtLeast, pyvmomi, qemu, requests, + distutils, setuptools, stdenv, verboselogs, + versioneer, }: buildPythonPackage rec { @@ -26,8 +27,14 @@ buildPythonPackage rec { hash = "sha256-9LNVNBX5DarGVvidPoLnmz11F5Mjm7FzpoO0zAzrJjU="; }; + build-system = [ + setuptools + versioneer + ]; + propagatedBuildInputs = [ colorlog + distutils pyvmomi requests verboselogs @@ -46,6 +53,7 @@ buildPythonPackage rec { # argparse is part of the standardlib substituteInPlace setup.py \ --replace "'argparse'," "" + rm versioneer.py ''; disabledTests = [ @@ -84,6 +92,5 @@ buildPythonPackage rec { ''; license = lib.licenses.mit; maintainers = with lib.maintainers; [ evanjs ]; - broken = pythonAtLeast "3.12"; # Because it requires packages removed from 3.12 onwards }; } From 379aeabd483dfdd093ed2ea9b30726032b102a35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 08:47:33 +0000 Subject: [PATCH 1045/1054] python312Packages.dm-haiku: 0.0.12 -> 0.0.13 --- .../python-modules/dm-haiku/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index e5f44feb69c5..715aa1f8c3a4 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -3,8 +3,10 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + setuptools, absl-py, flax, + jax, jaxlib, jmp, numpy, @@ -25,14 +27,14 @@ let dm-haiku = buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.12"; - format = "setuptools"; + version = "0.0.13"; + pyproject = true; src = fetchFromGitHub { owner = "deepmind"; repo = "dm-haiku"; rev = "refs/tags/v${version}"; - hash = "sha256-aJRXlMq4CNMH3ZSTDP8MgnVltdSc8l5raw4//KccL48="; + hash = "sha256-RJpQ9BzlbQ4X31XoJFnsZASiaC9fP2AdyuTAGINhMxs="; }; patches = [ @@ -44,15 +46,24 @@ let }) ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ absl-py - flax - jaxlib + jaxlib # implicit runtime dependency jmp numpy tabulate ]; + optional-dependencies = { + jax = [ + jax + jaxlib + ]; + flax = [ flax ]; + }; + pythonImportsCheck = [ "haiku" ]; nativeCheckInputs = [ From 6d2395e8c6dbc9a9e4c586d774836af5505cd6f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 15:32:57 +0000 Subject: [PATCH 1046/1054] python312Packages.itemadapter: 0.9.0 -> 0.10.0 --- .../python-modules/itemadapter/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix index b501fa5927c4..94191dd86a07 100644 --- a/pkgs/development/python-modules/itemadapter/default.nix +++ b/pkgs/development/python-modules/itemadapter/default.nix @@ -3,20 +3,23 @@ buildPythonPackage, fetchPypi, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "itemadapter"; - version = "0.9.0"; - format = "setuptools"; + version = "0.10.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-5PlYpra29YMfogc3MBADGgvX7QQp3dCbUZecARR1yv0="; + hash = "sha256-JlXIxQ8ahAXJ+nS4zcTaf+xUHKIXvIIbkKzIRRyYqdI="; }; + build-system = [ setuptools ]; + # Infinite recursion with Scrapy doCheck = false; From 5a4f44dd31e7fbab2184839df1560a33fe5e5b79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Nov 2024 18:08:12 +0000 Subject: [PATCH 1047/1054] python312Packages.scikit-posthocs: 0.9.1 -> 0.11.0 --- .../python-modules/scikit-posthocs/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/scikit-posthocs/default.nix b/pkgs/development/python-modules/scikit-posthocs/default.nix index 2a25488c1557..4ed82e24de1c 100644 --- a/pkgs/development/python-modules/scikit-posthocs/default.nix +++ b/pkgs/development/python-modules/scikit-posthocs/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools, - wheel, matplotlib, numpy, pandas, @@ -16,22 +15,19 @@ buildPythonPackage rec { pname = "scikit-posthocs"; - version = "0.9.1"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "maximtrp"; repo = "scikit-posthocs"; rev = "refs/tags/v${version}"; - hash = "sha256-ssaTd+A7lzd4tlKHGkgKixi3XjZLQBcPs6UOEzX/hrk="; + hash = "sha256-KrQqd3zChw9sxjbrTrxXInXAJLyXwPkhbPa9One6I+g="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ matplotlib numpy pandas From 841a952de1397fb15901ab0e1b4bda4d53672d47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Nov 2024 23:24:36 +0000 Subject: [PATCH 1048/1054] python312Packages.tensorflow-metadata: 1.15.0 -> 1.16.1 --- .../tensorflow-metadata/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 88f1bbe52a89..c2fb4e44e34a 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -4,28 +4,24 @@ fetchFromGitHub, googleapis-common-protos, protobuf, + setuptools, lib, }: buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.15.0"; - format = "setuptools"; + version = "1.16.1"; + pyproject = true; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; rev = "refs/tags/v${version}"; - hash = "sha256-f3bkDTy45uwqVJaXFb0Dmaj9U1lJTP5R5Ej1yzobEV4="; + hash = "sha256-MP5P4kFACT1guZVU3f9YrnKeQaUK0Tnu7edKRy4yvlM="; }; patches = [ ./build.patch ]; - postPatch = '' - substituteInPlace setup.py \ - --replace 'protobuf>=3.13,<4' 'protobuf>=3.13' - ''; - # Default build pulls in Bazel + extra deps, given the actual build # is literally three lines (see below) - replace it with custom build. preBuild = '' @@ -34,7 +30,9 @@ buildPythonPackage rec { done ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ absl-py googleapis-common-protos protobuf From e1eb67dc93120577a80d2bab0fbebe885cb9b140 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Nov 2024 12:33:42 +0100 Subject: [PATCH 1049/1054] python312Packages.cement: 3.0.10 -> 3.0.12 Diff: datafolklabs/cement@refs/tags/3.0.10...3.0.12 Changelog: https://github.com/datafolklabs/cement/blob/3.0.12/CHANGELOG.md --- .../python-modules/cement/default.nix | 71 ++++++++++++++++--- 1 file changed, 60 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index a3a131c8b8af..c16e9490b42e 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -1,33 +1,82 @@ { lib, buildPythonPackage, - fetchPypi, + colorlog, + fetchFromGitHub, + jinja2, + mock, + pdm-backend, + pylibmc, + pystache, + pytest-cov-stub, + pytestCheckHook, pythonOlder, + pyyaml, + redis, + requests, + tabulate, + watchdog, }: buildPythonPackage rec { pname = "cement"; - version = "3.0.10"; - format = "setuptools"; + version = "3.0.12"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-c9EBXr+bjfE+a8mH7fDUvj8ci0Q4kh7qjWbLtVBK7hU="; + src = fetchFromGitHub { + owner = "datafolklabs"; + repo = "cement"; + rev = "refs/tags/${version}"; + hash = "sha256-weBqmNEjeSh5YQfHK48VVFW3UbZQmV4MiIQ3UPQKTTI="; }; - # Disable test tests since they depend on a memcached server running on - # 127.0.0.1:11211. - doCheck = false; + build-system = [ pdm-backend ]; + + optional-dependencies = { + colorlog = [ colorlog ]; + jinja2 = [ jinja2 ]; + mustache = [ pystache ]; + generate = [ pyyaml ]; + redis = [ redis ]; + memcached = [ pylibmc ]; + tabulate = [ tabulate ]; + watchdog = [ watchdog ]; + yaml = [ pyyaml ]; + cli = [ + jinja2 + pyyaml + ]; + }; + + nativeCheckInputs = [ + mock + pytest-cov-stub + pytestCheckHook + requests + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cement" ]; + disabledTests = [ + # Test only works with the source from PyPI + "test_get_version" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/ext/test_ext_memcached.py" + "tests/ext/test_ext_redis.py" + "tests/ext/test_ext_smtp.py" + ]; + meta = with lib; { description = "CLI Application Framework for Python"; - mainProgram = "cement"; homepage = "https://builtoncement.com/"; + changelog = "https://github.com/datafolklabs/cement/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ eqyiel ]; + mainProgram = "cement"; }; } From 508a791f9ef7583531ad8145e448047b9f2c52d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Nov 2024 14:55:39 +0100 Subject: [PATCH 1050/1054] awsebcli: update override for cement --- pkgs/by-name/aw/awsebcli/package.nix | 67 ++++++++++++++-------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index 21a20ad7dd16..c03f97d07d00 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -2,34 +2,31 @@ lib, python3, fetchFromGitHub, + fetchPypi, git, }: let - changeVersion = - overrideFunc: version: hash: - overrideFunc (oldAttrs: rec { - inherit version; - src = oldAttrs.src.override { - inherit version hash; - }; - }); - - localPython = python3.override { - self = localPython; + python = python3.override { packageOverrides = self: super: { - cement = - changeVersion super.cement.overridePythonAttrs "2.10.14" - "sha256-NC4n21SmYW3RiS7QuzWXoifO4z3C2FVgQm3xf8qQcFg="; + cement = super.cement.overridePythonAttrs (old: rec { + pname = "cement"; + version = "2.10.14"; + src = fetchPypi { + inherit pname version; + hash = "sha256-NC4n21SmYW3RiS7QuzWXoifO4z3C2FVgQm3xf8qQcFg="; + }; + build-system = old.build-system or [ ] ++ (with python.pkgs; [ setuptools ]); + doCheck = false; + }); }; }; - in -localPython.pkgs.buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { pname = "awsebcli"; version = "3.21"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "aws"; @@ -38,12 +35,23 @@ localPython.pkgs.buildPythonApplication rec { hash = "sha256-VU8bXvS4m4eIamjlgGmHE2qwDXWAXvWTa0QHomXR5ZE="; }; + pythonRelaxDeps = [ + "botocore" + "colorama" + "pathspec" + "PyYAML" + "six" + "termcolor" + "urllib3" + ]; + postPatch = '' # https://github.com/aws/aws-elastic-beanstalk-cli/pull/469 - substituteInPlace setup.py --replace-fail "scripts=['bin/eb']," "" + substituteInPlace setup.py \ + --replace-fail "scripts=['bin/eb']," "" ''; - propagatedBuildInputs = with localPython.pkgs; [ + dependencies = with python.pkgs; [ blessed botocore cement @@ -59,20 +67,11 @@ localPython.pkgs.buildPythonApplication rec { websocket-client ]; - pythonRelaxDeps = [ - "botocore" - "colorama" - "pathspec" - "PyYAML" - "six" - "termcolor" - ]; - - nativeCheckInputs = with localPython.pkgs; [ - pytestCheckHook - pytest-socket - mock + nativeCheckInputs = with python.pkgs; [ git + mock + pytest-socket + pytestCheckHook ]; pytestFlagsArray = [ @@ -92,11 +91,11 @@ localPython.pkgs.buildPythonApplication rec { ]; meta = with lib; { - homepage = "https://aws.amazon.com/elasticbeanstalk/"; description = "Command line interface for Elastic Beanstalk"; + homepage = "https://aws.amazon.com/elasticbeanstalk/"; changelog = "https://github.com/aws/aws-elastic-beanstalk-cli/blob/${version}/CHANGES.rst"; - maintainers = with maintainers; [ kirillrdy ]; license = licenses.asl20; + maintainers = with maintainers; [ kirillrdy ]; mainProgram = "eb"; }; } From bbd314463df3253326e0e8dc902eb76cb29b362d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 09:15:07 +0100 Subject: [PATCH 1051/1054] python312Packages.cement: disable tests on Darwin --- pkgs/development/python-modules/cement/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index c16e9490b42e..dc8e0d851efa 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, colorlog, fetchFromGitHub, @@ -59,6 +60,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "cement" ]; + # Tests are failing on Darwin + doCheck = !stdenv.hostPlatform.isDarwin; + disabledTests = [ # Test only works with the source from PyPI "test_get_version" From 7aad7090b7bd3b5f18e1c5788f1aa35a7b2e57bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 8 Oct 2024 21:10:15 +0200 Subject: [PATCH 1052/1054] nixos/zfs: order pool sync services before final.target If we don't do this, I think systemd can kill the service(s) before they finish. --- nixos/modules/tasks/filesystems/zfs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 87876867c572..c07a09d701f6 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -761,6 +761,7 @@ in lib.nameValuePair "zfs-sync-${pool}" { description = "Sync ZFS pool \"${pool}\""; wantedBy = [ "shutdown.target" ]; + before = [ "final.target" ]; unitConfig = { DefaultDependencies = false; }; From 8c2f571052c58e33e945a2696d3673434e8a7e57 Mon Sep 17 00:00:00 2001 From: Anund Date: Sat, 7 Dec 2024 21:51:39 +1100 Subject: [PATCH 1053/1054] nerd-fonts: improve alias throw to give example migration --- .../doc/manual/release-notes/rl-2505.section.md | 2 +- pkgs/top-level/aliases.nix | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index e09e80792fb9..89e43abc584c 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -70,7 +70,7 @@ files have changed from `$out/share/fonts/{opentype,truetype}/NerdFonts` to `$out/share/fonts/{opentype,truetype}/NerdFonts/`, where `` can be found in the [official website](https://www.nerdfonts.com/font-downloads) as the titles in preview images, with the "Nerd Font" - suffix and any whitespaces trimmed. + suffix and any whitespaces trimmed. Configuration changes are required, see build output. - `retroarch` has been refactored and the older `retroarch.override { cores = [ ... ]; }` to create a RetroArch derivation with custom cores doesn't work anymore, use `retroarch.withCores (cores: [ ... ])` instead. If you need more customization (e.g.: custom settings), use `wrapRetroArch` instead. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c54bc8a6d161..a3e0509514e2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -862,7 +862,21 @@ mapAliases { nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25 nagiosPluginsOfficial = monitoring-plugins; neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10 - nerdfonts = throw "nerdfonts has been separated into individual font packages under the namespace nerd-fonts. To list all fonts use `builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts)`."; # Added 2024-11-09 + nerdfonts = throw ''nerdfonts has been separated into individual font packages under the namespace nerd-fonts. + For example change: + fonts.packages = [ + ... + (pkgs.nerdfonts.override { fonts = [ "0xproto" "DroidSansMono" ]; }) + ] + to + fonts.packages = [ + ... + pkgs.nerd-fonts._0xproto + pkgs.nerd-fonts.droid_sans_mono + ] + or for all fonts + font.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts) + ''; # Added 2024-11-09 newlibCross = newlib; # Added 2024-09-06 newlib-nanoCross = newlib-nano; # Added 2024-09-06 nix-direnv-flakes = nix-direnv; From f4fdea6accc918e928903c1d56e66061c4ed0374 Mon Sep 17 00:00:00 2001 From: nbCloud91 <73609114+nbCloud91@users.noreply.github.com> Date: Sat, 7 Dec 2024 17:11:21 +0530 Subject: [PATCH 1054/1054] morewaita-icon-theme: 47.1-> 47.2 (#361807) Diff: https://github.com/somepaulo/MoreWaita/compare/47.1...v47.2 Changelog: https://github.com/somepaulo/MoreWaita/releases/tag/v47.2 --- pkgs/by-name/mo/morewaita-icon-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index 77ca0a63f023..10f2cda2ece6 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "morewaita-icon-theme"; - version = "47.1"; + version = "47.2"; src = fetchFromGitHub { owner = "somepaulo"; repo = "MoreWaita"; - rev = "${version}"; - hash = "sha256-/ANzNQi+H2UzRlLrMBBMxEA/TGNpCwf8lNn6sHEKfQE="; + rev = "refs/tags/v${version}"; + hash = "sha256-LvkYLY8PYajCb1x1p0HfpKoMq+t4XwH/w9Hvy9YXzk0="; }; nativeBuildInputs = [