From 0996bcf25b343a084d05106fd836916801e89276 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 11:32:28 +0000 Subject: [PATCH 001/219] rwpspread: 0.3.1 -> 0.4.0 --- pkgs/by-name/rw/rwpspread/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rw/rwpspread/package.nix b/pkgs/by-name/rw/rwpspread/package.nix index 84bd7da27912..797d19957ed2 100644 --- a/pkgs/by-name/rw/rwpspread/package.nix +++ b/pkgs/by-name/rw/rwpspread/package.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage rec { pname = "rwpspread"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "0xk1f0"; repo = "rwpspread"; rev = "v${version}"; - hash = "sha256-ivxu1UsQLUm017A5Za82+l1bQoYA/TF/I1BwUQD3dWo="; + hash = "sha256-1i1675OiyleCXcc/uN95kyY7m5ht/rS3UKY7EmuSsrk="; }; - cargoHash = "sha256-pIsSH8cQYyG7v7z4O2R80kA4QHvKyTajBfqmRXjuQW8="; + cargoHash = "sha256-5e/Fj/8wfWrl0b4WRDmX/BOBfeCrlN+mq3c0Qz7MQPE="; nativeBuildInputs = [ pkg-config ]; From 7df3b8d625c8c530b694aa6872cc6a4c08c85c66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 12:50:50 +0000 Subject: [PATCH 002/219] cozette: 1.25.2 -> 1.26.0 --- pkgs/by-name/co/cozette/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cozette/package.nix b/pkgs/by-name/co/cozette/package.nix index 38ac3c054cf5..a6d296ead85d 100644 --- a/pkgs/by-name/co/cozette/package.nix +++ b/pkgs/by-name/co/cozette/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "cozette"; - version = "1.25.2"; + version = "1.26.0"; src = fetchzip { url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${ builtins.replaceStrings [ "." ] [ "-" ] version }.zip"; - hash = "sha256-LtZHbsma9EuegS349gQo4W+ZT8x+Vb3CD/5vRKjwkzc="; + hash = "sha256-FOgRz9amVmJSBYPa0HEwzXWsdcc53td9g3tY3sQbs9c="; }; installPhase = '' From f83c3e6af111113bd50d31822ba609c423a706dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 20:52:21 +0000 Subject: [PATCH 003/219] hheretic: 0.2.3 -> 0.2.4 --- pkgs/by-name/hh/hheretic/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hh/hheretic/package.nix b/pkgs/by-name/hh/hheretic/package.nix index 86f9b33e8e10..c2d7a7909ff1 100644 --- a/pkgs/by-name/hh/hheretic/package.nix +++ b/pkgs/by-name/hh/hheretic/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hheretic"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "sezero"; repo = "hheretic"; rev = "hheretic-${finalAttrs.version}"; - hash = "sha256-e9N869W8STZdLUBSscxEnF2Z+SrdVv8ARDL8AMe1SJ8="; + hash = "sha256-49eQeh0suU+7QLB25cvrqirZRaBgZp438H6NW0pWsPI="; }; nativeBuildInputs = [ From a5af564f0be98522026e0253f320e865c2b5b952 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 21:53:37 +0000 Subject: [PATCH 004/219] ssdfs-utils: 4.46 -> 4.49 --- pkgs/tools/filesystems/ssdfs-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/ssdfs-utils/default.nix b/pkgs/tools/filesystems/ssdfs-utils/default.nix index b176a4530e30..5e0261b24775 100644 --- a/pkgs/tools/filesystems/ssdfs-utils/default.nix +++ b/pkgs/tools/filesystems/ssdfs-utils/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.46"; + version = "4.49"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "7528ee1d923115c1536d97b119fd2a0ee978b59e"; - hash = "sha256-SL5BY+vLxRWRHkIp0hTQsi3w/fXRGe4OHpaapZFZBZo="; + rev = "cd080289b2183125a7adeba3d3b01481913cf810"; + hash = "sha256-ydt3xom9Tzf+kImPgg25y4Ht52WYwFSy8bAiy6AoiY4="; }; strictDeps = true; From b6f9dd796f5556a1c31e82d8ec415709e681572e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jan 2025 11:58:33 +0000 Subject: [PATCH 005/219] kokkos: 4.5.00 -> 4.5.01 --- pkgs/by-name/ko/kokkos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix index aab67ad54914..6560faa0e64c 100644 --- a/pkgs/by-name/ko/kokkos/package.nix +++ b/pkgs/by-name/ko/kokkos/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kokkos"; - version = "4.5.00"; + version = "4.5.01"; src = fetchFromGitHub { owner = "kokkos"; repo = "kokkos"; rev = finalAttrs.version; - hash = "sha256-4b26N7W++gIEPGgExsnyDjF+mD4jF0hGFTroqqVrfys="; + hash = "sha256-vqNuLoyhsw7Hoc4Or7dm5hPvKaHjQjlkvrHEc6sdL7M="; }; nativeBuildInputs = [ From a878bfd443411e08928833dc0a4c7c611f135de0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jan 2025 19:41:41 +0000 Subject: [PATCH 006/219] dynamodb-local: 2.5.3 -> 2.5.4 --- pkgs/by-name/dy/dynamodb-local/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dy/dynamodb-local/package.nix b/pkgs/by-name/dy/dynamodb-local/package.nix index c7e92369be6e..6abdc22cae50 100644 --- a/pkgs/by-name/dy/dynamodb-local/package.nix +++ b/pkgs/by-name/dy/dynamodb-local/package.nix @@ -27,11 +27,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "dynamodb-local"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { - url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2024-11-06.tar.gz"; - hash = "sha256-h1yyfceEPQ0kJj8OFSEoD5v98Ovw5p+9G0ywDnyGWOA="; + url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2024-12-23.tar.gz"; + hash = "sha256-YLFWH6YUFkLb062at1pjFclId/b0LmBVESWxHqimLJc="; }; sourceRoot = "."; From 7ef5822ac484039fa26f745af3ce011577434ae9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jan 2025 11:36:47 +0000 Subject: [PATCH 007/219] piknik: 0.10.1 -> 0.10.2 --- pkgs/by-name/pi/piknik/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/piknik/package.nix b/pkgs/by-name/pi/piknik/package.nix index d10c7d4df743..16d25c09f0f9 100644 --- a/pkgs/by-name/pi/piknik/package.nix +++ b/pkgs/by-name/pi/piknik/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "piknik"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "jedisct1"; repo = "piknik"; rev = version; - hash = "sha256-3yvr2H1a9YtgOEEBwn1HlGXIWFzRwQPBw9+KQxW3/jo="; + hash = "sha256-Kdqh3sQuO0iT0RW2hU+nrmBltxCFiqOSL00cbDHZJjc="; }; - vendorHash = null; + vendorHash = "sha256-t7w8uKYda6gT08ymAJqS38JgY70kuKNkQvjHFK91j8s="; ldflags = [ "-s" From 55c251ae61da8b1749be997f7d2030139cd1efa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jan 2025 12:49:48 +0000 Subject: [PATCH 008/219] cproto: 4.7w -> 4.7x --- pkgs/by-name/cp/cproto/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cp/cproto/package.nix b/pkgs/by-name/cp/cproto/package.nix index eb473627c45d..e1a0bc65d2a4 100644 --- a/pkgs/by-name/cp/cproto/package.nix +++ b/pkgs/by-name/cp/cproto/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "cproto"; - version = "4.7w"; + version = "4.7x"; src = fetchurl { urls = [ @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # No version listings and apparently no versioned tarball over http(s). "ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz" ]; - sha256 = "sha256-ix1GjM2aKFnzmcdf773KDf3KTcMYkf7bxArFwybSe20="; + sha256 = "sha256-+yS3JU2KURiRPTt6VDMZdeYFU6/HC4jk58KZggNHjP4="; }; # patch made by Joe Khoobyar copied from gentoo bugs From 70cef1dd8cc0908ccaaa1eac514009a4e9f62986 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jan 2025 15:21:32 +0000 Subject: [PATCH 009/219] sentry-cli: 2.39.1 -> 2.40.0 --- pkgs/development/tools/sentry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 81bfa72a3f71..5bb71e237970 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.39.1"; + version = "2.40.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-mVe1X2bXRJGHXkHEQ37AhtgcHoxwsjIJKtIFeqB05vs="; + sha256 = "sha256-e4e7Vj+WPRG2kH4Avanj6STYmwY7N39XI6SZV99CGE0="; }; doCheck = false; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration ]; nativeBuildInputs = [ installShellFiles pkg-config ]; - cargoHash = "sha256-Mp92cEvgOj0JH7+5+hl8wN+a7zPf8heV6whaqvIcBTU="; + cargoHash = "sha256-kpGe6IjoVmmwSXaNDgi4PMjL0Hc6520xPcGr2CViZqo="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sentry-cli \ From 9cf81429c3bd727db76ee3d032e349ccbf0d0d3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jan 2025 20:14:00 +0000 Subject: [PATCH 010/219] armadillo: 14.2.1 -> 14.2.2 --- pkgs/by-name/ar/armadillo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix index 351b252c1494..da683dc7bfbb 100644 --- a/pkgs/by-name/ar/armadillo/package.nix +++ b/pkgs/by-name/ar/armadillo/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "14.2.1"; + version = "14.2.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-JJWBXPnRMPcP/7ahJzPQ3K+Gy6rFHotLgq0lGD7aHdU="; + hash = "sha256-MFTI5j2zq98aXI+f235rStgz+bz7WDJMD/ht4HhMcOA="; }; nativeBuildInputs = [ cmake ]; From d69cdd2b578b1eae8616dcc0c98ed385d4c43eac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 12:55:37 +0000 Subject: [PATCH 011/219] freeciv: 3.1.3 -> 3.1.4 --- pkgs/games/freeciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 110dd68ace55..c0f7767bd5c1 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "freeciv"; - version = "3.1.3"; + version = "3.1.4"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-z4BmkAjKgK0rf4fCMpAhI++HCKFrvpwKmcUvdPSF6Zw="; + hash = "sha256-lT3sXD5lFjG/63eBXEG+rU9idem/8kXfUXj6iB3AGOg="; }; postPatch = '' From d10e413c2ced0b7d31dae3097d3ff9c170d78ca1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 13:08:26 +0000 Subject: [PATCH 012/219] fswatch: 1.17.1 -> 1.18.0 --- pkgs/development/tools/misc/fswatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index bce63deb9f03..814838532766 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fswatch"; - version = "1.17.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "sha256-gVYDvda+6ZJkShJXUxUEVxq4enkRrhdvlTTxYWq4Aho="; + sha256 = "sha256-n9EDEF5swC7UyvC0cd+U/u4Wd050Jf9h2AVtEVbUICA="; }; nativeBuildInputs = [ From 6da2bc74dccaa843945f08fd65d8348a6ad9ef25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 15:15:50 +0000 Subject: [PATCH 013/219] clojure: 1.12.0.1488 -> 1.12.0.1495 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index b6d40a68f682..1cd33002ab99 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.12.0.1488"; + version = "1.12.0.1495"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-vBm+ABC+8EIcJv077HvDvKCMGSgo1ZoVGEVCLcRCB0I="; + hash = "sha256-GMwT+Hx07E8Xe9g8RBbZ7Cu5FChg2wYFWvdZjhuClJw="; }; nativeBuildInputs = [ From c8e1cf73ec19f791eef6f0f9003fcc452d1faf68 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 16:17:26 +0000 Subject: [PATCH 014/219] ts_query_ls: 1.4.1 -> 1.4.2 --- pkgs/by-name/ts/ts_query_ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix index fa0f34de3448..0846fe493bd8 100644 --- a/pkgs/by-name/ts/ts_query_ls/package.nix +++ b/pkgs/by-name/ts/ts_query_ls/package.nix @@ -6,7 +6,7 @@ }: let pname = "ts_query_ls"; - version = "1.4.1"; + version = "1.4.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage { owner = "ribru17"; repo = "ts_query_ls"; rev = "v${version}"; - hash = "sha256-BPPM21hRRWlCequoHiME+9FAp4JunfdEv6VF5b2gQKs="; + hash = "sha256-h5ZxtFz70HXqAh9c+A350TKQTMv+PsV7tPzmJisLQ/I="; }; nativeBuildInputs = [ cmake ]; useFetchCargoVendor = true; - cargoHash = "sha256-N7glMlrKotsHXvABYO2J0fNgpbxhsyU/5RWC9GVOwdA="; + cargoHash = "sha256-/Xd++vGhv6SLpjqqjTEWwAJBAu34mTTOiJ+zdwgBs2k="; meta = { description = "LSP implementation for Tree-sitter's query files"; From c290055571428a1015b135d89bce86ffe13837a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 4 Jan 2025 04:08:22 +0100 Subject: [PATCH 015/219] nixos/simplesamlphp: don't configure empty options This pollutes options. ... .definitionsWithLocations --- nixos/modules/services/web-apps/simplesamlphp.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/simplesamlphp.nix b/nixos/modules/services/web-apps/simplesamlphp.nix index e970266fc17d..46d8b69a174b 100644 --- a/nixos/modules/services/web-apps/simplesamlphp.nix +++ b/nixos/modules/services/web-apps/simplesamlphp.nix @@ -97,7 +97,7 @@ in description = "Instances of SimpleSAMLphp. This module is designed to work with already existing PHP-FPM pool and NGINX virtualHost."; }; - config = { + config = lib.mkIf (cfg != { }) { services.phpfpm.pools = lib.mapAttrs' ( phpfpmName: opts: lib.nameValuePair opts.phpfpmPool { phpEnv.SIMPLESAMLPHP_CONFIG_DIR = "${generateConfig opts}"; } From 1a965b318d8298253f7b77f2d2737e7d7b2f1f18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 04:13:20 +0000 Subject: [PATCH 016/219] cloud-nuke: 0.38.0 -> 0.38.1 --- pkgs/by-name/cl/cloud-nuke/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix index 560b04ae9a81..bfda4b7531cf 100644 --- a/pkgs/by-name/cl/cloud-nuke/package.nix +++ b/pkgs/by-name/cl/cloud-nuke/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; tag = "v${version}"; - hash = "sha256-bQPfKIpOh3eq+7cGU7pB+y2a9wsOXNBdmqYbZ0kC6k8="; + hash = "sha256-i+mhxcY7201YADNb+OHLoh4zLIBLwkWVBZ6RnYPOJaM="; }; - vendorHash = "sha256-8PXmTI6xthWvAOkyOsxqr+ea0cscDMg3yp4DELDQvZA="; + vendorHash = "sha256-OrTRHje3ks3eGsJNusWJTpL740OWj5jy1es52DfNDbI="; nativeBuildInputs = [ makeBinaryWrapper From 8cd0bb377eeb0bc42136ee28c9bacb461f135b7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Jan 2025 23:37:32 +0000 Subject: [PATCH 017/219] rgbds: 0.8.0 -> 0.9.0 --- pkgs/by-name/rg/rgbds/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rg/rgbds/package.nix b/pkgs/by-name/rg/rgbds/package.nix index 6b0aec7123ef..f1cae1551f33 100644 --- a/pkgs/by-name/rg/rgbds/package.nix +++ b/pkgs/by-name/rg/rgbds/package.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - hash = "sha256-rSPYnbZjCoAKJBNCJCKsLBenolOzS78Zm850BJ8mKhA="; + hash = "sha256-njJ7g7hgaiahpeeDHrv9nYvWZp51Fl10CsV36ldBpf0="; }; nativeBuildInputs = [ bison From e51eefa29bfe025ba7fbd787679d038f48ded9a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Jan 2025 12:31:39 +0000 Subject: [PATCH 018/219] nng: 1.9.0 -> 1.10 --- pkgs/by-name/nn/nng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nn/nng/package.nix b/pkgs/by-name/nn/nng/package.nix index a10611f3a89a..2dcac6e869b7 100644 --- a/pkgs/by-name/nn/nng/package.nix +++ b/pkgs/by-name/nn/nng/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.9.0"; + version = "1.10"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; rev = "v${version}"; - hash = "sha256-N1ZMILrFhdkwU4PK/zlSCgGjOm0748fgvZRrk7I9YVg="; + hash = "sha256-HQQx65itnDPX/luN2JtU03R7o+jzmGXJPOh4ffodxzA="; }; nativeBuildInputs = [ From 45f276b257bca8640ae35a7412932984a4b85f7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Jan 2025 15:19:59 +0000 Subject: [PATCH 019/219] ultrastardx: 2024.10.0 -> 2025.1.0 --- pkgs/by-name/ul/ultrastardx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix index 4bf46c62e557..483b9e95785f 100644 --- a/pkgs/by-name/ul/ultrastardx/package.nix +++ b/pkgs/by-name/ul/ultrastardx/package.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "ultrastardx"; - version = "2024.10.0"; + version = "2025.1.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; rev = "v${version}"; - hash = "sha256-X5LixPRAI7A8Ns3D2A24T05w0iHag1EJVqt0aW1ZBps="; + hash = "sha256-8/qFzPP3Gw9YAGsnyI+wJUP3Jo8UoZkihRgYg4P5MVo="; }; nativeBuildInputs = [ From c6ae8291d2fac5e3195ac7af25d0bb2d25b28a75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Jan 2025 01:43:48 +0000 Subject: [PATCH 020/219] pgmoneta: 0.15.0 -> 0.15.1 --- pkgs/by-name/pg/pgmoneta/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index 7be0af081ae8..079d9ee5f87e 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "pgmoneta"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; rev = version; - hash = "sha256-3NESUksk3UgiDK6PUx99+eZ1XSrob5TgDgCebQ9EPhU="; + hash = "sha256-LkmTBg1Oed/epMSXbQrzLxhB/UL4GciM+iD+6FkNHyE="; }; nativeBuildInputs = [ From 53f806e02816c4129d40aa935f4a41ead5b8e217 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Jan 2025 03:09:58 +0000 Subject: [PATCH 021/219] stackql: 0.6.32 -> 0.6.50 --- pkgs/by-name/st/stackql/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix index 4d1391a9ede6..c9d91cc3ba0f 100644 --- a/pkgs/by-name/st/stackql/package.nix +++ b/pkgs/by-name/st/stackql/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "stackql"; - version = "0.6.32"; + version = "0.6.50"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${version}"; - hash = "sha256-7XpCbcOJ5t/ipBPgMVeP5ery/MFL90GuojMePJIczrs="; + hash = "sha256-7MVpfXYMkVXlao3rA9Sp5DWwr5SBkS9fPG4JcCc9GVw="; }; vendorHash = "sha256-eGpmA1MYiIn1LSbieMFvF7OYEtLBoN62X7CQMa35HT4="; From 9eccafa200b6fd33c63d69d6eacacbfae7584985 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Jan 2025 14:05:22 +0000 Subject: [PATCH 022/219] todoist: 0.20.0 -> 0.22.0 --- pkgs/by-name/to/todoist/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/to/todoist/package.nix b/pkgs/by-name/to/todoist/package.nix index 5f2ab9b20a88..e65deb19f956 100644 --- a/pkgs/by-name/to/todoist/package.nix +++ b/pkgs/by-name/to/todoist/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "todoist"; - version = "0.20.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "sachaos"; repo = "todoist"; rev = "v${version}"; - sha256 = "sha256-mdh+DOqlxcAqWIxEiKXmtvlsaaRCnRWEvrn56IFhBwk="; + sha256 = "sha256-+UECYUozca7PKKiTrmPAobSF0y6xnWYCGaChk9bwANg="; }; vendorHash = "sha256-fWFFWFVnLtZivlqMRIi6TjvticiKlyXF2Bx9Munos8M="; From b88b5a8066ef57dbfbb6b2ecdfc894c6b9fa8bdd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jan 2025 02:15:21 +0000 Subject: [PATCH 023/219] nbxplorer: 2.5.16 -> 2.5.17 --- pkgs/by-name/nb/nbxplorer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nb/nbxplorer/package.nix b/pkgs/by-name/nb/nbxplorer/package.nix index b91f3e1c1c8f..f99be6963a6a 100644 --- a/pkgs/by-name/nb/nbxplorer/package.nix +++ b/pkgs/by-name/nb/nbxplorer/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.5.16"; + version = "2.5.17"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-4hhnw7NNqJ4Q3UPqDlw5X/R0yGlte7YwWd9lpX0n8Fo="; + sha256 = "sha256-8tcE60SVhQ2CgoQu24hNL2rrv9JG+2+DuSJWtmycYA0="; }; projectFile = "NBXplorer/NBXplorer.csproj"; From f90c31df67079a89179c4037669fd6e4e591685c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jan 2025 16:22:32 +0000 Subject: [PATCH 024/219] zef: 0.22.6 -> 0.22.7 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 927c59d9bb23..a16b8b590333 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zef"; - version = "0.22.6"; + version = "0.22.7"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${finalAttrs.version}"; - hash = "sha256-lq3jSoV1/zD7TMOtvfZZTVJ5cjsaod5Tzvb+GyiMJs4="; + hash = "sha256-nRiOLy4LuxIXrqwn84OtUUelLcqbxgXSuVRaVsAtcIQ="; }; nativeBuildInputs = [ From 59e3191cadd9bdd874630d788af11856361fdecf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jan 2025 07:38:19 +0000 Subject: [PATCH 025/219] ols: 0-unstable-2024-12-28 -> 0-unstable-2025-01-04 --- pkgs/by-name/ol/ols/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix index 39f11a15c51d..ec94bf8ef149 100644 --- a/pkgs/by-name/ol/ols/package.nix +++ b/pkgs/by-name/ol/ols/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-12-28"; + version = "0-unstable-2025-01-04"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "fded19fc8ede748d31b67686941fbe33a8f77214"; - hash = "sha256-KuzYkCwcQ11vLaQ3Au+2sEADe4knWu/HAls7Qe0cr2A="; + rev = "3589fe03d7124c9058dc69bcc21aa85910367cfe"; + hash = "sha256-eF66PXABJaOsBPqHKyRkbif4fbaPbiOPyIVXPfwj/o4="; }; postPatch = '' From edad941e03cd7273503a603d584748f9241948f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Jan 2025 01:10:32 +0000 Subject: [PATCH 026/219] cilium-cli: 0.16.22 -> 0.16.23 --- pkgs/by-name/ci/cilium-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix index cd0054e9d4f5..c6dabec52841 100644 --- a/pkgs/by-name/ci/cilium-cli/package.nix +++ b/pkgs/by-name/ci/cilium-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.16.22"; + version = "0.16.23"; src = fetchFromGitHub { owner = "cilium"; repo = "cilium-cli"; tag = "v${version}"; - hash = "sha256-P4S+4N9f/m28lNwx7xzYcq99nvXelSvzX01QXDhfGM4="; + hash = "sha256-8GD3VjYInPaxOFoPeJGWIDfOIUQ7+g3GgfVq/IS18Bw="; }; nativeBuildInputs = [ installShellFiles ]; From 81f18468ae3e5a2d0612b5ab43ff74fa3a07f7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 10 Jan 2025 16:22:04 +0100 Subject: [PATCH 027/219] python312Packages.gattlib: use release tag --- pkgs/development/python-modules/gattlib/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/gattlib/default.nix b/pkgs/development/python-modules/gattlib/default.nix index 370b773c8934..beb2e482d723 100644 --- a/pkgs/development/python-modules/gattlib/default.nix +++ b/pkgs/development/python-modules/gattlib/default.nix @@ -16,19 +16,16 @@ }: -let +buildPythonPackage rec { pname = "gattlib"; - version = "unstable-2021-06-16"; -in -buildPythonPackage { - inherit pname version; + version = "20210616"; format = "setuptools"; src = fetchFromGitHub { owner = "oscaracena"; repo = "pygattlib"; - rev = "7bdb229124fe7d9f4a2cc090277b0fdef82e2a56"; - hash = "sha256-PS5DIH1JuH2HweyebLLM+UNFGY/XsjKIrsD9x7g7yMI="; + rev = "v.${version}"; + hash = "sha256-n3D9CWKvgw4FYmbvsfhaHN963HARBG0p4CcZBC8Gkb0="; }; patches = [ From 493d7f0cba1585b66e1e6f74334630d4a226fbd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 10 Jan 2025 16:22:41 +0100 Subject: [PATCH 028/219] python312Packages.gattlib: switch to pyproject = true --- pkgs/development/python-modules/gattlib/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/gattlib/default.nix b/pkgs/development/python-modules/gattlib/default.nix index beb2e482d723..ed264beccb59 100644 --- a/pkgs/development/python-modules/gattlib/default.nix +++ b/pkgs/development/python-modules/gattlib/default.nix @@ -3,23 +3,19 @@ buildPythonPackage, fetchFromGitHub, substituteAll, - - # build pkg-config, glibc, python, - - # runtime + setuptools, bluez, boost, glib, - }: buildPythonPackage rec { pname = "gattlib"; version = "20210616"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "oscaracena"; @@ -39,6 +35,8 @@ buildPythonPackage rec { }) ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ pkg-config glibc From e9004165ee77df1ee4b5676e4e5b41902c0fb726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 10 Jan 2025 16:22:53 +0100 Subject: [PATCH 029/219] python313Packages.gattlib: fix build against Python 3.13 --- pkgs/development/python-modules/gattlib/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/gattlib/default.nix b/pkgs/development/python-modules/gattlib/default.nix index ed264beccb59..bb961a993a13 100644 --- a/pkgs/development/python-modules/gattlib/default.nix +++ b/pkgs/development/python-modules/gattlib/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, substituteAll, pkg-config, glibc, @@ -25,6 +26,11 @@ buildPythonPackage rec { }; patches = [ + # Fix build for Python 3.13 + (fetchpatch { + url = "https://github.com/oscaracena/pygattlib/commit/73a73b71cfc139e1e0a08816fb976ff330c77ea5.patch"; + hash = "sha256-/Y/CZNdN/jcxWroqRfdCH2rPUxZUbug668MIAow0scs="; + }) (substituteAll { src = ./setup.patch; boost_version = From 9802baf3f42dae79e2707eb5c78f2f78c3753d43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Jan 2025 13:59:30 +0000 Subject: [PATCH 030/219] obs-cmd: 0.18.1 -> 0.18.2 --- pkgs/by-name/ob/obs-cmd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix index 01cb27a34680..091090bc7084 100644 --- a/pkgs/by-name/ob/obs-cmd/package.nix +++ b/pkgs/by-name/ob/obs-cmd/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "obs-cmd"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "grigio"; repo = "obs-cmd"; rev = "v${version}"; - hash = "sha256-+unUjGPDUSVGXyf91+mnPrLAslTpDxsCCmSnT34s7S0="; + hash = "sha256-plNLVBSTen11q945qtDBJaNTWKGICbuWokyvRzhu0Wg="; }; - cargoHash = "sha256-zEd8LUNZOspcrA90qJur6V2Dt/+9XJWvwBBjjFAPAg8="; + cargoHash = "sha256-xBzOMH6r8SkDsD8+3ZsrUK2sD3pHFt71fGK09kVeRc0="; meta = with lib; { description = "Minimal CLI to control OBS Studio via obs-websocket"; From 35aa065d9b32b6858ad42f860e4dc43aa29a7143 Mon Sep 17 00:00:00 2001 From: rein Date: Sun, 12 Jan 2025 22:45:16 +0530 Subject: [PATCH 031/219] paraview: 5.13.0 -> 5.13.2 Closes: #373185 --- pkgs/applications/graphics/paraview/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 4ff64094af80..b41e63e2c2df 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -26,13 +26,13 @@ }: let - version = "5.13.0"; + version = "5.13.2"; docFiles = [ (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf"; name = "Tutorial.pdf"; - hash = "sha256-hoCa/aTy2mmsPHP3Zm0hLZlZKbtUMpjUlc2rFKKChco="; + hash = "sha256-jJ6YUT2rgVExfKv900LbSO+MDQ4u73K7cBScHxWoP+g="; }) (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf"; @@ -42,7 +42,7 @@ let (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf"; name = "CatalystGuide.pdf"; - hash = "sha256-t1lJ1Wiswhdxovt2O4sXTXfFxshDiZZVdnkXt/+BQn8="; + hash = "sha256-Pl7X5cBj3OralkOw5A29CtXnA+agYr6kWHf/+KZNHow="; }) ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - hash = "sha256-JRSuvBON2n0UnbrFia4Qmf6eYb1Mc+Z7dIcXSeUhpIc="; + hash = "sha256-29PLXVpvj8RLkSDWQgj5QjBZ6l1/0NoVx/qcJXOSssU="; fetchSubmodules = true; }; From 0fceab9142454cac76d69e1f9f3bc026ce6adb45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Jan 2025 22:02:15 +0000 Subject: [PATCH 032/219] zsh-prezto: 0-unstable-2024-12-12 -> 0-unstable-2025-01-10 --- pkgs/by-name/zs/zsh-prezto/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zs/zsh-prezto/package.nix b/pkgs/by-name/zs/zsh-prezto/package.nix index 34a8f6edd259..4a6a88edad40 100644 --- a/pkgs/by-name/zs/zsh-prezto/package.nix +++ b/pkgs/by-name/zs/zsh-prezto/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "0-unstable-2024-12-12"; + version = "0-unstable-2025-01-10"; src = fetchFromGitHub { owner = "sorin-ionescu"; repo = "prezto"; - rev = "9626ce2beb8e20afb8f63020d974ff8a213bc773"; - sha256 = "TkmzNyPKv/K9sW0CCiR8hnXXM0d6En49HcdPsa011Xw="; + rev = "6e564503f1c5e6ddba2bcf5d9065e5872ca207d2"; + sha256 = "hYuYjSQtt00pU3eqrzN8Crk40NEtCCj1G6XUL89F4xU="; fetchSubmodules = true; }; From 6541a909098f62c158aacdeb599425eeaa293c18 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Mon, 13 Jan 2025 16:00:12 +0100 Subject: [PATCH 033/219] pcloud: use patchelfUnstable Closes https://github.com/NixOS/nixpkgs/issues/226339 --- pkgs/by-name/pc/pcloud/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index c075971d15dc..1d55f39fc3fc 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -18,6 +18,7 @@ # Build dependencies appimageTools, autoPatchelfHook, + patchelfUnstable, fetchzip, lib, stdenv, @@ -63,6 +64,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook + patchelfUnstable ]; buildInputs = [ From bef04e57aea66636c096aae4cf7c350e18bbf9f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 04:32:45 +0000 Subject: [PATCH 034/219] whistle: 2.9.92 -> 2.9.93 --- pkgs/by-name/wh/whistle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix index 3a0be68e35e7..a122d87afe63 100644 --- a/pkgs/by-name/wh/whistle/package.nix +++ b/pkgs/by-name/wh/whistle/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.92"; + version = "2.9.93"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-pIOVVCoyC6j8QeNDlls9EpDwKUpBLbFuxL2bMpSog5A="; + hash = "sha256-vax2KuYnjPJRewgJBcB8pmu5kedje8HUOmKSv47g1DQ="; }; - npmDepsHash = "sha256-z4w5JQdGuWu7z3rWYLO83uCrrSjt2wKbhRUGgrduoOc="; + npmDepsHash = "sha256-vEeQedclubf1GzoQOimQXeV/tzI4r8gThv0k5E+LxUc="; dontNpmBuild = true; From 11f9ec78ff314d4c65aaeff1013ac1b80ca81c10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 12:19:04 +0000 Subject: [PATCH 035/219] gensio: 2.8.10 -> 2.8.11 --- pkgs/development/libraries/gensio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index ec864c12225b..8906945434e7 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.8.10"; + version = "2.8.11"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NQvp2/HMw+9rkHHiqOgX/4Xjhq5TZhIF2CWXev6GwFY="; + sha256 = "sha256-0WHMAp8EuPk+O8Tt5fSJUIN3HHyRsHQDTXiCY7sIBLw="; }; passthru = { From daf056cf9c3410e44562f53137b2a93a54c43f88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 19:48:45 +0000 Subject: [PATCH 036/219] coursier: 2.1.22 -> 2.1.24 --- pkgs/by-name/co/coursier/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/coursier/package.nix b/pkgs/by-name/co/coursier/package.nix index 74fbec4ad226..51ce6aa5c88f 100644 --- a/pkgs/by-name/co/coursier/package.nix +++ b/pkgs/by-name/co/coursier/package.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.22"; + version = "2.1.24"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - hash = "sha256-0ugWgvG3AHt7h8F8W8kCksyx93YO51i5StqGAEZXGmg="; + hash = "sha256-eql18SRpcm1ruHhSEHr+C41vPIKxKknvQ8xmR8TgV8o="; }; dontUnpack = true; From de7025b325245ee6a31d54d1f9795f9b99862c5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 23:26:20 +0000 Subject: [PATCH 037/219] felix-fm: 2.14.0 -> 2.16.0 --- pkgs/by-name/fe/felix-fm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fe/felix-fm/package.nix b/pkgs/by-name/fe/felix-fm/package.nix index 664464e8e836..2ce2186d4e74 100644 --- a/pkgs/by-name/fe/felix-fm/package.nix +++ b/pkgs/by-name/fe/felix-fm/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.14.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "kyoheiu"; repo = "felix"; tag = "v${version}"; - hash = "sha256-PcC0lZ41qTVE4V3VdwBq83qYfEJO3RJouuS2+bpcBfo="; + hash = "sha256-h/sytTRufqFgnhbg67qtTx6XhnC/UzgT4zFq4bJYhQM="; }; - cargoHash = "sha256-4tvk7H2CrTx9m1f0PLnNv+LWg6oIGTUfirRhIaz2lHo="; + cargoHash = "sha256-CmIzarcjwhFkgzccLS2eIEc4J89TlazUzNQfqzmY16I="; nativeBuildInputs = [ pkg-config ]; From 8f0b7152f3b937e716efd05cb8d8118bab524e21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jan 2025 00:28:27 +0000 Subject: [PATCH 038/219] micronaut: 4.7.3 -> 4.7.4 --- pkgs/by-name/mi/micronaut/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/micronaut/package.nix b/pkgs/by-name/mi/micronaut/package.nix index 74392e4a4db2..bc360daf08fc 100644 --- a/pkgs/by-name/mi/micronaut/package.nix +++ b/pkgs/by-name/mi/micronaut/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.7.3"; + version = "4.7.4"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-rCGJnZ+WD0chYVa6XqkhHJqJUQKw2K+AebzYSftAsOk="; + sha256 = "sha256-R/7ozlbx7WAX7rLdhgckJGt9troBj+0rFcFDBz6eZiM="; }; nativeBuildInputs = [ From e9ebe4edec9884171a4fe46bfdc0d5add2740387 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jan 2025 01:42:57 +0000 Subject: [PATCH 039/219] iroh: 0.30.0 -> 0.31.0 --- pkgs/by-name/ir/iroh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix index eb17a3e5de5e..835e9d91ddde 100644 --- a/pkgs/by-name/ir/iroh/package.nix +++ b/pkgs/by-name/ir/iroh/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-9aRb1kMIo/DZOt1pYzXa8dfb3BlhVJ0kvS036jqGcHw="; + hash = "sha256-f6lDPjRUa64MnkFYcLCveaIYBTLFXjwQ1AFYbGQgFwQ="; }; - cargoHash = "sha256-QHysE7TBd619iVUEWmk7OhT4Y6SHmTXUnBkokmbaKRE="; + cargoHash = "sha256-fOGvnofeA+BdSxN1zZgrT1s1/pJjqH4btIO63vsYn00="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ From 6967de3b987d5803ee72ffd3d0facadedacdbd2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jan 2025 11:26:44 +0000 Subject: [PATCH 040/219] stress-ng: 0.18.07 -> 0.18.09 --- pkgs/by-name/st/stress-ng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix index fa9724ef7bc9..65a1e6a8dbb4 100644 --- a/pkgs/by-name/st/stress-ng/package.nix +++ b/pkgs/by-name/st/stress-ng/package.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.18.07"; + version = "0.18.09"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-yfAqI2bhZtPM+8rkQXjYKJJewIJZ4kizhi3qZtp1k9k="; + hash = "sha256-Xx9IdAc2jIGGmOTzqqOzSV7ck7JjeEdXUhbSnh77oV8="; }; postPatch = '' From 9b660dff6d7771bae9e620ffa342794c4ff79842 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 14 Jan 2025 19:34:48 -0500 Subject: [PATCH 041/219] incus: fix instance shutdown when softDaemonRestart enabled --- nixos/modules/virtualisation/incus.nix | 1 + nixos/tests/incus/incus-tests.nix | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 1a29e6ee104e..ead0ebb1badb 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -401,6 +401,7 @@ in "incus.socket" ]; requires = [ "incus.socket" ]; + wantedBy = config.systemd.services.incus.wantedBy; serviceConfig = { ExecStart = "${incus-startup} start"; diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index ee20139c21d8..05c5761b62b2 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -190,7 +190,7 @@ import ../make-test-python.nix ( def cleanup(): # avoid conflict between preseed and cleanup operations - machine.wait_for_unit("incus-preseed.service") + machine.execute("systemctl kill incus-preseed.service") instances = json.loads(machine.succeed("incus list --format json --all-projects")) with subtest("Stopping all running instances"): @@ -301,6 +301,13 @@ import ../make-test-python.nix ( machine.succeed(f"ps {pid}") machine.succeed("systemctl start incus") + with subtest("Instances stop with incus-startup.service"): + pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus-startup.service") + machine.wait_until_fails(f"ps {pid}", timeout=120) + machine.succeed("systemctl start incus-startup.service") + cleanup() '' @@ -360,6 +367,14 @@ import ../make-test-python.nix ( machine.succeed("systemctl start incus") + with subtest("Instances stop with incus-startup.service"): + pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus-startup.service") + machine.wait_until_fails(f"ps {pid}", timeout=120) + machine.succeed("systemctl start incus-startup.service") + + cleanup() '' ) "" initVariants) From 274e0fd934df69ce630f40522ee4f7e9fee6d8ca Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 14 Jan 2025 20:03:50 -0500 Subject: [PATCH 042/219] incus: support per-instance lxcfs This was added in 6.4 and backported to LTS 6.0.2 --- nixos/modules/virtualisation/incus.nix | 1 + nixos/tests/incus/incus-tests.nix | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index ead0ebb1badb..73d52c162fe6 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -38,6 +38,7 @@ let libnvidia-container libxfs lvm2 + lxcfs minio minio-client nftables diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index 05c5761b62b2..f41ae58fff5c 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -293,6 +293,16 @@ import ../make-test-python.nix ( check_sysctl(f"container-{variant}2") + with subtest("supports per-instance lxcfs"): + machine.succeed(f"incus stop container-{variant}1") + machine.fail(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") + + machine.succeed("incus config set instances.lxcfs.per_instance=true") + + machine.succeed(f"incus start container-{variant}1") + wait_for_instance(f"container-{variant}1") + machine.succeed(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") + with subtest("Instance remains running when softDaemonRestart is enabled and service is stopped"): pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() From f3a75905ab2f3ea3cd67f14fc5b132ff2df7f1e5 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 14 Jan 2025 20:16:26 -0500 Subject: [PATCH 043/219] nixos/tests/incus: fix subtest names and add reboot check --- nixos/tests/incus/incus-tests.nix | 76 ++++++++++++++++++------------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index f41ae58fff5c..5f648f4c04dc 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -228,39 +228,41 @@ import ../make-test-python.nix ( alias = "nixos/container/${variant}" variant = "${variant}" - with subtest("Container image can be imported"): + with subtest("container image can be imported"): machine.succeed(f"incus image import {metadata} {rootfs} --alias {alias}") - with subtest("Container can be launched and managed"): + with subtest("container can be launched and managed"): machine.succeed(f"incus launch {alias} container-{variant}1") wait_for_instance(f"container-{variant}1") - with subtest("Container mounts lxcfs overlays"): + with subtest("container mounts lxcfs overlays"): machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'") machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'") - with subtest("resource limits"): - with subtest("Container CPU limits can be managed"): - set_config(f"container-{variant}1", "limits.cpu 1", restart=True) - wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=15) - - with subtest("Container CPU limits can be hotplug changed"): - set_config(f"container-{variant}1", "limits.cpu 2") - wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=15) - - with subtest("Container memory limits can be managed"): - set_config(f"container-{variant}1", "limits.memory 128MB", restart=True) - wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=15) - - with subtest("Container memory limits can be hotplug changed"): - set_config(f"container-{variant}1", "limits.memory 256MB") - wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=15) + with subtest("container CPU limits can be managed"): + set_config(f"container-{variant}1", "limits.cpu 1", restart=True) + wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=15) - with subtest("virtual tpm can be configured"): + with subtest("container CPU limits can be hotplug changed"): + set_config(f"container-{variant}1", "limits.cpu 2") + wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=15) + + + with subtest("container memory limits can be managed"): + set_config(f"container-{variant}1", "limits.memory 128MB", restart=True) + wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=15) + + + with subtest("container memory limits can be hotplug changed"): + set_config(f"container-{variant}1", "limits.memory 256MB") + wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=15) + + + with subtest("container software tpm can be configured"): machine.succeed(f"incus config device add container-{variant}1 vtpm tpm path=/dev/tpm0 pathrm=/dev/tpmrm0") machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpm0") machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpmrm0") @@ -268,7 +270,7 @@ import ../make-test-python.nix ( machine.fail(f"incus exec container-{variant}1 -- test -e /dev/tpm0") - with subtest("lxc-generator"): + with subtest("container lxc-generator compatibility"): with subtest("lxc-container generator configures plain container"): # default container is plain machine.succeed(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") @@ -293,7 +295,7 @@ import ../make-test-python.nix ( check_sysctl(f"container-{variant}2") - with subtest("supports per-instance lxcfs"): + with subtest("container supports per-instance lxcfs"): machine.succeed(f"incus stop container-{variant}1") machine.fail(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") @@ -304,14 +306,19 @@ import ../make-test-python.nix ( machine.succeed(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") - with subtest("Instance remains running when softDaemonRestart is enabled and service is stopped"): + with subtest("container can successfully restart"): + machine.succeed(f"incus restart container-{variant}1") + wait_for_instance(f"container-{variant}1") + + + with subtest("container remains running when softDaemonRestart is enabled and service is stopped"): pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() machine.succeed(f"ps {pid}") machine.succeed("systemctl stop incus") machine.succeed(f"ps {pid}") machine.succeed("systemctl start incus") - with subtest("Instances stop with incus-startup.service"): + with subtest("containers stop with incus-startup.service"): pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() machine.succeed(f"ps {pid}") machine.succeed("systemctl stop incus-startup.service") @@ -342,7 +349,7 @@ import ../make-test-python.nix ( machine.succeed(f"incus create {alias} vm-{variant}1 --vm --config limits.memory=512MB --config security.secureboot=false") - with subtest("virtual tpm can be configured"): + with subtest("virtual-machine software tpm can be configured"): machine.succeed(f"incus config device add vm-{variant}1 vtpm tpm path=/dev/tpm0") @@ -351,25 +358,30 @@ import ../make-test-python.nix ( wait_for_instance(f"vm-{variant}1") - with subtest("incus-agent is started"): + with subtest("virtual-machine incus-agent is started"): machine.succeed(f"incus exec vm-{variant}1 systemctl is-active incus-agent") - with subtest("incus-agent has a valid path"): + with subtest("virtual-machine incus-agent has a valid path"): machine.succeed(f"incus exec vm-{variant}1 -- bash -c 'true'") - with subtest("Container CPU limits can be managed"): + with subtest("virtual-machine CPU limits can be managed"): set_config(f"vm-{variant}1", "limits.cpu 1", restart=True) wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^1$'", timeout=90) - with subtest("Container CPU limits can be hotplug changed"): + with subtest("virtual-machine CPU limits can be hotplug changed"): set_config(f"vm-{variant}1", "limits.cpu 2") wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=15) - with subtest("Instance remains running when softDaemonRestart is enabled and service is stopped"): + with subtest("virtual-machine can successfully restart"): + machine.succeed(f"incus restart vm-{variant}1") + wait_for_instance(f"vm-{variant}1") + + + with subtest("virtual-machine remains running when softDaemonRestart is enabled and service is stopped"): pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() machine.succeed(f"ps {pid}") machine.succeed("systemctl stop incus") @@ -377,7 +389,7 @@ import ../make-test-python.nix ( machine.succeed("systemctl start incus") - with subtest("Instances stop with incus-startup.service"): + with subtest("virtual-machines stop with incus-startup.service"): pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() machine.succeed(f"ps {pid}") machine.succeed("systemctl stop incus-startup.service") @@ -391,7 +403,7 @@ import ../make-test-python.nix ( + # python '' - with subtest("Can launch CSM virtual machine"): + with subtest("virtual-machine can launch CSM (BIOS)"): machine.succeed("incus init csm --vm --empty -c security.csm=true -c security.secureboot=false") machine.succeed("incus start csm") From 80e73d690ab2c68a0e82eb9f2cd939a2fc2a23d1 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 17 Jan 2025 08:45:54 -0500 Subject: [PATCH 044/219] nixos/incus: add lxc hook path to service env Fixes nvidia.runtime container passing --- nixos/modules/virtualisation/incus.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 73d52c162fe6..065cd1213b9a 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -122,6 +122,7 @@ let environment = lib.mkMerge [ { INCUS_EDK2_PATH = ovmf; + INCUS_LXC_HOOK = "${cfg.lxcPackage}/share/lxc/hooks"; INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids"; PATH = lib.mkForce serverBinPath; From 7f175c12cdea410a6a4d42694fb11549551817be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 20:45:25 +0000 Subject: [PATCH 045/219] oxlint: 0.15.3 -> 0.15.6 --- pkgs/by-name/ox/oxlint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index a4a9daa5d8f7..40b2afe10ec6 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.15.3"; + version = "0.15.6"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-cH3Sosfmx0eOWWOjglcB3puiK0XKbO0wua45/YMZe+0="; + hash = "sha256-2916XMkNvHmnY1wYHPSsRdCcgBHi4Akv1+A6WNlg6J4="; }; - cargoHash = "sha256-Yfk5DGOo3GLHzqJYCFrlLB7soHFI+zBRR93daVOgrmk="; + cargoHash = "sha256-niLqpSwoaZStK9xnQCoDdqE/NVeWysiJn1Mdaj8Yl6Y="; buildInputs = [ rust-jemalloc-sys From 629735627a8fadeb42011ff5b5e185913e0f92db Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 19 Jan 2025 10:56:34 +0100 Subject: [PATCH 046/219] grafana-image-renderer: 3.11.6 -> 3.12.0 ChangeLog: https://github.com/grafana/grafana-image-renderer/releases/tag/v3.12.0 --- pkgs/by-name/gr/grafana-image-renderer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix index 03baafa0a975..b611f476d891 100644 --- a/pkgs/by-name/gr/grafana-image-renderer/package.nix +++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix @@ -14,13 +14,13 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.11.6"; + version = "3.12.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-jHACiSTZHNHj61kN8zEjGb3NpkhRJrJ7Mp0pNmJXDXY="; + hash = "sha256-iTWkr7mruGda7CVz0L6puHeObnogXHfqjF9KAY+ExJg="; }; offlineCache = fetchYarnDeps { From 4128ae7e609a2dc057244e4dd3a633392b01f5db Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Fri, 17 Jan 2025 12:59:23 +0100 Subject: [PATCH 047/219] nom: 2.7.2 -> 2.7.3 --- pkgs/by-name/no/nom/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index 3f39e81559d8..88c029ef65a7 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "nom"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; - rev = "v${version}"; - hash = "sha256-2S/oMhjqNzwQAA747lOfvH7RQ2tRtfhxG9ErfwVuUg8="; + tag = "v${version}"; + hash = "sha256-kCvNUvU3fR3v/uRPl3y9HlNXMartNb23kfj1YYY2BWg="; }; vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw="; From 167d6634f8a4bad4e6a494cb47052d8dcaa29cac Mon Sep 17 00:00:00 2001 From: Slava Date: Sat, 28 Dec 2024 14:20:43 +0500 Subject: [PATCH 048/219] services.xray: pass the settings file with systemd loadCredential It enables passing a sops-nix secret as a `settingsFile` @see https://github.com/Mic92/sops-nix/issues/198. By default sops-nix secrets are accessible by only root. We can change owner to another user, but the xray service is defined with `dynamicUser=true`, which means, there is no user in the compile time. Systemd `loadCredential` passes the secret file to the service, which is exactly what we need here. --- nixos/modules/services/networking/xray.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/xray.nix b/nixos/modules/services/networking/xray.nix index 40a154d8d030..c7cbee44b81e 100644 --- a/nixos/modules/services/networking/xray.nix +++ b/nixos/modules/services/networking/xray.nix @@ -80,9 +80,12 @@ with lib; description = "xray Daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + script = '' + exec "${cfg.package}/bin/xray" -config "$CREDENTIALS_DIRECTORY/config.json" + ''; serviceConfig = { DynamicUser = true; - ExecStart = "${cfg.package}/bin/xray -config ${settingsFile}"; + LoadCredential = "config.json:${settingsFile}"; CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE"; AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE"; NoNewPrivileges = true; From ab59b272e46284497e1207c0d695f46694d68a10 Mon Sep 17 00:00:00 2001 From: hlad Date: Tue, 21 Jan 2025 11:15:23 +0100 Subject: [PATCH 049/219] audiobookshelf: 2.17.7 -> 2.18.1 --- pkgs/by-name/au/audiobookshelf/source.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index ac2ed8e3a0b8..9f5c5da60969 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "de8b0abc3af740148bddde462fe809f03159d678", - "hash": "sha256-lLCG6xw1qWbIOxHbD8ONH7iYzayJ8OhMy+WgaXExcFQ=", - "version": "2.17.7", - "depsHash": "sha256-1uDCbgZNmx8e+LrsOHTfM29SZhS1TLDHmTg48XMbwkg=", - "clientDepsHash": "sha256-cDT45OtLbFDF0TXO4zVVj9+UOJhkb9TjCajtSWq4H8U=" + "rev": "66b90e0841f2b08a4a401fad202605c8fbaf3c48", + "hash": "sha256-SAce3URkZxPa5URyaO7G9xty4JCG0/tJym5fXLnwv74=", + "version": "2.18.1", + "depsHash": "sha256-1d3V8MzIaJdYpY5BdoAX96HTGfjBBNz/JLkG7jl0TRY=", + "clientDepsHash": "sha256-hClfu993JpHWOqPMgmKdMIneAFDYAi6pCPlf8GmXzow=" } From 4ecf3fed98935a9b3963eed99037c1da83fe9cd1 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Tue, 21 Jan 2025 11:23:01 +0100 Subject: [PATCH 050/219] wastebin: 2.5.0 -> 2.7.0 --- pkgs/by-name/wa/wastebin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index 3a292eb208b7..f079c511be25 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "wastebin"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "matze"; repo = "wastebin"; rev = version; - hash = "sha256-iiGg5En7p+7142qURsdOj7nYwS/ushbxfa5QlT/pHDc="; + hash = "sha256-OMczHUAhEIdstX4h5Luhx4Ud7oNNM579pP59hj0fnc0="; }; - cargoHash = "sha256-yfjAtORymdSn0pLwnGPvjLH3/R4juY08+NanTdm4420="; + cargoHash = "sha256-bC0dxwJ2AtUA3dhDneV9Oc4wcKxoKvPH/mOegwGjveE="; nativeBuildInputs = [ pkg-config From 3b612cbceb81f840caafbbffe38c5afb140ba7df Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 21 Jan 2025 21:30:52 +0800 Subject: [PATCH 051/219] wev: 1.0.0 -> 1.0.0-unstable-2022-09-14 --- pkgs/by-name/we/wev/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/wev/package.nix b/pkgs/by-name/we/wev/package.nix index b758b17d0744..b9fa24cfc8c9 100644 --- a/pkgs/by-name/we/wev/package.nix +++ b/pkgs/by-name/we/wev/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wev"; - version = "1.0.0"; + version = "1.0.0-unstable-2022-09-14"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = pname; - rev = version; - sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms"; + rev = "83de8e931ab04ce3322a58b359d8effa7901b21c"; + sha256 = "sha256-lNFgjRXO/ZbcXJF06DykPoJJ6/a8ZfVA6g95i+rNdWs="; }; strictDeps = true; From 02adbdce1d5cc93d8e86d42c01a7405f89aacabe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jan 2025 16:42:15 +0000 Subject: [PATCH 052/219] python312Packages.yosys: 0.48 -> 0.49 --- pkgs/development/compilers/yosys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 93de98015198..ee9167016d20 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -81,13 +81,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.48"; + version = "0.49"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; tag = "v${finalAttrs.version}"; - hash = "sha256-LzBx1bxpiPOiRTPgBcjNnuQemZG5xfvtA/NgqUib/6g="; + hash = "sha256-He7lkNVj/J0OYNGypBvFFsSBLeZvT8iqG06okIfzkMo="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' From 4ea0805f4ea40ac7f1f60b4ae17e8f28d6436e88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 21 Jan 2025 15:02:52 +0100 Subject: [PATCH 053/219] nixos/modules: drop findutils locate support Co-authored-by: 71rd <71rd@posteo.net> --- .../manual/release-notes/rl-2505.section.md | 3 + nixos/modules/misc/locate.nix | 82 ++++++------------- 2 files changed, 26 insertions(+), 59 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index cb005a1e9b96..4526cc88065d 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -168,6 +168,9 @@ to review the new defaults and description of [](#opt-services.nextcloud.poolSettings). +- The `services.locate` module does no longer support findutil's `locate` due to its inferior performance compared to `mlocate` and `plocate`. The new default is `plocate`. + As the `service.locate.localuser` option only applied when using findutil's `locate`, it has also been removed. + - `kmonad` is now hardened by default using common `systemd` settings. If KMonad is used to execute shell commands, hardening may make some of them fail. In that case, you can disable hardening using {option}`services.kmonad.keyboards..enableHardening` option. diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 5b57463bff6e..092852330437 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -9,14 +9,15 @@ let cfg = config.services.locate; isMLocate = lib.hasPrefix "mlocate" cfg.package.name; isPLocate = lib.hasPrefix "plocate" cfg.package.name; - isMorPLocate = isMLocate || isPLocate; - isFindutils = lib.hasPrefix "findutils" cfg.package.name; in { imports = [ (lib.mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ]) (lib.mkRenamedOptionModule [ "services" "locate" "locate" ] [ "services" "locate" "package" ]) (lib.mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths") + (lib.mkRemovedOptionModule [ "services" "locate" "localuser" ] + "The services.locate.localuser option has been removed because support for findutils locate has been removed." + ) ]; options.services.locate = { @@ -29,7 +30,7 @@ in ''; }; - package = lib.mkPackageOption pkgs [ "findutils" "locate" ] { + package = lib.mkPackageOption pkgs [ "plocate" ] { example = "mlocate"; }; @@ -65,15 +66,6 @@ in ''; }; - localuser = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = "nobody"; - description = '' - The user to search non-network directories as, using - {command}`su`. - ''; - }; - pruneFS = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ @@ -180,7 +172,7 @@ in pruneNames = lib.mkOption { type = lib.types.listOf lib.types.str; - default = lib.optionals (!isFindutils) [ + default = [ ".bzr" ".cache" ".git" @@ -229,7 +221,7 @@ in source = "${cfg.package}/bin/plocate"; }; in - lib.mkIf isMorPLocate { + { locate = lib.mkMerge [ common mlocate @@ -253,59 +245,31 @@ in ''; systemPackages = [ cfg.package ]; - - variables = lib.mkIf isFindutils { - LOCATE_PATH = cfg.output; - }; }; - warnings = - lib.optional (isMorPLocate && cfg.localuser != null) - "mlocate and plocate do not support the services.locate.localuser option. updatedb will run as root. Silence this warning by setting services.locate.localuser = null." - ++ lib.optional ( - isFindutils && cfg.pruneNames != [ ] - ) "findutils locate does not support pruning by directory component" - ++ lib.optional ( - isFindutils && cfg.pruneBindMounts - ) "findutils locate does not support skipping bind mounts"; - systemd.services.update-locatedb = { description = "Update Locate Database"; - path = lib.mkIf (!isMorPLocate) [ pkgs.su ]; # mlocate's updatedb takes flags via a configuration file or # on the command line, but not by environment variable. script = - if isMorPLocate then - let - toFlags = - x: lib.optional (cfg.${x} != [ ]) "--${lib.toLower x} '${lib.concatStringsSep " " cfg.${x}}'"; - args = lib.concatLists ( - map toFlags [ - "pruneFS" - "pruneNames" - "prunePaths" - ] - ); - in - '' - exec ${cfg.package}/bin/updatedb \ - --output ${toString cfg.output} ${lib.concatStringsSep " " args} \ - --prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \ - ${lib.concatStringsSep " " cfg.extraFlags} - '' - else - '' - exec ${cfg.package}/bin/updatedb \ - ${lib.optionalString (cfg.localuser != null && !isMorPLocate) "--localuser=${cfg.localuser}"} \ - --output=${toString cfg.output} ${lib.concatStringsSep " " cfg.extraFlags} - ''; - environment = lib.optionalAttrs (!isMorPLocate) { - PRUNEFS = lib.concatStringsSep " " cfg.pruneFS; - PRUNEPATHS = lib.concatStringsSep " " cfg.prunePaths; - PRUNENAMES = lib.concatStringsSep " " cfg.pruneNames; - PRUNE_BIND_MOUNTS = if cfg.pruneBindMounts then "yes" else "no"; - }; + let + toFlags = + x: lib.optional (cfg.${x} != [ ]) "--${lib.toLower x} '${lib.concatStringsSep " " cfg.${x}}'"; + args = lib.concatLists ( + map toFlags [ + "pruneFS" + "pruneNames" + "prunePaths" + ] + ); + in + '' + exec ${cfg.package}/bin/updatedb \ + --output ${toString cfg.output} ${lib.concatStringsSep " " args} \ + --prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \ + ${lib.concatStringsSep " " cfg.extraFlags} + ''; serviceConfig = { CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_CHOWN"; Nice = 19; From dd7912665387d9e00f290af45f0e164de640ffa4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 06:26:12 +0000 Subject: [PATCH 054/219] graalvmPackages.graalvm-ce: 23.0.1 -> 23.0.2 --- .../community-edition/graalvm-ce/hashes.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix index ddceaa2b6dbc..e61db8f1138a 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "23.0.1"; + "version" = "23.0.2"; "hashes" = { "aarch64-linux" = { - sha256 = "0q2y6dh09k9rnr8bfhshgzpjag9i34y703nmmmgvx29a2swnsias"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.1/graalvm-community-jdk-23.0.1_linux-aarch64_bin.tar.gz"; + sha256 = "06ccc80fc1h9n3ws2v1ayyyz1fv31wv96snvlpjvybwjn66fxl3h"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.2/graalvm-community-jdk-23.0.2_linux-aarch64_bin.tar.gz"; }; "x86_64-linux" = { - sha256 = "0l996ahsyynj76qn7q3baxzzawdjqdy4vwmmav08j5jb0rs0lsp2"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.1/graalvm-community-jdk-23.0.1_linux-x64_bin.tar.gz"; + sha256 = "1pfnn5jz0yn47la6yd5zkbzy2nji5h2g053wjhv92x9v2n43xxhc"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.2/graalvm-community-jdk-23.0.2_linux-x64_bin.tar.gz"; }; "x86_64-darwin" = { - sha256 = "045j0vcppq8znkdw4bzy483hcby54llh2ip1pj5r0s1a4clnq86q"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.1/graalvm-community-jdk-23.0.1_macos-x64_bin.tar.gz"; + sha256 = "0g7gg46nvyslrn7w658sqpa0ifa4w3jr1ry93z6cynqwq1dangpc"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.2/graalvm-community-jdk-23.0.2_macos-x64_bin.tar.gz"; }; "aarch64-darwin" = { - sha256 = "13zlaplrxq8bk61q1qmdflnzw7c2h8cy6rzyrmby8xb7sgryqhni"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.1/graalvm-community-jdk-23.0.1_macos-aarch64_bin.tar.gz"; + sha256 = "050l8nyvwrnhig5n7j1530acqd9d03jv56gyqirnprj5qhrcx9x5"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.2/graalvm-community-jdk-23.0.2_macos-aarch64_bin.tar.gz"; }; }; } From 6e25482792f78c5c449c8582e0e1340514ffd09f Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Wed, 22 Jan 2025 12:46:54 +0100 Subject: [PATCH 055/219] broadcom_sta: source kernel 6.12 patch from RPM Fusion --- pkgs/os-specific/linux/broadcom-sta/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 9d310b02e179..c609260ab7fc 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -21,8 +21,8 @@ let rpmFusionPatches = fetchFromGitHub { owner = "rpmfusion"; repo = "wl-kmod"; - rev = "a04330284bfc38fd91eade6f8b28fa63cfcdc95e"; - hash = "sha256-c72Pr/v+nxZPLEeNKbWnSpbH3gqYZaTgzMO9PlYQkf0="; + rev = "cb67598cbf5d8c5260b750d6f7e5c6a6599b7b85"; + hash = "sha256-g/j/LIZHG2Jl6UwnDNAlZpsuvjCyVzv4Qweog/tviqE="; }; patchset = [ "wl-kmod-001_wext_workaround.patch" @@ -52,6 +52,7 @@ let "wl-kmod-025_kernel_6.5_adaptation.patch" "wl-kmod-026_kernel_6.10_fix_empty_body_in_if_warning.patch" "wl-kmod-027_wpa_supplicant-2.11_add_max_scan_ie_len.patch" + "wl-kmod-028_kernel_6.12_adaptation.patch" ]; in stdenv.mkDerivation { @@ -67,13 +68,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - 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="; - }) - ]; + patches = map (patch: "${rpmFusionPatches}/${patch}") patchset; makeFlags = [ "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}" ]; From 2e337fa60004bbb600dc3a688bebd4665181972a Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Wed, 22 Jan 2025 12:55:10 +0100 Subject: [PATCH 056/219] broadcom_sta: add patch to compile on kernel 6.13 --- pkgs/os-specific/linux/broadcom-sta/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index c609260ab7fc..753830c70049 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -68,7 +68,13 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - patches = map (patch: "${rpmFusionPatches}/${patch}") patchset; + patches = map (patch: "${rpmFusionPatches}/${patch}") patchset ++ [ + # Fix for Kernel 6.13 + (fetchpatch2 { + url = "https://gist.githubusercontent.com/joanbm/72189c81ff67b39d36a660cf00483ccb/raw/17cae74c8d3ebb90e5bfcb84dc176c32f2519078/broadcom-wl-fix-linux-6.13.patch"; + hash = "sha256-b4XE3Dys0d7finPmNhTtvQqxXBSX1CXEj2Krq7qGHAw="; + }) + ]; makeFlags = [ "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}" ]; From 6603faa87233b492bbb4348370f4357c85403e08 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Wed, 22 Jan 2025 12:56:20 +0100 Subject: [PATCH 057/219] broadcom_sta: add j0hax as maintainer --- pkgs/os-specific/linux/broadcom-sta/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 753830c70049..6748c98d9617 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation { description = "Kernel module driver for some Broadcom's wireless cards"; homepage = "http://www.broadcom.com/support/802.11/linux_sta.php"; license = lib.licenses.unfreeRedistributable; - maintainers = [ ]; + maintainers = [ lib.maintainers.j0hax ]; platforms = lib.platforms.linux; }; } From 7a21d6f048cad87d7c879b18460a1b7661d83cfd Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Tue, 17 Dec 2024 16:41:39 +0000 Subject: [PATCH 058/219] nexusmods-app: 0.7.1 -> 0.7.2 --- pkgs/by-name/ne/nexusmods-app/deps.json | 100 +++++++++++++--------- pkgs/by-name/ne/nexusmods-app/package.nix | 4 +- 2 files changed, 62 insertions(+), 42 deletions(-) diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json index 0f6d10c751cc..b83c979c76d3 100644 --- a/pkgs/by-name/ne/nexusmods-app/deps.json +++ b/pkgs/by-name/ne/nexusmods-app/deps.json @@ -161,18 +161,18 @@ }, { "pname": "Bannerlord.LauncherManager", - "version": "1.0.138", - "hash": "sha256-U954PUK8oq1mFBqNjONMXi1DYSudT7gjpueWYBIXDdo=" + "version": "1.0.140", + "hash": "sha256-zqfi52ATMfzBkYhsSS4I8xNIyy+SQc4fOOEfJIVEfoE=" }, { "pname": "Bannerlord.LauncherManager.Localization", - "version": "1.0.138", - "hash": "sha256-i7OhCR6pceJU7xyaY1pi67PLSnyDX5YDCIrbHw1Jcuc=" + "version": "1.0.140", + "hash": "sha256-WMvQCbIykmF0V7yHf/yMsiov7cbwfujBUhYrWqmPbX8=" }, { "pname": "Bannerlord.LauncherManager.Models", - "version": "1.0.138", - "hash": "sha256-mo7Xmj7Ntxgy2/aMzywuyCJ9w/Y1FzbhKOf7fR6ebjw=" + "version": "1.0.140", + "hash": "sha256-1E5s8PPehDmxQB1ln5oA2l3j3Q1PVqgj3HqMTE3uWA8=" }, { "pname": "Bannerlord.ModuleManager", @@ -181,8 +181,8 @@ }, { "pname": "Bannerlord.ModuleManager", - "version": "6.0.242", - "hash": "sha256-nHBchr6mLQNOWEyfPGi4nzspaIviQY4j+fGJkUTN0Bs=" + "version": "6.0.246", + "hash": "sha256-YXBoSra3bsLB86GLUfFcsVja6QKLqgZBFPQi71y2s1k=" }, { "pname": "Bannerlord.ModuleManager.Models", @@ -191,8 +191,8 @@ }, { "pname": "Bannerlord.ModuleManager.Models", - "version": "6.0.242", - "hash": "sha256-iRTxQ7VhrYziaAy3jzD7qEXzq6bOM8eIrB6kyZMurkY=" + "version": "6.0.246", + "hash": "sha256-i8sTl8pldn9VzluxtSZ0EctC9P4j5ymZ01s9oWnMFI4=" }, { "pname": "BenchmarkDotNet", @@ -356,58 +356,58 @@ }, { "pname": "GameFinder", - "version": "4.3.3", - "hash": "sha256-uJzGa5CAa+6oHuG5gU0TN68biDb7ZQYGgqeW1nGLHQc=" + "version": "4.4.0", + "hash": "sha256-MaVW4qgbZgsoyIq8cLQLNJnZe2M7wsKAIE+ICxRNyzg=" }, { "pname": "GameFinder.Common", - "version": "4.3.3", - "hash": "sha256-0mITSz+9TyknYO8zzvLNB70jWPe5v2Q3sKHPupvGGBk=" + "version": "4.4.0", + "hash": "sha256-7tk84DGPBM2M8KvuTnDm4hLVmLUMd8GSLDFhsjl7Ra0=" }, { "pname": "GameFinder.Launcher.Heroic", - "version": "4.3.3", - "hash": "sha256-3DuhHRGbWeh4Smj0TXitzUsTPbCwHmtZsk3e+CVZHHA=" + "version": "4.4.0", + "hash": "sha256-/fp62b11/TXEMsrZzafHbbZYmU9pGgr7qVE2iUCVJik=" }, { "pname": "GameFinder.RegistryUtils", - "version": "4.3.3", - "hash": "sha256-bd6qpOthn4ljNpwQi7pdVe5P1EN8DnXbyKyR4PnSxJk=" + "version": "4.4.0", + "hash": "sha256-6Yk3A88xSWO7wr+1bJQtH6D2DRzQ0AOb8HkmSb34MPk=" }, { "pname": "GameFinder.StoreHandlers.EADesktop", - "version": "4.3.3", - "hash": "sha256-jvh672wPSH0T4W6dJHdvMGJi93LWDJBefcVFrkxT6hI=" + "version": "4.4.0", + "hash": "sha256-k2tUCIxnKEdIZtaqATpJLoHh6p0mgLIB1UzBWoEcDec=" }, { "pname": "GameFinder.StoreHandlers.EGS", - "version": "4.3.3", - "hash": "sha256-IKDDTnCor3G7HdsVjo0wYNJQjBoQjQ+a+MgjnGVOaek=" + "version": "4.4.0", + "hash": "sha256-7zxg064pFoHOYOa2kibtC1kpYgXRpbFh1Z9EatEcSNE=" }, { "pname": "GameFinder.StoreHandlers.GOG", - "version": "4.3.3", - "hash": "sha256-76+W+wi33ms0Xm5OCXQBmHCAilWRaA/OMd343vkkhc0=" + "version": "4.4.0", + "hash": "sha256-8LWj1MaEKhukBXs0ZIt5pt5z1H1i3VuoJONqqH6gNvY=" }, { "pname": "GameFinder.StoreHandlers.Origin", - "version": "4.3.3", - "hash": "sha256-Ss48fc+19RqhjkEP0tld5Eui65XwECFeAMu+126JCo4=" + "version": "4.4.0", + "hash": "sha256-TP9KYLDIZxFn3+N58zwjBPrL5COl2HxEpfr550OsUrM=" }, { "pname": "GameFinder.StoreHandlers.Steam", - "version": "4.3.3", - "hash": "sha256-EQxtM7k459MfHL0Z2Li45jWji6CgGvpJbJbJv8zXVc4=" + "version": "4.4.0", + "hash": "sha256-D6ABxneqdc+467RvYMs8qULyYHNTs7I0GsmXBIpiZMM=" }, { "pname": "GameFinder.StoreHandlers.Xbox", - "version": "4.3.3", - "hash": "sha256-uzIPKS3O/uxqXZMysZfgRlQaDUSUhj1y9hCKAwwhK0g=" + "version": "4.4.0", + "hash": "sha256-xLZJ4J79ptEjPduwdY8E288UJRQ92JnHSjkJc6Ubt+4=" }, { "pname": "GameFinder.Wine", - "version": "4.3.3", - "hash": "sha256-aEFkI7UVHsipCxdvHq3P+mrThgYdrFhpK6EbyFYqU6Y=" + "version": "4.4.0", + "hash": "sha256-lmGF+gzipCBIu/c4wR2Qgqq6/5Dd4ZhqlxUuCRX7pmY=" }, { "pname": "Gee.External.Capstone", @@ -1006,8 +1006,8 @@ }, { "pname": "Microsoft.CodeCoverage", - "version": "17.11.1", - "hash": "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA=" + "version": "17.12.0", + "hash": "sha256-lGjifppD0OBMBp28pjUfPipaeXg739n8cPhtHWoo5RE=" }, { "pname": "Microsoft.Composition", @@ -1436,8 +1436,8 @@ }, { "pname": "Microsoft.NET.Test.Sdk", - "version": "17.11.1", - "hash": "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI=" + "version": "17.12.0", + "hash": "sha256-DKFEbhh2wPzahNeHdEoFig8tZh/LEVrFc5+zpT43Btg=" }, { "pname": "Microsoft.NETCore.Platforms", @@ -1481,13 +1481,13 @@ }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.11.1", - "hash": "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4=" + "version": "17.12.0", + "hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w=" }, { "pname": "Microsoft.TestPlatform.TestHost", - "version": "17.11.1", - "hash": "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU=" + "version": "17.12.0", + "hash": "sha256-rf8Sh0fQq44Sneuvs64unkkIHg8kOjDGWE35j9iLx5I=" }, { "pname": "Microsoft.VisualStudio.Composition", @@ -1799,11 +1799,26 @@ "version": "9.4.1", "hash": "sha256-YfGVVfl/Yon9WgJCZscXZMbZoCNg+OvGFvdPSxe+Q1I=" }, + { + "pname": "protobuf-net", + "version": "3.2.45", + "hash": "sha256-rWitxe3uP3SOyoG1fwM5n00RpR5IL1V6u1zXMI0p0JA=" + }, + { + "pname": "protobuf-net.Core", + "version": "3.2.45", + "hash": "sha256-bsMGUmd0yno8g0H0637jJboKJwyyHLHoHg45+bt9pLQ=" + }, { "pname": "QoiSharp", "version": "1.0.0", "hash": "sha256-iN/yCXVN0M5+T/Ye9KJ+EGoLsaBxFU/uCIXvX17EhkM=" }, + { + "pname": "QRCoder", + "version": "1.6.0", + "hash": "sha256-2Ev/6d7PH6K4dVYQQHlZ+ZggkCnDtrlaGygs65mDo28=" + }, { "pname": "R3", "version": "1.0.0", @@ -2184,6 +2199,11 @@ "version": "15.2.22", "hash": "sha256-4QO7NAcOqTDxwsheB2wyXRdH626JylEbahQaKWKZpIc=" }, + { + "pname": "SteamKit2", + "version": "3.0.0", + "hash": "sha256-bRRdX8WFo9k+QCZWh0KHb3TULpJxpR4Hg9FDXKBW6d4=" + }, { "pname": "StrawberryShake.Core", "version": "14.1.0", diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 63a4081260e1..f175b8e97798 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -25,12 +25,12 @@ let in buildDotnetModule (finalAttrs: { inherit pname; - version = "0.7.1"; + version = "0.7.2"; src = fetchgit { url = "https://github.com/Nexus-Mods/NexusMods.App.git"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-TcT+siZMJlOYRtiQV+RAPPfM47wewfsz7WiPFaxCUkc="; + hash = "sha256-Kss1K1ZqXLZ/WbbyY3ZQRe8Kvmjdu3tRGfcagE7Q42Q="; fetchSubmodules = true; fetchLFS = true; }; From 6deb037f39c1252eb7ce88aa2c0666edc40074fd Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Tue, 17 Dec 2024 16:41:39 +0000 Subject: [PATCH 059/219] nexusmods-app: `convert` is deprecated, use `magick` Resolves the following warning during the install phase: WARNING: The convert command is deprecated in IMv7, use "magick" instead of "convert" or "magick convert" --- pkgs/by-name/ne/nexusmods-app/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index f175b8e97798..fc6fdcf620f1 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -97,7 +97,7 @@ buildDotnetModule (finalAttrs: { size=''${i}x''${i} dir=$out/share/icons/hicolor/$size/apps mkdir -p $dir - convert -background none -resize $size $icon $dir/com.nexusmods.app.png + magick -background none $icon -resize $size $dir/com.nexusmods.app.png done ''; From a1983a63f3e9446497bba870dddf1182f9043fc0 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Wed, 22 Jan 2025 14:17:29 +0100 Subject: [PATCH 060/219] krita: switch to openexr_3 --- pkgs/applications/graphics/krita/generic.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 1a1ba8e115fd..989bdb6fb02e 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -30,7 +30,7 @@ libkdcraw, lcms2, gsl, - openexr, + openexr_3, giflib, libjxl, mlt, @@ -105,7 +105,7 @@ mkDerivation rec { fribidi lcms2 gsl - openexr + openexr_3 lager libaom libheif @@ -132,9 +132,7 @@ mkDerivation rec { python3Packages.pyqt5 ]; - env.NIX_CFLAGS_COMPILE = toString ( - [ "-I${ilmbase.dev}/include/OpenEXR" ] ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy" - ); + env.NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"); # Krita runs custom python scripts in CMake with custom PYTHONPATH which krita determined in their CMake script. # Patch the PYTHONPATH so python scripts can import sip successfully. From ab8ef860868be691c6c3ae966a22dcd3827fbbae Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Wed, 22 Jan 2025 15:41:56 +0100 Subject: [PATCH 061/219] kio-extras, kio-extras-kf5: switch to openexr_3 --- pkgs/applications/kde/kio-extras.nix | 6 ++---- pkgs/kde/gear/kio-extras/default.nix | 4 ++-- pkgs/kde/misc/kio-extras-kf5/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 21738a1ac142..91d80677bb16 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -24,9 +24,8 @@ syntax-highlighting, libmtp, libssh, - openexr, + openexr_3, libtirpc, - ilmbase, phonon, qtsvg, samba, @@ -72,7 +71,7 @@ mkDerivation { syntax-highlighting libmtp libssh - openexr + openexr_3 libtirpc phonon qtsvg @@ -90,5 +89,4 @@ mkDerivation { --replace Exec=$out Exec=${kio} ''; - CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ]; } diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix index 2260feeac62c..0e3702ce7360 100644 --- a/pkgs/kde/gear/kio-extras/default.nix +++ b/pkgs/kde/gear/kio-extras/default.nix @@ -9,7 +9,7 @@ libimobiledevice, gperf, libtirpc, - openexr, + openexr_3, taglib, shared-mime-info, libappimage, @@ -34,7 +34,7 @@ mkKdeDerivation { libimobiledevice gperf libtirpc - openexr + openexr_3 taglib libappimage xorg.libXcursor diff --git a/pkgs/kde/misc/kio-extras-kf5/default.nix b/pkgs/kde/misc/kio-extras-kf5/default.nix index 886ae1a62777..add6b08de399 100644 --- a/pkgs/kde/misc/kio-extras-kf5/default.nix +++ b/pkgs/kde/misc/kio-extras-kf5/default.nix @@ -10,7 +10,7 @@ libimobiledevice, gperf, libtirpc, - openexr, + openexr_3, taglib, libappimage, }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { libimobiledevice gperf libtirpc - openexr + openexr_3 taglib libappimage ]; From 6487cec254eb25562bfab64c34987eb84acfb0a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 10:36:06 +0000 Subject: [PATCH 062/219] kimai: 2.27.0 -> 2.28.0 --- pkgs/by-name/ki/kimai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index aee271d3286a..266ba0f87a9e 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -7,13 +7,13 @@ php.buildComposerProject (finalAttrs: { pname = "kimai"; - version = "2.27.0"; + version = "2.28.0"; src = fetchFromGitHub { owner = "kimai"; repo = "kimai"; rev = finalAttrs.version; - hash = "sha256-CTYmk6QGEd+WKC+Q+odvLF961u61MCaA6VoZlxpo3Gc="; + hash = "sha256-z8NyPpaG6wNxQ7SSEdtVM/gFTOzxjclhE/Y++M4wN5I="; }; php = php.buildEnv { @@ -39,7 +39,7 @@ php.buildComposerProject (finalAttrs: { ''; }; - vendorHash = "sha256-DV4yU1PiH2HnAJ2hcVmSkZxTTpjtfqP3dV2d/FL9VHg="; + vendorHash = "sha256-xa0vdlCxKe5QPsqVZ61HcUcxnYYbb7w+Qn3PBEmUkH0="; composerNoPlugins = false; composerNoScripts = false; From 9a7b0d66c4edea3933961a18fa4d70ec51b80d55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 18:53:21 +0000 Subject: [PATCH 063/219] ossia-score: 3.4.0 -> 3.4.1 --- pkgs/by-name/os/ossia-score/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix index c8bedeac4db3..59591c867175 100644 --- a/pkgs/by-name/os/ossia-score/package.nix +++ b/pkgs/by-name/os/ossia-score/package.nix @@ -44,13 +44,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "ossia-score"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "ossia"; repo = "score"; rev = "v${finalAttrs.version}"; - hash = "sha256-UuU9WP8AIwNSipt9gikb5YY2mQpIbSENPv1vyIOLfVo="; + hash = "sha256-PpIGlw3MmJYiLaKX+oHM7QUjlk6Bw/W2GwdkLgPK1Hg="; fetchSubmodules = true; }; From 86d461ed885d1a37f3f50f8944345ee88000ed42 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 23 Jan 2025 22:59:31 +0100 Subject: [PATCH 064/219] nvc: 1.15.0 -> 1.15.1 --- pkgs/by-name/nv/nvc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix index 41d042750c3c..c662a67cf228 100644 --- a/pkgs/by-name/nv/nvc/package.nix +++ b/pkgs/by-name/nv/nvc/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-EpDJhgj1oYz+050qPwrToQAJNMtkSb423+Bh09qlka0="; + hash = "sha256-E/Q2f5b6Y0ZGEyq18I09SXHK0PJrBMiuCwpStyd/E8M="; }; nativeBuildInputs = [ From a0457110fb17b3deb0ade5e16f1e667318f9189f Mon Sep 17 00:00:00 2001 From: nat Date: Thu, 23 Jan 2025 23:18:38 +0100 Subject: [PATCH 065/219] feather: pin to boost186 --- pkgs/by-name/fe/feather/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix index ae567d8ffa18..ce2be604fff4 100644 --- a/pkgs/by-name/fe/feather/package.nix +++ b/pkgs/by-name/fe/feather/package.nix @@ -1,6 +1,6 @@ { bc-ur, - boost, + boost186, cmake, fetchFromGitHub, hidapi, @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bc-ur - boost + boost186 hidapi libsodium libusb1 From bb651b372c6960fbfa9516f26407f47f38e7070d Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 21 Jan 2025 16:35:39 +0100 Subject: [PATCH 066/219] python312Packages.pyerfa: fix cross build --- pkgs/development/python-modules/pyerfa/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyerfa/default.nix b/pkgs/development/python-modules/pyerfa/default.nix index e5bd3e20e5be..d8afee56061f 100644 --- a/pkgs/development/python-modules/pyerfa/default.nix +++ b/pkgs/development/python-modules/pyerfa/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { build-system = [ jinja2 + numpy packaging setuptools setuptools-scm From fcf77794e02999980b69518b95d606032b7f62f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 01:06:50 +0000 Subject: [PATCH 067/219] ledger-live-desktop: 2.94.0 -> 2.96.0 --- 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 719d896c9937..0896ce343a4b 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -8,11 +8,11 @@ let pname = "ledger-live-desktop"; - version = "2.94.0"; + version = "2.96.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-7nnsphM6PGvv/jy22Z7OFi5OEUYFaU5bIKNbgzCcwAc="; + hash = "sha256-3Buab2SDhEEOSQdXCBf7jHlSbgYUe/G1IUSNrcWTbqs="; }; appimageContents = appimageTools.extractType2 { From c84e75570307b5f46267ee6a4b651726f3ed34ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 01:47:50 +0000 Subject: [PATCH 068/219] obs-studio-plugins.obs-freeze-filter: 0.3.3 -> 0.3.4 --- .../video/obs-studio/plugins/obs-freeze-filter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix index 1cc6d312ec38..af2afe2cbdc6 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-freeze-filter"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-freeze-filter"; rev = finalAttrs.version; - hash = "sha256-CaHBTfdk8VFjmiclG61elj35glQafgz5B4ENo+7J35o="; + hash = "sha256-fVrfGqwce4oFYdWGElXMsXHO1AzQ/mhfBmZL1mPdT3I="; fetchSubmodules = true; }; From 7325116640ac2514931e0a35a8718960e800debc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 02:41:36 +0000 Subject: [PATCH 069/219] nats-server: 2.10.24 -> 2.10.25 --- pkgs/by-name/na/nats-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix index cb2fffddda50..d15df89ddf7f 100644 --- a/pkgs/by-name/na/nats-server/package.nix +++ b/pkgs/by-name/na/nats-server/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.24"; + version = "2.10.25"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-/iKgRnoAjZX6hiUpPOXpCjY2FsX7JMpNSSCtWgcFLWQ="; + hash = "sha256-cpAUyTnGEPPPA2RRJ+jYQgUSZuI8YJQ3s4uhHvoYDCg="; }; - vendorHash = "sha256-aopqwxIfLFBdy4MFjyQCUKRUORosm4oHcScET9BW3D4="; + vendorHash = "sha256-8wExTV9seztPnpgyckDZnGc5iF3oY453YX7aoRcZHaI="; doCheck = false; From 2221b83704e8bb72d3d318a74813acb9d6148b34 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 24 Jan 2025 14:15:06 +0800 Subject: [PATCH 070/219] linuxPackages_latest.nvidiaPackages: do not apply patchesOpen to priority --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 1c11334d002c..edb99de0e407 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -187,17 +187,7 @@ let else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}"; - patches = - if libsOnly then - null - else - ( - patches - ++ (builtins.map (rewritePatch { - from = "kernel-open"; - to = "kernel"; - }) patchesOpen) - ); + patches = if libsOnly then null else patches; inherit prePatch postPatch patchFlags; inherit preInstall postInstall; inherit version useGLVND useProfiles; From 5ebc7f832c3a2213bf29d19807033c6f79f74a08 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 22 Jan 2025 21:51:15 +0800 Subject: [PATCH 071/219] linuxPackages_latest.nvidiaPackages.{stable,latest,beta}: fix build --- ...-Add-fix-for-6.13-Module-compilation.patch | 251 ++++++++++++++++++ pkgs/os-specific/linux/nvidia-x11/default.nix | 11 + .../linux/nvidia-x11/fix-for-linux-6.13.patch | 48 ++++ ...t-symbol-namespace-to-string-literal.patch | 40 +++ 4 files changed, 350 insertions(+) create mode 100644 pkgs/os-specific/linux/nvidia-x11/crypto-Add-fix-for-6.13-Module-compilation.patch create mode 100644 pkgs/os-specific/linux/nvidia-x11/fix-for-linux-6.13.patch create mode 100644 pkgs/os-specific/linux/nvidia-x11/nvidia-nv-Convert-symbol-namespace-to-string-literal.patch diff --git a/pkgs/os-specific/linux/nvidia-x11/crypto-Add-fix-for-6.13-Module-compilation.patch b/pkgs/os-specific/linux/nvidia-x11/crypto-Add-fix-for-6.13-Module-compilation.patch new file mode 100644 index 000000000000..1fc6063740b7 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/crypto-Add-fix-for-6.13-Module-compilation.patch @@ -0,0 +1,251 @@ +diff --git a/kernel-open/conftest.sh b/kernel-open/conftest.sh +index fdceda72..3bfe39aa 100755 +--- a/kernel-open/conftest.sh ++++ b/kernel-open/conftest.sh +@@ -6721,6 +6721,47 @@ compile_test() { + compile_check_conftest "$CODE" "NV_CRYPTO_PRESENT" "" "symbols" + ;; + ++ crypto_akcipher_verify) ++ # ++ # Determine whether the crypto_akcipher_verify API is still present. ++ # It was removed by commit 6b34562 ('crypto: akcipher - Drop sign/verify operations') ++ # in v6.13-rc1 (2024-10-04). ++ # ++ # This test is dependent on the crypto conftest to determine whether crypto should be ++ # enabled at all. That means that if the kernel is old enough such that crypto_akcipher_verify ++ # ++ # The test merely checks for the presence of the API, as it assumes that if the API ++ # is no longer present, the new API to replace it (crypto_sig_verify) must be present. ++ # If the kernel version is too old to have crypto_akcipher_verify, it will fail the crypto ++ # conftest above and all crypto code will be compiled out. ++ # ++ CODE=" ++ #include ++ #include ++ void conftest_crypto_akcipher_verify(void) { ++ (void)crypto_akcipher_verify; ++ }" ++ ++ compile_check_conftest "$CODE" "NV_CRYPTO_AKCIPHER_VERIFY_PRESENT" "" "symbols" ++ ;; ++ ++ ecc_digits_from_bytes) ++ # ++ # Determine whether ecc_digits_from_bytes is present. ++ # It was added in commit c6ab5c915da4 ('crypto: ecc - Prevent ecc_digits_from_bytes from ++ # reading too many bytes') in v6.10. ++ # ++ # This functionality is needed when crypto_akcipher_verify is not present. ++ # ++ CODE=" ++ #include ++ void conftest_ecc_digits_from_bytes(void) { ++ (void)ecc_digits_from_bytes; ++ }" ++ ++ compile_check_conftest "$CODE" "NV_ECC_DIGITS_FROM_BYTES_PRESENT" "" "symbols" ++ ;; ++ + mempolicy_has_unified_nodes) + # + # Determine if the 'mempolicy' structure has +diff --git a/kernel-open/nvidia/internal_crypt_lib.h b/kernel-open/nvidia/internal_crypt_lib.h +index 2eac7d5e..917acb26 100644 +--- a/kernel-open/nvidia/internal_crypt_lib.h ++++ b/kernel-open/nvidia/internal_crypt_lib.h +@@ -64,7 +64,9 @@ + * old or even just user disabled. If we should use LKCA, include headers, else + * define stubs to return errors. + */ +-#if defined(NV_CRYPTO_PRESENT) && defined (NV_CONFIG_CRYPTO_PRESENT) ++#if defined(NV_CRYPTO_PRESENT) && defined (NV_CONFIG_CRYPTO_PRESENT) && \ ++ (defined(NV_CRYPTO_AKCIPHER_VERIFY_PRESENT) || \ ++ (defined(NV_CRYPTO_SIG_H_PRESENT) && defined(NV_ECC_DIGITS_FROM_BYTES_PRESENT))) + #define USE_LKCA 1 + #endif + +diff --git a/kernel-open/nvidia/libspdm_ecc.c b/kernel-open/nvidia/libspdm_ecc.c +index 1f8f0100..a9eb4db5 100644 +--- a/kernel-open/nvidia/libspdm_ecc.c ++++ b/kernel-open/nvidia/libspdm_ecc.c +@@ -30,14 +30,26 @@ MODULE_SOFTDEP("pre: ecdh_generic,ecdsa_generic"); + #include + #include + #include ++#ifndef NV_CRYPTO_AKCIPHER_VERIFY_PRESENT ++#include ++ ++struct signature ++{ ++ u64 r[ECC_MAX_DIGITS]; ++ u64 s[ECC_MAX_DIGITS]; ++}; ++#endif // NV_CRYPTO_AKCIPHER_VERIFY_PRESENT ++ ++#define ECDSA_PUBKEY_HEADER_XY_PRESENT (0x4) + + struct ecc_ctx { + unsigned int curve_id; + u64 priv_key[ECC_MAX_DIGITS]; // In big endian + + struct { +- // ecdsa wants byte preceding pub_key to be set to '4' +- u64 pub_key_prefix; ++ // ecdsa pubkey has header indicating length of pubkey ++ u8 padding[7]; ++ u8 pub_key_prefix; + u64 pub_key[2 * ECC_MAX_DIGITS]; + }; + +@@ -221,25 +233,84 @@ bool lkca_ec_compute_key(void *ec_context, const uint8_t *peer_public, + #endif + } + +-bool lkca_ecdsa_verify(void *ec_context, size_t hash_nid, +- const uint8_t *message_hash, size_t hash_size, +- const uint8_t *signature, size_t sig_size) ++#ifndef NV_CRYPTO_AKCIPHER_VERIFY_PRESENT ++static bool lkca_ecdsa_verify_crypto_sig(void *ec_context, size_t hash_nid, ++ const uint8_t *message_hash, size_t hash_size, ++ const uint8_t *signature, size_t sig_size) + { + #ifndef USE_LKCA + return false; + #else + struct ecc_ctx *ctx = ec_context; ++ u8 *pub_key; ++ int err; ++ DECLARE_CRYPTO_WAIT(wait); ++ struct crypto_sig * tfm = NULL; ++ struct signature sig; ++ ++ if (sig_size != ctx->size || !ctx->pub_key_set) ++ { ++ return false; ++ } ++ ++ tfm = crypto_alloc_sig(ctx->name, CRYPTO_ALG_TYPE_SIG, 0); ++ if (IS_ERR(tfm)) { ++ pr_info("crypto_alloc_sig failed in lkca_ecdsa_verify\n"); ++ return false; ++ } ++ ++ // modify header of pubkey to indicate size ++ pub_key = (u8 *) &(ctx->pub_key_prefix); ++ *pub_key = ECDSA_PUBKEY_HEADER_XY_PRESENT; ++ err = crypto_sig_set_pubkey(tfm, pub_key, ctx->size + 1); ++ if (err != 0) ++ { ++ pr_info("crypto_sig_set_pubkey failed in lkca_ecdsa_verify: %d", -err); ++ goto failTfm; ++ } ++ ++ // ++ // Compared to the way we receive the signature, we need to: ++ // - swap order of all digits ++ // - swap endianness for each digit ++ // ++ memset(&sig, 0, sizeof(sig)); ++ ecc_digits_from_bytes(signature, ctx->size/2, sig.r, ECC_MAX_DIGITS); ++ ecc_digits_from_bytes(signature + ctx->size/2, ctx->size/2, sig.s, ECC_MAX_DIGITS); ++ ++ err = crypto_sig_verify(tfm, (void *)&sig, sizeof(sig), message_hash, hash_size); ++ if (err != 0) ++ { ++ pr_info("crypto_sig_verify failed in lkca_ecdsa_verify %d\n", -err); ++ } ++ ++failTfm: ++ crypto_free_sig(tfm); ++ ++ return err == 0; ++#endif // USE_LKCA ++} ++ ++#else // NV_CRYPTO_AKCIPHER_VERIFY_PRESENT ++static bool lkca_ecdsa_verify_akcipher(void *ec_context, size_t hash_nid, ++ const uint8_t *message_hash, size_t hash_size, ++ const uint8_t *signature, size_t sig_size) ++{ ++#ifndef USE_LKCA ++ return false; ++#else // USE_LKCA ++ struct ecc_ctx *ctx = ec_context; ++ u8 *pub_key; ++ int err; ++ DECLARE_CRYPTO_WAIT(wait); + + // Roundabout way + u64 ber_max_len = 3 + 2 * (4 + (ECC_MAX_BYTES)); + u64 ber_len = 0; + u8 *ber = NULL; +- u8 *pub_key; + struct akcipher_request *req = NULL; + struct crypto_akcipher *tfm = NULL; + struct scatterlist sg; +- DECLARE_CRYPTO_WAIT(wait); +- int err; + + if (sig_size != ctx->size) { + return false; +@@ -251,21 +322,21 @@ bool lkca_ecdsa_verify(void *ec_context, size_t hash_nid, + + tfm = crypto_alloc_akcipher(ctx->name, CRYPTO_ALG_TYPE_AKCIPHER, 0); + if (IS_ERR(tfm)) { +- pr_info("ALLOC FAILED\n"); ++ pr_info("crypto_alloc_akcipher failed in lkca_ecdsa_verify\n"); + return false; + } + +- pub_key = (u8 *) ctx->pub_key; +- pub_key--; // Go back into byte of pub_key_prefix +- *pub_key = 4; // And set it to 4 to placate kernel ++ // modify header of pubkey to indicate size ++ pub_key = (u8 *) &(ctx->pub_key_prefix); ++ *pub_key = ECDSA_PUBKEY_HEADER_XY_PRESENT; + if ((err = crypto_akcipher_set_pub_key(tfm, pub_key, ctx->size + 1)) != 0) { +- pr_info("SET PUB KEY FAILED: %d\n", -err); ++ pr_info("crypto_akcipher_set_pub_key failed in lkca_ecdsa_verify: %d\n", -err); + goto failTfm; + } + + req = akcipher_request_alloc(tfm, GFP_KERNEL); + if (IS_ERR(req)) { +- pr_info("REQUEST ALLOC FAILED\n"); ++ pr_info("akcipher_request_alloc failed in lkca_ecdsa_verify\n"); + goto failTfm; + } + +@@ -310,9 +381,8 @@ bool lkca_ecdsa_verify(void *ec_context, size_t hash_nid, + CRYPTO_TFM_REQ_MAY_SLEEP, crypto_req_done, &wait); + akcipher_request_set_crypt(req, &sg, NULL, ber_len, hash_size); + err = crypto_wait_req(crypto_akcipher_verify(req), &wait); +- + if (err != 0){ +- pr_info("Verify FAILED %d\n", -err); ++ pr_info("crypto_akcipher_verify failed in lkca_ecdsa_verify %d\n", -err); + } + + kfree(ber); +@@ -322,5 +392,19 @@ failTfm: + crypto_free_akcipher(tfm); + + return err == 0; +-#endif ++#endif // USE_LKCA ++} ++#endif // NV_CRYPTO_AKCIPHER_VERIFY_PRESENT ++ ++bool lkca_ecdsa_verify(void *ec_context, size_t hash_nid, ++ const uint8_t *message_hash, size_t hash_size, ++ const uint8_t *signature, size_t sig_size) ++{ ++#ifndef NV_CRYPTO_AKCIPHER_VERIFY_PRESENT ++ return lkca_ecdsa_verify_crypto_sig(ec_context, hash_nid, message_hash, hash_size, ++ signature, sig_size); ++#else // NV_CRYPTO_AKCIPHER_VERIFY_PRESENT ++ return lkca_ecdsa_verify_akcipher(ec_context, hash_nid, message_hash, hash_size, ++ signature, sig_size); ++#endif // NV_CRYPTO_AKCIPHER_VERIFY_PRESENT + } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 9b59c05cb106..1e073aab2682 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -70,6 +70,10 @@ rec { openSha256 = "sha256-hjpwTR4I0MM5dEjQn7MKM3RY1a4Mt6a61Ii9KW2KbiY="; settingsSha256 = "sha256-Wk6IlVvs23cB4s0aMeZzSvbOQqB1RnxGMv3HkKBoIgY="; persistencedSha256 = "sha256-yQFrVk4i2dwReN0XoplkJ++iA1WFhnIkP7ns4ORmkFA="; + patchesOpen = [ + ./nvidia-nv-Convert-symbol-namespace-to-string-literal.patch + ./crypto-Add-fix-for-6.13-Module-compilation.patch + ]; }; latest = selectHighestVersion production (generic { @@ -79,6 +83,13 @@ rec { openSha256 = "sha256-Fxo0t61KQDs71YA8u7arY+503wkAc1foaa51vi2Pl5I="; settingsSha256 = "sha256-VUetj3LlOSz/LB+DDfMCN34uA4bNTTpjDrb6C6Iwukk="; persistencedSha256 = "sha256-wnDjC099D8d9NJSp9D0CbsL+vfHXyJFYYgU3CwcqKww="; + patches = [ + ./fix-for-linux-6.13.patch + ]; + patchesOpen = [ + ./nvidia-nv-Convert-symbol-namespace-to-string-literal.patch + ./crypto-Add-fix-for-6.13-Module-compilation.patch + ]; }); beta = selectHighestVersion latest (generic { diff --git a/pkgs/os-specific/linux/nvidia-x11/fix-for-linux-6.13.patch b/pkgs/os-specific/linux/nvidia-x11/fix-for-linux-6.13.patch new file mode 100644 index 000000000000..2d3d88065af6 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/fix-for-linux-6.13.patch @@ -0,0 +1,48 @@ +diff --git a/kernel/nvidia-modeset/nvidia-modeset.Kbuild b/kernel/nvidia-modeset/nvidia-modeset.Kbuild +index a7d84e0..d417c28 100644 +--- a/kernel/nvidia-modeset/nvidia-modeset.Kbuild ++++ b/kernel/nvidia-modeset/nvidia-modeset.Kbuild +@@ -40,13 +40,15 @@ NV_KERNEL_MODULE_TARGETS += $(NVIDIA_MODESET_KO) + NVIDIA_MODESET_BINARY_OBJECT := $(src)/nvidia-modeset/nv-modeset-kernel.o_binary + NVIDIA_MODESET_BINARY_OBJECT_O := nvidia-modeset/nv-modeset-kernel.o + +-quiet_cmd_symlink = SYMLINK $@ +-cmd_symlink = ln -sf $< $@ ++# Rel. commit 80f289101690 "kbuild: change working directory to external module directory with M=" (Masahiro Yamada, 10 Nov 2024) ++# Ensure `$<` is absolute, since the link target is resolved relative to its path, not from where `ln` is run from. ++quiet_cmd_symlinkabs = SYMLINK $@ ++ cmd_symlinkabs = ln -sf $(abspath $<) $@ + + targets += $(NVIDIA_MODESET_BINARY_OBJECT_O) + + $(obj)/$(NVIDIA_MODESET_BINARY_OBJECT_O): $(NVIDIA_MODESET_BINARY_OBJECT) FORCE +- $(call if_changed,symlink) ++ $(call if_changed,symlinkabs) + + nvidia-modeset-y += $(NVIDIA_MODESET_BINARY_OBJECT_O) + +diff --git a/kernel/nvidia/nvidia.Kbuild b/kernel/nvidia/nvidia.Kbuild +index 31a6f92..62689f6 100644 +--- a/kernel/nvidia/nvidia.Kbuild ++++ b/kernel/nvidia/nvidia.Kbuild +@@ -40,13 +40,15 @@ NVIDIA_KO = nvidia/nvidia.ko + NVIDIA_BINARY_OBJECT := $(src)/nvidia/nv-kernel.o_binary + NVIDIA_BINARY_OBJECT_O := nvidia/nv-kernel.o + +-quiet_cmd_symlink = SYMLINK $@ +- cmd_symlink = ln -sf $< $@ ++# Rel. commit 80f289101690 "kbuild: change working directory to external module directory with M=" (Masahiro Yamada, 10 Nov 2024) ++# Ensure `$<` is absolute, since the link target is resolved relative to its path, not from where `ln` is run from. ++quiet_cmd_symlinkabs = SYMLINK $@ ++ cmd_symlinkabs = ln -sf $(abspath $<) $@ + + targets += $(NVIDIA_BINARY_OBJECT_O) + + $(obj)/$(NVIDIA_BINARY_OBJECT_O): $(NVIDIA_BINARY_OBJECT) FORCE +- $(call if_changed,symlink) ++ $(call if_changed,symlinkabs) + + nvidia-y += $(NVIDIA_BINARY_OBJECT_O) + +-- +2.47.0 diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-nv-Convert-symbol-namespace-to-string-literal.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-nv-Convert-symbol-namespace-to-string-literal.patch new file mode 100644 index 000000000000..98d17e8834e8 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/nvidia-nv-Convert-symbol-namespace-to-string-literal.patch @@ -0,0 +1,40 @@ +From 35a25dda24d8f02ca89d53e5975fa7705058c39e Mon Sep 17 00:00:00 2001 +From: Eric Naim +Date: Mon, 9 Dec 2024 19:45:50 +0800 +Subject: [PATCH 07/10] nvidia/nv: Convert symbol namespace to string literal + +Commit https://github.com/torvalds/linux/commit/cdd30ebb1b9f36159d66f088b61aee264e649d7a ("module: Convert symbol namespace to string literal") +breaks importing symbol namespaces. Apply this change only for 6.13 and higher. + +Signed-off-by: Eric Naim +--- + kernel-open/nvidia/nv.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/kernel-open/nvidia/nv.c b/kernel-open/nvidia/nv.c +index 83705a05..1e7de9ea 100644 +--- a/kernel-open/nvidia/nv.c ++++ b/kernel-open/nvidia/nv.c +@@ -22,6 +22,7 @@ + */ + + #include // for MODULE_FIRMWARE ++#include + + // must precede "nv.h" and "nv-firmware.h" includes + #define NV_FIRMWARE_FOR_NAME(name) "nvidia/" NV_VERSION_STRING "/" name ".bin" +@@ -127,7 +128,11 @@ MODULE_ALIAS_CHARDEV_MAJOR(NV_MAJOR_DEVICE_NUMBER); + * DMA_BUF namespace is added by commit id 16b0314aa746 + * ("dma-buf: move dma-buf symbols into the DMA_BUF module namespace") in 5.16 + */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0) ++MODULE_IMPORT_NS("DMA_BUF"); ++#else + MODULE_IMPORT_NS(DMA_BUF); ++#endif + #endif // defined(MODULE_IMPORT_NS) + + const NvBool nv_is_rm_firmware_supported_os = NV_TRUE; +-- +2.47.1 + From 18b947311b4e9a67a45e9b66caf6c49ff891e151 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 08:56:04 +0000 Subject: [PATCH 072/219] supabase-cli: 2.6.1 -> 2.9.4 --- 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 4b2d44aafbbc..cd80718efd06 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.6.1"; + version = "2.9.4"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-kMVVb5f8SEo/fc+PmRh1QskIxzbG+Y9gOufVvq5mN30="; + hash = "sha256-qUx6KMJVknMzLzmOTXM6sqTqIK9EyT46nehzcSleGiU="; }; - vendorHash = "sha256-H4o38npYbF77NSO7EALjoH3EXdUCjIPDboWEhWE4hXo="; + vendorHash = "sha256-k/w+4ledwTXxUQttjqtnTGVpNVOcEXuDe4gF4wViyB4="; ldflags = [ "-s" From cd19d7872c0dc466f87ca78c59bb11f9911f1b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Fri, 24 Jan 2025 21:16:09 +1100 Subject: [PATCH 073/219] reaper: don't strip upstream binaries --- pkgs/applications/audio/reaper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 047ad7d2c7cb..22019815da3a 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { ++ lib.optional pulseaudioSupport libpulseaudio; dontBuild = true; + dontStrip = true; installPhase = if stdenv.hostPlatform.isDarwin then From 9bf35e0bbd54523ea455646684c21ee5cd4da714 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Fri, 24 Jan 2025 11:28:44 +0100 Subject: [PATCH 074/219] capnproto-rust: 0.17.2 -> 0.20.1; add update script --- pkgs/by-name/ca/capnproto-rust/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/capnproto-rust/package.nix b/pkgs/by-name/ca/capnproto-rust/package.nix index 087dcf2745ac..2adba43fe8b2 100644 --- a/pkgs/by-name/ca/capnproto-rust/package.nix +++ b/pkgs/by-name/ca/capnproto-rust/package.nix @@ -3,19 +3,20 @@ fetchCrate, rustPlatform, capnproto, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "capnproto-rust"; - version = "0.17.2"; + version = "0.20.1"; src = fetchCrate { crateName = "capnpc"; inherit version; - hash = "sha256-WVjXVLVoTCAtA8a6+zaX4itAaPCWb2c0trtSsxBopO4="; + hash = "sha256-iLjvKxVfkAVoM4AYgr31Ud1mk3MyMPReDXv1IbKEvcE="; }; - cargoHash = "sha256-h9YArxHnY14T8eQCS4JVItjaCjv+2dorcOVBir7r6SY="; + cargoHash = "sha256-KNUXIKzTlbEW7WUwqVOXjN5/6BDGEbOjbKELo0KtWDc="; postInstall = '' mkdir -p $out/include/capnp @@ -26,6 +27,8 @@ rustPlatform.buildRustPackage rec { capnproto ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Cap'n Proto codegen plugin for Rust"; homepage = "https://github.com/capnproto/capnproto-rust"; From 560b6b2d6c926cfe00ea9232f6d8c344b841a14e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 24 Jan 2025 16:25:38 +0000 Subject: [PATCH 075/219] osu-lazer: 2025.118.2 -> 2025.118.3 --- pkgs/by-name/os/osu-lazer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix index cc33bb1aae9a..79b2132a6c7f 100644 --- a/pkgs/by-name/os/osu-lazer/package.nix +++ b/pkgs/by-name/os/osu-lazer/package.nix @@ -21,13 +21,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2025.118.2"; + version = "2025.118.3"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; tag = version; - hash = "sha256-pQEMd+y+uS+Xl8lBuk7KwX7AcPs0MCXwkY5oPBPWmEE="; + hash = "sha256-sObk/T5QywneLVvBIekR0vJ1VbXbHKr9ByiKPF1MwBY="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; From 1da95166ba6f485fb7d0d464ef84a5d33c1fecee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 24 Jan 2025 16:28:23 +0000 Subject: [PATCH 076/219] osu-lazer-bin: 2025.118.2 -> 2025.118.3 --- pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index 7aa20b00f053..caacc0422f04 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -10,23 +10,23 @@ let pname = "osu-lazer-bin"; - version = "2025.118.2"; + version = "2025.118.3"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-cUyndZAKc2Dd3YHb+rdq5QRE7ei9MxrLaal7yvjVsKE="; + hash = "sha256-+Z/lF7RjJGkzlauQlMCMOjvXArWjEg0mGu7HTe2S7Xs="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-tTuiFEUv5ZVXxiN4ZN26p4ysJWeU2ccQsN06/zR2780="; + hash = "sha256-/kF09xFrH0zlN2kpzxIwvMC+W6pR0Lc8hlxOmwYn2mI="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-E2WWjLFEAqDqFso8eO+coZ2cuQEhUS0nBZY45jInEFA="; + hash = "sha256-bnffUtzs5IsWKhAGeGTt+UHMmlTWbbT79Ac4fKhXK9s="; }; } .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported."); From 62f9a733b7d6f233f042cdf5404ae32888432eb8 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:29:53 +0100 Subject: [PATCH 077/219] komikku: 1.67.0 -> 1.68.0 --- pkgs/by-name/ko/komikku/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index cf61592b4f7b..083d19203a35 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.67.0"; + version = "1.68.0"; pyproject = false; src = fetchFromGitea { @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-vWAYsImJseEQvgq7vreqS76M963zfuL56R87P3od9m4="; + hash = "sha256-pfhGMeXVSgsQApFXXhQA6pzOqhiuDuNzmarOtO0Gm90="; }; nativeBuildInputs = [ From bf40d1db220196be9d912c3c9896e339627531a6 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 24 Jan 2025 15:00:21 -0500 Subject: [PATCH 078/219] telegram-desktop: 5.10.4 -> 5.10.5 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.10.4...v5.10.5 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.10.5 --- .../telegram/telegram-desktop/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index 763fdab2db8a..ae2d44e75ea8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -46,14 +46,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop-unwrapped"; - version = "5.10.4"; + version = "5.10.5"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-3v9B4tdD9oNyQ96t21VRmV43Ib7l6ki8DlFXmbk7DJw="; + hash = "sha256-0BfKWwb+mnlaMD55KKvEMRIFvqBDQCs272lemvXBnjw="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' From f65d36693a360d31b6d662a9d2d73efc24625135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 Jan 2025 10:25:20 -0800 Subject: [PATCH 079/219] immich: 1.124.2 -> 1.125.2 Diff: https://github.com/immich-app/immich/compare/refs/tags/v1.124.2...v1.125.2 Changelog: https://github.com/immich-app/immich/releases/tag/v1.125.1 https://github.com/immich-app/immich/releases/tag/v1.125.2 --- pkgs/by-name/im/immich/package.nix | 36 +---------------------------- pkgs/by-name/im/immich/sources.json | 24 +++++++++---------- 2 files changed, 13 insertions(+), 47 deletions(-) diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 759925c0e451..06839ba36e60 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -1,6 +1,5 @@ { lib, - stdenvNoCC, buildNpmPackage, fetchFromGitHub, fetchpatch2, @@ -129,21 +128,6 @@ let ''; }; - node-addon-api = stdenvNoCC.mkDerivation rec { - pname = "node-addon-api"; - version = "8.3.0"; - src = fetchFromGitHub { - owner = "nodejs"; - repo = "node-addon-api"; - tag = "v${version}"; - hash = "sha256-7KkJkMNX352XnWTOC6mJB+IcFrda20UENcNwoXWDm+s="; - }; - installPhase = '' - mkdir $out - cp -r *.c *.h *.gyp *.gypi index.js package-support.json package.json tools $out/ - ''; - }; - vips' = vips.overrideAttrs (prev: { mesonFlags = prev.mesonFlags ++ [ "-Dtiff=disabled" ]; }); @@ -180,27 +164,9 @@ buildNpmPackage' { # Required because vips tries to write to the cache dir makeCacheWritable = true; - # we manually build sharp from source later on - # FIXME figure out why otherwise it fails with - # error: 'NewOrCopy' is not a member of 'Napi::Buffer' - env.SHARP_IGNORE_GLOBAL_LIBVIPS = 1; + env.SHARP_FORCE_GLOBAL_LIBVIPS = 1; preBuild = '' - unset SHARP_IGNORE_GLOBAL_LIBVIPS - export SHARP_FORCE_GLOBAL_LIBVIPS=1 - - pushd node_modules/sharp - - mkdir node_modules - ln -s ${node-addon-api} node_modules/node-addon-api - - node install/check - - rm -r node_modules - - popd - rm -r node_modules/@img/sharp* - # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH rm -r node_modules/exiftool-vendored.* ''; diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index 27ea111b151d..6935c5e9fa5c 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,26 +1,26 @@ { - "version": "1.124.2", - "hash": "sha256-EIp1KH2sNvEiB3wl6m0IiAUyDwBETgKlSXCrIsw73Oo=", + "version": "1.125.2", + "hash": "sha256-vtEUMERvCibOKYlHtu8eTQX6LLAMF5riBs2feX8HCAU=", "components": { "cli": { - "npmDepsHash": "sha256-k3sA4OcjlvzMMI2GsUYks2fIj7LG89H3OX4vTZOCIOo=", - "version": "2.2.40" + "npmDepsHash": "sha256-wHxNmmZVWuOYueEgkSGokwVZ20DklrjTyLYyamLzPvk=", + "version": "2.2.43" }, "server": { - "npmDepsHash": "sha256-O0XqMOUYy7VdumDDbSenMy22lgZLCDy/GpaSVNs+k4I=", - "version": "1.124.2" + "npmDepsHash": "sha256-0zcEiQM2KDrpLVv/uybcis9ohtyB5LcbZhvlXSMVRg0=", + "version": "1.125.2" }, "web": { - "npmDepsHash": "sha256-f3p0HT7l3hXFEo+8AvKEn8QvH6KOTMGZOvaOAPxv3Kc=", - "version": "1.124.2" + "npmDepsHash": "sha256-dTkRTxFhIeXhIkc87pERTCXtEoipiDA6C5RdlQ6Dvo8=", + "version": "1.125.2" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-uk4Gfs10TIsbD4VdHt7a9Fub8PcT6R8ksfvnOLFs/Zo=", - "version": "1.124.2" + "npmDepsHash": "sha256-uBzPhxITGzEnKrcATzTQeIwjKpAE8Y0xoJdC5dm6cZo=", + "version": "1.125.2" }, "geonames": { - "timestamp": "20250108222614", - "hash": "sha256-gCi0iFQplv4XizDi9DYEVekFFe46DM4X2YiPSe7ugR4=" + "timestamp": "20250124195258", + "hash": "sha256-2m+0M6200SixTFVZ1V7ZFw8D4E9VYhbmOto0RqWQPsQ=" } } } From 917e65fc418b77b4a46cf1e3a8c944cbb7c74f37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 20:10:24 +0000 Subject: [PATCH 080/219] nu_scripts: 0-unstable-2025-01-06 -> 0-unstable-2025-01-17 --- pkgs/by-name/nu/nu_scripts/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index 62ca93d7140d..a74b4d42a03e 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2025-01-06"; + version = "0-unstable-2025-01-17"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "a9b829115ff3c77981616ae777379fc0bd4dc998"; - hash = "sha256-fIayTOyJCqOkFUkmghBQJfCp8s8oNrdUi+/BuOjcbTU="; + rev = "fd686c0b0c10e284b1da72d6c3c42ab28c7504a7"; + hash = "sha256-nO7Dyg1ZxjSInkWW+kHa32H0P1CQ6vc6ODLLTj2abcI="; }; installPhase = '' From 8cb42ff55414f4e468dd2bd3cd6d6b678d014060 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 Jan 2025 22:03:42 +0100 Subject: [PATCH 081/219] cargo-profiler: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/by-name/ca/cargo-profiler/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/cargo-profiler/package.nix b/pkgs/by-name/ca/cargo-profiler/package.nix index adceadd6ccc2..0874582ea0ab 100644 --- a/pkgs/by-name/ca/cargo-profiler/package.nix +++ b/pkgs/by-name/ca/cargo-profiler/package.nix @@ -13,7 +13,7 @@ let version = "0.2.0"; rev = "0a8ab772fd5c0f1579e4847c5d05aa443ffa2bc8"; hash = "sha256-ZRAbvSMrPtgaWy9RwlykQ3iiPxHCMh/tS5p67/4XqqA="; - cargoHash = "sha256-qt3S6ZcLEP9ZQoP5+kSQdmBlxdMgGUqLszdU7JkFNVI="; + cargoHash = "sha256-GrHH98jcJaEkCzHe1hoVAeZvTvE0kXdp0bPTIiiOYss="; inherit (rustPlatform) buildRustPackage; in @@ -25,6 +25,7 @@ buildRustPackage rec { repo = pname; }; + useFetchCargoVendor = true; inherit cargoHash; meta = with lib; { From ea71373b3810a4a722b5ac8f483899bf963b33fd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 Jan 2025 22:18:14 +0100 Subject: [PATCH 082/219] nixpkgs-hammering: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/by-name/ni/nixpkgs-hammering/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixpkgs-hammering/package.nix b/pkgs/by-name/ni/nixpkgs-hammering/package.nix index 088ae8425db7..575d213de0c9 100644 --- a/pkgs/by-name/ni/nixpkgs-hammering/package.nix +++ b/pkgs/by-name/ni/nixpkgs-hammering/package.nix @@ -30,7 +30,8 @@ let pname = "nixpkgs-hammering-rust-checks"; inherit version src meta; sourceRoot = "${src.name}/rust-checks"; - cargoHash = "sha256-QrtAalZClNc0ZN6iNqN9rFRQ7w68lEZPV5e25uXYToA="; + useFetchCargoVendor = true; + cargoHash = "sha256-cE1fzdxGa0WG2WCPs8UFnE2vzaKfU7r6LS+9HLCVJ1U="; }; in From 63b7f69ce8425ca8c476ac84ea8ee6ef07c81fd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 21:18:30 +0000 Subject: [PATCH 083/219] golds: 0.7.4 -> 0.7.5 --- pkgs/by-name/go/golds/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix index de811d147b9c..a4e9026238e6 100644 --- a/pkgs/by-name/go/golds/package.nix +++ b/pkgs/by-name/go/golds/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "golds"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "go101"; repo = "golds"; tag = "v${version}"; - hash = "sha256-kVXr/5qJCTjpfRpz2mDIsMRirp5dT5aGo/BlLR9Qp0M="; + hash = "sha256-maYkVZlr8VW3nsNLVD+ib8TfltBkDrgWiC7VyeEJIy4="; }; # nixpkgs is not using the go distpack archive and missing a VERSION file in the source From e518d4ad2bcad74f98fec028cf21ce5b1e5020dd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 Jan 2025 22:21:45 +0100 Subject: [PATCH 084/219] process-viewer: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/by-name/pr/process-viewer/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/process-viewer/package.nix b/pkgs/by-name/pr/process-viewer/package.nix index 646245950944..4dce0784aca0 100644 --- a/pkgs/by-name/pr/process-viewer/package.nix +++ b/pkgs/by-name/pr/process-viewer/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mEmtLCtHlrCurjKKJ3vEtEkLBik4LwuUED5UeQ1QLws="; }; - cargoHash = "sha256-lgVByl+mpCDbhwlC1Eiw9ZkHIDYJsOR06Ds790pXOMc="; + useFetchCargoVendor = true; + cargoHash = "sha256-vmNqay/tYGASSez+VqyCQVMW+JGqfBvjwSKx0AG/LeY="; nativeBuildInputs = [ pkg-config ]; From 0ae4ba909ef66dd1447f0f4899065702b19ffa2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 21:22:39 +0000 Subject: [PATCH 085/219] operator-sdk: 1.39.0 -> 1.39.1 --- pkgs/by-name/op/operator-sdk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/operator-sdk/package.nix b/pkgs/by-name/op/operator-sdk/package.nix index be5f7a14e060..713d10af36c4 100644 --- a/pkgs/by-name/op/operator-sdk/package.nix +++ b/pkgs/by-name/op/operator-sdk/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.39.0"; + version = "1.39.1"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; tag = "v${version}"; - hash = "sha256-D3LAKrMlqfRqSLuQv6qh5dyQVzIAXCPwTpb1mDkjLF4="; + hash = "sha256-+lgpwpLkqpAZ0aScM62gk4l/h44auB7ixhW3ZoT7m64="; }; vendorHash = "sha256-3CtVl3HWUcbXp/U/pTqoCol4kmJqtLsTlcAijGHENtI="; From ee500bc60f5f3da07c72244a56394385ebcbe693 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 Jan 2025 22:23:08 +0100 Subject: [PATCH 086/219] proton-caller: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/by-name/pr/proton-caller/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/proton-caller/package.nix b/pkgs/by-name/pr/proton-caller/package.nix index 354181609e1a..d34045ad47da 100644 --- a/pkgs/by-name/pr/proton-caller/package.nix +++ b/pkgs/by-name/pr/proton-caller/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-srzahBMihkEP9/+7oRij5POHkCcH6QBh4kGz42Pz0nM="; }; - cargoHash = "sha256-LBXCcFqqscCGgtTzt/gr7Lz0ExT9kAWrXPuPuKzKt0E="; + useFetchCargoVendor = true; + cargoHash = "sha256-AZp6Mbm9Fg+EVr31oJe6/Z8LIwapYhos8JpZzPMiwz0="; meta = with lib; { description = "Run Windows programs with Proton"; From 49bda54591ffb9a3bdc3d455ba982e99fad0b092 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 Jan 2025 22:26:39 +0100 Subject: [PATCH 087/219] shavee: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/by-name/sh/shavee/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sh/shavee/package.nix b/pkgs/by-name/sh/shavee/package.nix index a34066fb8800..d914497ce3c2 100644 --- a/pkgs/by-name/sh/shavee/package.nix +++ b/pkgs/by-name/sh/shavee/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-41wJ3QBZdmCl7v/6JetXhzH2zF7tsKYMKZY1cKhByX8="; }; - cargoHash = "sha256-tnIqhZpqdy8pV4L6KF5v19ufpWRpMX5gTPlWWbwB3RU="; + useFetchCargoVendor = true; + cargoHash = "sha256-IGMEl/iK25WMkkLgbT7pCfppAf3GCvyBk1NrqMDtbUA="; nativeBuildInputs = [ pkg-config From 98c7e1d3912e4724ed06024a7886b40e49490b7c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 Jan 2025 22:28:20 +0100 Subject: [PATCH 088/219] shticker-book-unwritten: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix b/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix index 527564a0d219..b82c88c2af5e 100644 --- a/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix +++ b/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jI2uL8tMUmjZ5jPkCV2jb98qtKwi9Ti4NVCPfuO3iB4="; }; - cargoHash = "sha256-Tney9SG9MZh7AUIT1h/dlgJyRrSPX7mUhfsKD1Rfsfc="; + useFetchCargoVendor = true; + cargoHash = "sha256-0eumZoAL8/nkeFS+sReCAYKHiXiqZHfdC/9Ao5U6/SQ="; nativeBuildInputs = [ pkg-config ]; From ea7f91ed25dad28a8188cd2cc01099556d5882ea Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 Jan 2025 22:40:48 +0100 Subject: [PATCH 089/219] wgautomesh: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/by-name/wg/wgautomesh/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wg/wgautomesh/package.nix b/pkgs/by-name/wg/wgautomesh/package.nix index f3b80cfd5b23..a017c7790a28 100644 --- a/pkgs/by-name/wg/wgautomesh/package.nix +++ b/pkgs/by-name/wg/wgautomesh/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1xphnyuRMZEeq907nyhAW7iERYJLS1kxH0wRBsfYL40="; }; - cargoHash = "sha256-HZ1VImsfxRd0sFN/vKAKgwIV2eio2GiEz+6c1+dCmdk="; + useFetchCargoVendor = true; + cargoHash = "sha256-Lshj8L880gGLi5xY1H/7twrL3YHolqloOfXeckGw/VE="; meta = with lib; { description = "Simple utility to help connect wireguard nodes together in a full mesh topology"; From 31b15409c0f5bd2a6fbc44dd248e1fcd8fc277d6 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Fri, 24 Jan 2025 23:54:01 +0000 Subject: [PATCH 090/219] nexusmods-app: disable flaky StardewValley test Passes locally, but fails on ofborg. --- pkgs/by-name/ne/nexusmods-app/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index fc6fdcf620f1..30eba95da65e 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -135,6 +135,9 @@ buildDotnetModule (finalAttrs: { "NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_RemoteImage" "NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_ImageStoredFile" + # Fails in ofborg with VerifyException tests/Games/NexusMods.Games.StardewValley.Tests + "NexusMods.Games.StardewValley.Tests.StardewValleyInstallersTests.CanInstallMod" + # Fails with: Expected a to be thrown, but no exception was thrown. "NexusMods.Networking.ModUpdates.Tests.PerFeedCacheUpdaterTests.Constructor_WithItemsFromDifferentGames_ShouldThrowArgumentException_InDebug" ] From 8cca643e46529aeaa1db6ccb5e4abb761908d9c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 00:18:52 +0000 Subject: [PATCH 091/219] python312Packages.deepl: 1.20.0 -> 1.21.0 --- pkgs/development/python-modules/deepl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deepl/default.nix b/pkgs/development/python-modules/deepl/default.nix index 8586079f16de..a5b691df269c 100644 --- a/pkgs/development/python-modules/deepl/default.nix +++ b/pkgs/development/python-modules/deepl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "deepl"; - version = "1.20.0"; + version = "1.21.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Lq5G2PAnmwC85GhuwBi7V1egrQzANmFu8ArRL5dYlVs="; + hash = "sha256-+udougyvv8x94/zsWOLq/UXQyRffk4X5veISaWjDWp4="; }; nativeBuildInputs = [ poetry-core ]; From 6b8d59b57d7ec159170b55007a57dae00fcbd04f Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 19 Jan 2025 18:36:24 +0100 Subject: [PATCH 092/219] clorinde: init at 0.11.2 --- pkgs/by-name/cl/clorinde/package.nix | 48 ++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/cl/clorinde/package.nix diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix new file mode 100644 index 000000000000..e9b5c0efc990 --- /dev/null +++ b/pkgs/by-name/cl/clorinde/package.nix @@ -0,0 +1,48 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "clorinde"; + version = "0.11.2"; + + src = fetchFromGitHub { + owner = "halcyonnouveau"; + repo = "clorinde"; + tag = "clorinde-v${version}"; + hash = "sha256-Nqf0NNjE3gu+75tjMKAY3Wn75PiPwpnXgXtzdhqx7u8="; + }; + + cargoHash = "sha256-OLA9n7MBN5Fz3D3MJLb6PoEksO5Da2mp5h8pti2/lpA="; + + cargoBuildFlags = [ "--package=clorinde" ]; + + cargoTestFlags = cargoBuildFlags; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "clorinde-v(.*)" + ]; + }; + + meta = { + description = "Generate type-checked Rust from your PostgreSQL"; + homepage = "https://github.com/halcyonnouveau/clorinde"; + changelog = "https://github.com/halcyonnouveau/clorinde/blob/${src.rev}/CHANGELOG.md"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ defelo ]; + mainProgram = "clorinde"; + }; +} From 58810f9239df91db2bc66d2cdeedb9b0fbcee9fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 01:06:37 +0000 Subject: [PATCH 093/219] framesh: 0.6.9 -> 0.6.10 --- pkgs/by-name/fr/framesh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/framesh/package.nix b/pkgs/by-name/fr/framesh/package.nix index 5cc572eeac82..262f705820d6 100644 --- a/pkgs/by-name/fr/framesh/package.nix +++ b/pkgs/by-name/fr/framesh/package.nix @@ -7,10 +7,10 @@ let pname = "framesh"; - version = "0.6.9"; + version = "0.6.10"; src = fetchurl { url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage"; - hash = "sha256-SsQIAg5DttvNJk1z+GJq4+e0Qa/j+VEKPV2bPA6+V8A="; + hash = "sha256-h2Y0G7luakd5UVu7bVt9r6xhvyOh80gYMTswmEIcnnk="; }; appimageContents = appimageTools.extractType2 { From 864822c7c285a40db4cac7da1c13199af5404514 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 01:13:49 +0000 Subject: [PATCH 094/219] handheld-daemon-ui: 3.3.5 -> 3.3.6 --- 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 2454a82642bb..84ef6b091681 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.3.5"; + version = "3.3.6"; src = fetchurl { url = "https://github.com/hhd-dev/hhd-ui/releases/download/v${version}/hhd-ui.Appimage"; - hash = "sha256-g8LB24WxpbsGDFHRI0c80m9XXZghKYiRyuRRoYvb34g="; + hash = "sha256-M9YTP4Q27bqeTD5JhO58ltPDxgMuGAftOXYAGHQNmhc="; }; extractedFiles = appimageTools.extractType2 { inherit pname version src; }; in From 41f6c055043e3584dd532306ee07c877143bda1c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 24 Jan 2025 11:37:47 -0600 Subject: [PATCH 095/219] nixos/pay-respects: fix environment config Unable to build flake since this was introduced, seems it clobbers other configuration attributes. --- nixos/modules/programs/pay-respects.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/nixos/modules/programs/pay-respects.nix b/nixos/modules/programs/pay-respects.nix index fe4a2610903b..c44fec300851 100644 --- a/nixos/modules/programs/pay-respects.nix +++ b/nixos/modules/programs/pay-respects.nix @@ -8,11 +8,11 @@ let inherit (lib) getExe isBool + listToAttrs literalExpression maintainers mkEnableOption mkIf - mkMerge mkOption mkPackageOption optionalString @@ -169,16 +169,19 @@ in "url" "model" ]; - environment = mkMerge ( - [ - { - systemPackages = [ finalPackage ]; - } - ] - ++ map (rule: { - etc."xdg/pay-respects/rules/${rule.command}.toml".source = generate "${rule.command}.toml" rule; - }) cfg.runtimeRules - ); + + environment = { + etc = listToAttrs ( + map (rule: { + name = "xdg/pay-respects/rules/${rule.command}.toml"; + value = { + source = generate "${rule.command}.toml" rule; + }; + }) cfg.runtimeRules + ); + + systemPackages = [ finalPackage ]; + }; programs = { bash.interactiveShellInit = initScript "bash"; From 1d636713c9455ba8b5d21c65035666b248829cfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 02:54:33 +0000 Subject: [PATCH 096/219] fcitx5-pinyin-moegirl: 20250111 -> 20250113 --- pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index f3c53462b941..7549010606c2 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20250111"; + version = "20250113"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-ooYpkrqeOc5OrjeGTbobfv4b8x5uV/ot3QaU3d5MRLQ="; + hash = "sha256-Z6MqYZMpvTGcz61NnzZQy63GXfcaTWE8dezPoYht6q0="; }; dontUnpack = true; From eab5e5a70f064d984609edb175c68bb49716fced Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 02:57:11 +0000 Subject: [PATCH 097/219] pass-git-helper: 3.0.0 -> 3.1.0 --- .../version-management/pass-git-helper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/pass-git-helper/default.nix b/pkgs/applications/version-management/pass-git-helper/default.nix index 9d4ab973c19d..ab7fe589fdf9 100644 --- a/pkgs/applications/version-management/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/pass-git-helper/default.nix @@ -11,14 +11,14 @@ buildPythonApplication rec { pname = "pass-git-helper"; - version = "3.0.0"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; tag = "v${version}"; - sha256 = "sha256-DLH3l4wYfBlrc49swLgyHeZXebJ5JSzU7cHjD7Hmw0g="; + sha256 = "sha256-HcafOaunDsyUm5KPcDNo/hENFMZseWSD8GYilKYOPco="; }; build-system = [ setuptools ]; From f9df7f5196c0459cffd6ed9a4e5f3eb8818d7660 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 03:03:26 +0000 Subject: [PATCH 098/219] spacer: 0.3.0 -> 0.3.1 --- pkgs/by-name/sp/spacer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spacer/package.nix b/pkgs/by-name/sp/spacer/package.nix index c0b96db011ce..a2be66b89b88 100644 --- a/pkgs/by-name/sp/spacer/package.nix +++ b/pkgs/by-name/sp/spacer/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "spacer"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "samwho"; repo = "spacer"; rev = "v${version}"; - hash = "sha256-gxqUMtONjYPjSmxyguE9/GBC91PUK1rdFGsISGaSe44="; + hash = "sha256-gEJUHNtoLurBMhSMoJUiJMm6xLjUJNjTejPwkgltf2U="; }; - cargoHash = "sha256-pMYqIl0Td2awAxe3BRglBcOychwTmFZ+pZV0QOT0CL4="; + cargoHash = "sha256-/laEbJ1kev7CpDZ4ygrZr1jMI9n6QtVPOwf22NFOZGU="; meta = with lib; { description = "CLI tool to insert spacers when command output stops"; From 084fb82808c61f13c7a4afa79868784b99d38d96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 03:11:53 +0000 Subject: [PATCH 099/219] subxt: 0.38.0 -> 0.38.1 --- pkgs/by-name/su/subxt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix index 80bcc27a890e..725ed7810647 100644 --- a/pkgs/by-name/su/subxt/package.nix +++ b/pkgs/by-name/su/subxt/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "subxt"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; rev = "v${version}"; - hash = "sha256-mUW1foT3JkpsnieJutL+GZZXiTcRUklnjfoaWcH8ccE="; + hash = "sha256-ce6fxyKPWyuRAnS88laW+sFP8InZghlYNhg5ToD9t00="; }; - cargoHash = "sha256-+psdikles6ICg2eSBGxJoiG5EZG8voR2fs6PGnOWvDc="; + cargoHash = "sha256-SW35Neh8mFgnPanhuTb260QOCSOAnQjx12Ts3qhQY3Y="; # Only build the command line client cargoBuildFlags = [ "--bin" "subxt" ]; From 53cf371ada6804d3b558a5e49cefd035bba9dc91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 04:15:12 +0000 Subject: [PATCH 100/219] qlog: 0.40.1 -> 0.41.1 --- pkgs/applications/radio/qlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index 40720def672c..e2131ebf31d3 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.40.1"; + version = "0.41.1"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-6mAFOf/5LsmgMBxzkBlN1MOz4NVS9hi9YWOgeJ2tHSs="; + hash = "sha256-6+/GtAf/MGPcL6hh7aFeoCPVo6jhX3BQGBTHVHx1jDU="; fetchSubmodules = true; }; From bf64e387f2489f2f53c916822aeaae029e95ade7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 04:24:50 +0000 Subject: [PATCH 101/219] libretro.nestopia: 0-unstable-2025-01-05 -> 0-unstable-2025-01-19 --- pkgs/applications/emulators/libretro/cores/nestopia.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/nestopia.nix b/pkgs/applications/emulators/libretro/cores/nestopia.nix index abb82b387614..91b6b2a1fb56 100644 --- a/pkgs/applications/emulators/libretro/cores/nestopia.nix +++ b/pkgs/applications/emulators/libretro/cores/nestopia.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "nestopia"; - version = "0-unstable-2025-01-05"; + version = "0-unstable-2025-01-19"; src = fetchFromGitHub { owner = "libretro"; repo = "nestopia"; - rev = "9762adc00668f3a2e1016f3ad07ff9cbf9d67459"; - hash = "sha256-CLEwhQ91dxoTLyhlQwssoCL/dEqY6SetwWLogfJi8RU="; + rev = "5b56b6b98ed5f0d7871be4c957fc9d39a608a7c0"; + hash = "sha256-SBVvfrIaXFx984PG4pG1CE0xsTVypOfn/kCvWSgtZSA="; }; makefile = "Makefile"; From 93dbf29eb67fed739c325d272b4a045efbd7c1af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 05:02:16 +0000 Subject: [PATCH 102/219] libretro.gpsp: 0-unstable-2024-12-26 -> 0-unstable-2025-01-20 --- pkgs/applications/emulators/libretro/cores/gpsp.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/gpsp.nix b/pkgs/applications/emulators/libretro/cores/gpsp.nix index eb93437d04cd..2b86c4bd0e2a 100644 --- a/pkgs/applications/emulators/libretro/cores/gpsp.nix +++ b/pkgs/applications/emulators/libretro/cores/gpsp.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gpsp"; - version = "0-unstable-2024-12-26"; + version = "0-unstable-2025-01-20"; src = fetchFromGitHub { owner = "libretro"; repo = "gpsp"; - rev = "66ced08c693094f2eaefed5e11bd596c41028959"; - hash = "sha256-gXk9T62wns7QixY98RSjfM/OW6SfH8N3NcjZ328WSAM="; + rev = "b0d5d27ae51c23f514974ddffa5760f1e1d05d9b"; + hash = "sha256-e2U1xEshoPJlaVUEbqNZIayNaSdDC65hE1VrvxvQSx0="; }; makefile = "Makefile"; From 58156758de8a4620879486869206f4e2cd47fc9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 05:09:07 +0000 Subject: [PATCH 103/219] libretro.puae: 0-unstable-2025-01-11 -> 0-unstable-2025-01-24 --- pkgs/applications/emulators/libretro/cores/puae.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix index aabeb76ee711..6512b5bd64ee 100644 --- a/pkgs/applications/emulators/libretro/cores/puae.nix +++ b/pkgs/applications/emulators/libretro/cores/puae.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "puae"; - version = "0-unstable-2025-01-11"; + version = "0-unstable-2025-01-24"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-uae"; - rev = "67785f95db6e96dc081a2207751ab98b06b422ab"; - hash = "sha256-jJ1yki9uPutIdAI6TBKPWjiZc7W5K9n7P/oYA/UWJf4="; + rev = "9b05ecda81e14c0c5b2c5f6af8a65d034afd54a1"; + hash = "sha256-jBY+Xn9aR/lTyxFZlydWJA5+bpkaCcyCAiYG3fcmGmc="; }; makefile = "Makefile"; From 03590a07bdde81c733dac027543b87830418bf26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 05:31:10 +0000 Subject: [PATCH 104/219] libretro.bsnes: 0-unstable-2025-01-10 -> 0-unstable-2025-01-17 --- pkgs/applications/emulators/libretro/cores/bsnes.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix index eecae32a0d18..fbe23e9e5da5 100644 --- a/pkgs/applications/emulators/libretro/cores/bsnes.nix +++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bsnes"; - version = "0-unstable-2025-01-10"; + version = "0-unstable-2025-01-17"; src = fetchFromGitHub { owner = "libretro"; repo = "bsnes-libretro"; - rev = "1e0054da1c158857dc444b9b52273ddd18858d49"; - hash = "sha256-zm4X5RTaAm2njtvCBWBT1vhtf/YQvoBaaBSMzz9D2aQ="; + rev = "05e820a436d2e2cbbb1b871400f84a96e76e2359"; + hash = "sha256-jq1W1OrltfTc4WEnEDZSNQUPSWfnUtzrOtiA4fzlIpk="; }; makefile = "Makefile"; From 8182a322116c9e07af1d4db93cfbf532a4a04cb0 Mon Sep 17 00:00:00 2001 From: Qiming Chu Date: Sat, 25 Jan 2025 13:34:55 +0800 Subject: [PATCH 105/219] circt: 1.102.0 -> 1.103.0 --- pkgs/by-name/ci/circt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 83b1fb8451f1..c9d6c4999651 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.102.0"; + version = "1.103.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-hnmQR9Buu+2z1UkeStVFazbl/czUhV8E7sZrkcPGKFo="; + hash = "sha256-MpNsGioHd7VstuHlzI7SUvrvGcSpViULzAyL0CzMFgw="; fetchSubmodules = true; }; From aa05f4c5b8bd6e6698f724be42bd8c73370fa04e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 05:37:38 +0000 Subject: [PATCH 106/219] libretro.genesis-plus-gx: 0-unstable-2025-01-10 -> 0-unstable-2025-01-17 --- .../emulators/libretro/cores/genesis-plus-gx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index 212b3c55587b..7372326c2696 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2025-01-10"; + version = "0-unstable-2025-01-17"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "bf492bf3532b9d30e7a023e4329e202b15169e1c"; - hash = "sha256-QxplBzath9xN0AaFOT8K0dVEnMnTaZpLfdsX81fmP9g="; + rev = "8ea39eefc76bd97331c0da9efbac6ff343704a95"; + hash = "sha256-BZHZ5aixtivkxI+1Fpo/ziykIQFM27UtF4hLGOrQ4cQ="; }; meta = { From c93ef6cee294eaf53ecf278def3d483a00dd45a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 05:48:27 +0000 Subject: [PATCH 107/219] libretro.gambatte: 0-unstable-2025-01-10 -> 0-unstable-2025-01-24 --- pkgs/applications/emulators/libretro/cores/gambatte.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix index 6488f61c6895..9442d5d2c4a3 100644 --- a/pkgs/applications/emulators/libretro/cores/gambatte.nix +++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gambatte"; - version = "0-unstable-2025-01-10"; + version = "0-unstable-2025-01-24"; src = fetchFromGitHub { owner = "libretro"; repo = "gambatte-libretro"; - rev = "36a0da43fe6a82aba6acc5336574dbd749b18fa8"; - hash = "sha256-3PM7PK1ouMObNZEIIIBG8gxIydYFKP9RRGlWBr5PIGU="; + rev = "cd1e180b1edf6e6853cf4d501adac0538076de34"; + hash = "sha256-NwxditChigU8dUhmv6pnoreG1kp7cZlLBTAexNqbiAo="; }; meta = { From 737267b91a883c2fe951a3e94c9a83750cbe0b4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 05:49:05 +0000 Subject: [PATCH 108/219] libretro.swanstation: 0-unstable-2024-07-24 -> 0-unstable-2025-01-17 --- pkgs/applications/emulators/libretro/cores/swanstation.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/swanstation.nix b/pkgs/applications/emulators/libretro/cores/swanstation.nix index 092060008072..3e8041379e41 100644 --- a/pkgs/applications/emulators/libretro/cores/swanstation.nix +++ b/pkgs/applications/emulators/libretro/cores/swanstation.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "swanstation"; - version = "0-unstable-2024-07-24"; + version = "0-unstable-2025-01-17"; src = fetchFromGitHub { owner = "libretro"; repo = "swanstation"; - rev = "37cd87e14ca09ac1b558e5b2c7db4ad256865bbb"; - hash = "sha256-dNIxlTPoY4S6VMtTN22ti3DE4aU/8XN/XhAo3DMNR/E="; + rev = "10af0c78ba0e3516e70f4ed7c6020827bdb2647e"; + hash = "sha256-xxyWvsDF3FXTaP7GOGr9Zym0DgNZKJ4x9BDUgDzcHYA="; }; extraNativeBuildInputs = [ cmake ]; From a288f49377e83cf3c7cd8ee3a61fd6ac5014f1e4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 08:23:43 +0100 Subject: [PATCH 109/219] neverest: update source location The Sourcehut repository no longer exists. I found the new location by following the link from the author's Sourcehut profile to their website, and from there to GitHub. This location is also used by Homebrew. --- pkgs/by-name/ne/neverest/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix index 10d472e8e968..6f0d4c503176 100644 --- a/pkgs/by-name/ne/neverest/package.nix +++ b/pkgs/by-name/ne/neverest/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchFromSourcehut, + fetchFromGitHub, stdenv, pkg-config, darwin, @@ -22,9 +22,9 @@ rustPlatform.buildRustPackage rec { pname = "neverest"; version = "1.0.0-beta"; - src = fetchFromSourcehut { - owner = "~soywod"; - repo = "neverest-cli"; + src = fetchFromGitHub { + owner = "pimalaya"; + repo = "neverest"; rev = "v${version}"; hash = "sha256-3PSJyhxrOCiuHUeVHO77+NecnI5fN5EZfPhYizuYvtE="; }; From 6319c2ee71605ef56d4fb688ed38dbba52217174 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 08:26:06 +0100 Subject: [PATCH 110/219] neverest: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/by-name/ne/neverest/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix index 10d472e8e968..ce3d16534ab7 100644 --- a/pkgs/by-name/ne/neverest/package.nix +++ b/pkgs/by-name/ne/neverest/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3PSJyhxrOCiuHUeVHO77+NecnI5fN5EZfPhYizuYvtE="; }; - cargoHash = "sha256-i5or8oBtjGqOfTfwB7dYXn/OPgr5WEWNEvC0WdCCG+c="; + useFetchCargoVendor = true; + cargoHash = "sha256-K+LKRokfE8i4Huti0aQm4UrpConTcxVwJ2DyeOLjNKA="; nativeBuildInputs = [ pkg-config From 01b90c8042d9b0bad070eadb88d1ad57a334c752 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 08:37:59 +0100 Subject: [PATCH 111/219] sqld: remove redundant cargoHash This is obviously here by mistake. cargoLock takes precedence over cargoHash, so removing this should be a non-functional change, despite the rebuild. --- pkgs/by-name/sq/sqld/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/sq/sqld/package.nix b/pkgs/by-name/sq/sqld/package.nix index 79c52798c6b8..e67a95377c82 100644 --- a/pkgs/by-name/sq/sqld/package.nix +++ b/pkgs/by-name/sq/sqld/package.nix @@ -28,8 +28,6 @@ rustPlatform.buildRustPackage rec { "sqld" ]; - cargoHash = ""; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { From fa341312c5f59482c70cd2c01db4a9f9711a708c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jan 2025 09:30:55 +0100 Subject: [PATCH 112/219] python313Packages.dash-bootstrap-components: 1.6.0 -> 1.7.1 Changelog: https://github.com/facultyai/dash-bootstrap-components/releases/tag/1.7.1 --- .../python-modules/dash-bootstrap-components/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dash-bootstrap-components/default.nix b/pkgs/development/python-modules/dash-bootstrap-components/default.nix index ce39e11af1f5..fa6b4b5c35f9 100644 --- a/pkgs/development/python-modules/dash-bootstrap-components/default.nix +++ b/pkgs/development/python-modules/dash-bootstrap-components/default.nix @@ -3,13 +3,13 @@ buildPythonPackage, fetchPypi, dash, - setuptools, + hatchling, pythonOlder, }: buildPythonPackage rec { pname = "dash-bootstrap-components"; - version = "1.6.0"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,10 +17,10 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "dash_bootstrap_components"; - hash = "sha256-lgoeyTl1dHkvSagkECT6POzeD1kwyXGj/IHwFsvrEJU="; + hash = "sha256-MNSDQNbciYMdbAbkAM1CNvDVNjViwFsqki8hVFaVoII="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ dash ]; From ad737316f7ee7db33a9534b67c80a1b9977d72d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 08:32:52 +0000 Subject: [PATCH 113/219] gitlab-ci-ls: 1.0.0 -> 1.0.1 --- pkgs/by-name/gi/gitlab-ci-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix index 11eaa3d06239..768bb4911a1c 100644 --- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage rec { pname = "gitlab-ci-ls"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "alesbrelih"; repo = "gitlab-ci-ls"; rev = "${version}"; - hash = "sha256-HpFdebG4pRa+g2ycOOfnWgN/+DcYdPHAN/RHBHN6S8A="; + hash = "sha256-G0MKq2qGxcMpNOQDHo9LtewDEExYIA8/kTUkiZdnygg="; }; - cargoHash = "sha256-CS3MkCumqHmTcRf/YJr/M8s7BoGos/ixXm97BCCXBvw="; + cargoHash = "sha256-YzSBCc+1Vsg4daTjGlskER3P9UjNobwT6KYFoQjLTWs="; nativeBuildInputs = [ pkg-config ]; buildInputs = From a477667e11b11fdb7a94655ad84c3bed7bef2b6e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jan 2025 09:33:19 +0100 Subject: [PATCH 114/219] python313Packages.model-checker: 0.7.3 -> 0.7.17 --- pkgs/development/python-modules/model-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 188f5867fb10..08ec5b909432 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.7.3"; + version = "0.7.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-ZADgS+Mtpko+UvPBOo7cv9QVz1MdzFqeB4MRwZK9kkg="; + hash = "sha256-u9WHYglZG+SytH2qiUJV7YI+zCZ6UIdORXgSgcYgFYc="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From ac3ad804746362789ccf9fd28695378013aba561 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jan 2025 09:40:45 +0100 Subject: [PATCH 115/219] python313Packages.tencentcloud-sdk-python: 3.0.1308 -> 3.0.1309 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1308...3.0.1309 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1309/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 1440af16b2c0..6bd40b69a036 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1308"; + version = "3.0.1309"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-gT0ociYhvrjS+JOOOSBFeL3VE5gUZFcjpSa0kT/hVD0="; + hash = "sha256-1VMvMnF73vAwlFVCGrEdUZaWuJuH2q6If3VuypbhQN8="; }; build-system = [ setuptools ]; From 41e5f81ea71df55ca1a3777da12984248e5c0643 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jan 2025 09:41:02 +0100 Subject: [PATCH 116/219] python313Packages.boto3-stubs: 1.36.5 -> 1.36.6 --- 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 622985e3f6ed..92e73ce6b242 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.36.5"; + version = "1.36.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-omKsvzBXro4XZe+kEU6xypz2kgyYQRk4MiytYVWooVA="; + hash = "sha256-9ewaWm7LkpEpA2MRY0gvbOhPCS1bw27Aj3cHAL78zHs="; }; build-system = [ setuptools ]; From a5f33f7cbdbb99e9ce56399d847643652d03b7a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jan 2025 09:41:06 +0100 Subject: [PATCH 117/219] python313Packages.botocore-stubs: 1.36.5 -> 1.36.6 --- 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 05ad19c6f1fe..4bb19c57001f 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.36.5"; + version = "1.36.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-5gV/EnugGndwtnGvkkzGWiFNDBSirgVOsW4+pa1HU3I="; + hash = "sha256-9HwwA2pePIQu9zR66yBnqVKVmnucMsfcDtJwQKIxNQ0="; }; nativeBuildInputs = [ setuptools ]; From b48a1eedce706819b62aebbb5048354b6b99f1f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jan 2025 09:41:31 +0100 Subject: [PATCH 118/219] python312Packages.mypy-boto3-cloudtrail: 1.36.0 -> 1.36.6 --- 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 035d71732e65..4794b76de255 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -250,8 +250,8 @@ rec { "sha256-FCOuT2svx3aUPC0OEJE7yKDPjdATV3w1ILmZGgAOaXs="; mypy-boto3-cloudtrail = - buildMypyBoto3Package "cloudtrail" "1.36.0" - "sha256-ZPxfq5J7Vm/dGMAdyKiQskaJ3DyQcg/6DjsjxLqJx4Y="; + buildMypyBoto3Package "cloudtrail" "1.36.6" + "sha256-vL2HIQS5Z2yQjSJMoFAfu44ijka8zUCEypeyA/Hi0Fc="; mypy-boto3-cloudtrail-data = buildMypyBoto3Package "cloudtrail-data" "1.36.0" From cf9b192a70995a3f43f61182df0fd2f777e95cd1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jan 2025 09:41:49 +0100 Subject: [PATCH 119/219] python312Packages.mypy-boto3-eks: 1.36.0 -> 1.36.6 --- 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 4794b76de255..842f22fd316b 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -470,8 +470,8 @@ rec { "sha256-5xK6JX8tM+3EDHC5Ma4G6fGYSf/9Q1V7O2YS+E20HOo="; mypy-boto3-eks = - buildMypyBoto3Package "eks" "1.36.0" - "sha256-G4kIlOE/2SYhP0JzX0jmu3al7UbU0wwTx/lVAP19JQ0="; + buildMypyBoto3Package "eks" "1.36.6" + "sha256-XmOg80pQ9TTSBbpIEABm/fST0yGyLYZCm4XO+1CwLcw="; mypy-boto3-elastic-inference = buildMypyBoto3Package "elastic-inference" "1.36.0" From af5b8aec3c0a48a718e52e8382aaaf40aebb521d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jan 2025 09:42:00 +0100 Subject: [PATCH 120/219] python312Packages.mypy-boto3-healthlake: 1.36.0 -> 1.36.6 --- 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 842f22fd316b..15c8a18f2aee 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -602,8 +602,8 @@ rec { "sha256-EofHk2ODs/ARQ8wYlKtIEkSyreK0oNnY2XaAqXJ+jJw="; mypy-boto3-healthlake = - buildMypyBoto3Package "healthlake" "1.36.0" - "sha256-hhnoxBkT9GNYe5TPlRcsC7CHhq3Zqw6f3jL1LguwmQM="; + buildMypyBoto3Package "healthlake" "1.36.6" + "sha256-5qJo7cHwuGBFz8B9x8C9JZUc5hb+UbmKV2SZHEZ3WzE="; mypy-boto3-iam = buildMypyBoto3Package "iam" "1.36.0" From 867e60522968a0b167b6464d45bd7a655edc3b88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jan 2025 09:42:51 +0100 Subject: [PATCH 121/219] python312Packages.mypy-boto3-ssm: 1.36.0 -> 1.36.6 --- 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 15c8a18f2aee..ebaa4c09fda9 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1294,8 +1294,8 @@ rec { "sha256-p/kB20Mw0WpJyhE8MVQRkQbj2zT7J/6+vuEpl4aBUUM="; mypy-boto3-ssm = - buildMypyBoto3Package "ssm" "1.36.0" - "sha256-u7mpzg4xjK0qU/ggAQK0/cVHx/M5EhRt+CaYya5AGB8="; + buildMypyBoto3Package "ssm" "1.36.6" + "sha256-7cgZt1Jqs1sQVkhgODnRWLABRq9XQ/x3hNsyJwc+GXM="; mypy-boto3-ssm-contacts = buildMypyBoto3Package "ssm-contacts" "1.36.0" From 956bfa36edc2e4f8d1fa53e8f9592d4ef4658637 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jan 2025 09:42:53 +0100 Subject: [PATCH 122/219] python312Packages.mypy-boto3-sso-oidc: 1.36.0 -> 1.36.6 --- 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 ebaa4c09fda9..6f929704deef 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1318,8 +1318,8 @@ rec { "sha256-SdY+ZIHzE7P2riMhr9MbiPISKx8eK0uXH8R8eSFY7Yo="; mypy-boto3-sso-oidc = - buildMypyBoto3Package "sso-oidc" "1.36.0" - "sha256-4YCnPVxaK/HwAQnfhgK8nHYqSo2YJez5jpWlByhtKz4="; + buildMypyBoto3Package "sso-oidc" "1.36.6" + "sha256-beQp4GmS7la2xDmHNnhuyAFeoZ4UIJ7xTS/qEedAfnQ="; mypy-boto3-stepfunctions = buildMypyBoto3Package "stepfunctions" "1.36.0" From 98971164276d854a3f6ec286f78866387599a079 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jan 2025 09:42:58 +0100 Subject: [PATCH 123/219] python312Packages.mypy-boto3-transfer: 1.36.0 -> 1.36.6 --- 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 6f929704deef..36c2a05eeb59 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1370,8 +1370,8 @@ rec { "sha256-LOMhyKiJ5K1AHzGmcV+GXLUsKyc8mX6zYguh3UZgzNM="; mypy-boto3-transfer = - buildMypyBoto3Package "transfer" "1.36.0" - "sha256-UNXQ8UPxPBEChjLf54CWE9rDFMi/BiOXdbou/pOsHdg="; + buildMypyBoto3Package "transfer" "1.36.6" + "sha256-i+bqPZy3UkWbXBA6nW0HxaXq+v6Nky0yS1khYfF/H4o="; mypy-boto3-translate = buildMypyBoto3Package "translate" "1.36.0" From 2fc3545aac163dd601f928814f1799ff5d0387f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 08:43:37 +0000 Subject: [PATCH 124/219] python312Packages.coffea: 2025.1.0 -> 2025.1.1 --- pkgs/development/python-modules/coffea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index d4d1a9f2a17f..5e61b17c5c2d 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "coffea"; - version = "2025.1.0"; + version = "2025.1.1"; pyproject = true; src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; tag = "v${version}"; - hash = "sha256-l/HjTX3zm1jquAhuvNNI+oaC7TbaICNnmfqXxBNlaic="; + hash = "sha256-AGYi1w4e8XJOWRbuPX5eB/rTY5dCPji49zD0VQ4FvAs="; }; build-system = [ From f4858f7169ed4a251f52300138eef41f52d53b9c Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Sat, 25 Jan 2025 10:03:21 +0100 Subject: [PATCH 125/219] pcloud: 1.14.8 -> 1.14.9 --- pkgs/by-name/pc/pcloud/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index c075971d15dc..a5e0e960993b 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -38,13 +38,13 @@ let pname = "pcloud"; - version = "1.14.8"; - code = "XZxqNX5Z7nKd4XMTlkbMbnuRDuhyfL1g5efk"; + version = "1.14.9"; + code = "XZjcLF5ZnbPpMxAlI5FuU39vntbjAhMhVEVV"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-+uWvaNA9mCF9vkBbNnsak+h11mcl9QBamBhMzt68Rfc="; + hash = "sha256-9YgXF2oAbIN8k33wveCPnc4fU3mYv1RB2/jeHmbockY="; }; appimageContents = appimageTools.extractType2 { From 85cf27e78cae80cfc1c2d8bf95f52a1b69d781f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jan 2025 10:07:50 +0100 Subject: [PATCH 126/219] python313Packages.wsdiscovery: 2.0.0 -> 2.1.2 Diff: https://github.com/andreikop/python-ws-discovery/compare/2.0.0...v2.1.2 --- .../python-modules/wsdiscovery/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/wsdiscovery/default.nix b/pkgs/development/python-modules/wsdiscovery/default.nix index 9d5d1e884cb4..7af12d7689fe 100644 --- a/pkgs/development/python-modules/wsdiscovery/default.nix +++ b/pkgs/development/python-modules/wsdiscovery/default.nix @@ -7,23 +7,26 @@ netifaces, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "wsdiscovery"; - version = "2.0.0"; - format = "setuptools"; + version = "2.1.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "andreikop"; repo = "python-ws-discovery"; - rev = version; + rev = "v${version}"; hash = "sha256-6LGZogNRCnmCrRXvHq9jmHwqW13KQPpaGaao/52JPtk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ click netifaces ]; @@ -38,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "WS-Discovery implementation for Python"; homepage = "https://github.com/andreikop/python-ws-discovery"; - license = with licenses; [ lgpl3Plus ]; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ fab ]; }; } From f2eba4bb22ae29863c1ca5e0ecf2aa84b30f6697 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 09:11:38 +0000 Subject: [PATCH 127/219] iplookup-gtk: 0.3.4 -> 0.4.0 --- pkgs/by-name/ip/iplookup-gtk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ip/iplookup-gtk/package.nix b/pkgs/by-name/ip/iplookup-gtk/package.nix index 3d2486fe5b98..2efdca4256c5 100644 --- a/pkgs/by-name/ip/iplookup-gtk/package.nix +++ b/pkgs/by-name/ip/iplookup-gtk/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonPackage rec { pname = "iplookup-gtk"; - version = "0.3.4"; + version = "0.4.0"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Bytezz"; repo = "IPLookup-gtk"; - rev = "v${version}"; - hash = "sha256-NqFE6vRdLpnlCzGAUE4iOfLmTnUgX3CHtoXfsbT3zm4="; + tag = "v${version}"; + hash = "sha256-pO05WDNb9AMKXm8OqzOnk77T5sLBdURV90FgQKL9oAw="; }; nativeBuildInputs = [ From 65d353e44af670dcf1f084cba22f7eb01bd61a71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 09:48:23 +0000 Subject: [PATCH 128/219] syshud: 0-unstable-2024-11-25 -> 0-unstable-2025-01-13 --- pkgs/by-name/sy/syshud/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix index 8702978a8602..ea7423fcf116 100644 --- a/pkgs/by-name/sy/syshud/package.nix +++ b/pkgs/by-name/sy/syshud/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "syshud"; - version = "0-unstable-2024-11-25"; + version = "0-unstable-2025-01-13"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syshud"; - rev = "922d3fbc811644cb14d0f11cff91f8e8f97eca56"; - hash = "sha256-ubsmkC/mjDe/6AH/2Y6e9CmhBX3CxtOW2xOhvPJiAqg="; + rev = "ca5c05145d440c7e96a3521af327da91bb1ac539"; + hash = "sha256-mglmmIZz1bbRT15/Xr1vrYBy+PVgIaKpjRfAAFT5OcQ="; }; postPatch = '' From 6ed1578a94243438520848e7335a5ce107b681b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 09:52:37 +0000 Subject: [PATCH 129/219] remnote: 1.18.28 -> 1.18.39 --- pkgs/by-name/re/remnote/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 761efd08df0a..55a1608067d2 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.18.28"; + version = "1.18.39"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-ixKZwwqk93pc8N+DJe2H7oyjf0+u7kQRDRFOm2VbJZs="; + hash = "sha256-YDRXXS0nNiPdchcCUiKD0pE4duE0LFzdZ5GkYcddsD8="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in From a40b4b76efaa069d65a1a0d78d8df8c9a6cd693d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 25 Jan 2025 11:12:54 +0100 Subject: [PATCH 130/219] libcli: 1.9.7 -> 1.10.7 --- pkgs/by-name/li/libcli/package.nix | 39 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/li/libcli/package.nix b/pkgs/by-name/li/libcli/package.nix index 71aca93bf84b..afc41038077a 100644 --- a/pkgs/by-name/li/libcli/package.nix +++ b/pkgs/by-name/li/libcli/package.nix @@ -2,47 +2,48 @@ lib, stdenv, fetchFromGitHub, - fetchurl, + fetchDebianPatch, libxcrypt, }: stdenv.mkDerivation rec { pname = "libcli"; - version = "1.9.7"; + version = "1.10.7"; src = fetchFromGitHub { - sha256 = "08pmjhqkwldhmcwjhi2l27slf1fk6nxxfaihnk2637pqkycy8z0c"; - rev = "v${version}"; - repo = "libcli"; owner = "dparrish"; + repo = "libcli"; + rev = "V${version}"; + hash = "sha256-ItmZfclx2mprKUOk/MwlS2w4f0ukiiPA5/QaRdGfEO8="; }; patches = [ - (fetchurl { - url = "https://github.com/dparrish/libcli/commit/ebc5a09db457ee1be9996711463cbbafe5ea72d5.patch"; - sha256 = "0szjiw3gd7by1sv924shnngfxvc98xvaqvx228b575xq93xxjcwl"; + (fetchDebianPatch { + pname = "libcli"; + version = "1.10.7"; + debianRevision = "2"; + patch = "02-fix-transposed-calloc-args"; + hash = "sha256-lSZeg5h+LUIGa4DnkAmwIEs+tctCYs/tuY63hbBUjuw="; }) ]; - buildInputs = [ libxcrypt ]; + buildInputs = [ + libxcrypt + ]; enableParallelBuilding = true; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" - "PREFIX=$(out)" + "PREFIX=${placeholder "out"}" ]; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=address" - ]; - - meta = with lib; { + meta = { description = "Emulate a Cisco-style telnet command-line interface"; - homepage = "http://sites.dparrish.com/libcli"; - license = licenses.lgpl21Plus; - platforms = platforms.all; + homepage = "https://dparrish.com/pages/libcli"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ wegank ]; + platforms = lib.platforms.linux; }; } From f4ce941ec47588b78a1101ef3a017d678e0a4a60 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 25 Jan 2025 11:14:37 +0100 Subject: [PATCH 131/219] netsniff-ng: 0.6.8 -> 0.6.9 --- pkgs/by-name/ne/netsniff-ng/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ne/netsniff-ng/package.nix b/pkgs/by-name/ne/netsniff-ng/package.nix index 98fbc042a64c..8489627e329c 100644 --- a/pkgs/by-name/ne/netsniff-ng/package.nix +++ b/pkgs/by-name/ne/netsniff-ng/package.nix @@ -16,19 +16,18 @@ liburcu, ncurses, pkg-config, - gnumake42, zlib, }: stdenv.mkDerivation rec { pname = "netsniff-ng"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { - repo = pname; - owner = pname; + repo = "netsniff-ng"; + owner = "netsniff-ng"; rev = "v${version}"; - sha256 = "10ih8amaqspy0zwg7hqvypa1v7ixpjl0n608cyfgyfzffp73lbqf"; + hash = "sha256-P1xZqhZ/HJV3fAvh4xhhApZ0+FLDFqvYrZlbvb+FV7I="; }; nativeBuildInputs = [ @@ -36,7 +35,6 @@ stdenv.mkDerivation rec { flex makeWrapper pkg-config - gnumake42 # fails with make 4.4 ]; buildInputs = [ From 0194f3f62ddf87c8e9124adb7dd5a9e214b136fc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 11:18:23 +0100 Subject: [PATCH 132/219] cargo-kcov: remove 6 years since the last upstream commit. Lockfile is too old for fetchCargoVendor. --- pkgs/by-name/ca/cargo-kcov/package.nix | 40 -------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/by-name/ca/cargo-kcov/package.nix diff --git a/pkgs/by-name/ca/cargo-kcov/package.nix b/pkgs/by-name/ca/cargo-kcov/package.nix deleted file mode 100644 index aa2adfe12dfe..000000000000 --- a/pkgs/by-name/ca/cargo-kcov/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - makeWrapper, - kcov, -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-kcov"; - version = "0.5.2"; - - src = fetchFromGitHub { - owner = "kennytm"; - repo = pname; - rev = "v${version}"; - sha256 = "0hqplgj3i8js42v2kj44khk543a93sk3n6wlfpv3c84pdqlm29br"; - }; - - cargoHash = "sha256-cgnTf4KKthO1HvjFCjoZw7eCTqsbobHW5Kjx/6V3r1Q="; - doCheck = false; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/cargo-kcov \ - --prefix PATH : ${lib.makeBinPath [ kcov ]} - ''; - - meta = with lib; { - description = "Cargo subcommand to run kcov to get coverage report on Linux"; - mainProgram = "cargo-kcov"; - homepage = "https://github.com/kennytm/cargo-kcov"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ - saschagrunert - matthiasbeyer - ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..53f5bd17204f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -200,6 +200,7 @@ mapAliases { canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17 cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09 cargo-espflash = espflash; + cargo-kcov = throw "'cargo-kcov' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; certmgr-selfsigned = certmgr; # Added 2023-11-30 cgal_4 = throw "cgal_4 has been removed as it is obsolete use cgal instead"; # Added 2024-12-30 From 62115f083401ee952deffc2cb9c61ac01af4205b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 10:21:44 +0000 Subject: [PATCH 133/219] vimPlugins.avante-nvim: 0.0.14 -> 0.0.15 --- .../vim/plugins/non-generated/avante-nvim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index 9fcd587ae0fc..b94df5bb8dfd 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -10,18 +10,18 @@ vimUtils, }: let - version = "0.0.14"; + version = "0.0.15"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; tag = "v${version}"; - hash = "sha256-0dkPejvupXhVZY/5qT45f4LZ4MIVcz8uZam+9TmB+Yo="; + hash = "sha256-REFF+4U0AjNwiK1ecbDPwF7C1jKRzITV29aolx+HI24="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; inherit version src; - cargoHash = "sha256-80++U7CIu6QtH1jQCHCEpv2tnYOuoWSczZIUmKyrqJE="; + cargoHash = "sha256-7W7uuyzqTTlvZAkeRYRIfkxYVbOv5h7elH8noZe1VMQ="; nativeBuildInputs = [ pkg-config From 1f2758af98b3b4b188ce974eb3a207c2a151b662 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sat, 25 Jan 2025 05:25:22 -0500 Subject: [PATCH 134/219] phoc: migrate to by-name --- .../misc/phoc/default.nix => by-name/ph/phoc/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/misc/phoc/default.nix => by-name/ph/phoc/package.nix} (97%) diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/by-name/ph/phoc/package.nix similarity index 97% rename from pkgs/applications/misc/phoc/default.nix rename to pkgs/by-name/ph/phoc/package.nix index 19dc0653c753..eb5d3c32b3c5 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/by-name/ph/phoc/package.nix @@ -18,7 +18,7 @@ , wayland , libdrm , libxkbcommon -, wlroots +, wlroots_0_17 , xorg , directoryListingUpdater , nixosTests @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { # Patch wlroots to remove a check which crashes Phosh. # This patch can be found within the phoc source tree. - wlroots = wlroots.overrideAttrs (old: { + wlroots = wlroots_0_17.overrideAttrs (old: { patches = (old.patches or []) ++ [ (stdenvNoCC.mkDerivation { name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5750b99a5dc1..7cb482bc375f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4669,10 +4669,6 @@ with pkgs; pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; - phoc = callPackage ../applications/misc/phoc { - wlroots = wlroots_0_17; - }; - piper-train = callPackage ../tools/audio/piper/train.nix { }; piper-tts = callPackage ../tools/audio/piper { }; From 9bec16ff494005b59c41d731015a5b14cc552e7c Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sat, 25 Jan 2025 05:26:42 -0500 Subject: [PATCH 135/219] phoc: format with nixfmt --- pkgs/by-name/ph/phoc/package.nix | 62 +++++++++++++++++--------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/ph/phoc/package.nix b/pkgs/by-name/ph/phoc/package.nix index eb5d3c32b3c5..00460210ec8d 100644 --- a/pkgs/by-name/ph/phoc/package.nix +++ b/pkgs/by-name/ph/phoc/package.nix @@ -1,29 +1,30 @@ -{ lib -, stdenv -, stdenvNoCC -, fetchFromGitLab -, meson -, ninja -, pkg-config -, python3 -, wayland-scanner -, wrapGAppsHook3 -, libinput -, gobject-introspection -, mutter -, gnome-desktop -, glib -, gtk3 -, json-glib -, wayland -, libdrm -, libxkbcommon -, wlroots_0_17 -, xorg -, directoryListingUpdater -, nixosTests -, testers -, gmobile +{ + lib, + stdenv, + stdenvNoCC, + fetchFromGitLab, + meson, + ninja, + pkg-config, + python3, + wayland-scanner, + wrapGAppsHook3, + libinput, + gobject-introspection, + mutter, + gnome-desktop, + glib, + gtk3, + json-glib, + wayland, + libdrm, + libxkbcommon, + wlroots_0_17, + xorg, + directoryListingUpdater, + nixosTests, + testers, + gmobile, }: stdenv.mkDerivation (finalAttrs: { @@ -65,12 +66,12 @@ stdenv.mkDerivation (finalAttrs: { gmobile ]; - mesonFlags = ["-Dembed-wlroots=disabled"]; + mesonFlags = [ "-Dembed-wlroots=disabled" ]; # Patch wlroots to remove a check which crashes Phosh. # This patch can be found within the phoc source tree. wlroots = wlroots_0_17.overrideAttrs (old: { - patches = (old.patches or []) ++ [ + patches = (old.patches or [ ]) ++ [ (stdenvNoCC.mkDerivation { name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"; inherit (finalAttrs) src; @@ -94,7 +95,10 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "phoc"; homepage = "https://gitlab.gnome.org/World/Phosh/phoc"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ masipcat zhaofengli ]; + maintainers = with maintainers; [ + masipcat + zhaofengli + ]; platforms = platforms.linux; }; }) From cdd3a6378dcffc5be26bc540edcbc8711ce5d8d9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 11:27:14 +0100 Subject: [PATCH 136/219] diskonaut: remove 3 years since the last upstream commit. Lockfile is too old for fetchCargoVendor. --- pkgs/by-name/di/diskonaut/package.nix | 34 --------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/by-name/di/diskonaut/package.nix diff --git a/pkgs/by-name/di/diskonaut/package.nix b/pkgs/by-name/di/diskonaut/package.nix deleted file mode 100644 index 36ddb1488f97..000000000000 --- a/pkgs/by-name/di/diskonaut/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromGitHub, -}: - -rustPlatform.buildRustPackage rec { - pname = "diskonaut"; - version = "0.11.0"; - - src = fetchFromGitHub { - owner = "imsnif"; - repo = "diskonaut"; - rev = version; - sha256 = "1pmbag3r2ka30zmy2rs9jps2qxj2zh0gy4a774v9yhf0b6qjid54"; - }; - - cargoHash = "sha256-S/ne3iTEnlA3AqcPg3geLzV4bYVuYPjMCITSVJFnWYI="; - - # 1 passed; 44 failed https://hydra.nixos.org/build/148943783/nixlog/1 - doCheck = !stdenv.hostPlatform.isDarwin; - - meta = with lib; { - description = "Terminal disk space navigator"; - homepage = "https://github.com/imsnif/diskonaut"; - license = licenses.mit; - maintainers = with maintainers; [ - evanjs - figsoda - ]; - mainProgram = "diskonaut"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..fb4bf636cc9d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -301,6 +301,7 @@ mapAliases { dgsh = throw "'dgsh' has been removed, as it was broken and unmaintained"; # added 2024-05-09 dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14 dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07 + diskonaut = throw "'diskonaut' was removed due to lack of upstream maintenance"; # Added 2025-01-25 dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17 dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02 From dc27a816186e0f6b6a9d702e6fc93b03dba355c3 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sat, 25 Jan 2025 05:28:23 -0500 Subject: [PATCH 137/219] phoc: 0.44.0 -> 0.44.1 --- pkgs/by-name/ph/phoc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ph/phoc/package.nix b/pkgs/by-name/ph/phoc/package.nix index 00460210ec8d..084542190c57 100644 --- a/pkgs/by-name/ph/phoc/package.nix +++ b/pkgs/by-name/ph/phoc/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "phoc"; - version = "0.44.0"; + version = "0.44.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Phosh"; repo = "phoc"; rev = "v${finalAttrs.version}"; - hash = "sha256-KaCQtORMJUM7/BLD+Jnbunhd/9/3NYWYx/XMYMo27hI="; + hash = "sha256-Whke7wTRp5NaRauiiQZLjs0pSD1uAyr0aAhlK5e1+Hw="; }; nativeBuildInputs = [ From 9683e94ff5556a78e36465464cebf18b5b949222 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 11:33:29 +0100 Subject: [PATCH 138/219] epilys-bb: unstable-2020-12-04 -> 0.4.4 Untested; required for fetchCargoVendor compatibility. --- pkgs/by-name/ep/epilys-bb/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ep/epilys-bb/package.nix b/pkgs/by-name/ep/epilys-bb/package.nix index c30a2865f693..db5fba6a6008 100644 --- a/pkgs/by-name/ep/epilys-bb/package.nix +++ b/pkgs/by-name/ep/epilys-bb/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "epilys-bb"; - version = "unstable-2020-12-04"; + version = "0.4.4"; src = fetchFromGitHub { owner = "epilys"; repo = "bb"; - rev = "c903d4c2975509299fd3d2600a0c4c2102f445d0"; - hash = "sha256-KOXK+1arUWtu/QU7dwXhojIM0faMtwNN3AqVbofq1lY="; + rev = "v${version}"; + hash = "sha256-szeEBiolg2rVD2XZoNrncUYnA8KPhWwhQPYsjuxp904="; }; - cargoHash = "sha256-+aCMwKOg+3HDntG14gjJLec8XD51wuTyYyzLjuW6lbY="; + cargoHash = "sha256-hQuWRcg9dWYYaHXxocJ+XG1K7aTWLhR2RZVUc4geJLI="; meta = with lib; { description = "Clean, simple, and fast process viewer"; From 462666cb8e303a0465543273b10bfa535a0d9b64 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 11:34:55 +0100 Subject: [PATCH 139/219] epilys-bb: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/by-name/ep/epilys-bb/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ep/epilys-bb/package.nix b/pkgs/by-name/ep/epilys-bb/package.nix index db5fba6a6008..3fb42e80a170 100644 --- a/pkgs/by-name/ep/epilys-bb/package.nix +++ b/pkgs/by-name/ep/epilys-bb/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-szeEBiolg2rVD2XZoNrncUYnA8KPhWwhQPYsjuxp904="; }; - cargoHash = "sha256-hQuWRcg9dWYYaHXxocJ+XG1K7aTWLhR2RZVUc4geJLI="; + useFetchCargoVendor = true; + cargoHash = "sha256-xUNvVG5jdAXsro2P8je3LFxqMycJEB4j7w3abf6jilw="; meta = with lib; { description = "Clean, simple, and fast process viewer"; From 1d721acb10358ce4d6caccb48ead3ae22220fb27 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Sat, 25 Jan 2025 10:36:28 +0000 Subject: [PATCH 140/219] nerd-font-patcher: 3.2.1 -> 3.3.0 --- pkgs/by-name/ne/nerd-font-patcher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nerd-font-patcher/package.nix b/pkgs/by-name/ne/nerd-font-patcher/package.nix index 83ada71e8e35..0cc66507523e 100644 --- a/pkgs/by-name/ne/nerd-font-patcher/package.nix +++ b/pkgs/by-name/ne/nerd-font-patcher/package.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "nerd-font-patcher"; - version = "3.2.1"; + version = "3.3.0"; src = fetchzip { url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/FontPatcher.zip"; - sha256 = "sha256-3s0vcRiNA/pQrViYMwU2nnkLUNUcqXja/jTWO49x3BU="; + sha256 = "sha256-/LbO8+ZPLFIUjtZHeyh6bQuplqRfR6SZRu9qPfVZ0Mw="; stripRoot = false; }; From 8eb32e4f73403a2f4f7e8a0997b9c0cc2bf8d19f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 11:40:46 +0100 Subject: [PATCH 141/219] fornalder: remove 3 years since the last upstream commit. --- pkgs/by-name/fo/fornalder/package.nix | 39 --------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/by-name/fo/fornalder/package.nix diff --git a/pkgs/by-name/fo/fornalder/package.nix b/pkgs/by-name/fo/fornalder/package.nix deleted file mode 100644 index 84b88da240fe..000000000000 --- a/pkgs/by-name/fo/fornalder/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - makeWrapper, - gnuplot, -}: - -rustPlatform.buildRustPackage rec { - pname = "fornalder"; - version = "unstable-2022-12-25"; - - src = fetchFromGitHub { - owner = "hpjansson"; - repo = pname; - rev = "3248128fe320d88183d17a65e936092e07d6529b"; - sha256 = "sha256-IPSxVWJs4EhyBdA1NXpD8v3fusewt1ELpn/kbZt7c5Q="; - }; - - cargoHash = "sha256-eK+oQbOQj8pKiOTXzIgRjzVB7Js8MMa9V6cF9D98Ftc="; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/fornalder \ - --suffix PATH : ${lib.makeBinPath [ gnuplot ]} - ''; - - meta = with lib; { - description = "Visualize long-term trends in collections of Git repositories"; - homepage = "https://github.com/hpjansson/fornalder"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ - astro - figsoda - ]; - mainProgram = "fornalder"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..1008d04e1971 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -409,6 +409,7 @@ mapAliases { fmt_8 = throw "fmt_8 has been removed as it is obsolete and was no longer used in the tree"; # Added 2024-11-12 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 + fornalder = throw "'fornalder' has been removed as it is unmaintained upstream"; # Added 2025-01-25 foundationdb71 = throw "foundationdb71 has been removed; please upgrade to foundationdb73"; # Added 2024-12-28 fractal-next = fractal; # added 2023-11-25 From 2d7efdc44e223ecff1eac46357a3521610ff99d3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 11:42:23 +0100 Subject: [PATCH 142/219] git-codeowners: remove 5 years since the last upstream commit. Lockfile is too old for fetchCargoVendor. --- pkgs/by-name/gi/git-codeowners/package.nix | 26 ---------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 pkgs/by-name/gi/git-codeowners/package.nix diff --git a/pkgs/by-name/gi/git-codeowners/package.nix b/pkgs/by-name/gi/git-codeowners/package.nix deleted file mode 100644 index b206a4312c80..000000000000 --- a/pkgs/by-name/gi/git-codeowners/package.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, -}: -rustPlatform.buildRustPackage rec { - pname = "git-codeowners"; - version = "0.1.2"; - - src = fetchFromGitHub { - owner = "softprops"; - repo = "git-codeowners"; - rev = "v${version}"; - hash = "sha256-eF6X+fLkQ8lZIk4WPzlW7l05P90gB5nxD5Ss32Im+C8="; - }; - - cargoHash = "sha256-TayvqcVNCFHF5UpR1pPVRe076Pa8LS4duhnZLzYxkQM="; - - meta = with lib; { - homepage = "https://github.com/softprops/git-codeowners"; - description = "Git extension to work with CODEOWNERS files"; - license = licenses.mit; - maintainers = with maintainers; [ zimbatm ]; - mainProgram = "git-codeowners"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..b571c5e7a88a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -453,6 +453,7 @@ mapAliases { gfortran7 = throw "gfortran7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20 gfortran8 = throw "gfortran8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 + git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28 gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14 gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 From c561dd1463a778aae252f41fbd6f077979d1d165 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 11:43:27 +0100 Subject: [PATCH 143/219] hacksaw: remove 5 years since the last upstream commit. Lockfile is too old for fetchCargoVendor. --- pkgs/by-name/ha/hacksaw/package.nix | 40 ----------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/by-name/ha/hacksaw/package.nix diff --git a/pkgs/by-name/ha/hacksaw/package.nix b/pkgs/by-name/ha/hacksaw/package.nix deleted file mode 100644 index ddf703433b11..000000000000 --- a/pkgs/by-name/ha/hacksaw/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - fetchCrate, - rustPlatform, - pkg-config, - libXrandr, - libX11, - python3, -}: - -rustPlatform.buildRustPackage rec { - pname = "hacksaw"; - version = "1.0.4"; - - nativeBuildInputs = [ - pkg-config - python3 - ]; - - buildInputs = [ - libXrandr - libX11 - ]; - - src = fetchCrate { - inherit pname version; - hash = "sha256-HRYTiccXU8DboAwZAr2gfzXUs8igSiFDpOEGtHpI0dA="; - }; - - cargoHash = "sha256-CDDJmWnAcXJ4wPfSPvu2DfthaFwZGZk1XXMNTA1g0+c="; - - meta = with lib; { - description = "Lightweight selection tool for usage in screenshot scripts etc"; - homepage = "https://github.com/neXromancers/hacksaw"; - license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ TethysSvensson ]; - platforms = platforms.linux; - mainProgram = "hacksaw"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..cbb0c7a79172 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -559,6 +559,7 @@ mapAliases { ### H ### + hacksaw = throw "'hacksaw' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 HentaiAtHome = hentai-at-home; # Added 2024-06-12 hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21 hop-cli = throw "hop-cli has been removed as the service has been shut-down"; # Added 2024-08-13 From 13c36449d87fd1f932687c746785c780b7c7a8e4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 11:50:54 +0100 Subject: [PATCH 144/219] loop: remove 5 years since the last upstream commit. Lockfile is too old for fetchCargoVendor. --- pkgs/by-name/lo/loop/package.nix | 27 --------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/by-name/lo/loop/package.nix diff --git a/pkgs/by-name/lo/loop/package.nix b/pkgs/by-name/lo/loop/package.nix deleted file mode 100644 index 805069f33e09..000000000000 --- a/pkgs/by-name/lo/loop/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage { - pname = "loop"; - version = "unstable-2020-07-08"; - - src = fetchFromGitHub { - owner = "Miserlou"; - repo = "Loop"; - rev = "944df766ddecd7a0d67d91cc2dfda8c197179fb0"; - sha256 = "0v61kahwk1kdy8pb40rjnzcxby42nh02nyg9jqqpx3vgdrpxlnix"; - }; - - cargoHash = "sha256-sceS/2qxiV16VP8E3M39MYnGiCbq0rrnehsV/SuHZl4="; - - meta = with lib; { - description = "UNIX's missing `loop` command"; - homepage = "https://github.com/Miserlou/Loop"; - maintainers = with maintainers; [ koral ]; - license = licenses.mit; - mainProgram = "loop"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..681d5e02f428 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -815,6 +815,7 @@ mapAliases { llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08 lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17 + loop = throw "'loop' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 lsh = throw "lsh has been removed as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decade"; # Added 2024-08-14 luna-icons = throw "luna-icons has been removed as it was removed upstream"; # Added 2024-10-29 lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 From 561270c9474ff03128d63802aeb6f8b6b74c8189 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 11:52:51 +0100 Subject: [PATCH 145/219] mq-cli: remove 7 years since the last upstream commit. Lockfile is too old for fetchCargoVendor. --- pkgs/by-name/mq/mq-cli/package.nix | 28 ---------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/by-name/mq/mq-cli/package.nix diff --git a/pkgs/by-name/mq/mq-cli/package.nix b/pkgs/by-name/mq/mq-cli/package.nix deleted file mode 100644 index 1e3867616505..000000000000 --- a/pkgs/by-name/mq/mq-cli/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - fetchFromGitHub, - lib, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "mq-cli"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "aprilabank"; - repo = "mq-cli"; - rev = "v${version}"; - sha256 = "02z85waj5jc312biv2qhbgplsggxgjmfmyv9v8b1ky0iq1mpxjw7"; - }; - - cargoHash = "sha256-kZox1QhMPFC5l8mJNxh6C3tiNYMgfmLyWLhkdigEs6Y="; - - meta = with lib; { - description = "CLI tool to manage POSIX message queues"; - homepage = "https://github.com/aprilabank/mq-cli"; - license = licenses.mit; - maintainers = with maintainers; [ tazjin ]; - platforms = platforms.linux; - mainProgram = "mq"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..b8c055e88889 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -888,6 +888,7 @@ mapAliases { mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17 mpdevil = plattenalbum; # Added 2024-05-22 mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10 + mq-cli = throw "'mq-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 mrkd = throw "'mrkd' has been removed as it is unmaintained since 2021"; # Added 2024-12-21 msp430NewlibCross = msp430Newlib; # Added 2024-09-06 mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22 From 3ed845f4bc02329c6531345f1fa5460e41e3bafa Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 12:06:22 +0100 Subject: [PATCH 146/219] pio: remove 2 years since the last upstream commit. --- pkgs/by-name/pi/pio/package.nix | 34 --------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/by-name/pi/pio/package.nix diff --git a/pkgs/by-name/pi/pio/package.nix b/pkgs/by-name/pi/pio/package.nix deleted file mode 100644 index 69e9c2ff06f6..000000000000 --- a/pkgs/by-name/pi/pio/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - stdenv, - darwin, -}: - -rustPlatform.buildRustPackage rec { - pname = "pio"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "siiptuo"; - repo = "pio"; - rev = version; - hash = "sha256-iR6G+G1UOT1ThLI3yhz3na1HmN6z2qUiI6NSKT0krtY="; - }; - - cargoHash = "sha256-jVOpk+Z3yEEoDexvxT9I0aVHJKVq47y8km/9ltoqrDA="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Accelerate - ]; - - meta = with lib; { - description = "Utility to compress image files while maintaining quality"; - homepage = "https://github.com/siiptuo/pio"; - changelog = "https://github.com/siiptuo/pio/blob/${version}/CHANGELOG.md"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ liassica ]; - mainProgram = "pio"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..dcd8768ea685 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1071,6 +1071,7 @@ mapAliases { picom-next = picom; # Added 2024-02-13 pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20 + pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25 pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28 pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17 From bd79174ba2ceea11d2dc9b03948dc210148b8dda Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 12:09:43 +0100 Subject: [PATCH 147/219] rargs: remove 5 years since the last upstream commit. Lockfile is too old for fetchCargoVendor. --- pkgs/by-name/ra/rargs/package.nix | 29 ----------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 pkgs/by-name/ra/rargs/package.nix diff --git a/pkgs/by-name/ra/rargs/package.nix b/pkgs/by-name/ra/rargs/package.nix deleted file mode 100644 index 1b465e5071b5..000000000000 --- a/pkgs/by-name/ra/rargs/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, -}: - -rustPlatform.buildRustPackage rec { - pname = "rargs"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "lotabout"; - repo = pname; - rev = "v${version}"; - sha256 = "188gj05rbivci1z4z29vwdwxlj2w01v5i4avwrxjnj1dd6mmlbxd"; - }; - - cargoHash = "sha256-cPfuABjn62Wuxtk8nQlGcLpiPe7/kqNr4IZ7+W8jzaM="; - - doCheck = false; # `rargs`'s test depends on the deprecated `assert_cli` crate, which in turn is not in Nixpkgs - - meta = with lib; { - description = "xargs + awk with pattern matching support"; - homepage = "https://github.com/lolabout/rargs"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ pblkt ]; - mainProgram = "rargs"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..dc43ace28a76 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1179,6 +1179,7 @@ mapAliases { railway-travel = diebahn; # Added 2024-04-01 rambox-pro = rambox; # Added 2022-12-12 rapidjson-unstable = lib.warnOnInstantiate "'rapidjson-unstable' has been renamed to 'rapidjson'" rapidjson; # Added 2024-07-28 + rargs = throw "'rargs' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 redocly-cli = redocly; # Added 2024-04-14 redpanda = redpanda-client; # Added 2023-10-14 redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10 From 2e069ef1f718677ea5240a900ff3d5f95aae11ce Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 12:20:28 +0100 Subject: [PATCH 148/219] rnix-hashes: remove Upstream repo has been archived since 2022. Lockfile is too old for fetchCargoVendor. --- pkgs/by-name/rn/rnix-hashes/package.nix | 39 ------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/by-name/rn/rnix-hashes/package.nix diff --git a/pkgs/by-name/rn/rnix-hashes/package.nix b/pkgs/by-name/rn/rnix-hashes/package.nix deleted file mode 100644 index 12144247e290..000000000000 --- a/pkgs/by-name/rn/rnix-hashes/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - fetchpatch, -}: - -rustPlatform.buildRustPackage rec { - pname = "rnix-hashes"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "numtide"; - repo = pname; - rev = "v${version}"; - sha256 = "SzHyG5cEjaaPjTkn8puht6snjHMl8DtorOGDjxakJfA="; - }; - - patches = [ - # fix test failure - (fetchpatch { - url = "https://github.com/numtide/rnix-hashes/commit/62ab96cfd1efeade7d98efd9829eae8677bac9cc.patch"; - sha256 = "sha256-oE2fBt20FmO2cEUGivu2mKo3z6rbhVLXSF8SRvhibFs="; - }) - ]; - - cargoHash = "sha256-p6W9NtOKzVViyFq5SQvnIsik7S3mqUqxI/05OiC+P+Q="; - - meta = with lib; { - description = "Nix Hash Converter"; - mainProgram = "rnix-hashes"; - homepage = "https://github.com/numtide/rnix-hashes"; - license = licenses.asl20; - maintainers = with maintainers; [ - rizary - SuperSandro2000 - ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..c936d32bf6e0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1194,6 +1194,7 @@ mapAliases { rippled = throw "rippled has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25 rippled-validator-keys-tool = throw "rippled-validator-keys-tool has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25 rockbox_utility = rockbox-utility; # Added 2022-03-17 + rnix-hashes = throw "'rnix-hashes' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17 rr-unstable = rr; # Added 2022-09-17 rtx = mise; # Added 2024-01-05 From ea27531fc892ee2f22731dd930e9b7407f9e9dd4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 12:22:24 +0100 Subject: [PATCH 149/219] rs-git-fsmonitor: remove 5 years since the last upstream commit. Lockfile is too old for fetchCargoVendor. --- pkgs/by-name/rs/rs-git-fsmonitor/package.nix | 35 -------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/by-name/rs/rs-git-fsmonitor/package.nix diff --git a/pkgs/by-name/rs/rs-git-fsmonitor/package.nix b/pkgs/by-name/rs/rs-git-fsmonitor/package.nix deleted file mode 100644 index 77ebac70578a..000000000000 --- a/pkgs/by-name/rs/rs-git-fsmonitor/package.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, - makeWrapper, - watchman, -}: - -rustPlatform.buildRustPackage rec { - pname = "rs-git-fsmonitor"; - version = "0.1.3"; - - src = fetchFromGitHub { - owner = "jgavris"; - repo = pname; - rev = "v${version}"; - sha256 = "021vdk5i7yyrnh4apn0gnsh6ycnx15wm3g2jrfsg7fycnq8167wc"; - }; - - cargoHash = "sha256-Vi8PUy6Qgp03SghtCneDxwE8vbt7uGClfOCayDq0pUM="; - - nativeBuildInputs = [ makeWrapper ]; - - fixupPhase = '' - wrapProgram $out/bin/rs-git-fsmonitor --prefix PATH ":" "${lib.makeBinPath [ watchman ]}" ; - ''; - - meta = with lib; { - description = "Fast git core.fsmonitor hook written in Rust"; - homepage = "https://github.com/jgavris/rs-git-fsmonitor"; - license = licenses.mit; - maintainers = [ ]; - mainProgram = "rs-git-fsmonitor"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..633487d47193 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1196,6 +1196,7 @@ mapAliases { rockbox_utility = rockbox-utility; # Added 2022-03-17 rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17 rr-unstable = rr; # Added 2022-09-17 + rs-git-fsmonitor = throw "'rs-git-fsmonitor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 rtx = mise; # Added 2024-01-05 runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; From 7cc2bed112e17b73fbeea6363c1e06571c82f54b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 12:25:30 +0100 Subject: [PATCH 150/219] serial-unit-testing: remove 3 years since the last upstream commit. --- .../se/serial-unit-testing/package.nix | 41 ------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 pkgs/by-name/se/serial-unit-testing/package.nix diff --git a/pkgs/by-name/se/serial-unit-testing/package.nix b/pkgs/by-name/se/serial-unit-testing/package.nix deleted file mode 100644 index 9971033ea0b6..000000000000 --- a/pkgs/by-name/se/serial-unit-testing/package.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - udev, -}: - -rustPlatform.buildRustPackage rec { - pname = "serial-unit-testing"; - version = "0.2.4"; - - src = fetchFromGitHub { - owner = "markatk"; - repo = "serial-unit-testing"; - rev = "v${version}"; - hash = "sha256-SLwTwEQdwbus9RFskFjU8m4fS9Pnp8HsgnKkBvTqmSI="; - }; - - cargoHash = "sha256-PoV2v0p0L3CTtC9VMAx2Z/ZsSAIFi2gh2TtOp64S6ZQ="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - udev - ]; - - # tests require a serial port - doCheck = false; - - meta = with lib; { - description = "Automate testing of serial communication with any serial port device"; - homepage = "https://github.com/markatk/serial-unit-testing"; - changelog = "https://github.com/markatk/serial-unit-testing/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ rudolfvesely ]; - mainProgram = "sut"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..890b5bf179f4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1228,6 +1228,7 @@ mapAliases { semeru-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01 sensu = throw "sensu has been removed as the upstream project is deprecated. Consider using `sensu-go`"; # Added 2024-10-28 + serial-unit-testing = throw "'serial-unit-testing' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 session-desktop-appimage = session-desktop; sequoia = sequoia-sq; # Added 2023-06-26 sexp = sexpp; # Added 2023-07-03 From e14e3db6951e19932635b913e8aad0382c463db9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 12:27:08 +0100 Subject: [PATCH 151/219] shell-hist: remove 6 years since the last upstream commit. Lockfile is too old for fetchCargoVendor. --- pkgs/by-name/sh/shell-hist/package.nix | 30 -------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/by-name/sh/shell-hist/package.nix diff --git a/pkgs/by-name/sh/shell-hist/package.nix b/pkgs/by-name/sh/shell-hist/package.nix deleted file mode 100644 index f906d7a9b810..000000000000 --- a/pkgs/by-name/sh/shell-hist/package.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage { - pname = "shell-hist"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "jamesmunns"; - repo = "shell-hist"; - rev = "158de8c3908b49530ecd76bf6e65c210f351ef82"; - sha256 = "0kc128xnnp1d56if70vfv0w3qnwhljhbnvzwwb7hfm3x2m0vqrqf"; - }; - - cargoHash = "sha256-V/smviEa7b+2vyY2dn9MpbITnXw0HpOtPF/RPYB2TKw="; - - meta = with lib; { - description = "Inspect your shell history"; - homepage = "https://github.com/jamesmunns/shell-hist"; - license = with licenses; [ - mit # or - asl20 - ]; - maintainers = [ maintainers.spacekookie ]; - mainProgram = "shell-hist"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..e3e5df4dbb2b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1232,6 +1232,7 @@ mapAliases { sequoia = sequoia-sq; # Added 2023-06-26 sexp = sexpp; # Added 2023-07-03 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 + shell-hist = throw "'shell-hist' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 shipyard = jumppad; # Added 2023-06-06 siduck76-st = st-snazzy; # Added 2024-12-24 signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain"; From 45c03ae758d94c808ca4274b4a8c660c774d186d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 12:55:32 +0100 Subject: [PATCH 152/219] uq: remove 7 years since the last upstream commit. Lockfile is too old for fetchCargoVendor. --- pkgs/by-name/uq/uq/package.nix | 30 ------------------------------ pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/by-name/uq/uq/package.nix diff --git a/pkgs/by-name/uq/uq/package.nix b/pkgs/by-name/uq/uq/package.nix deleted file mode 100644 index 794105920955..000000000000 --- a/pkgs/by-name/uq/uq/package.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "uq"; - version = "unstable-2018-05-27"; - - src = fetchFromGitHub { - owner = "lostutils"; - repo = "uq"; - rev = "118bc2f3b1cf292afdffbc1cb4415d150b323165"; - sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb"; - }; - - cargoHash = "sha256-hBV+mqN4rnHGKAVRtlk2VFml/T9YQxzGTvGK2jcCwNw="; - - meta = with lib; { - description = "Simple, user-friendly alternative to sort | uniq"; - homepage = "https://github.com/lostutils/uq"; - license = licenses.mit; - maintainers = with maintainers; [ - doronbehar - matthiasbeyer - ]; - mainProgram = "uq"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..a43777719ae5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1406,6 +1406,7 @@ mapAliases { unifiStable = throw "'unifiStable' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Converted to throw 2024-04-11 unl0kr = throw "'unl0kr' is now included with buffybox. Use `pkgs.buffybox` instead."; # Removed 2024-12-20 untrunc = throw "'untrunc' has been renamed to/replaced by 'untrunc-anthwlock'"; # Converted to throw 2024-10-17 + uq = throw "'uq' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 urxvt_autocomplete_all_the_things = throw "'urxvt_autocomplete_all_the_things' has been renamed to/replaced by 'rxvt-unicode-plugins.autocomplete-all-the-things'"; # Converted to throw 2024-10-17 urxvt_bidi = throw "'urxvt_bidi' has been renamed to/replaced by 'rxvt-unicode-plugins.bidi'"; # Converted to throw 2024-10-17 urxvt_font_size = throw "'urxvt_font_size' has been renamed to/replaced by 'rxvt-unicode-plugins.font-size'"; # Converted to throw 2024-10-17 From ccd18bae4c8b8f36e0bc7afccca23808c9279354 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 13:01:46 +0100 Subject: [PATCH 153/219] wg-bond: remove Upstream repo is archived. --- pkgs/by-name/wg/wg-bond/package.nix | 34 ----------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/by-name/wg/wg-bond/package.nix diff --git a/pkgs/by-name/wg/wg-bond/package.nix b/pkgs/by-name/wg/wg-bond/package.nix deleted file mode 100644 index ab5c3eb32739..000000000000 --- a/pkgs/by-name/wg/wg-bond/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitLab, - wireguard-tools, - makeWrapper, -}: -rustPlatform.buildRustPackage rec { - pname = "wg-bond"; - version = "0.2.0"; - - src = fetchFromGitLab { - owner = "cab404"; - repo = "wg-bond"; - rev = "v${version}"; - hash = "sha256:04k0maxy39k7qzcsqsv1byddsmjszmnyjffrf22nzbvml83p3l0y"; - }; - - cargoHash = "sha256-Itw3fnKfUW+67KKB2Y7tutGBTm3E8mGNhBL4MOGEn9o="; - - nativeBuildInputs = [ makeWrapper ]; - postInstall = '' - wrapProgram $out/bin/wg-bond --set PATH ${lib.makeBinPath [ wireguard-tools ]} - ''; - - meta = with lib; { - description = "Wireguard configuration manager"; - homepage = "https://gitlab.com/cab404/wg-bond"; - changelog = "https://gitlab.com/cab404/wg-bond/-/releases#v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ cab404 ]; - mainProgram = "wg-bond"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..0f876ccef91c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1459,6 +1459,7 @@ mapAliases { ''; # Add 2023-07-29 waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24 webkitgtk = lib.warnOnInstantiate "Explicitly set the ABI version of 'webkitgtk'" webkitgtk_4_0; + wg-bond = throw "'wg-bond' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 wineWayland = wine-wayland; win-virtio = virtio-win; # Added 2023-10-17 wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17 From ad9d0d07c5bb8dbdda8d3553bdd188d415919dff Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 13:03:41 +0100 Subject: [PATCH 154/219] xxv: remove Upstream repo has been archived since 2022. --- pkgs/by-name/xx/xxv/package.nix | 48 --------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 pkgs/by-name/xx/xxv/package.nix diff --git a/pkgs/by-name/xx/xxv/package.nix b/pkgs/by-name/xx/xxv/package.nix deleted file mode 100644 index c5a5515f9613..000000000000 --- a/pkgs/by-name/xx/xxv/package.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - rustPlatform, - ncurses ? null, - darwin ? null, -}: - -let - useNcurses = !stdenv.hostPlatform.isWindows; -in - -assert useNcurses -> ncurses != null; - -rustPlatform.buildRustPackage rec { - pname = "xxv"; - version = "0.1.2"; - - src = fetchFromGitHub { - owner = "chrisvest"; - repo = pname; - rev = version; - sha256 = "0ppfsgdigza2jppbkg4qanjhlkpnq7p115c4471vc6vpikpfrlk3"; - }; - - cargoHash = "sha256-S8IKBXREJ+0z4Qz9i3RH52btg1Mpk6GjKIJf4ivdt14="; - - buildInputs = - lib.optionals useNcurses [ ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); - - # I'm picking pancurses for Windows simply because that's the example given in Cursive's - # documentation for picking an alternative backend. We could just as easily pick crossterm. - buildNoDefaultFeatures = !useNcurses; - buildFeatures = lib.optional (!useNcurses) "pancurses-backend"; - - meta = with lib; { - description = "Visual hex viewer for the terminal"; - longDescription = '' - XXV is a terminal hex viewer with a text user interface, written in 100% safe Rust. - ''; - homepage = "https://chrisvest.github.io/xxv/"; - license = with licenses; [ gpl3 ]; - maintainers = [ ]; - mainProgram = "xxv"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..8288f6b7704c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1503,6 +1503,7 @@ mapAliases { xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17 xwaylandvideobridge = libsForQt5.xwaylandvideobridge; # Added 2024-09-27 + xxv = throw "'xxv' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 ### Y ### From 2681970be69d88810ef13a5580edf649cbf4cf4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 12:05:20 +0000 Subject: [PATCH 155/219] lockbook-desktop: 0.9.16 -> 0.9.17 --- pkgs/by-name/lo/lockbook-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index 5d511b16e05b..febc2b7c2f80 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,17 +18,17 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook-desktop"; - version = "0.9.16"; + version = "0.9.17"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-FHD84IJ2ahxB8L75xep+TSb8e+DtUsjEyHc6P/SFi9c="; + hash = "sha256-AwzescNVsHt1bJFX+TjHtIAxZGzbpGxxb2xSx0mAVQ8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-z00WBA/51zmqFCBX1hD3dLKvuvxQvuyvtBGrxxAr7FE="; + cargoHash = "sha256-oWcGN3WtMCC9LPmVmljXQPQap9JskSTuUTV7XFYiOGI="; nativeBuildInputs = [ pkg-config From a8f73e2dfe7722f71ed2106b5edbc63cea102574 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 12:06:34 +0000 Subject: [PATCH 156/219] t-rec: 0.7.7 -> 0.7.8 --- pkgs/misc/t-rec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix index fd33e41c1ea7..309f0e64a5ec 100644 --- a/pkgs/misc/t-rec/default.nix +++ b/pkgs/misc/t-rec/default.nix @@ -18,13 +18,13 @@ let in rustPlatform.buildRustPackage rec { pname = "t-rec"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "sassman"; repo = "t-rec-rs"; rev = "v${version}"; - sha256 = "sha256-lOsagLiaGRvJKtBJAfDgmtZvPSF2EAdGrVXSPQCj7zs="; + sha256 = "sha256-111zbUDmp/Yyvx0uXMzqEnk/Jr2hfxtNNX6f0Ti3Brg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" ''; - cargoHash = "sha256-orgSmGtZwTqlWSpUjU17QRgDlbheo2DbS1YI7l4MhmM="; + cargoHash = "sha256-fjq4Bys7KnSu6kV74CZJ95oov4HXY59VltjcAuXGMPg="; meta = with lib; { description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; From ca27b6276c607fa34d964fc1535bf128e997060b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 11:04:28 +0100 Subject: [PATCH 157/219] panopticon: remove Unmaintained upstream, broken for more than a year, and lockfile is too old to use fetchCargoVendor. --- pkgs/by-name/pa/panopticon/package.nix | 63 -------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 pkgs/by-name/pa/panopticon/package.nix diff --git a/pkgs/by-name/pa/panopticon/package.nix b/pkgs/by-name/pa/panopticon/package.nix deleted file mode 100644 index 9ed89a80d126..000000000000 --- a/pkgs/by-name/pa/panopticon/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, - qt5, - git, - cmake, - pkg-config, - makeWrapper, -}: - -rustPlatform.buildRustPackage rec { - pname = "panopticon"; - version = "unstable-20171202"; - - src = fetchFromGitHub { - owner = "das-labor"; - repo = pname; - rev = "33ffec0d6d379d51b38d6ea00d040f54b1356ae4"; - sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - makeWrapper - ]; - propagatedBuildInputs = with qt5; [ - qt5.qtbase - qtdeclarative - qtsvg - qtquickcontrols2 - qtgraphicaleffects - git - ]; - - dontWrapQtApps = true; - - cargoHash = "sha256-VQG7WTubznDi7trrnZIPB5SLfvYUzWxHh+z9wOdYDG4="; - doCheck = false; - - postInstall = '' - mkdir -p $out/share/${pname} $out/bin - cp -R qml $out/share/${pname} - mv $out/bin/${pname} $out/share/${pname} - chmod +x $out/share/${pname} - makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} - ''; - - meta = with lib; { - description = "Libre cross-platform disassembler"; - longDescription = '' - Panopticon is a cross platform disassembler for reverse - engineering written in Rust. It can disassemble AMD64, - x86, AVR and MOS 6502 instruction sets and open ELF files. - Panopticon comes with Qt GUI for browsing and annotating - control flow graphs. - ''; - license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ leenaars ]; - broken = true; # Added 2024-03-16 - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..ddb8c8becf21 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1047,6 +1047,7 @@ mapAliases { PageEdit = pageedit; # Added 2024-01-21 p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20 packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17 + panopticon = throw "'panopticon' has been removed because it is unmaintained upstream"; # Added 2025-01-25 paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14 paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17 paperless-ng = paperless-ngx; # Added 2022-04-11 From 003a7a26ccac8d6e2e9340ca46826d82c2d38fcd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 12:09:59 +0000 Subject: [PATCH 158/219] lockbook: 0.9.16 -> 0.9.17 --- pkgs/by-name/lo/lockbook/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index 9fd699e5a9c1..bc8210af67e4 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "lockbook"; - version = "0.9.16"; + version = "0.9.17"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-FHD84IJ2ahxB8L75xep+TSb8e+DtUsjEyHc6P/SFi9c="; + hash = "sha256-AwzescNVsHt1bJFX+TjHtIAxZGzbpGxxb2xSx0mAVQ8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-z00WBA/51zmqFCBX1hD3dLKvuvxQvuyvtBGrxxAr7FE="; + cargoHash = "sha256-oWcGN3WtMCC9LPmVmljXQPQap9JskSTuUTV7XFYiOGI="; doCheck = false; # there are no cli tests cargoBuildFlags = [ From 2cb2681a9ef0ca716458996565f113065c0850d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 12:20:53 +0000 Subject: [PATCH 159/219] helm-ls: 0.1.1 -> 0.2.0 --- pkgs/by-name/he/helm-ls/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/helm-ls/package.nix b/pkgs/by-name/he/helm-ls/package.nix index 5c92a637c99d..3ffedc478a9c 100644 --- a/pkgs/by-name/he/helm-ls/package.nix +++ b/pkgs/by-name/he/helm-ls/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-pf/gC0jIrJUfU//uj+CGkUsNDVFeS6Wm4kx3Di9wpVI="; + hash = "sha256-k/JJoLRykIY/ZmjqG+ZzXuMPQRcoumqisPKrD9PPyd0="; }; vendorHash = "sha256-VAxmMDZIbbcGHoRL06oqWkDnWZBuweKyoCLSqItWHyg="; From 165b8b404dd559b6ea866a515a7effe1c3afb18c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 12:40:00 +0000 Subject: [PATCH 160/219] fcitx5-table-other: 5.1.3 -> 5.1.4 --- pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index 8a584ec67202..bbfb6d53800d 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-hIUzVc3Bs1zGvM/+R72NigU997Wmm++ZDxnzP+YpX1w="; + hash = "sha256-Yt6lAievCj9FC4eO6EIqUxiSaBPMvjSEb1PNyXPa82Q="; }; nativeBuildInputs = [ From 6f5e2edbf8b6cdd1fa2cd5963ab1bbdd767ffe55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 12:40:37 +0000 Subject: [PATCH 161/219] fcitx5-table-extra: 5.1.6 -> 5.1.7 --- pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 4d8845c0c2d3..6989bab1100e 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-no8TDbK88SnuLAz72QK2q2XM5bLdkGd8lkWFwreajO8="; + hash = "sha256-3Er01Qj3XEIO36xTQrBISzxMaIO4j8uqPe7+w9uk3UM="; }; nativeBuildInputs = [ From bf24296bbe2e31ac7147b02ea645922390ca8f4b Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sat, 25 Jan 2025 14:10:12 +0100 Subject: [PATCH 162/219] typst-lsp, vscode-extensions.nvarner.typst-lsp: remove typst-lsp is archived, tinymist is an maintained alternative --- .../editors/vscode/extensions/default.nix | 2 - .../extensions/nvarner.typst-lsp/default.nix | 39 - pkgs/by-name/ty/typst-lsp/Cargo.lock | 4339 ----------------- pkgs/by-name/ty/typst-lsp/package.nix | 84 - pkgs/top-level/aliases.nix | 1 + 5 files changed, 1 insertion(+), 4464 deletions(-) delete mode 100644 pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix delete mode 100644 pkgs/by-name/ty/typst-lsp/Cargo.lock delete mode 100644 pkgs/by-name/ty/typst-lsp/package.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3a7d09a05c2b..3a4a86852d42 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3907,8 +3907,6 @@ let }; }; - nvarner.typst-lsp = callPackage ./nvarner.typst-lsp { }; - ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { meta = { changelog = "https://marketplace.visualstudio.com/items/ocamllabs.ocaml-platform/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix b/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix deleted file mode 100644 index 13fdcef74019..000000000000 --- a/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - jq, - lib, - moreutils, - typst-lsp, - vscode-utils, -}: - -vscode-utils.buildVscodeMarketplaceExtension { - mktplcRef = { - name = "typst-lsp"; - publisher = "nvarner"; - # Please update the corresponding binary (typst-lsp) when updating - # this extension. - version = "0.13.0"; - hash = "sha256-xiFUJymZOTEqlGvCHvLiI0pVg7NLgIXhZ7x8yx+a5mY="; - }; - - nativeBuildInputs = [ - jq - moreutils - ]; - - buildInputs = [ typst-lsp ]; - - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${lib.getExe typst-lsp}"' package.json | sponge package.json - ''; - - meta = { - changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog"; - description = "VSCode extension for providing a language server for Typst"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=nvarner.typst-lsp"; - homepage = "https://github.com/nvarner/typst-lsp"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.drupol ]; - }; -} diff --git a/pkgs/by-name/ty/typst-lsp/Cargo.lock b/pkgs/by-name/ty/typst-lsp/Cargo.lock deleted file mode 100644 index 2fd85ca28a54..000000000000 --- a/pkgs/by-name/ty/typst-lsp/Cargo.lock +++ /dev/null @@ -1,4339 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -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.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 = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "arrayref" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-compression" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[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", -] - -[[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", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "az" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -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 = "biblatex" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27fe7285040d0227cd8b5395e1c4783f44f0b673eca5a657f4432ae401f2b7b8" -dependencies = [ - "numerals", - "paste", - "strum", - "unicode-normalization", - "unscanny", -] - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[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.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -dependencies = [ - "serde", -] - -[[package]] -name = "bpaf" -version = "0.9.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3280efcf6d66bc77c2cf9b67dc8acee47a217d9be67dd590b3230dffe663724d" -dependencies = [ - "owo-colors", - "supports-color", -] - -[[package]] -name = "bstr" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "by_address" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" - -[[package]] -name = "bytemuck" -version = "1.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" - -[[package]] -name = "camino" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "castaway" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" - -[[package]] -name = "cc" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chinese-number" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fccaef6346f6d6a741908d3b79fe97c2debe2fbb5eb3a7d00ff5981b52bb6c" -dependencies = [ - "chinese-variant", - "enum-ordinalize", - "num-bigint", - "num-traits", -] - -[[package]] -name = "chinese-variant" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7588475145507237ded760e52bf2f1085495245502033756d28ea72ade0e498b" - -[[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", - "num-traits", - "windows-targets 0.52.6", -] - -[[package]] -name = "ciborium" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" - -[[package]] -name = "ciborium-ll" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "citationberg" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d259fe9fd78ffa05a119581d20fddb50bfba428311057b12741ffb9015123d0b" -dependencies = [ - "quick-xml 0.31.0", - "serde", -] - -[[package]] -name = "cobs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "comemo" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf5705468fa80602ee6a5f9318306e6c428bffd53e43209a78bc05e6e667c6f4" -dependencies = [ - "comemo-macros 0.3.1", - "siphasher 1.0.1", -] - -[[package]] -name = "comemo" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6916408a724339aa77b18214233355f3eb04c42eb895e5f8909215bd8a7a91" -dependencies = [ - "comemo-macros 0.4.0", - "once_cell", - "parking_lot", - "siphasher 1.0.1", -] - -[[package]] -name = "comemo-macros" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "comemo-macros" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[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 = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "core_maths" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" -dependencies = [ - "libm", -] - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[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.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.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[package]] -name = "curl" -version = "0.4.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "windows-sys 0.52.0", -] - -[[package]] -name = "curl-sys" -version = "0.4.74+curl-8.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "windows-sys 0.52.0", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-url" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[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 = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "ecow" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1990d053cf6edf3f030682dba3b0eb65ef01fabb2686072765d8a17d6728e8" -dependencies = [ - "serde", -] - -[[package]] -name = "ecow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54bfbb1708988623190a6c4dbedaeaf0f53c20c6395abd6a01feb327b3146f4b" -dependencies = [ - "serde", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "elsa" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "embedded-io" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enum-ordinalize" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" -dependencies = [ - "enum-ordinalize-derive", -] - -[[package]] -name = "enum-ordinalize-derive" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[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-srgb8" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" - -[[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 = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", -] - -[[package]] -name = "flate2" -version = "1.0.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "fontconfig-parser" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" -dependencies = [ - "roxmltree 0.20.0", -] - -[[package]] -name = "fontdb" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2", - "slotmap", - "tinyvec", - "ttf-parser", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[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.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[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 = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gif" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globmatch" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3755076379cc2b2bbf53855fe718e1eed3093cfb769ebf5d290f617fa9cc09a0" -dependencies = [ - "globset", - "log", - "walkdir", -] - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[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 = "hayagriva" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0d20c98b77b86ce737876b2a1653e2e6abbeee84afbb39d72111091191c97a" -dependencies = [ - "biblatex", - "ciborium", - "citationberg", - "indexmap", - "numerals", - "paste", - "serde", - "serde_yaml", - "thiserror", - "unic-langid", - "unicode-segmentation", - "unscanny", - "url", -] - -[[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.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "0.14.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http", - "hyper", - "rustls", - "tokio", - "tokio-rustls", -] - -[[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 = "hypher" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b24ad5637230df201ab1034d593f1d09bf7f2a9274f2e8897638078579f4265" - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[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 = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "serde", - "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_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", - "serde", - "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", - "postcard", - "serde", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_adapters" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6324dfd08348a8e0374a447ebd334044d766b1839bb8d5ccf2482a99a77c0bc" -dependencies = [ - "icu_locid", - "icu_locid_transform", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_provider_blob" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24b98d1365f55d78186c205817631a4acf08d7a45bdf5dc9dcf9c5d54dccf51" -dependencies = [ - "icu_provider", - "postcard", - "serde", - "writeable", - "zerotrie", - "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 = "icu_segmenter" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a717725612346ffc2d7b42c94b820db6908048f39434504cb130e8b46256b0de" -dependencies = [ - "core_maths", - "displaydoc", - "icu_collections", - "icu_locid", - "icu_provider", - "icu_segmenter_data", - "serde", - "utf8_iter", - "zerovec", -] - -[[package]] -name = "icu_segmenter_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f739ee737260d955e330bc83fdeaaf1631f7fb7ed218761d3c04bb13bb7d79df" - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif 0.13.1", - "jpeg-decoder", - "num-traits", - "png", -] - -[[package]] -name = "imagesize" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" - -[[package]] -name = "indexmap" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" -dependencies = [ - "equivalent", - "hashbrown", - "serde", -] - -[[package]] -name = "indexmap-nostd" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "integer-encoding" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" - -[[package]] -name = "internment" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8e537b529b8674e97e9fb82c10ff168a290ac3867a0295f112061ffbca1ef" -dependencies = [ - "hashbrown", - "parking_lot", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "is_ci" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" - -[[package]] -name = "isahc" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" -dependencies = [ - "async-channel", - "castaway", - "crossbeam-utils", - "curl", - "curl-sys", - "event-listener", - "futures-lite", - "http", - "log", - "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.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kamadak-exif" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" -dependencies = [ - "mutate_once", -] - -[[package]] -name = "kurbo" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", -] - -[[package]] -name = "libz-sys" -version = "1.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" -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.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "lipsum" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "636860251af8963cc40f6b4baadee105f02e21b28131d76eba8e40ce84ab8064" -dependencies = [ - "rand", - "rand_chacha", -] - -[[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" -dependencies = [ - "serde", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[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 = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" -dependencies = [ - "hermit-abi", - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "mutate_once" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[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", -] - -[[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", - "libc", -] - -[[package]] -name = "numerals" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" - -[[package]] -name = "object" -version = "0.36.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" -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.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[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.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" -dependencies = [ - "cc", - "libc", - "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", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - -[[package]] -name = "opentelemetry-http" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" -dependencies = [ - "async-trait", - "bytes", - "http", - "isahc", - "opentelemetry", -] - -[[package]] -name = "opentelemetry-jaeger" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e617c66fd588e40e0dbbd66932fdc87393095b125d4459b1a3a10feb1712f8a1" -dependencies = [ - "async-trait", - "futures-core", - "futures-util", - "http", - "isahc", - "opentelemetry", - "opentelemetry-http", - "opentelemetry-semantic-conventions", - "opentelemetry_sdk", - "thrift", - "tokio", -] - -[[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 4.2.2", - "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 = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" -dependencies = [ - "num-traits", -] - -[[package]] -name = "ordered-float" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "owo-colors" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" - -[[package]] -name = "palette" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" -dependencies = [ - "approx", - "fast-srgb8", - "libm", - "palette_derive", -] - -[[package]] -name = "palette_derive" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" -dependencies = [ - "by_address", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[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 0.5.3", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pdf-writer" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e9127455063c816e661caac9ecd9043ad2871f55be93014e6838a8ced2332b" -dependencies = [ - "bitflags 1.3.2", - "itoa", - "memchr", - "ryu", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[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", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher 0.3.11", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[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", -] - -[[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 = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "plist" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" -dependencies = [ - "base64 0.22.1", - "indexmap", - "quick-xml 0.32.0", - "serde", - "time", -] - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "portable-atomic" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" - -[[package]] -name = "postcard" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" -dependencies = [ - "cobs", - "embedded-io", - "serde", -] - -[[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.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "psm" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] - -[[package]] -name = "qcms" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edecfcd5d755a5e5d98e24cf43113e7cdaec5a070edd0f6b250c03a573da30fa" - -[[package]] -name = "quick-xml" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "quick-xml" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "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.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -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_syscall" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "redox_users" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "resvg" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c34501046959e06470ba62a2dc7f31c15f94ac250d842a45f9e012f4ee40c1e" -dependencies = [ - "gif 0.12.0", - "jpeg-decoder", - "log", - "pico-args", - "png", - "rgb", - "svgtypes", - "tiny-skia", - "usvg", -] - -[[package]] -name = "rgb" -version = "0.8.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12bc8d2f72df26a5d3178022df33720fbede0d31d82c7291662eff89836994d" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "roxmltree" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" - -[[package]] -name = "roxmltree" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "rustybuzz" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "smallvec", - "ttf-parser", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-properties", - "unicode-script", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[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.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.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", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.204" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.204" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.122" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_spanned" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" -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.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simplecss" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" -dependencies = [ - "log", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "version_check", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -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 = "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 = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" -dependencies = [ - "float-cmp", -] - -[[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", -] - -[[package]] -name = "subsetter" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" - -[[package]] -name = "supports-color" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f" -dependencies = [ - "is_ci", -] - -[[package]] -name = "svg2pdf" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba36b330062be8497fd96597227a757b621b86c4d24d164b06e4522b52b3693e" -dependencies = [ - "image", - "miniz_oxide", - "once_cell", - "pdf-writer", - "resvg", - "tiny-skia", - "usvg", -] - -[[package]] -name = "svgtypes" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" -dependencies = [ - "kurbo", - "siphasher 0.3.11", -] - -[[package]] -name = "syn" -version = "2.0.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" -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 = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "syntect" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" -dependencies = [ - "bincode", - "bitflags 1.3.2", - "fancy-regex", - "flate2", - "fnv", - "once_cell", - "plist", - "regex-syntax", - "serde", - "serde_derive", - "serde_json", - "thiserror", - "walkdir", - "yaml-rust", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "temp-dir" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" - -[[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", - "windows-sys 0.59.0", -] - -[[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", -] - -[[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 = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "thrift" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" -dependencies = [ - "byteorder", - "integer-encoding", - "log", - "ordered-float 2.10.1", - "threadpool", -] - -[[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-skia" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "png", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "serde", - "zerovec", -] - -[[package]] -name = "tinyvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" -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", - "pin-project-lite", - "socket2", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[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", -] - -[[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-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - -[[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-tar" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" -dependencies = [ - "filetime", - "futures-core", - "libc", - "redox_syscall 0.3.5", - "tokio", - "tokio-stream", - "xattr", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - -[[package]] -name = "toml" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.20", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.18", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "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", - "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", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[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-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[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-opentelemetry" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" -dependencies = [ - "js-sys", - "once_cell", - "opentelemetry", - "opentelemetry_sdk", - "smallvec", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", - "web-time", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "ttf-parser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" - -[[package]] -name = "two-face" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37bed2135b2459c7eefba72c906d374697eb15949c205f2f124e3636a46b5eeb" -dependencies = [ - "once_cell", - "serde", - "syntect", -] - -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "typst" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12492297d20937494f0143ae50ef339e5fd3d927b4096af1c52fe73fb9c5fa9a" -dependencies = [ - "az", - "bitflags 2.6.0", - "chinese-number", - "ciborium", - "comemo 0.4.0", - "csv", - "ecow 0.2.2", - "fontdb", - "hayagriva", - "hypher", - "icu_properties", - "icu_provider", - "icu_provider_adapters", - "icu_provider_blob", - "icu_segmenter", - "if_chain", - "image", - "indexmap", - "kamadak-exif", - "kurbo", - "lipsum", - "log", - "once_cell", - "palette", - "phf", - "png", - "portable-atomic", - "qcms", - "rayon", - "regex", - "roxmltree 0.19.0", - "rustybuzz", - "serde", - "serde_json", - "serde_yaml", - "siphasher 1.0.1", - "smallvec", - "stacker", - "syntect", - "time", - "toml 0.8.19", - "ttf-parser", - "two-face", - "typed-arena", - "typst-assets", - "typst-macros", - "typst-syntax 0.11.1", - "typst-timing", - "unicode-bidi", - "unicode-math-class", - "unicode-script", - "unicode-segmentation", - "usvg", - "wasmi", -] - -[[package]] -name = "typst-assets" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3061f8d268e8eec7481c9ab24540455cb4912983c49aae38fa6e8bf8ef4d9c" - -[[package]] -name = "typst-ide" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3921e77003924e164f75a166a8d78a8f708479f43fa7e7cc7152f6bdf9558016" -dependencies = [ - "comemo 0.4.0", - "ecow 0.2.2", - "if_chain", - "log", - "serde", - "typst", - "unscanny", -] - -[[package]] -name = "typst-lsp" -version = "0.13.0" -dependencies = [ - "anyhow", - "async-compression", - "async-trait", - "bpaf", - "cargo_metadata", - "chrono", - "comemo 0.4.0", - "dirs", - "elsa", - "fontdb", - "futures", - "if_chain", - "indexmap", - "internment", - "itertools 0.12.1", - "lazy_static", - "once_cell", - "opentelemetry", - "opentelemetry-jaeger", - "parking_lot", - "percent-encoding", - "regex", - "reqwest", - "same-file", - "serde", - "serde_json", - "siphasher 1.0.1", - "strum", - "temp-dir", - "thiserror", - "tokio", - "tokio-tar", - "tokio-util", - "tower-lsp", - "tracing", - "tracing-opentelemetry", - "tracing-subscriber", - "typst", - "typst-ide", - "typst-pdf", - "typstfmt_lib", - "walkdir", -] - -[[package]] -name = "typst-macros" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a0fdfd46b4920b0f8e4215e5b8438c737e8bc3498a681ea59b0130228363fc" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "typst-pdf" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54f743b64330e576d31b2108626490ae1fbd7fb4bb28307536ceff3227a4e0d5" -dependencies = [ - "base64 0.22.1", - "bytemuck", - "comemo 0.4.0", - "ecow 0.2.2", - "image", - "miniz_oxide", - "once_cell", - "pdf-writer", - "subsetter", - "svg2pdf", - "ttf-parser", - "typst", - "typst-assets", - "typst-macros", - "typst-timing", - "unicode-properties", - "unscanny", - "xmp-writer", -] - -[[package]] -name = "typst-syntax" -version = "0.7.0" -source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" -dependencies = [ - "comemo 0.3.1", - "ecow 0.1.2", - "once_cell", - "serde", - "tracing", - "unicode-ident", - "unicode-math-class", - "unicode-segmentation", - "unscanny", -] - -[[package]] -name = "typst-syntax" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3db69f2f41613b1ff6edbec44fd7dc524137f099ee36c46f560cedeaadb40c4" -dependencies = [ - "comemo 0.4.0", - "ecow 0.2.2", - "once_cell", - "serde", - "unicode-ident", - "unicode-math-class", - "unicode-script", - "unicode-segmentation", - "unscanny", -] - -[[package]] -name = "typst-timing" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b58e17192bcacb2a39aace6d3eece70f008b2949ce384ac501a58357fafee67" -dependencies = [ - "parking_lot", - "serde", - "serde_json", - "typst-syntax 0.11.1", -] - -[[package]] -name = "typstfmt_lib" -version = "0.2.7" -source = "git+https://github.com/astrale-sharp/typstfmt?tag=0.2.7#46b4ec34b4726c3c6541012f433c68c22d9e509c" -dependencies = [ - "globmatch", - "itertools 0.10.5", - "regex", - "serde", - "toml 0.7.8", - "tracing", - "typst-syntax 0.7.0", - "unicode-segmentation", -] - -[[package]] -name = "unic-langid" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" -dependencies = [ - "unic-langid-impl", -] - -[[package]] -name = "unic-langid-impl" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" -dependencies = [ - "serde", - "tinystr", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-bidi-mirroring" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" - -[[package]] -name = "unicode-ccc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-math-class" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-properties" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" - -[[package]] -name = "unicode-script" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-vo" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - -[[package]] -name = "unscanny" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "usvg" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377f62b4a3c173de8654c1aa80ab1dac1154e6f13a779a9943e53780120d1625" -dependencies = [ - "base64 0.21.7", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", -] - -[[package]] -name = "usvg-parser" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a05e6f2023d6b4e946f734240a3927aefdcf930d7d42587a2c8a8869814b0" -dependencies = [ - "data-url", - "flate2", - "imagesize", - "kurbo", - "log", - "roxmltree 0.19.0", - "simplecss", - "siphasher 0.3.11", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c41888b9d5cf431fe852eaf9d047bbde83251b98f1749c2f08b1071e6db46e2" -dependencies = [ - "fontdb", - "kurbo", - "log", - "rustybuzz", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18863e0404ed153d6e56362c5b1146db9f4f262a3244e3cf2dbe7d8a85909f05" -dependencies = [ - "strict-num", - "svgtypes", - "tiny-skia-path", -] - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "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.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "wasm-streams" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wasmi" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" -dependencies = [ - "smallvec", - "spin", - "wasmi_arena", - "wasmi_core", - "wasmparser-nostd", -] - -[[package]] -name = "wasmi_arena" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" - -[[package]] -name = "wasmi_core" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" -dependencies = [ - "downcast-rs", - "libm", - "num-traits", - "paste", -] - -[[package]] -name = "wasmparser-nostd" -version = "0.100.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" -dependencies = [ - "indexmap-nostd", -] - -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -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 = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.0", -] - -[[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-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - -[[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.5", -] - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[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.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[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 = "winnow" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "xmlwriter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" - -[[package]] -name = "xmp-writer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4543ba138f64a94b19e1e9c66c165bca7e03d470e1c066cb76ea279d9d0e1989" - -[[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 = "yoke" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zerofrom" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerotrie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb594dd55d87335c5f60177cee24f19457a5ec10a065e0a3014722ad252d0a1f" -dependencies = [ - "displaydoc", - "litemap", - "serde", - "zerovec", -] - -[[package]] -name = "zerovec" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" -dependencies = [ - "serde", - "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/ty/typst-lsp/package.nix b/pkgs/by-name/ty/typst-lsp/package.nix deleted file mode 100644 index d5b9693428da..000000000000 --- a/pkgs/by-name/ty/typst-lsp/package.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - stdenv, - darwin, - nix-update-script, - vscode-extensions, - testers, - typst-lsp, -}: - -rustPlatform.buildRustPackage rec { - pname = "typst-lsp"; - # Please update the corresponding vscode extension when updating - # this derivation. - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "nvarner"; - repo = "typst-lsp"; - tag = "v${version}"; - hash = "sha256-OubKtSHw9L4GzVzZY0AVdHY7LzKg/XQIhUfUc2OYAG0="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; - "typstfmt_lib-0.2.7" = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI="; - }; - }; - - # In order to make typst-lsp build with rust >= 1.80, we use the patched Cargo.lock from - # https://github.com/nvarner/typst-lsp/pull/515 - # TODO remove once the PR will have been merged upstream - postPatch = '' - rm Cargo.lock - ln -s ${./Cargo.lock} Cargo.lock - ''; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - checkFlags = - [ - # requires internet access - "--skip=workspace::package::external::remote_repo::test::full_download" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # both tests fail on darwin with 'Attempted to create a NULL object.' - "--skip=workspace::fs::local::test::read" - "--skip=workspace::package::external::manager::test::local_package" - ]; - - # workspace::package::external::manager::test::local_package tries to access the data directory - preCheck = '' - export HOME=$(mktemp -d) - ''; - - passthru = { - updateScript = nix-update-script { }; - tests = { - vscode-extension = vscode-extensions.nvarner.typst-lsp; - version = testers.testVersion { package = typst-lsp; }; - }; - }; - - meta = { - description = "Brand-new language server for Typst"; - homepage = "https://github.com/nvarner/typst-lsp"; - mainProgram = "typst-lsp"; - changelog = "https://github.com/nvarner/typst-lsp/releases/tag/v${version}"; - license = with lib.licenses; [ - asl20 - mit - ]; - maintainers = with lib.maintainers; [ - figsoda - GaetanLepage - ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 764f93abded6..350c34a43c10 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1387,6 +1387,7 @@ mapAliases { tvbrowser-bin = tvbrowser; # Added 2023-03-02 tvheadend = throw "tvheadend has been removed as it nobody was willing to maintain it and it was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 typst-fmt = typstfmt; # Added 2023-07-15 + typst-lsp = throw "'typst-lsp' has been removed due to lack of upstream maintenance, consider using 'tinymist' instead"; # Added 2025-01-25 typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07 ### U ### From 2de2bed546df909bc23e046148610f4d5dcd9d2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 13:11:46 +0000 Subject: [PATCH 163/219] kdePackages.fcitx5-configtool: 5.1.7 -> 5.1.8 --- pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 618eb1587fda..2bb6a8659051 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.1.7"; + version = "5.1.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-6Slh1uZglRNBLQ1ziKf2xaP+NK6Abug/6TZcYy2HFPQ="; + hash = "sha256-4CvRQU6tcr3l14KzCGIhMvtYuT8DbSywxz6knbl+HgA="; }; cmakeFlags = [ From b3a96a8d44caf27ccb34a8728bd3e5508f098b79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jan 2025 14:28:14 +0100 Subject: [PATCH 164/219] python313Packages.webexpythonsdk: 2.0.3 -> 2.0.4 Diff: https://github.com/WebexCommunity/WebexPythonSDK/compare/refs/tags/v2.0.3...v2.0.4 Changelog: https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v2.0.4 --- pkgs/development/python-modules/webexpythonsdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webexpythonsdk/default.nix b/pkgs/development/python-modules/webexpythonsdk/default.nix index 745b9cc95f46..15fe08f89031 100644 --- a/pkgs/development/python-modules/webexpythonsdk/default.nix +++ b/pkgs/development/python-modules/webexpythonsdk/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "webexpythonsdk"; - version = "2.0.3"; + version = "2.0.4"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "WebexCommunity"; repo = "WebexPythonSDK"; tag = "v${version}"; - hash = "sha256-E66LwqzNWYAxnB8y5t8JHH4oVVXvheO7tteHWqrRRt8="; + hash = "sha256-8U3aAS+9dU5Zg4fS2t6zLvTEJ/6aIV/YEWte06GvKTo="; }; build-system = [ From cb4d104bafe40d21ac1d59b0f3c5c39bc9ef04ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 24 Jan 2025 14:30:38 +0100 Subject: [PATCH 165/219] nixos/libvirt-guests: add missing dependency on libvirtd.service Ensure that VMs get properly suspended (or shutdown) instead of "pulling the plug" on them. Simulating shutdown with `sudo systemctl stop libvirtd.service libvirtd-ro.socket libvirtd-admin.socket libvirtd.socket libvirt-guests`: Before: systemd[1]: Stopping libvirt guests suspend/resume service... libvirt-guests.sh[1472512]: Can't connect to default. Skipping. systemd[1]: libvirt-guests.service: Deactivated successfully. After: systemd[1]: Stopping libvirt guests suspend/resume service... libvirt-guests.sh[1524073]: Running guests on default URI: libvirt-guests.sh[1524067]: ubuntu22.04 libvirt-guests.sh[1524100]: Suspending guests on default URI... libvirt-guests.sh[1524067]: Suspending ubuntu22.04: ... libvirt-guests.sh[1524067]: Suspending ubuntu22.04: 1.421 GiB libvirt-guests.sh[1524067]: Suspending ubuntu22.04: 2.618 GiB libvirt-guests.sh[1524067]: Suspending ubuntu22.04: done systemd[1]: libvirt-guests.service: Deactivated successfully. --- nixos/modules/virtualisation/libvirtd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 03691d12e63a..05c916751303 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -515,6 +515,8 @@ in systemd.services.libvirt-guests = { wantedBy = [ "multi-user.target" ]; + requires = [ "libvirtd.service" ]; + after = [ "libvirtd.service" ]; path = with pkgs; [ coreutils gawk cfg.package ]; restartIfChanged = false; From 53180601369524be22d662ec7dbebad776db488f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 13:39:13 +0000 Subject: [PATCH 166/219] markdownlint-cli: 0.43.0 -> 0.44.0 --- pkgs/by-name/ma/markdownlint-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/markdownlint-cli/package.nix b/pkgs/by-name/ma/markdownlint-cli/package.nix index 32eba5e1aa76..a0e65f253922 100644 --- a/pkgs/by-name/ma/markdownlint-cli/package.nix +++ b/pkgs/by-name/ma/markdownlint-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "markdownlint-cli"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "igorshubovych"; repo = "markdownlint-cli"; rev = "v${version}"; - hash = "sha256-x9ind66qFS7k6rBDOiJ6amtVf7LTXmXsNKlnJmF6cJY="; + hash = "sha256-1CQVj2iFywimK9sBJ60u9xH5qm/stEOA0yAHcUSAdY8="; }; - npmDepsHash = "sha256-oAUhSdbEMv96dS0lhZMSNXs9sQbu06Lwf45GVj0m+2U="; + npmDepsHash = "sha256-iRK+8wyqHmP6vluDVBs3L4IpnZVvVfEfKDit+9YFU4g="; dontNpmBuild = true; From 73637f761d1c6a3b97a55ef8f77f8a678c7533e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 13:56:46 +0000 Subject: [PATCH 167/219] pineapple-pictures: 0.9.0 -> 0.9.1 --- pkgs/applications/graphics/pineapple-pictures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 8f90d85dd7d1..86f8a6300d9e 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pineapple-pictures"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = finalAttrs.version; - hash = "sha256-NXg+lCkm4i4ONkIp3F7Z1yHHO9daXucC+X1SuNxPJgQ="; + hash = "sha256-FgOmdqhsHyIQvwoNhD3pCoWYr4tW+vni0/rlICGu6rc="; }; nativeBuildInputs = [ From b4522f79d89f33caf44ed62fb8e0c606d9dbcb04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 14:01:28 +0000 Subject: [PATCH 168/219] yaydl: 0.17.1 -> 0.17.2 --- pkgs/tools/video/yaydl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/video/yaydl/default.nix b/pkgs/tools/video/yaydl/default.nix index 1befd6715f16..b07988a7de47 100644 --- a/pkgs/tools/video/yaydl/default.nix +++ b/pkgs/tools/video/yaydl/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "yaydl"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "dertuxmalwieder"; repo = pname; rev = "release-${version}"; - sha256 = "sha256-mMV7fnl3tEM22LCTLXoXG9RQhPSQ7DXanSURdoa0+EI="; + sha256 = "sha256-r+UkwEtuGL6los9ohv86KA/3qsaEkpnI4yV/UnYelgk="; }; - cargoHash = "sha256-HsRg8SO9c9Fomeb5B+kOW3VDNIG4W+dagEwAoWqONyA="; + cargoHash = "sha256-nEZBrtfUFybXIp7PBbR6X32GfIkjNylqpxaPOqNy+ww="; nativeBuildInputs = [ pkg-config From 3db0cc9b81c49dc5c558ab47112fe2851507020a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 14:02:44 +0000 Subject: [PATCH 169/219] gat: 0.19.3 -> 0.20.0 --- pkgs/by-name/ga/gat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index bef50038d1ef..c13f6bf7543b 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gat"; - version = "0.19.3"; + version = "0.20.0"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; tag = "v${version}"; - hash = "sha256-MBRKp1S/6dizZR0zDyaNGqKsHI+vK6oTNkPuxwbf7os="; + hash = "sha256-xO0MUbryuglbRIbBEbKJGYPPaJD8j4hNpIR+Kqc302s="; }; - vendorHash = "sha256-ns1jFmBvIfclb3SBtdg05qNBy18p6VjtEKrahtxJUM4="; + vendorHash = "sha256-z2Hbn1debyJn/nTKVC2y3vd6V7XQyHFPNA6hCVuYzgU="; env.CGO_ENABLED = 0; From c56976936570157a02b414fa1d22dc15ccfc0ae2 Mon Sep 17 00:00:00 2001 From: lain ping tool <35755164+l1npengtul@users.noreply.github.com> Date: Sat, 25 Jan 2025 23:26:51 +0900 Subject: [PATCH 170/219] airwin2rack: init at 2.13.0 (#371759) Co-authored-by: nicoo --- ...-juce-extensions-src-juce-cmakelists.patch | 36 +++ pkgs/by-name/ai/airwin2rack/package.nix | 228 ++++++++++++++++++ 2 files changed, 264 insertions(+) create mode 100644 pkgs/by-name/ai/airwin2rack/juce-clap-juce-extensions-src-juce-cmakelists.patch create mode 100644 pkgs/by-name/ai/airwin2rack/package.nix diff --git a/pkgs/by-name/ai/airwin2rack/juce-clap-juce-extensions-src-juce-cmakelists.patch b/pkgs/by-name/ai/airwin2rack/juce-clap-juce-extensions-src-juce-cmakelists.patch new file mode 100644 index 000000000000..a773abcdb4d8 --- /dev/null +++ b/pkgs/by-name/ai/airwin2rack/juce-clap-juce-extensions-src-juce-cmakelists.patch @@ -0,0 +1,36 @@ +diff --git a/src-juce/CMakeLists.txt b/src-juce/CMakeLists.txt +index 1f41088..10bdbb4 100644 +--- a/src-juce/CMakeLists.txt ++++ b/src-juce/CMakeLists.txt +@@ -1,28 +1,8 @@ + # vi:set sw=2 et: + project(airwin-consolidated VERSION ${CMAKE_PROJECT_VERSION}) + +-include ("../cmake/CPM.cmake") +- +- +-if (DEFINED AWCO_ONJUCE7) +- set(AWCO_JUCETAG 7.0.12) +-else() +- set(AWCO_JUCETAG 8.0.4) +-endif() +- +-message(STATUS "Getting JUCE TAG ${AWCO_JUCETAG}") +-CPMAddPackage( +- NAME JUCE +- GITHUB_REPOSITORY juce-framework/JUCE +- GIT_TAG ${AWCO_JUCETAG} # specify the tag to a version of your choice +-) +- +-CPMAddPackage( +- NAME clap-juce-extensions +- GITHUB_REPOSITORY free-audio/clap-juce-extensions +- GIT_TAG main +- SUBMODULE_RECURSIVE ON +-) ++add_subdirectory(juce) ++add_subdirectory(clap-juce-extensions) + + if (NOT DEFINED AWCO_ARM64EC) + list(APPEND AWCO_FORMATS VST3) + diff --git a/pkgs/by-name/ai/airwin2rack/package.nix b/pkgs/by-name/ai/airwin2rack/package.nix new file mode 100644 index 000000000000..e36aed4a6046 --- /dev/null +++ b/pkgs/by-name/ai/airwin2rack/package.nix @@ -0,0 +1,228 @@ +{ + stdenv, + fetchFromGitHub, + lib, + makeDesktopItem, + copyDesktopItems, + srcOnly, + cmake, + pkg-config, + alsa-lib, + xorg, + freetype, + libGLU, + libjack2, + juce, + webkitgtk_4_0, + libsysprof-capture, + pcre2, + util-linux, + libselinux, + libsepol, + libthai, + libxkbcommon, + libdatrie, + libepoxy, + libsoup_2_4, + lerc, + sqlite, + glib, + gtk3-x11, + curl, + vcv-rack, + jansson, + glew, + glfw, + libarchive, + speexdsp, + libpulseaudio, + libsamplerate, + rtmidi, + zstd, + jq, + enableVCVRack ? false, +}: +let + clapJuceExtensions = fetchFromGitHub { + owner = "free-audio"; + repo = "clap-juce-extensions"; + rev = "4f33b4930b6af806018c009f0f24b3a50808af99"; + hash = "sha256-M+T7ll3Ap6VIP5ub+kfEKwT2RW2IxxY4wUPRQKFIotk="; + fetchSubmodules = true; + }; + + vcvRackSdk = srcOnly vcv-rack; + pname = "airwin2rack"; + version = "2.13.0"; +in +stdenv.mkDerivation { + inherit pname; + inherit version; + + src = fetchFromGitHub { + owner = "baconpaul"; + repo = "airwin2rack"; + tag = "DAWPlugin"; + hash = "sha256-xjE9M5fMeOOYncq7xe+v++XvfUL6QZc2tF0jnYWSwKQ="; + fetchSubmodules = true; + }; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "Airwin2rack"; + desktopName = "Airwindows Consolidated"; + comment = "Various Airwindows Plugins Consolidated (Standalone)"; + exec = "Airwindows Consolidated"; + categories = [ + "Audio" + "AudioVideo" + ]; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = + [ + cmake + pkg-config + copyDesktopItems + ] + ++ lib.optionals enableVCVRack [ + jq + zstd + ]; + + buildInputs = + [ + alsa-lib + xorg.libX11 + xorg.libXcomposite + xorg.libXcursor + xorg.libXext + xorg.libXinerama + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libXdmcp + libGLU + libjack2 + freetype + webkitgtk_4_0 + glib + gtk3-x11 + curl + libsysprof-capture + pcre2 + util-linux + libselinux + libsepol + libthai + libxkbcommon + libdatrie + libepoxy + libsoup_2_4 + lerc + sqlite + ] + ++ lib.optionals enableVCVRack [ + vcv-rack + jansson + glew + glfw + libarchive + speexdsp + libpulseaudio + libsamplerate + rtmidi + zstd + ]; + + cmakeFlags = + [ + (lib.cmakeBool "BUILD_JUCE_PLUGIN" true) + (lib.cmakeBool "USE_JUCE_PROGRAMS" true) + ] + ++ lib.optionals enableVCVRack [ + (lib.cmakeBool "BUILD_RACK_PLUGIN" true) + (lib.cmakeFeature "RACK_SDK_DIR" "${vcvRackSdk}") + ]; + + cmakeBuildType = "Release"; + + patches = [ + ./juce-clap-juce-extensions-src-juce-cmakelists.patch + ]; + + prePatch = '' + ln -s ${juce.src} src-juce/juce + ln -s ${clapJuceExtensions} src-juce/clap-juce-extensions + ''; + + preConfigure = lib.optionalString enableVCVRack ''export RACK_DIR=${vcvRackSdk}''; + + buildPhase = '' + runHook preBuild + cmake --build . --target awcons-products ${lib.optionalString enableVCVRack "build_plugin"} --parallel $NIX_BUILD_CORES + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/vst3 $out/lib/lv2 $out/lib/clap $out/bin + + cp -r "awcons-products/Airwindows Consolidated.vst3" $out/lib/vst3 + cp -r "awcons-products/Airwindows Consolidated.lv2" $out/lib/lv2 + install -Dm644 "awcons-products/Airwindows Consolidated.clap" -t $out/lib/clap + + install -Dm755 "awcons-products/Airwindows Consolidated" $out/bin/Airwindows\ Consolidated + + ${lib.optionalString enableVCVRack '' + mkdir ../${pname} + strip -s plugin.so + mv plugin.so ../${pname} + cd .. + mv LICENSE.md ${pname} + mv README.md ${pname} + mv plugin.json ${pname} + mv res ${pname} + tar -c ${pname} | zstd -19 -o "${pname}-${version}-lin-x64.vcvplugin" + # got the directory from arch wiki + install -Dm755 "${pname}-${version}-lin-x64.vcvplugin" $out/usr/lib/vcvrack/plugins + ''} + + runHook postInstall + ''; + + NIX_LDFLAGS = ( + toString [ + "-lX11" + "-lXext" + "-lXcomposite" + "-lXcursor" + "-lXinerama" + "-lXrandr" + "-lXrender" + "-lXtst" + "-lXdmcp" + ] + ); + + meta = { + description = "JUCE Plugin Version of Airwindows Consolidated"; + homepage = "https://airwindows.com/"; + platforms = [ "x86_64-linux" ]; + license = + with lib.licenses; + [ mit ] + ++ lib.optional enableVCVRack [ + gpl3Plus + cc-by-nc-40 + unfreeRedistributable + ]; + mainProgram = "Airwindows Consolidated"; + maintainers = [ lib.maintainers.l1npengtul ]; + }; +} From 8e16ed1c9782a75fd8f6f95eeccbb86092a426ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 14:31:29 +0000 Subject: [PATCH 171/219] boxbuddy: 2.5.2 -> 2.5.3 --- pkgs/by-name/bo/boxbuddy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index f1fc14620fcd..e144f761d624 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-wtAc5h3bm/X1aCPGjl30NaM7XR602q5NdlamUQvADDo="; + hash = "sha256-9BGgm4yRjCarJIGP/G9gPj/qsYWb96XGJmpgLj3XCdM="; }; - cargoHash = "sha256-oyxO92wXVN7kbIcTy5OAaqK/ySnetpkFwcop34ERpxs="; + cargoHash = "sha256-/0tk3unjiXwBqQEMTYMu1kasb34i0nbp99PHmtpdxAA="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here From d62f4933f2951304d9daf8e9928ce5a80ada27d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 14:44:24 +0000 Subject: [PATCH 172/219] fzf-make: 0.55.0 -> 0.56.0 --- pkgs/by-name/fz/fzf-make/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index a99524b5a2d4..bfcfa8b139d3 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.55.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-YPflHIHOnl6j2J60g1K2HjjUVf21P4Tofi65K3FUZxs="; + hash = "sha256-OioPl2uJVepMsR1PYHpASj3yQ10bCaGFxI1wQR61EsA="; }; - cargoHash = "sha256-oXxCPuUtzUNYrlqUdksGodITnWt7pGrA8UsNYSzOJVA="; + cargoHash = "sha256-Y1kFbJi+AB4uROieZERafU82RWm2AGQseDUuVzJn3NA="; useFetchCargoVendor = true; From cef52ca30eb96dcd0f1b9224327c82f6e762b88c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 14:49:24 +0000 Subject: [PATCH 173/219] cargo-deb: 2.10.0 -> 2.11.0 --- 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 0b2902163bd5..38fbc19a9d2b 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.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-J3ChNrZUctDcs1bOCoDLTQtqTT9rWi24XK2fki8PYLw="; + hash = "sha256-Nr6Hl8kjLHVrxqj5Xm147gb13xF2dQ5C+KuPD+PQglU="; }; - cargoHash = "sha256-CjlMadj4/QhbSlCoZs3JRaplbY4XlcBFKR4ZXJLK+Uo="; + cargoHash = "sha256-hQQ03tdEyxEBqdxGmz6y70jSGpW7CAn7Pm2pTS5jwOM="; nativeBuildInputs = [ makeWrapper From 0790597f4dd8febcd9355cae227a4d119c06aa8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 14:57:14 +0000 Subject: [PATCH 174/219] pik: 0.14.0 -> 0.15.0 --- pkgs/by-name/pi/pik/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index d9badfa3d18c..e5282b696f43 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "pik"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "jacek-kurlit"; repo = "pik"; rev = version; - hash = "sha256-6nIJ2uayWTwcrGJd7nJQFZ84+QE3R6k/2y9mxdILCEU="; + hash = "sha256-iXLAV4VWJczdxrfevxaRxYTAL+d/VRQ61zc0B4UNbPM="; }; - cargoHash = "sha256-geOAhnAg1JefM06rG4nc5aUY7It7c7U5aELpFiFOW4w="; + cargoHash = "sha256-n1lFgaoHboq5UKJKa3IGD1jET4EZ1GcAflNVgoRTP70="; passthru.tests.version = testers.testVersion { package = pik; }; From ce1ba13c718372ba10ebd217f1b9c330ab00ce1a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 25 Jan 2025 15:59:13 +0100 Subject: [PATCH 175/219] gui-for-singbox: fix basepath patching placeholder can't be used with replaceVars, because it results in the output of the **replaceVars** derivation, not the "calling" derivation. --- pkgs/by-name/gu/gui-for-singbox/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix index 08620f978925..f69c6461165e 100644 --- a/pkgs/by-name/gu/gui-for-singbox/package.nix +++ b/pkgs/by-name/gu/gui-for-singbox/package.nix @@ -68,11 +68,13 @@ in buildGoModule { inherit pname version src; - patches = [ - (replaceVars ./bridge.patch { - basepath = placeholder "out"; - }) - ]; + patches = [ ./bridge.patch ]; + + postPatch = '' + # As we need the $out reference, we can't use `replaceVars` here. + substituteInPlace bridge/bridge.go \ + --replace-fail '@basepath@' "$out" + ''; vendorHash = "sha256-OrysyJF+lUMf+0vWmOZHjxUdE6fQCKArmpV4alXxtYs="; From dcc754b57cd434ba9769d878cabdcaa1320a1041 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 23 Jan 2025 07:35:10 -0500 Subject: [PATCH 176/219] linux: remove linuxPackages.zfs alias This is not needed for any regular usage, as folks will almost always consume `linuxPackages.zfs*` via `boot.zfs.package = pkgs.zfs*`, where that is the top-level package that has a reference to the appropriate Kernel package via its `kernelModuleAttribute`. As such, this alias provides little usefulness, so remove it to avoid having to maintain it in-sync with the top-level alias. --- pkgs/top-level/linux-kernels.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index a63c22a7a8c9..966106374799 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -605,7 +605,6 @@ in { configFile = "kernel"; inherit pkgs kernel; }; - zfs = zfs_2_2; can-isotp = callPackage ../os-specific/linux/can-isotp { }; @@ -628,6 +627,7 @@ in { tsme-test = callPackage ../os-specific/linux/tsme-test { }; } // lib.optionalAttrs config.allowAliases { + zfs = throw "linuxPackages.zfs has been removed, use zfs_* instead, or linuxPackages.\${pkgs.zfs.kernelModuleAttribute}"; # added 2025-01-23 zfs_2_1 = throw "zfs_2_1 has been removed"; # added 2024-12-25; ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30 From e6c76c051f96f3f0991faad5dc78fea86adf35f9 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 25 Jan 2025 16:03:09 +0100 Subject: [PATCH 177/219] gui-for-clash: fix basepath patching --- pkgs/by-name/gu/gui-for-clash/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix index 402e3ba6cb4e..84d01efb1640 100644 --- a/pkgs/by-name/gu/gui-for-clash/package.nix +++ b/pkgs/by-name/gu/gui-for-clash/package.nix @@ -68,11 +68,13 @@ in buildGoModule { inherit pname version src; - patches = [ - (replaceVars ./bridge.patch { - basepath = placeholder "out"; - }) - ]; + patches = [ ./bridge.patch ]; + + postPatch = '' + # As we need the $out reference, we can't use `replaceVars` here. + substituteInPlace bridge/bridge.go \ + --replace-fail '@basepath@' "$out" + ''; vendorHash = "sha256-OrysyJF+lUMf+0vWmOZHjxUdE6fQCKArmpV4alXxtYs="; From 30c355bde01a4e4439c17b853c74a952a45e2891 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 25 Jan 2025 16:03:30 +0100 Subject: [PATCH 178/219] chawan: fix search path patching --- pkgs/by-name/ch/chawan/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index ce320d7d167e..cf5c642e87e1 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -26,12 +26,14 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - patches = [ - # Include chawan's man pages in mancha's search path - (replaceVars ./mancha-augment-path.diff { - out = placeholder "out"; - }) - ]; + patches = [ ./mancha-augment-path.diff ]; + + # Include chawan's man pages in mancha's search path + postPatch = '' + # As we need the $out reference, we can't use `replaceVars` here. + substituteInPlace adapter/protocol/man.nim \ + --replace-fail '@out@' "$out" + ''; env.NIX_CFLAGS_COMPILE = toString ( lib.optional stdenv.cc.isClang "-Wno-error=implicit-function-declaration" From b457d4c76beace1b85f9edacc3a4103c328ed73b Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 25 Jan 2025 10:25:12 -0500 Subject: [PATCH 179/219] incus: 6.8.0 -> 6.9.0 https://discuss.linuxcontainers.org/t/incus-6-9-has-been-released/22679 https://github.com/lxc/incus/releases/tag/v6.9.0 --- pkgs/by-name/in/incus/1531.diff | 271 ------------------------------ pkgs/by-name/in/incus/generic.nix | 10 +- pkgs/by-name/in/incus/lts.nix | 5 +- pkgs/by-name/in/incus/package.nix | 12 +- pkgs/by-name/in/incus/update.py | 86 ---------- 5 files changed, 15 insertions(+), 369 deletions(-) delete mode 100644 pkgs/by-name/in/incus/1531.diff delete mode 100755 pkgs/by-name/in/incus/update.py diff --git a/pkgs/by-name/in/incus/1531.diff b/pkgs/by-name/in/incus/1531.diff deleted file mode 100644 index fbcdcad438f0..000000000000 --- a/pkgs/by-name/in/incus/1531.diff +++ /dev/null @@ -1,271 +0,0 @@ -diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go -index 1c773213468..fb43917ca96 100644 ---- a/internal/server/instance/drivers/driver_qemu.go -+++ b/internal/server/instance/drivers/driver_qemu.go -@@ -2393,7 +2393,7 @@ func (d *qemu) deviceAttachPath(deviceName string, configCopy map[string]string, - - d.logger.Debug("Using PCI bus device to hotplug virtiofs into", logger.Ctx{"device": deviceName, "port": pciDeviceName}) - -- qemuDev := map[string]string{ -+ qemuDev := map[string]any{ - "driver": "vhost-user-fs-pci", - "bus": pciDeviceName, - "addr": "00.0", -@@ -2535,7 +2535,7 @@ func (d *qemu) deviceAttachNIC(deviceName string, configCopy map[string]string, - return err - } - -- qemuDev := make(map[string]string) -+ qemuDev := make(map[string]any) - - // PCIe and PCI require a port device name to hotplug the NIC into. - if slices.Contains([]string{"pcie", "pci"}, qemuBus) { -@@ -2633,7 +2633,7 @@ func (d *qemu) deviceAttachPCI(deviceName string, configCopy map[string]string, - return err - } - -- qemuDev := make(map[string]string) -+ qemuDev := make(map[string]any) - escapedDeviceName := linux.PathNameEncode(devName) - - d.logger.Debug("Using PCI bus device to hotplug NIC into", logger.Ctx{"device": deviceName, "port": pciDeviceName}) -@@ -3589,7 +3589,7 @@ func (d *qemu) generateQemuConfigFile(cpuInfo *cpuTopology, mountInfo *storagePo - break - } - -- qemuDev := make(map[string]string) -+ qemuDev := make(map[string]any) - if slices.Contains([]string{"nvme", "virtio-blk"}, busName) { - // Allocate a PCI(e) port and write it to the config file so QMP can "hotplug" the - // drive into it later. -@@ -3600,7 +3600,7 @@ func (d *qemu) generateQemuConfigFile(cpuInfo *cpuTopology, mountInfo *storagePo - qemuDev["addr"] = devAddr - - if multi { -- qemuDev["multifunction"] = "on" -+ qemuDev["multifunction"] = true - } - } - -@@ -3624,7 +3624,7 @@ func (d *qemu) generateQemuConfigFile(cpuInfo *cpuTopology, mountInfo *storagePo - - // Add network device. - if len(runConf.NetworkInterface) > 0 { -- qemuDev := make(map[string]string) -+ qemuDev := make(map[string]any) - if slices.Contains([]string{"pcie", "pci"}, bus.name) { - // Allocate a PCI(e) port and write it to the config file so QMP can "hotplug" the - // NIC into it later. -@@ -3635,7 +3635,7 @@ func (d *qemu) generateQemuConfigFile(cpuInfo *cpuTopology, mountInfo *storagePo - qemuDev["addr"] = devAddr - - if multi { -- qemuDev["multifunction"] = "on" -+ qemuDev["multifunction"] = true - } - } - -@@ -3860,7 +3860,7 @@ func (d *qemu) addFileDescriptor(fdFiles *[]*os.File, file *os.File) int { - } - - // addRootDriveConfig adds the qemu config required for adding the root drive. --func (d *qemu) addRootDriveConfig(qemuDev map[string]string, mountInfo *storagePools.MountInfo, bootIndexes map[string]int, rootDriveConf deviceConfig.MountEntryItem) (monitorHook, error) { -+func (d *qemu) addRootDriveConfig(qemuDev map[string]any, mountInfo *storagePools.MountInfo, bootIndexes map[string]int, rootDriveConf deviceConfig.MountEntryItem) (monitorHook, error) { - if rootDriveConf.TargetPath != "/" { - return nil, fmt.Errorf("Non-root drive config supplied") - } -@@ -3992,7 +3992,7 @@ func (d *qemu) addDriveDirConfig(cfg *[]cfgSection, bus *qemuBus, fdFiles *[]*os - } - - // addDriveConfig adds the qemu config required for adding a supplementary drive. --func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string]int, driveConf deviceConfig.MountEntryItem) (monitorHook, error) { -+func (d *qemu) addDriveConfig(qemuDev map[string]any, bootIndexes map[string]int, driveConf deviceConfig.MountEntryItem) (monitorHook, error) { - aioMode := "native" // Use native kernel async IO and O_DIRECT by default. - cacheMode := "none" // Bypass host cache, use O_DIRECT semantics by default. - media := "disk" -@@ -4248,7 +4248,7 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] - } - - if qemuDev == nil { -- qemuDev = map[string]string{} -+ qemuDev = map[string]any{} - } - - qemuDev["id"] = fmt.Sprintf("%s%s", qemuDeviceIDPrefix, escapedDeviceName) -@@ -4256,8 +4256,8 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] - qemuDev["serial"] = fmt.Sprintf("%s%s", qemuBlockDevIDPrefix, escapedDeviceName) - - if bus == "virtio-scsi" { -- qemuDev["channel"] = "0" -- qemuDev["lun"] = "1" -+ qemuDev["channel"] = 0 -+ qemuDev["lun"] = 1 - qemuDev["bus"] = "qemu_scsi.0" - - if media == "disk" { -@@ -4282,7 +4282,7 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] - } - - if bootIndexes != nil { -- qemuDev["bootindex"] = strconv.Itoa(bootIndexes[driveConf.DevName]) -+ qemuDev["bootindex"] = bootIndexes[driveConf.DevName] - } - - monHook := func(m *qmp.Monitor) error { -@@ -4336,7 +4336,7 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] - } - - if driveConf.Limits != nil { -- err = m.SetBlockThrottle(qemuDev["id"], int(driveConf.Limits.ReadBytes), int(driveConf.Limits.WriteBytes), int(driveConf.Limits.ReadIOps), int(driveConf.Limits.WriteIOps)) -+ err = m.SetBlockThrottle(qemuDev["id"].(string), int(driveConf.Limits.ReadBytes), int(driveConf.Limits.WriteBytes), int(driveConf.Limits.ReadIOps), int(driveConf.Limits.WriteIOps)) - if err != nil { - return fmt.Errorf("Failed applying limits for disk device %q: %w", driveConf.DevName, err) - } -@@ -4351,7 +4351,7 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string] - - // addNetDevConfig adds the qemu config required for adding a network device. - // The qemuDev map is expected to be preconfigured with the settings for an existing port to use for the device. --func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]string, bootIndexes map[string]int, nicConfig []deviceConfig.RunConfigItem) (monitorHook, error) { -+func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]any, bootIndexes map[string]int, nicConfig []deviceConfig.RunConfigItem) (monitorHook, error) { - reverter := revert.New() - defer reverter.Fail() - -@@ -4382,7 +4382,7 @@ func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]string, bootIn - if len(bootIndexes) > 0 { - bootIndex, found := bootIndexes[devName] - if found { -- qemuDev["bootindex"] = strconv.Itoa(bootIndex) -+ qemuDev["bootindex"] = bootIndex - } - } - -@@ -4400,9 +4400,9 @@ func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]string, bootIn - // Number of vectors is number of vCPUs * 2 (RX/TX) + 2 (config/control MSI-X). - vectors := 2*queueCount + 2 - if vectors > 0 { -- qemuDev["mq"] = "on" -+ qemuDev["mq"] = true - if slices.Contains([]string{"pcie", "pci"}, busName) { -- qemuDev["vectors"] = strconv.Itoa(vectors) -+ qemuDev["vectors"] = vectors - } - } - -@@ -4591,9 +4591,9 @@ func (d *qemu) addNetDevConfig(busName string, qemuDev map[string]string, bootIn - } - - qemuDev["netdev"] = qemuNetDev["id"].(string) -- qemuDev["page-per-vq"] = "on" -- qemuDev["iommu_platform"] = "on" -- qemuDev["disable-legacy"] = "on" -+ qemuDev["page-per-vq"] = true -+ qemuDev["iommu_platform"] = true -+ qemuDev["disable-legacy"] = true - - err = m.AddNIC(qemuNetDev, qemuDev) - if err != nil { -@@ -4819,7 +4819,7 @@ func (d *qemu) addGPUDevConfig(cfg *[]cfgSection, bus *qemuBus, gpuConfig []devi - } - - func (d *qemu) addUSBDeviceConfig(usbDev deviceConfig.USBDeviceItem) (monitorHook, error) { -- device := map[string]string{ -+ qemuDev := map[string]any{ - "id": fmt.Sprintf("%s%s", qemuDeviceIDPrefix, usbDev.DeviceName), - "driver": "usb-host", - "bus": "qemu_usb.0", -@@ -4836,18 +4836,18 @@ func (d *qemu) addUSBDeviceConfig(usbDev deviceConfig.USBDeviceItem) (monitorHoo - - defer func() { _ = f.Close() }() - -- info, err := m.SendFileWithFDSet(device["id"], f, false) -+ info, err := m.SendFileWithFDSet(qemuDev["id"].(string), f, false) - if err != nil { - return fmt.Errorf("Failed to send file descriptor: %w", err) - } - - revert.Add(func() { -- _ = m.RemoveFDFromFDSet(device["id"]) -+ _ = m.RemoveFDFromFDSet(qemuDev["id"].(string)) - }) - -- device["hostdevice"] = fmt.Sprintf("/dev/fdset/%d", info.ID) -+ qemuDev["hostdevice"] = fmt.Sprintf("/dev/fdset/%d", info.ID) - -- err = m.AddDevice(device) -+ err = m.AddDevice(qemuDev) - if err != nil { - return fmt.Errorf("Failed to add device: %w", err) - } -@@ -9188,19 +9188,19 @@ func (d *qemu) setCPUs(monitor *qmp.Monitor, count int) error { - - devID := fmt.Sprintf("cpu%d%d%d", cpu.Props.SocketID, cpu.Props.CoreID, cpu.Props.ThreadID) - -- dev := map[string]string{ -+ qemuDev := map[string]any{ - "id": devID, - "driver": cpu.Type, -- "core-id": fmt.Sprintf("%d", cpu.Props.CoreID), -+ "core-id": cpu.Props.CoreID, - } - - // No such thing as sockets and threads on s390x. - if d.architecture != osarch.ARCH_64BIT_S390_BIG_ENDIAN { -- dev["socket-id"] = fmt.Sprintf("%d", cpu.Props.SocketID) -- dev["thread-id"] = fmt.Sprintf("%d", cpu.Props.ThreadID) -+ qemuDev["socket-id"] = cpu.Props.SocketID -+ qemuDev["thread-id"] = cpu.Props.ThreadID - } - -- err := monitor.AddDevice(dev) -+ err := monitor.AddDevice(qemuDev) - if err != nil { - return fmt.Errorf("Failed to add device: %w", err) - } -@@ -9229,12 +9229,12 @@ func (d *qemu) setCPUs(monitor *qmp.Monitor, count int) error { - } - - revert.Add(func() { -- err := monitor.AddDevice(map[string]string{ -+ err := monitor.AddDevice(map[string]any{ - "id": devID, - "driver": cpu.Type, -- "socket-id": fmt.Sprintf("%d", cpu.Props.SocketID), -- "core-id": fmt.Sprintf("%d", cpu.Props.CoreID), -- "thread-id": fmt.Sprintf("%d", cpu.Props.ThreadID), -+ "socket-id": cpu.Props.SocketID, -+ "core-id": cpu.Props.CoreID, -+ "thread-id": cpu.Props.ThreadID, - }) - d.logger.Warn("Failed to add CPU device", logger.Ctx{"err": err}) - }) -diff --git a/internal/server/instance/drivers/qmp/commands.go b/internal/server/instance/drivers/qmp/commands.go -index 3e9752780c5..d81da8ff4f4 100644 ---- a/internal/server/instance/drivers/qmp/commands.go -+++ b/internal/server/instance/drivers/qmp/commands.go -@@ -538,7 +538,7 @@ func (m *Monitor) SetMemoryBalloonSizeBytes(sizeBytes int64) error { - } - - // AddBlockDevice adds a block device. --func (m *Monitor) AddBlockDevice(blockDev map[string]any, device map[string]string) error { -+func (m *Monitor) AddBlockDevice(blockDev map[string]any, device map[string]any) error { - revert := revert.New() - defer revert.Fail() - -@@ -624,7 +624,7 @@ func (m *Monitor) RemoveCharDevice(deviceID string) error { - } - - // AddDevice adds a new device. --func (m *Monitor) AddDevice(device map[string]string) error { -+func (m *Monitor) AddDevice(device map[string]any) error { - if device != nil { - err := m.Run("device_add", device, nil) - if err != nil { -@@ -656,7 +656,7 @@ func (m *Monitor) RemoveDevice(deviceID string) error { - } - - // AddNIC adds a NIC device. --func (m *Monitor) AddNIC(netDev map[string]any, device map[string]string) error { -+func (m *Monitor) AddNIC(netDev map[string]any, device map[string]any) error { - revert := revert.New() - defer revert.Fail() - diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix index fda8a541bc25..0954032da23c 100644 --- a/pkgs/by-name/in/incus/generic.nix +++ b/pkgs/by-name/in/incus/generic.nix @@ -2,7 +2,7 @@ hash, lts ? false, patches ? [ ], - updateScriptArgs ? "", + nixUpdateExtraArgs ? [ ], vendorHash, version, }: @@ -12,7 +12,6 @@ lib, buildGoModule, fetchFromGitHub, - writeScript, acl, cowsql, libcap, @@ -21,6 +20,7 @@ sqlite, udev, installShellFiles, + nix-update-script, nixosTests, }: @@ -128,9 +128,9 @@ buildGoModule rec { ui = callPackage ./ui.nix { }; - updateScript = writeScript "ovs-update.py" '' - ${./update.py} ${updateScriptArgs} - ''; + updateScript = nix-update-script { + extraArgs = nixUpdateExtraArgs; + }; }; meta = { diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index 94b30f5d39b9..a6cbeffb08d4 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -8,5 +8,8 @@ import ./generic.nix { ./0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch ]; lts = true; - updateScriptArgs = "--lts --regex '6.0.*'"; + nixUpdateExtraArgs = [ + "--version-regex=^v(6\\.0\\.[0-9]+)$" + "--override-filename=pkgs/by-name/in/incus/lts.nix" + ]; } diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index a0e1c4c3e0c5..56dc51e57065 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,9 +1,9 @@ import ./generic.nix { - hash = "sha256-Ir+cT+2xA+L4kBXhwA0XXE/D8zjMPGYiwW0VrEdobZ4="; - version = "6.8.0"; - vendorHash = "sha256-CDLq41AB2Y9nYlTuXZaAOgwXIin9CbqSXCFoigsc14A="; - patches = [ - # qemu 9.2 support - ./1531.diff + hash = "sha256-bi++GJLLYlX8JZwmxx4S2EGALuwVOGW4G7u2Nv6s26k="; + version = "6.9.0"; + vendorHash = "sha256-aYQOKO5RMPqChV6hXPBfSLKdfCuS+BFVmpakJX7swKg="; + patches = [ ]; + nixUpdateExtraArgs = [ + "--override-filename=pkgs/by-name/in/incus/package.nix" ]; } diff --git a/pkgs/by-name/in/incus/update.py b/pkgs/by-name/in/incus/update.py deleted file mode 100755 index e0a23f2fd65f..000000000000 --- a/pkgs/by-name/in/incus/update.py +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i python -p python3 python3Packages.looseversion common-updater-scripts nurl - -import argparse -import json -import os -import re -from looseversion import LooseVersion -from subprocess import run - -parser = argparse.ArgumentParser() -parser.add_argument("--lts", action="store_true") -parser.add_argument("--regex") -args = parser.parse_args() - -nixpkgs_path = os.environ["PWD"] - -attr = "incus" -file = "pkgs/by-name/in/incus/package.nix" -if args.lts: - attr = "incus-lts" - file = "pkgs/by-name/in/incus/lts.nix" - -tags = ( - run(["list-git-tags", "--url=https://github.com/lxc/incus"], capture_output=True) - .stdout.decode("utf-8") - .splitlines() -) -tags = [t.lstrip("v") for t in tags] - -latest_version = "0" -for tag in tags: - if args.regex is not None and not re.match(args.regex, tag): - continue - - if LooseVersion(tag) > LooseVersion(latest_version): - latest_version = tag - -current_version = ( - run( - ["nix", "eval", "--raw", "-f", "default.nix", f"{attr}.version"], - capture_output=True, - ) - .stdout.decode("utf-8") - .strip() -) - -if LooseVersion(latest_version) <= LooseVersion(current_version): - print("No update available") - exit(0) - -print(f"Found new version {latest_version} > {current_version}") - -run(["update-source-version", attr, latest_version, f"--file={file}"]) - -file_content: str - -with open(file, "r+") as f: - file_content = f.read() - file_content = re.sub( - 'vendorHash = "sha256-.*"', - 'vendorHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="', - file_content, - ) - f.seek(0) - f.write(file_content) - -print("Generating new vendorHash") - -latest_vendor_hash = ( - run( - ["nurl", "--expr", f"(import {nixpkgs_path} {{}}).{attr}.goModules"], - capture_output=True, - ) - .stdout.decode("utf-8") - .strip() -) - -file_content = file_content.replace( - "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", latest_vendor_hash -) - -with open(file, "w") as f: - f.write(file_content) - -print("Done") From 272fb5babf63d95410023cf6cd214123138c77cb Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 25 Jan 2025 10:50:19 -0500 Subject: [PATCH 180/219] nixos/tests/incus: extend check timeouts --- nixos/tests/incus/incus-tests.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index 5f648f4c04dc..1b9b590863e3 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -244,22 +244,22 @@ import ../make-test-python.nix ( with subtest("container CPU limits can be managed"): set_config(f"container-{variant}1", "limits.cpu 1", restart=True) - wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=15) + wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=90) with subtest("container CPU limits can be hotplug changed"): set_config(f"container-{variant}1", "limits.cpu 2") - wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=15) + wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=90) with subtest("container memory limits can be managed"): set_config(f"container-{variant}1", "limits.memory 128MB", restart=True) - wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=15) + wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=90) with subtest("container memory limits can be hotplug changed"): set_config(f"container-{variant}1", "limits.memory 256MB") - wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=15) + wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=90) with subtest("container software tpm can be configured"): @@ -373,7 +373,7 @@ import ../make-test-python.nix ( with subtest("virtual-machine CPU limits can be hotplug changed"): set_config(f"vm-{variant}1", "limits.cpu 2") - wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=15) + wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=90) with subtest("virtual-machine can successfully restart"): From fce0852e77262497a5a8cd9d398b9a9e4fa65b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Bori?= Date: Fri, 22 Nov 2024 15:36:26 +0100 Subject: [PATCH 181/219] vkquake: install a desktop file --- pkgs/games/quakespasm/vulkan.nix | 36 +++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 137bf667f2f4..b0772c0ad4d4 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -17,16 +17,17 @@ stdenv, vulkan-headers, vulkan-loader, + copyDesktopItems, + makeDesktopItem, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vkquake"; version = "1.31.3"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; - rev = version; + tag = finalAttrs.version; sha256 = "sha256-VqTfcwt6/VTotD2Y7x7WiVwISRGOLfmMWh6EO5DSMX4="; }; @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config + copyDesktopItems ]; buildInputs = @@ -64,18 +66,36 @@ stdenv.mkDerivation rec { }; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" cp vkquake "$out/bin" + + install -D ../Misc/vkQuake_256.png "$out/share/icons/hicolor/256x256/apps/vkquake.png" + + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + exec = finalAttrs.meta.mainProgram; + name = "vkquake"; + icon = "vkquake"; + comment = finalAttrs.meta.description; + desktopName = "vkQuake"; + categories = [ "Game" ]; + }) + ]; + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' patchelf $out/bin/vkquake \ --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; - meta = with lib; { + meta = { description = "Vulkan Quake port based on QuakeSpasm"; - homepage = src.meta.homepage; + homepage = "https://github.com/Novum/vkQuake"; + changelog = "https://github.com/Novum/vkQuake/releases"; longDescription = '' vkQuake is a Quake 1 port using Vulkan instead of OpenGL for rendering. It is based on the popular QuakeSpasm port and runs all mods compatible with it @@ -85,11 +105,11 @@ stdenv.mkDerivation rec { specialization constants, CPU/GPU parallelism and memory pooling. ''; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ PopeRigby ylh ]; mainProgram = "vkquake"; }; -} +}) From c8721658d50e7792ee2769f50069db84d94c8402 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 24 Jan 2025 15:45:42 +0000 Subject: [PATCH 182/219] vst2-sdk: init at 2018-06-11 --- pkgs/by-name/vs/vst2-sdk/package.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/by-name/vs/vst2-sdk/package.nix diff --git a/pkgs/by-name/vs/vst2-sdk/package.nix b/pkgs/by-name/vs/vst2-sdk/package.nix new file mode 100644 index 000000000000..bf16ba8025f7 --- /dev/null +++ b/pkgs/by-name/vs/vst2-sdk/package.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchzip, +}: +fetchzip rec { + name = "vst2-sdk-${version}"; # cannot be `pname`, as `fetchzip` expects `name` + version = "2018-06-11"; + url = "https://web.archive.org/web/20181016150224if_/https://download.steinberg.net/sdk_downloads/vstsdk3610_11_06_2018_build_37.zip"; + hash = "sha256-TyPy8FsXWB8LRz0yr38t3d5xxAxGufAn0dsyrg1JXBA="; + + # Only keep the VST2_SDK directory + stripRoot = false; + postFetch = '' + mv $out/VST_SDK/VST2_SDK/* $out/ + rm -rf $out/VST_SDK + ''; + + meta = { + description = "The VST2 source development kit"; + longDescription = '' + VST2 is proprietary, and deprecated by Steinberg. + As such, it should only be used for legacy reasons. + ''; + license = [ lib.licenses.unfree ]; + }; +} From b98418678dc6d0e69c584511266980d7fe984ee8 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 24 Jan 2025 16:57:17 +0000 Subject: [PATCH 183/219] airwave: use the packaged version of `vst2-sdk` --- pkgs/applications/audio/airwave/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index c7422a2baac8..29e2f1044d0c 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -12,6 +12,7 @@ file, libX11, qt5, + vst2-sdk, }: let @@ -24,18 +25,6 @@ let sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s"; }; - vst-sdk = stdenv.mkDerivation rec { - name = "vstsdk369_01_03_2018_build_132"; - src = requireFile { - name = "${name}.zip"; - url = "http://www.steinberg.net/en/company/developers.html"; - sha256 = "0r29fv6yhm2m5yznn8m4my7fq01w1lpphax4sshagy6b1dgjlv3w"; - }; - nativeBuildInputs = [ unzip ]; - installPhase = "cp -r . $out"; - meta.license = lib.licenses.unfree; - }; - wine-wow64 = wine.override { wineRelease = "stable"; wineBuild = "wineWow"; @@ -84,7 +73,7 @@ multiStdenv.mkDerivation { # Cf. https://github.com/phantom-code/airwave/issues/57 hardeningDisable = [ "format" ]; - cmakeFlags = [ "-DVSTSDK_PATH=${vst-sdk}/VST2_SDK" ]; + cmakeFlags = [ "-DVSTSDK_PATH=${vst2-sdk}" ]; postInstall = '' mv $out/bin $out/libexec From c6f20632f5aa3e1a0aae148d3721c9cd136b524b Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 24 Jan 2025 17:20:38 +0000 Subject: [PATCH 184/219] airwave.meta: min-scope `with lib` --- pkgs/applications/audio/airwave/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 29e2f1044d0c..9789485488be 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -83,7 +83,7 @@ multiStdenv.mkDerivation { wrapProgram $out/libexec/airwave-host-64.exe --set WINELOADER ${wine-xembed}/bin/wine64 ''; - meta = with lib; { + meta = { description = "WINE-based VST bridge for Linux VST hosts"; longDescription = '' Airwave is a wine based VST bridge, that allows for the use of @@ -94,9 +94,9 @@ multiStdenv.mkDerivation { window. ''; homepage = "https://github.com/phantom-code/airwave"; - license = licenses.mit; + license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ michalrus ]; + maintainers = with lib.maintainers; [ michalrus ]; hydraPlatforms = [ ]; }; } From eee2e78a74d7c0a8000a40dd93a16ad4f6855da8 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 24 Jan 2025 15:52:42 +0000 Subject: [PATCH 185/219] airwindows: use the packaged copy of `vst2-sdk` --- pkgs/by-name/ai/airwindows/package.nix | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index ac0bd3f3714e..c2c5b1c41886 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -5,27 +5,8 @@ lib, cmake, nix-update-script, + vst2-sdk, }: -let - # adapted from oxefmsynth - vst-sdk = stdenv.mkDerivation { - dontConfigure = true; - dontPatch = true; - dontBuild = true; - dontStrip = true; - dontPatchELF = true; - - name = "vstsdk3610_11_06_2018_build_37"; - src = fetchzip { - url = "https://web.archive.org/web/20181016150224if_/https://download.steinberg.net/sdk_downloads/vstsdk3610_11_06_2018_build_37.zip"; - sha256 = "0da16iwac590wphz2sm5afrfj42jrsnkr1bxcy93lj7a369ildkj"; - }; - - installPhase = '' - cp -r VST2_SDK $out - ''; - }; -in stdenv.mkDerivation { pname = "airwindows"; version = "0-unstable-2025-01-06"; @@ -41,7 +22,7 @@ stdenv.mkDerivation { # came from. prePatch = '' mkdir -p plugins/LinuxVST/include - ln -s ${vst-sdk.out} plugins/LinuxVST/include/vstsdk + ln -s ${vst2-sdk} plugins/LinuxVST/include/vstsdk ''; patches = [ @@ -62,7 +43,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - vst-sdk + vst2-sdk ]; installPhase = '' @@ -82,7 +63,6 @@ stdenv.mkDerivation { platforms = lib.platforms.linux; license = [ lib.licenses.mit - lib.licenses.unfree ]; maintainers = [ lib.maintainers.l1npengtul ]; }; From 80b19f8e497af6b33e3cd53f84e801abbcdc9f43 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 24 Jan 2025 15:58:40 +0000 Subject: [PATCH 186/219] bespokesynth: use the packaged version of `vst2-sdk` --- pkgs/by-name/be/bespokesynth/package.nix | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix index 29ff82de7e2f..112c83287565 100644 --- a/pkgs/by-name/be/bespokesynth/package.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -23,6 +23,7 @@ libXScrnSaver, libGL, libxcb, + vst2-sdk, xcbutil, libxkbcommon, xcbutilkeysyms, @@ -40,20 +41,6 @@ enableVST2 ? false, }: -let - # equal to vst-sdk in ../oxefmsynth/default.nix - vst-sdk = stdenv.mkDerivation rec { - name = "vstsdk3610_11_06_2018_build_37"; - src = fetchzip { - url = "https://web.archive.org/web/20181016150224if_/https://download.steinberg.net/sdk_downloads/${name}.zip"; - sha256 = "0da16iwac590wphz2sm5afrfj42jrsnkr1bxcy93lj7a369ildkj"; - }; - installPhase = '' - cp -r . $out - ''; - }; - -in stdenv.mkDerivation (finalAttrs: { pname = "bespokesynth"; version = "1.3.0"; @@ -88,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BESPOKE_SYSTEM_JSONCPP" true) ] ++ lib.optionals enableVST2 [ - (lib.cmakeFeature "BESPOKE_VST2_SDK_LOCATION" "${vst-sdk}/VST2_SDK") + (lib.cmakeFeature "BESPOKE_VST2_SDK_LOCATION" "${vst2-sdk}") ]; strictDeps = true; @@ -185,12 +172,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Software modular synth with controllers support, scripting and VST"; homepage = "https://www.bespokesynth.com/"; - license = - with lib.licenses; - [ - gpl3Plus - ] - ++ lib.optional enableVST2 unfree; + license = [ lib.licenses.gpl3Plus ]; maintainers = with lib.maintainers; [ astro tobiasBora From 0285aa63477857cfe1d481180bf7ff8117fcbcd8 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 24 Jan 2025 16:00:59 +0000 Subject: [PATCH 187/219] jackass: use the packaged version of `vst2-sdk` --- pkgs/by-name/ja/jackass/package.nix | 30 ++++++----------------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/ja/jackass/package.nix b/pkgs/by-name/ja/jackass/package.nix index 6f31b8bcfb8c..b46723c16776 100644 --- a/pkgs/by-name/ja/jackass/package.nix +++ b/pkgs/by-name/ja/jackass/package.nix @@ -4,26 +4,11 @@ fetchFromGitHub, fetchzip, pkg-config, + vst2-sdk, wine64, enableJackAssWine64 ? false, }: -let - # equal to vst-sdk in ../oxefmsynth/default.nix - vst-sdk = stdenv.mkDerivation (finalAttrs: { - name = "vstsdk3610_11_06_2018_build_37"; - src = fetchzip { - url = "https://web.archive.org/web/20181016150224if_/https://download.steinberg.net/sdk_downloads/${finalAttrs.name}.zip"; - hash = "sha256-cjYakxnqSDqSZ32FPK3OUhDpslOlavHh5SAVpng0QTU="; - }; - installPhase = '' - runHook preInstall - cp -r . $out - runHook postInstall - ''; - }); - -in stdenv.mkDerivation (finalAttrs: { pname = "jackass"; version = "1.1"; @@ -36,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' - cp -r ${vst-sdk}/VST2_SDK/{public.sdk,pluginterfaces} vstsdk2.4 + cp -r ${vst2-sdk}/{public.sdk,pluginterfaces} vstsdk2.4 ''; nativeBuildInputs = [ pkg-config ] ++ lib.optionals enableJackAssWine64 [ wine64 ]; @@ -59,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "JackAss is a VST plugin that provides JACK-MIDI support for VST hosts"; longDescription = '' Simply load the plugin in your favourite host to get a JACK-MIDI port. @@ -67,11 +52,8 @@ stdenv.mkDerivation (finalAttrs: { applications. Set enableJackAssWine64 to true to enable this output. ''; homepage = "https://github.com/falkTX/JackAss"; - maintainers = with maintainers; [ PowerUser64 ]; - license = with licenses; [ - mit - unfree - ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ PowerUser64 ]; + license = [ lib.licenses.mit ]; + platforms = lib.platforms.linux; }; }) From c33c3066be8ee4bcb26dc329207c2836fe561df4 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 24 Jan 2025 16:03:03 +0000 Subject: [PATCH 188/219] oxefmsynth: use the packaged version of `vst2-sdk` --- pkgs/by-name/ox/oxefmsynth/package.nix | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ox/oxefmsynth/package.nix b/pkgs/by-name/ox/oxefmsynth/package.nix index b569dccb8723..d64e51bb9232 100644 --- a/pkgs/by-name/ox/oxefmsynth/package.nix +++ b/pkgs/by-name/ox/oxefmsynth/package.nix @@ -4,20 +4,8 @@ fetchFromGitHub, fetchzip, libX11, + vst2-sdk, }: - -let - - vst-sdk = stdenv.mkDerivation rec { - name = "vstsdk3610_11_06_2018_build_37"; - src = fetchzip { - url = "https://web.archive.org/web/20181016150224if_/https://download.steinberg.net/sdk_downloads/${name}.zip"; - sha256 = "0da16iwac590wphz2sm5afrfj42jrsnkr1bxcy93lj7a369ildkj"; - }; - installPhase = "cp -r . $out"; - }; - -in stdenv.mkDerivation rec { pname = "oxefmsynth"; version = "1.3.5"; @@ -31,7 +19,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString [ "-Wno-narrowing" ]; - buildFlags = [ "VSTSDK_PATH=${vst-sdk}/VST2_SDK" ]; + buildFlags = [ "VSTSDK_PATH=${vst2-sdk}" ]; buildInputs = [ libX11 ]; @@ -40,11 +28,11 @@ stdenv.mkDerivation rec { install -Dm644 oxevst64.so -t $out/lib/lxvst ''; - meta = with lib; { + meta = { homepage = "https://github.com/oxesoft/oxefmsynth"; description = "Open source VST 2.4 instrument plugin"; - maintainers = [ maintainers.hirenashah ]; + maintainers = [ lib.maintainers.hirenashah ]; platforms = [ "x86_64-linux" ]; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; }; } From 4e7cc47a2261b3d9270abfa260120dfa3fba3f45 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 11 Apr 2024 08:47:48 +0200 Subject: [PATCH 189/219] pkgs/top-level: rewrite some outdated comments This removes all specific references to pkgsCross or pkgsi686Linux, because they have become outdated with the addition of many more package sets. --- pkgs/top-level/default.nix | 16 ++++++---------- pkgs/top-level/stage.nix | 7 +------ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index fd443ac773ff..918a47639f3c 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -122,22 +122,18 @@ in let config = lib.showWarnings configEval.config.warnings configEval.config; # A few packages make a new package set to draw their dependencies from. - # (Currently to get a cross tool chain, or forced-i686 package.) Rather than - # give `all-packages.nix` all the arguments to this function, even ones that - # don't concern it, we give it this function to "re-call" nixpkgs, inheriting - # whatever arguments it doesn't explicitly provide. This way, - # `all-packages.nix` doesn't know more than it needs too. + # Rather than give `all-packages.nix` all the arguments to this function, + # even ones that don't concern it, we give it this function to "re-call" + # nixpkgs, inheriting whatever arguments it doesn't explicitly provide. This + # way, `all-packages.nix` doesn't know more than it needs to. # # It's OK that `args` doesn't include default arguments from this file: # they'll be deterministically inferred. In fact we must *not* include them, # because it's important that if some parameter which affects the default is # substituted with a different argument, the default is re-inferred. # - # To put this in concrete terms, this function is basically just used today to - # use package for a different platform for the current platform (namely cross - # compiling toolchains and 32-bit packages on x86_64). In both those cases we - # want the provided non-native `localSystem` argument to affect the stdenv - # chosen. + # To put this in concrete terms, we want the provided non-native `localSystem` + # and `crossSystem` arguments to affect the stdenv chosen. # # NB!!! This thing gets its `config` argument from `args`, i.e. it's actually # `config0`. It is important to keep it to `config0` format (as opposed to the diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 64bc2308f6da..7b20ed0f4e4b 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -180,12 +180,7 @@ let ((config.packageOverrides or (super: {})) super); # Convenience attributes for instantitating package sets. Each of - # these will instantiate a new version of allPackages. Currently the - # following package sets are provided: - # - # - pkgsCross. where system is a member of lib.systems.examples - # - pkgsMusl - # - pkgsi686Linux + # these will instantiate a new version of allPackages. otherPackageSets = self: super: { # This maps each entry in lib.systems.examples to its own package # set. Each of these will contain all packages cross compiled for From 3fcedef056944942c9d368ea785ecb1fe6ff5f57 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 26 May 2024 21:43:20 +0200 Subject: [PATCH 190/219] pkgs/top-level/stage: refactor moving more generic package sets to the bottom No change, just move appendOverlays and extend to the bottom, since they will be changed much less often. This makes it easier to compare the other package sets side-by-side. --- pkgs/top-level/stage.nix | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 7b20ed0f4e4b..782fcae95da4 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -298,23 +298,6 @@ let localSystem = lib.systems.elaborate "${stdenv.hostPlatform.parsed.cpu.name}-linux"; }; - # Extend the package set with zero or more overlays. This preserves - # preexisting overlays. Prefer to initialize with the right overlays - # in one go when calling Nixpkgs, for performance and simplicity. - appendOverlays = extraOverlays: - if extraOverlays == [] - then self - else nixpkgsFun { overlays = args.overlays ++ extraOverlays; }; - - # NOTE: each call to extend causes a full nixpkgs rebuild, adding ~130MB - # of allocations. DO NOT USE THIS IN NIXPKGS. - # - # Extend the package set with a single overlay. This preserves - # preexisting overlays. Prefer to initialize with the right overlays - # in one go when calling Nixpkgs, for performance and simplicity. - # Prefer appendOverlays if used repeatedly. - extend = f: self.appendOverlays [f]; - # Fully static packages. # Currently uses Musl on Linux (couldn’t get static glibc to work). pkgsStatic = nixpkgsFun ({ @@ -357,6 +340,23 @@ let }) ] ++ overlays; }; + + # Extend the package set with zero or more overlays. This preserves + # preexisting overlays. Prefer to initialize with the right overlays + # in one go when calling Nixpkgs, for performance and simplicity. + appendOverlays = extraOverlays: + if extraOverlays == [] + then self + else nixpkgsFun { overlays = args.overlays ++ extraOverlays; }; + + # NOTE: each call to extend causes a full nixpkgs rebuild, adding ~130MB + # of allocations. DO NOT USE THIS IN NIXPKGS. + # + # Extend the package set with a single overlay. This preserves + # preexisting overlays. Prefer to initialize with the right overlays + # in one go when calling Nixpkgs, for performance and simplicity. + # Prefer appendOverlays if used repeatedly. + extend = f: self.appendOverlays [f]; }; # The complete chain of package set builders, applied from top to bottom. From 071851299f3a5b2880b456e487fd9010011118ae Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 15 Dec 2024 15:05:05 +0100 Subject: [PATCH 191/219] pkgs/top-level: refactor mkPkgs Sharing a first piece of common code between all package sets makes it easier to maintain and less likely to introduce a new package set without this. --- pkgs/top-level/stage.nix | 66 +++++++++++++--------------------------- 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 782fcae95da4..781dcd357cd4 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -181,7 +181,15 @@ let # Convenience attributes for instantitating package sets. Each of # these will instantiate a new version of allPackages. - otherPackageSets = self: super: { + otherPackageSets = let + mkPkgs = name: nixpkgsArgs: nixpkgsFun (nixpkgsArgs // { + overlays = [ + (self': super': { + "${name}" = super'; + }) + ] ++ nixpkgsArgs.overlays or [] ++ overlays; + }); + in self: super: { # This maps each entry in lib.systems.examples to its own package # set. Each of these will contain all packages cross compiled for # that target system. For instance, pkgsCross.raspberryPi.hello, @@ -191,12 +199,7 @@ let nixpkgsFun { inherit crossSystem; }) lib.systems.examples; - pkgsLLVM = nixpkgsFun { - overlays = [ - (self': super': { - pkgsLLVM = super'; - }) - ] ++ overlays; + pkgsLLVM = mkPkgs "pkgsLLVM" { # Bootstrap a cross stdenv using the LLVM toolchain. # This is currently not possible when compiling natively, # so we don't need to check hostPlatform != buildPlatform. @@ -206,10 +209,7 @@ let }; }; - pkgsLLVMLibc = nixpkgsFun { - overlays = [ (self': super': { - pkgsLLVMLibc = super'; - })] ++ overlays; + pkgsLLVMLibc = mkPkgs "pkgsLLVMLibc" { # Bootstrap a cross stdenv using LLVM libc. # This is currently not possible when compiling natively, # so we don't need to check hostPlatform != buildPlatform. @@ -219,12 +219,7 @@ let }; }; - pkgsArocc = nixpkgsFun { - overlays = [ - (self': super': { - pkgsArocc = super'; - }) - ] ++ overlays; + pkgsArocc = mkPkgs "pkgsArocc" { # Bootstrap a cross stdenv using the Aro C compiler. # This is currently not possible when compiling natively, # so we don't need to check hostPlatform != buildPlatform. @@ -234,12 +229,7 @@ let }; }; - pkgsZig = nixpkgsFun { - overlays = [ - (self': super': { - pkgsZig = super'; - }) - ] ++ overlays; + pkgsZig = mkPkgs "pkgsZig" { # Bootstrap a cross stdenv using the Zig toolchain. # This is currently not possible when compiling natively, # so we don't need to check hostPlatform != buildPlatform. @@ -252,10 +242,7 @@ let # All packages built with the Musl libc. This will override the # default GNU libc on Linux systems. Non-Linux systems are not # supported. 32-bit is also not supported. - pkgsMusl = if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then nixpkgsFun { - overlays = [ (self': super': { - pkgsMusl = super'; - })] ++ overlays; + pkgsMusl = if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then mkPkgs "pkgsMusl" { ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed); @@ -264,10 +251,7 @@ let # All packages built for i686 Linux. # Used by wine, firefox with debugging version of Flash, ... - pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then nixpkgsFun { - overlays = [ (self': super': { - pkgsi686Linux = super'; - })] ++ overlays; + pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then mkPkgs "pkgsi686Linux" { ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // { @@ -277,10 +261,7 @@ let } else throw "i686 Linux package set can only be used with the x86 family."; # x86_64-darwin packages for aarch64-darwin users to use with Rosetta for incompatible packages - pkgsx86_64Darwin = if stdenv.hostPlatform.isDarwin then nixpkgsFun { - overlays = [ (self': super': { - pkgsx86_64Darwin = super'; - })] ++ overlays; + pkgsx86_64Darwin = if stdenv.hostPlatform.isDarwin then mkPkgs "pkgsx86_64Darwin" { localSystem = { config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // { cpu = lib.systems.parse.cpuTypes.x86_64; @@ -290,20 +271,16 @@ let # If already linux: the same package set unaltered # Otherwise, return a natively built linux package set for the current cpu architecture string. - # (ABI and other details will be set to the default for the cpu/os pair) pkgsLinux = if stdenv.hostPlatform.isLinux then self - else nixpkgsFun { + else mkPkgs "pkgsLinux" { localSystem = lib.systems.elaborate "${stdenv.hostPlatform.parsed.cpu.name}-linux"; }; # Fully static packages. # Currently uses Musl on Linux (couldn’t get static glibc to work). - pkgsStatic = nixpkgsFun ({ - overlays = [ (self': super': { - pkgsStatic = super'; - })] ++ overlays; + pkgsStatic = mkPkgs "pkgsStatic" { crossSystem = { isStatic = true; config = lib.systems.parse.tripleFromSystem ( @@ -314,12 +291,11 @@ let gcc = lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { abi = "elfv2"; } // stdenv.hostPlatform.gcc or {}; }; - }); + }; - pkgsExtraHardening = nixpkgsFun { + pkgsExtraHardening = mkPkgs "pkgsExtraHardening" { overlays = [ (self': super': { - pkgsExtraHardening = super'; stdenv = super'.withDefaultHardeningFlags ( super'.stdenv.cc.defaultHardeningFlags ++ [ "shadowstack" @@ -338,7 +314,7 @@ let pcre-cpp = super'.pcre-cpp.override { enableJit = false; }; pcre16 = super'.pcre16.override { enableJit = false; }; }) - ] ++ overlays; + ]; }; # Extend the package set with zero or more overlays. This preserves From 941f3d430aa1d80f17a142dc7dff5a18554de759 Mon Sep 17 00:00:00 2001 From: Corbin Wunderlich Date: Thu, 2 Jan 2025 17:30:28 -0500 Subject: [PATCH 192/219] xpraWithNvenc: add nvjpeg support --- pkgs/tools/X11/xpra/default.nix | 38 +++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index f1c275ca322e..156a927527bf 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -9,6 +9,7 @@ atk, cairo, cudatoolkit, + cudaPackages, ffmpeg, gdk-pixbuf, getopt, @@ -40,7 +41,7 @@ xorgserver, xxHash, clang, -}: +}@args: let inherit (python3.pkgs) cython buildPythonApplication; @@ -73,11 +74,18 @@ let cp ${nv-codec-headers-10}/include/ffnvcodec/nvEncodeAPI.h $out/include substituteAll ${./nvenc.pc} $out/lib/pkgconfig/nvenc.pc ''; + + nvjpegHeaders = runCommand "nvjpeg-headers" { } '' + mkdir -p $out/include $out/lib/pkgconfig + substituteAll ${cudaPackages.libnvjpeg.dev}/share/pkgconfig/nvjpeg.pc $out/lib/pkgconfig/nvjpeg.pc + ''; in buildPythonApplication rec { pname = "xpra"; version = "6.2.2"; + stdenv = if withNvenc then cudaPackages.backendStdenv else args.stdenv; + src = fetchFromGitHub { owner = "Xpra-org"; repo = "xpra"; @@ -148,7 +156,10 @@ buildPythonApplication rec { x265 xxHash ] - ++ lib.optional withNvenc nvencHeaders; + ++ lib.optional withNvenc [ + nvencHeaders + nvjpegHeaders + ]; propagatedBuildInputs = with python3.pkgs; @@ -185,15 +196,20 @@ buildPythonApplication rec { # error: 'import_cairo' defined but not used env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; - setupPyBuildFlags = [ - "--with-Xdummy" - "--without-Xdummy_wrapper" - "--without-strict" - "--with-gtk3" - # Override these, setup.py checks for headers in /usr/* paths - "--with-pam" - "--with-vsock" - ] ++ lib.optional withNvenc "--with-nvenc"; + setupPyBuildFlags = + [ + "--with-Xdummy" + "--without-Xdummy_wrapper" + "--without-strict" + "--with-gtk3" + # Override these, setup.py checks for headers in /usr/* paths + "--with-pam" + "--with-vsock" + ] + ++ lib.optional withNvenc [ + "--with-nvenc" + "--with-nvjpeg_encoder" + ]; dontWrapGApps = true; From da1df2947269159848b062f353e2ab80015c9def Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 17:08:27 +0000 Subject: [PATCH 193/219] television: 0.9.3 -> 0.9.4 --- 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 3c9af991b718..687a0fa9775c 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.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = version; - hash = "sha256-0VnDgDLsPmNaY1sjw891hm65TsE3HH9KBkkgp0TFQKg="; + hash = "sha256-S0at9qiPaHtFSag/DjJxczcjuQwPIWQBqxrRwrWIPk0="; }; - cargoHash = "sha256-WtB1rmgOfAnZ9OGJ8M5s5NqMm24s8gcPzlu14f2mTrE="; + cargoHash = "sha256-eWy1MnduirMyPeOhNYelDV+4J4+9Qf9jSaW772p7t1k="; passthru = { tests.version = testers.testVersion { From ab097402432cd299418eedec90d2bfcca18bdfc7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 17:12:15 +0000 Subject: [PATCH 194/219] gitify: 5.17.0 -> 5.18.0 --- pkgs/by-name/gi/gitify/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index 3d807ba7b9ad..ffcabfe0433e 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gitify"; - version = "5.17.0"; + version = "5.18.0"; src = fetchFromGitHub { owner = "gitify-app"; repo = "gitify"; tag = "v${finalAttrs.version}"; - hash = "sha256-l89CXfARLBNS6MMq54gM63y5FqeHdMXDBt52znir+/A="; + hash = "sha256-INeOQY39IepcqigThymEcBjkrQkIC/9Py+g32/VBpmg="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-I78AvOBdDd59eVJJ51xxNwVvMnNvLdJJpFEtE/I1H8U="; + hash = "sha256-86RiBzZwoyDX5l9wV3JiUo4efkol3sKH3tlu61D7D+0="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; From 3be72f3bc292ed52b36805ea7eb47b3ec098d80d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kobsch=C3=A4tzki?= Date: Sat, 25 Jan 2025 18:19:39 +0100 Subject: [PATCH 195/219] squid: make ipv6 configurable --- pkgs/by-name/sq/squid/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix index d38921626061..73322d9a5797 100644 --- a/pkgs/by-name/sq/squid/package.nix +++ b/pkgs/by-name/sq/squid/package.nix @@ -15,6 +15,7 @@ systemd, cppunit, esi ? false, + ipv6 ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -47,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ - "--enable-ipv6" "--disable-strict-error-checking" "--disable-arch-native" "--with-openssl" @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-x-accelerator-vary" "--enable-htcp" ] + ++ (if ipv6 then [ "--enable-ipv6" ] else [ "--disable-ipv6" ]) ++ lib.optional (!esi) "--disable-esi" ++ lib.optional ( stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl From bb1993232d1a03128793a625305291ff18f800da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kobsch=C3=A4tzki?= Date: Sat, 25 Jan 2025 18:34:00 +0100 Subject: [PATCH 196/219] squid: add config validation Inspired by NGINX config validation with pkgs.writers --- nixos/modules/services/networking/squid.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/squid.nix b/nixos/modules/services/networking/squid.nix index 4865718b24f7..7bcbc0ec151f 100644 --- a/nixos/modules/services/networking/squid.nix +++ b/nixos/modules/services/networking/squid.nix @@ -6,8 +6,19 @@ let cfg = config.services.squid; + configWriter = + if cfg.validateConfig then + ( + content: + pkgs.writers.makeScriptWriter { + check = "${cfg.package}/bin/squid -k parse -f"; + interpreter = "${cfg.package}/bin/squid"; + } "squid.conf" content + ) + else + (content: pkgs.writeText "squid.conf" content); - squidConfig = pkgs.writeText "squid.conf" + squidConfig = configWriter (if cfg.configText != null then cfg.configText else '' # @@ -111,6 +122,12 @@ in description = "Whether to run squid web proxy."; }; + validateConfig = mkOption { + type = types.bool; + default = true; + description = "Validate config syntax."; + }; + package = mkPackageOption pkgs "squid" { }; proxyAddress = mkOption { From b75355ccc317b8562c4a7a66373070f210f6ed72 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 10 Apr 2024 22:18:25 +0200 Subject: [PATCH 197/219] pkgs/test/top-level: add tests for package set composability This adds some basic tests to compose package sets. The cases that are currently broken are commented out, they include things like: - pkgsStatic.pkgsMusl losing the isStatic flag - pkgsCross.ppc64-musl.pkgsMusl losing the gcc.abi setting - pkgsCross.mingwW64.pkgsStatic losing the config string - pkgsLLVM.pkgsMusl losing the useLLVM flag - pkgsLLVM.pkgsStatic losing the useLLVM flag - pkgsLLVM.pkgsi686Linux losing the useLLVM flag And probably more. --- pkgs/test/top-level/stage.nix | 128 ++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 pkgs/test/top-level/stage.nix diff --git a/pkgs/test/top-level/stage.nix b/pkgs/test/top-level/stage.nix new file mode 100644 index 000000000000..c56d417659ce --- /dev/null +++ b/pkgs/test/top-level/stage.nix @@ -0,0 +1,128 @@ +# run like this: +# nix-build pkgs/test/top-level/stage.nix +{ + localSystem ? { + system = builtins.currentSystem; + }, +}: + +with import ../../top-level { inherit localSystem; }; + +let + # To silence platform specific evaluation errors + discardEvaluationErrors = e: (builtins.tryEval e).success -> e; + + # Basic test for idempotency of the package set, i.e: + # Applying the same package set twice should work and + # not change anything. + isIdempotent = set: discardEvaluationErrors (pkgs.${set}.stdenv == pkgs.${set}.${set}.stdenv); + + # Some package sets should be noops in certain circumstances. + # This is very similar to the idempotency test, but not going + # via the super' overlay. + isNoop = + parent: child: + discardEvaluationErrors ( + (lib.getAttrFromPath parent pkgs).stdenv == (lib.getAttrFromPath parent pkgs).${child}.stdenv + ); + + allMuslExamples = builtins.attrNames ( + lib.filterAttrs (_: system: lib.hasSuffix "-musl" system.config) lib.systems.examples + ); + + allLLVMExamples = builtins.attrNames ( + lib.filterAttrs (_: system: system.useLLVM or false) lib.systems.examples + ); + + # A package set should only change specific configuration, but needs + # to keep all other configuration from previous layers in place. + # Each package set has one or more key characteristics for which we + # test here. Those should be kept, even when applying the "set" package + # set. + isComposable = + set: + ( + # Can't compose two different libcs... + builtins.elem set [ "pkgsLLVMLibc" ] + || discardEvaluationErrors ( + pkgsCross.mingwW64.${set}.stdenv.hostPlatform.config == "x86_64-w64-mingw32" + ) + ) + && ( + # Can't compose two different libcs... + builtins.elem set [ "pkgsLLVMLibc" ] + || discardEvaluationErrors (pkgsCross.mingwW64.${set}.stdenv.hostPlatform.libc == "msvcrt") + ) + && discardEvaluationErrors (pkgsCross.ppc64-musl.${set}.stdenv.hostPlatform.gcc.abi == "elfv2") + && discardEvaluationErrors ( + builtins.elem "trivialautovarinit" pkgs.pkgsExtraHardening.${set}.stdenv.cc.defaultHardeningFlags + ) + && discardEvaluationErrors (pkgs.pkgsLLVM.${set}.stdenv.hostPlatform.useLLVM) + && ( + # Can't compose two different libcs... + builtins.elem set [ + "pkgsMusl" + "pkgsStatic" + ] + || discardEvaluationErrors (pkgs.pkgsLLVMLibc.${set}.stdenv.hostPlatform.isLLVMLibc) + ) + && discardEvaluationErrors (pkgs.pkgsArocc.${set}.stdenv.hostPlatform.useArocc) + && discardEvaluationErrors (pkgs.pkgsZig.${set}.stdenv.hostPlatform.useZig) + && discardEvaluationErrors (pkgs.pkgsLinux.${set}.stdenv.buildPlatform.isLinux) + && ( + # Can't compose two different libcs... + builtins.elem set [ "pkgsLLVMLibc" ] + || discardEvaluationErrors (pkgs.pkgsMusl.${set}.stdenv.hostPlatform.isMusl) + ) + && discardEvaluationErrors (pkgs.pkgsStatic.${set}.stdenv.hostPlatform.isStatic) + && discardEvaluationErrors (pkgs.pkgsi686Linux.${set}.stdenv.hostPlatform.isx86_32) + && discardEvaluationErrors (pkgs.pkgsx86_64Darwin.${set}.stdenv.hostPlatform.isx86_64); +in + +# Appends same defaultHardeningFlags again on each .pkgsExtraHardening - thus not idempotent. +# assert isIdempotent "pkgsExtraHardening"; +# TODO: Remove the isDarwin condition, which currently results in infinite recursion. +# Also see https://github.com/NixOS/nixpkgs/pull/330567#discussion_r1894653309 +assert (stdenv.hostPlatform.isDarwin || isIdempotent "pkgsLLVM"); +# TODO: This currently results in infinite recursion, even on Linux +# assert isIdempotent "pkgsLLVMLibc"; +assert isIdempotent "pkgsArocc"; +assert isIdempotent "pkgsZig"; +assert isIdempotent "pkgsLinux"; +assert isIdempotent "pkgsMusl"; +assert isIdempotent "pkgsStatic"; +assert isIdempotent "pkgsi686Linux"; +assert isIdempotent "pkgsx86_64Darwin"; + +# TODO: fails +# assert isNoop [ "pkgsStatic" ] "pkgsMusl"; +# TODO: fails because of ppc64-musl +# assert lib.all (sys: isNoop [ "pkgsCross" sys ] "pkgsMusl") allMuslExamples; +assert lib.all (sys: isNoop [ "pkgsCross" sys ] "pkgsLLVM") allLLVMExamples; + +# TODO: fails +# assert isComposable "pkgsExtraHardening"; +# assert isComposable "pkgsLLVM"; +# assert isComposable "pkgsLLVMLibc"; +# assert isComposable "pkgsArocc"; +# TODO: unexpected argument 'bintools' - uncomment once https://github.com/NixOS/nixpkgs/pull/331011 is done +# assert isComposable "pkgsZig"; +# TODO: attribute 'abi' missing +# assert isComposable "pkgsMusl"; +# TODO: fails +# assert isComposable "pkgsStatic"; +# assert isComposable "pkgsi686Linux"; + +# Special cases regarding buildPlatform vs hostPlatform +# TODO: fails +# assert discardEvaluationErrors (pkgsCross.gnu64.pkgsMusl.stdenv.hostPlatform.isMusl); +# assert discardEvaluationErrors (pkgsCross.gnu64.pkgsi686Linux.stdenv.hostPlatform.isx86_32); +# assert discardEvaluationErrors (pkgsCross.mingwW64.pkgsLinux.stdenv.hostPlatform.isLinux); +# assert discardEvaluationErrors (pkgsCross.aarch64-darwin.pkgsx86_64Darwin.stdenv.hostPlatform.isx86_64); + +# pkgsCross should keep upper cross settings +# TODO: fails +# assert discardEvaluationErrors (with pkgsStatic.pkgsCross.gnu64.stdenv.hostPlatform; isGnu && isStatic); +# assert discardEvaluationErrors (with pkgsLLVM.pkgsCross.musl64.stdenv.hostPlatform; isMusl && useLLVM); + +emptyFile From eec21001b0f7961cb84fe40512e8238ec3effb87 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 11 Jan 2025 11:24:30 +0100 Subject: [PATCH 198/219] nixos/nixpkgs: pass original system args instead of elaborated Passing the elaborated system defeats what pkgs/top-level/default.nix tries to do: Pass only the original args and let defaults be inferred. The underlying problem is that lib.systems.elaborate can not deal with arbitrary overrides, but will often return an inconsistent system description when partially overriding some values. This becomes most prominent if trying to override an already elaborated system. --- lib/modules.nix | 2 ++ nixos/modules/misc/nixpkgs.nix | 15 ++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 79b8f25c2f43..8ec850b59193 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -844,6 +844,8 @@ let in warnDeprecation opt // { value = addErrorContext "while evaluating the option `${showOption loc}':" value; + # raw value before "apply" above + rawValue = addErrorContext "while evaluating the option `${showOption loc}':" res.mergedValue; inherit (res.defsFinal') highestPrio; definitions = map (def: def.value) res.defsFinal; files = map (def: def.file) res.defsFinal; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index e1c705eef3b5..f99f75af7659 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -70,19 +70,24 @@ let ++ lib.optional (opt.localSystem.highestPrio < (lib.mkOptionDefault { }).priority) opt.localSystem ++ lib.optional (opt.crossSystem.highestPrio < (lib.mkOptionDefault { }).priority) opt.crossSystem; + # pkgs/top-level/default.nix takes great strides to pass the *original* localSystem/crossSystem args + # on to nixpkgsFun to create package sets like pkgsStatic, pkgsMusl. This is to be able to infer default + # values again. Since cfg.xxxPlatform and cfg.xxxSystem are elaborated via apply, those can't be passed + # directly. Instead we use the rawValue before the apply/elaboration step, via opt.xxx.rawValue. defaultPkgs = if opt.hostPlatform.isDefined then let + # This compares elaborated systems on purpose, **not** using rawValue. isCross = cfg.buildPlatform != cfg.hostPlatform; systemArgs = if isCross then { - localSystem = cfg.buildPlatform; - crossSystem = cfg.hostPlatform; + localSystem = opt.buildPlatform.rawValue; + crossSystem = opt.hostPlatform.rawValue; } else { - localSystem = cfg.hostPlatform; + localSystem = opt.hostPlatform.rawValue; }; in import ../../.. ( @@ -96,9 +101,9 @@ let inherit (cfg) config overlays - localSystem - crossSystem ; + localSystem = opt.localSystem.rawValue; + crossSystem = opt.crossSystem.rawValue; }; finalPkgs = if opt.pkgs.isDefined then cfg.pkgs.appendOverlays cfg.overlays else defaultPkgs; From 01a02e41f7ba456172eed105511c94a27a8c3848 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 9 Apr 2024 08:41:18 +0200 Subject: [PATCH 199/219] pkgs/top-level: make package sets composable The various pkgsXYZ top-level package sets did not pass localSystem / crossSystem to lower levels, so far. This change propagates original arguments to lower levels, which include the overrides made by an upper package sets. There is an extensive test-suite to test various combinations of package sets in pkgs/test/top-level. There are a few basic promises made: - Package sets must be idempotent. pkgsMusl.pkgsMusl === pkgsMusl. - Once pkgsCross is used any subsequent package sets should affect the **host platform** and not the build platform. Examples: - pkgsMusl.pkgsCross.aarch64-multiplatform is a cross compilation from musl to glibc/aarch64 - pkgsCross.aarch64-multiplatform.pkgsMusl is a cross compilation to musl/aarch64 - Modifications from an earlier layer should not be lost, unless explicitly overwritten. Examples: - pkgsStatic.pkgsMusl should still be static. - pkgsStatic.pkgsCross.gnu64 should be static, but with glibc instead of musl. Exceptions / TODOs: - pkgsExtraHardening is currently not idempotent, because it applies the same flags over and over again. Supersedes #136549 Resolves #114510 Resolves #212494 Resolves #281596 --- pkgs/test/top-level/stage.nix | 37 +++++++------- pkgs/top-level/default.nix | 2 +- pkgs/top-level/stage.nix | 92 ++++++++++++++++++----------------- 3 files changed, 67 insertions(+), 64 deletions(-) diff --git a/pkgs/test/top-level/stage.nix b/pkgs/test/top-level/stage.nix index c56d417659ce..7b97dae012f3 100644 --- a/pkgs/test/top-level/stage.nix +++ b/pkgs/test/top-level/stage.nix @@ -94,35 +94,36 @@ assert isIdempotent "pkgsStatic"; assert isIdempotent "pkgsi686Linux"; assert isIdempotent "pkgsx86_64Darwin"; -# TODO: fails -# assert isNoop [ "pkgsStatic" ] "pkgsMusl"; -# TODO: fails because of ppc64-musl -# assert lib.all (sys: isNoop [ "pkgsCross" sys ] "pkgsMusl") allMuslExamples; +assert isNoop [ "pkgsStatic" ] "pkgsMusl"; +assert lib.all (sys: isNoop [ "pkgsCross" sys ] "pkgsMusl") allMuslExamples; assert lib.all (sys: isNoop [ "pkgsCross" sys ] "pkgsLLVM") allLLVMExamples; -# TODO: fails -# assert isComposable "pkgsExtraHardening"; -# assert isComposable "pkgsLLVM"; +assert isComposable "pkgsExtraHardening"; +assert isComposable "pkgsLLVM"; +# TODO: Results in infinite recursion # assert isComposable "pkgsLLVMLibc"; -# assert isComposable "pkgsArocc"; +assert isComposable "pkgsArocc"; # TODO: unexpected argument 'bintools' - uncomment once https://github.com/NixOS/nixpkgs/pull/331011 is done # assert isComposable "pkgsZig"; -# TODO: attribute 'abi' missing -# assert isComposable "pkgsMusl"; -# TODO: fails -# assert isComposable "pkgsStatic"; -# assert isComposable "pkgsi686Linux"; +assert isComposable "pkgsMusl"; +assert isComposable "pkgsStatic"; +assert isComposable "pkgsi686Linux"; # Special cases regarding buildPlatform vs hostPlatform # TODO: fails # assert discardEvaluationErrors (pkgsCross.gnu64.pkgsMusl.stdenv.hostPlatform.isMusl); # assert discardEvaluationErrors (pkgsCross.gnu64.pkgsi686Linux.stdenv.hostPlatform.isx86_32); -# assert discardEvaluationErrors (pkgsCross.mingwW64.pkgsLinux.stdenv.hostPlatform.isLinux); -# assert discardEvaluationErrors (pkgsCross.aarch64-darwin.pkgsx86_64Darwin.stdenv.hostPlatform.isx86_64); +assert discardEvaluationErrors (pkgsCross.mingwW64.pkgsLinux.stdenv.hostPlatform.isLinux); +assert discardEvaluationErrors ( + pkgsCross.aarch64-darwin.pkgsx86_64Darwin.stdenv.hostPlatform.isx86_64 +); # pkgsCross should keep upper cross settings -# TODO: fails -# assert discardEvaluationErrors (with pkgsStatic.pkgsCross.gnu64.stdenv.hostPlatform; isGnu && isStatic); -# assert discardEvaluationErrors (with pkgsLLVM.pkgsCross.musl64.stdenv.hostPlatform; isMusl && useLLVM); +assert discardEvaluationErrors ( + with pkgsStatic.pkgsCross.gnu64.stdenv.hostPlatform; isGnu && isStatic +); +assert discardEvaluationErrors ( + with pkgsLLVM.pkgsCross.musl64.stdenv.hostPlatform; isMusl && useLLVM +); emptyFile diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 918a47639f3c..6787793dbdfc 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -142,7 +142,7 @@ in let # via `evalModules` is not idempotent. In other words, if you add `config` to # `newArgs`, expect strange very hard to debug errors! (Yes, I'm speaking from # experience here.) - nixpkgsFun = newArgs: import ./. (args // newArgs); + nixpkgsFun = f0: import ./. (args // f0 args); # Partially apply some arguments for building bootstraping stage pkgs # sets. Only apply arguments which no stdenv would want to override. diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 781dcd357cd4..7884e2378f36 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -182,12 +182,12 @@ let # Convenience attributes for instantitating package sets. Each of # these will instantiate a new version of allPackages. otherPackageSets = let - mkPkgs = name: nixpkgsArgs: nixpkgsFun (nixpkgsArgs // { + mkPkgs = name: fn: nixpkgsFun (prevArgs: let nixpkgsArgs = fn prevArgs; in nixpkgsArgs // { overlays = [ (self': super': { "${name}" = super'; }) - ] ++ nixpkgsArgs.overlays or [] ++ overlays; + ] ++ nixpkgsArgs.overlays or [] ++ prevArgs.overlays or []; }); in self: super: { # This maps each entry in lib.systems.examples to its own package @@ -196,104 +196,106 @@ let # will refer to the "hello" package built for the ARM6-based # Raspberry Pi. pkgsCross = lib.mapAttrs (n: crossSystem: - nixpkgsFun { inherit crossSystem; }) + nixpkgsFun (prevArgs: { crossSystem = (lib.systems.systemToAttrs (lib.defaultTo { } prevArgs.crossSystem or null)) // crossSystem; })) lib.systems.examples; - pkgsLLVM = mkPkgs "pkgsLLVM" { + pkgsLLVM = mkPkgs "pkgsLLVM" (prevArgs: { # Bootstrap a cross stdenv using the LLVM toolchain. # This is currently not possible when compiling natively, - # so we don't need to check hostPlatform != buildPlatform. - crossSystem = stdenv.hostPlatform // { + # so we don't need to check whether we are cross already. + crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { useLLVM = true; linker = "lld"; }; - }; + }); - pkgsLLVMLibc = mkPkgs "pkgsLLVMLibc" { + pkgsLLVMLibc = mkPkgs "pkgsLLVMLibc" (prevArgs: { # Bootstrap a cross stdenv using LLVM libc. # This is currently not possible when compiling natively, - # so we don't need to check hostPlatform != buildPlatform. - crossSystem = stdenv.hostPlatform // { + # so we don't need to check whether we are cross already. + crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { config = lib.systems.parse.tripleFromSystem (makeLLVMParsedPlatform stdenv.hostPlatform.parsed); libc = "llvm"; }; - }; + }); - pkgsArocc = mkPkgs "pkgsArocc" { + pkgsArocc = mkPkgs "pkgsArocc" (prevArgs: { # Bootstrap a cross stdenv using the Aro C compiler. # This is currently not possible when compiling natively, - # so we don't need to check hostPlatform != buildPlatform. - crossSystem = stdenv.hostPlatform // { + # so we don't need to check whether we are cross already. + crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { useArocc = true; linker = "lld"; }; - }; + }); - pkgsZig = mkPkgs "pkgsZig" { + pkgsZig = mkPkgs "pkgsZig" (prevArgs: { # Bootstrap a cross stdenv using the Zig toolchain. # This is currently not possible when compiling natively, - # so we don't need to check hostPlatform != buildPlatform. - crossSystem = stdenv.hostPlatform // { + # so we don't need to check whether we are cross already. + crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { useZig = true; linker = "lld"; }; - }; + }); # All packages built with the Musl libc. This will override the # default GNU libc on Linux systems. Non-Linux systems are not # supported. 32-bit is also not supported. - pkgsMusl = if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then mkPkgs "pkgsMusl" { + pkgsMusl = if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then mkPkgs "pkgsMusl" (prevArgs: { ${if stdenv.hostPlatform == stdenv.buildPlatform - then "localSystem" else "crossSystem"} = { + then "localSystem" else "crossSystem"} = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed); }; - } else throw "Musl libc only supports 64-bit Linux systems."; + }) else throw "Musl libc only supports 64-bit Linux systems."; # All packages built for i686 Linux. # Used by wine, firefox with debugging version of Flash, ... - pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then mkPkgs "pkgsi686Linux" { + pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then mkPkgs "pkgsi686Linux" (prevArgs: { ${if stdenv.hostPlatform == stdenv.buildPlatform - then "localSystem" else "crossSystem"} = { + then "localSystem" else "crossSystem"} = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // { cpu = lib.systems.parse.cpuTypes.i686; }); }; - } else throw "i686 Linux package set can only be used with the x86 family."; + }) else throw "i686 Linux package set can only be used with the x86 family."; # x86_64-darwin packages for aarch64-darwin users to use with Rosetta for incompatible packages - pkgsx86_64Darwin = if stdenv.hostPlatform.isDarwin then mkPkgs "pkgsx86_64Darwin" { - localSystem = { + pkgsx86_64Darwin = if stdenv.hostPlatform.isDarwin then mkPkgs "pkgsx86_64Darwin" (prevArgs: { + ${if stdenv.hostPlatform == stdenv.buildPlatform + then "localSystem" else "crossSystem"} = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // { cpu = lib.systems.parse.cpuTypes.x86_64; }); }; - } else throw "x86_64 Darwin package set can only be used on Darwin systems."; + }) else throw "x86_64 Darwin package set can only be used on Darwin systems."; # If already linux: the same package set unaltered - # Otherwise, return a natively built linux package set for the current cpu architecture string. + # Otherwise, return a linux package set for the current cpu architecture string. + # (ABI and other details will be set to the default for the cpu/os pair) pkgsLinux = if stdenv.hostPlatform.isLinux then self - else mkPkgs "pkgsLinux" { - localSystem = lib.systems.elaborate "${stdenv.hostPlatform.parsed.cpu.name}-linux"; - }; + else mkPkgs "pkgsLinux" (prevArgs: { + ${if stdenv.hostPlatform == stdenv.buildPlatform + then "localSystem" else "crossSystem"} = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { + config = lib.systems.parse.tripleFromSystem (lib.systems.elaborate "${stdenv.hostPlatform.parsed.cpu.name}-linux").parsed; + }; + }); # Fully static packages. # Currently uses Musl on Linux (couldn’t get static glibc to work). - pkgsStatic = mkPkgs "pkgsStatic" { - crossSystem = { + pkgsStatic = mkPkgs "pkgsStatic" (prevArgs: { + crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { isStatic = true; - config = lib.systems.parse.tripleFromSystem ( - if stdenv.hostPlatform.isLinux - then makeMuslParsedPlatform stdenv.hostPlatform.parsed - else stdenv.hostPlatform.parsed - ); - gcc = lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { abi = "elfv2"; } // - stdenv.hostPlatform.gcc or {}; + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { + config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed); + } // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { + gcc = { abi = "elfv2"; } // stdenv.hostPlatform.gcc or {}; }; - }; + }); - pkgsExtraHardening = mkPkgs "pkgsExtraHardening" { + pkgsExtraHardening = mkPkgs "pkgsExtraHardening" (_: { overlays = [ (self': super': { stdenv = super'.withDefaultHardeningFlags ( @@ -315,7 +317,7 @@ let pcre16 = super'.pcre16.override { enableJit = false; }; }) ]; - }; + }); # Extend the package set with zero or more overlays. This preserves # preexisting overlays. Prefer to initialize with the right overlays @@ -323,7 +325,7 @@ let appendOverlays = extraOverlays: if extraOverlays == [] then self - else nixpkgsFun { overlays = args.overlays ++ extraOverlays; }; + else nixpkgsFun (prevArgs: { overlays = prevArgs.overlays ++ extraOverlays; }); # NOTE: each call to extend causes a full nixpkgs rebuild, adding ~130MB # of allocations. DO NOT USE THIS IN NIXPKGS. From ba6262f2ebb78ea506a98bfc6e4e857f8047e32d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 14 Dec 2024 18:54:28 +0100 Subject: [PATCH 200/219] pkgs/top-level: refactor mkCrossPkgs --- pkgs/top-level/stage.nix | 78 ++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 44 deletions(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 7884e2378f36..00589c61b018 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -189,6 +189,10 @@ let }) ] ++ nixpkgsArgs.overlays or [] ++ prevArgs.overlays or []; }); + # This is always cross. + mkCrossPkgs = name: crossAttrs: mkPkgs name (prevArgs: { + crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // crossAttrs; + }); in self: super: { # This maps each entry in lib.systems.examples to its own package # set. Each of these will contain all packages cross compiled for @@ -199,45 +203,33 @@ let nixpkgsFun (prevArgs: { crossSystem = (lib.systems.systemToAttrs (lib.defaultTo { } prevArgs.crossSystem or null)) // crossSystem; })) lib.systems.examples; - pkgsLLVM = mkPkgs "pkgsLLVM" (prevArgs: { - # Bootstrap a cross stdenv using the LLVM toolchain. - # This is currently not possible when compiling natively, - # so we don't need to check whether we are cross already. - crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { - useLLVM = true; - linker = "lld"; - }; - }); + # Bootstrap a cross stdenv using the LLVM toolchain. + # This is currently not possible when compiling natively. + pkgsLLVM = mkCrossPkgs "pkgsLLVM" { + useLLVM = true; + linker = "lld"; + }; - pkgsLLVMLibc = mkPkgs "pkgsLLVMLibc" (prevArgs: { - # Bootstrap a cross stdenv using LLVM libc. - # This is currently not possible when compiling natively, - # so we don't need to check whether we are cross already. - crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { - config = lib.systems.parse.tripleFromSystem (makeLLVMParsedPlatform stdenv.hostPlatform.parsed); - libc = "llvm"; - }; - }); + # Bootstrap a cross stdenv using LLVM libc. + # This is currently not possible when compiling natively. + pkgsLLVMLibc = mkCrossPkgs "pkgsLLVMLibc" { + config = lib.systems.parse.tripleFromSystem (makeLLVMParsedPlatform stdenv.hostPlatform.parsed); + libc = "llvm"; + }; - pkgsArocc = mkPkgs "pkgsArocc" (prevArgs: { - # Bootstrap a cross stdenv using the Aro C compiler. - # This is currently not possible when compiling natively, - # so we don't need to check whether we are cross already. - crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { - useArocc = true; - linker = "lld"; - }; - }); + # Bootstrap a cross stdenv using the Aro C compiler. + # This is currently not possible when compiling natively. + pkgsArocc = mkCrossPkgs "pkgsArocc" { + useArocc = true; + linker = "lld"; + }; - pkgsZig = mkPkgs "pkgsZig" (prevArgs: { - # Bootstrap a cross stdenv using the Zig toolchain. - # This is currently not possible when compiling natively, - # so we don't need to check whether we are cross already. - crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { - useZig = true; - linker = "lld"; - }; - }); + # Bootstrap a cross stdenv using the Zig toolchain. + # This is currently not possible when compiling natively. + pkgsZig = mkCrossPkgs "pkgsZig" { + useZig = true; + linker = "lld"; + }; # All packages built with the Musl libc. This will override the # default GNU libc on Linux systems. Non-Linux systems are not @@ -285,14 +277,12 @@ let # Fully static packages. # Currently uses Musl on Linux (couldn’t get static glibc to work). - pkgsStatic = mkPkgs "pkgsStatic" (prevArgs: { - crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { - isStatic = true; - } // lib.optionalAttrs stdenv.hostPlatform.isLinux { - config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed); - } // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { - gcc = { abi = "elfv2"; } // stdenv.hostPlatform.gcc or {}; - }; + pkgsStatic = mkCrossPkgs "pkgsStatic" ({ + isStatic = true; + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { + config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed); + } // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { + gcc = { abi = "elfv2"; } // stdenv.hostPlatform.gcc or {}; }); pkgsExtraHardening = mkPkgs "pkgsExtraHardening" (_: { From 69775e2deb4be02ec34c8055f7c005867fce5f4c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 14 Dec 2024 19:01:31 +0100 Subject: [PATCH 201/219] pkgs/top-level: refactor mkHybridPkgs --- pkgs/top-level/stage.nix | 52 ++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 00589c61b018..137b36197205 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -191,7 +191,13 @@ let }); # This is always cross. mkCrossPkgs = name: crossAttrs: mkPkgs name (prevArgs: { - crossSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // crossAttrs; + crossSystem = + (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // crossAttrs; + }); + # This is only cross when we are already cross, otherwise local. + mkHybridPkgs = name: hybridAttrs: mkPkgs name (prevArgs: { + ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = + (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // hybridAttrs; }); in self: super: { # This maps each entry in lib.systems.examples to its own package @@ -234,33 +240,24 @@ let # All packages built with the Musl libc. This will override the # default GNU libc on Linux systems. Non-Linux systems are not # supported. 32-bit is also not supported. - pkgsMusl = if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then mkPkgs "pkgsMusl" (prevArgs: { - ${if stdenv.hostPlatform == stdenv.buildPlatform - then "localSystem" else "crossSystem"} = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { - config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed); - }; - }) else throw "Musl libc only supports 64-bit Linux systems."; + pkgsMusl = if stdenv.hostPlatform.isLinux && stdenv.buildPlatform.is64bit then mkHybridPkgs "pkgsMusl" { + config = lib.systems.parse.tripleFromSystem (makeMuslParsedPlatform stdenv.hostPlatform.parsed); + } else throw "Musl libc only supports 64-bit Linux systems."; # All packages built for i686 Linux. # Used by wine, firefox with debugging version of Flash, ... - pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then mkPkgs "pkgsi686Linux" (prevArgs: { - ${if stdenv.hostPlatform == stdenv.buildPlatform - then "localSystem" else "crossSystem"} = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { - config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // { - cpu = lib.systems.parse.cpuTypes.i686; - }); - }; - }) else throw "i686 Linux package set can only be used with the x86 family."; + pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then mkHybridPkgs "pkgsi686Linux" { + config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // { + cpu = lib.systems.parse.cpuTypes.i686; + }); + } else throw "i686 Linux package set can only be used with the x86 family."; # x86_64-darwin packages for aarch64-darwin users to use with Rosetta for incompatible packages - pkgsx86_64Darwin = if stdenv.hostPlatform.isDarwin then mkPkgs "pkgsx86_64Darwin" (prevArgs: { - ${if stdenv.hostPlatform == stdenv.buildPlatform - then "localSystem" else "crossSystem"} = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { - config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // { - cpu = lib.systems.parse.cpuTypes.x86_64; - }); - }; - }) else throw "x86_64 Darwin package set can only be used on Darwin systems."; + pkgsx86_64Darwin = if stdenv.hostPlatform.isDarwin then mkHybridPkgs "pkgsx86_64Darwin" { + config = lib.systems.parse.tripleFromSystem (stdenv.hostPlatform.parsed // { + cpu = lib.systems.parse.cpuTypes.x86_64; + }); + } else throw "x86_64 Darwin package set can only be used on Darwin systems."; # If already linux: the same package set unaltered # Otherwise, return a linux package set for the current cpu architecture string. @@ -268,12 +265,9 @@ let pkgsLinux = if stdenv.hostPlatform.isLinux then self - else mkPkgs "pkgsLinux" (prevArgs: { - ${if stdenv.hostPlatform == stdenv.buildPlatform - then "localSystem" else "crossSystem"} = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // { - config = lib.systems.parse.tripleFromSystem (lib.systems.elaborate "${stdenv.hostPlatform.parsed.cpu.name}-linux").parsed; - }; - }); + else mkHybridPkgs "pkgsLinux" { + config = lib.systems.parse.tripleFromSystem (lib.systems.elaborate "${stdenv.hostPlatform.parsed.cpu.name}-linux").parsed; + }; # Fully static packages. # Currently uses Musl on Linux (couldn’t get static glibc to work). From 2acca93befe5cfef5e1fbde08f5068d6d312bfbf Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 21 Dec 2024 16:42:40 +0100 Subject: [PATCH 202/219] pkgs/top-level: fix composing "native cross" package sets When using pkgsCross with a system that ends up the same as the localSystem, then modifications for package sets like pksgMusl need to be done for **both** localSystem and crossSystem. Consider the following on x86_64-linux: pkgsCross.gnu64.pkgsMusl Before this change, this would result in a musl buildPlatform, but a gnu hostPlatform. This breaks the promise of "stacking" package sets on top of each other. After this change, it results in a musl buildPlatform and a musl hostPlatform. This works better. One could expect this to result in the same as pkgsCross.musl64, i.e. a gnu buildPlatform and a musl hostPlatform, however I couldn't get this to work without increasing memory usage for ci/eval by many, many GB. This is caused by usage of pkgsi686Linux inside the main package set, which follows the same hybrid pattern. --- pkgs/test/top-level/stage.nix | 5 ++--- pkgs/top-level/stage.nix | 11 +++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/test/top-level/stage.nix b/pkgs/test/top-level/stage.nix index 7b97dae012f3..449a36a425ab 100644 --- a/pkgs/test/top-level/stage.nix +++ b/pkgs/test/top-level/stage.nix @@ -110,9 +110,8 @@ assert isComposable "pkgsStatic"; assert isComposable "pkgsi686Linux"; # Special cases regarding buildPlatform vs hostPlatform -# TODO: fails -# assert discardEvaluationErrors (pkgsCross.gnu64.pkgsMusl.stdenv.hostPlatform.isMusl); -# assert discardEvaluationErrors (pkgsCross.gnu64.pkgsi686Linux.stdenv.hostPlatform.isx86_32); +assert discardEvaluationErrors (pkgsCross.gnu64.pkgsMusl.stdenv.hostPlatform.isMusl); +assert discardEvaluationErrors (pkgsCross.gnu64.pkgsi686Linux.stdenv.hostPlatform.isx86_32); assert discardEvaluationErrors (pkgsCross.mingwW64.pkgsLinux.stdenv.hostPlatform.isLinux); assert discardEvaluationErrors ( pkgsCross.aarch64-darwin.pkgsx86_64Darwin.stdenv.hostPlatform.isx86_64 diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 137b36197205..49034a7384f4 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -195,10 +195,13 @@ let (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // crossAttrs; }); # This is only cross when we are already cross, otherwise local. - mkHybridPkgs = name: hybridAttrs: mkPkgs name (prevArgs: { - ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = - (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // hybridAttrs; - }); + # For the case of "native cross", i.e. pkgsCross.gnu64 on a x86_64-linux system, we need to adjust **both** + # localSystem **and** crossSystem, otherwise they're out of sync. + mkHybridPkgs = name: hybridAttrs: mkPkgs name (prevArgs: let + newSystem = (lib.systems.systemToAttrs (lib.defaultTo prevArgs.localSystem prevArgs.crossSystem or null)) // hybridAttrs; + in { crossSystem = newSystem; } + // lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform) { localSystem = newSystem; } + ); in self: super: { # This maps each entry in lib.systems.examples to its own package # set. Each of these will contain all packages cross compiled for From 5c64063e8478e736e321a5cc375a7c3595bc1078 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 25 Jan 2025 12:09:54 -0600 Subject: [PATCH 203/219] vimPlugins.cord-nvim: 0-unstable-2024-12-17 -> 1.0.0 --- .../vim/plugins/non-generated/cord-nvim/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix index b60067186f3d..f2ebf27db899 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix @@ -7,19 +7,19 @@ vimUtils, }: let - version = "0-unstable-2024-12-17"; + version = "1.0.0"; src = fetchFromGitHub { owner = "vyfor"; repo = "cord.nvim"; - rev = "c82ab475e7bb198d6fac20833a3468de1a1d14d0"; - hash = "sha256-GVy8q9Fxb3mzx6mUQyIMumjnwZ7W08dPz1O3ckzVvdE="; + tag = "v${version}"; + hash = "sha256-rA3R9SO3QRLGBVHlT5NZLtQw+EmkkmSDO/K6DdNtfBI="; }; extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; cord-nvim-rust = rustPlatform.buildRustPackage { pname = "cord.nvim-rust"; inherit version src; - cargoHash = "sha256-unE600Uo8fXaFV0UWRhBenhQaXftDH7K+HyQ/9xo7JY="; + cargoHash = "sha256-wYXJ4+8b3PtHzL2jdplNHrjIBzbAzA7jdvLZ7Vz+Yz8="; installPhase = let @@ -56,7 +56,6 @@ vimUtils.buildVimPlugin { passthru = { updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; attrPath = "vimPlugins.cord-nvim.cord-nvim-rust"; }; From 36cb620fb6ece5bf2f8ec521fdedb72a94f4d2e8 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 2 Dec 2024 05:17:00 +0100 Subject: [PATCH 204/219] got: format --- pkgs/by-name/go/got/package.nix | 110 +++++++++++++++++++------------- 1 file changed, 66 insertions(+), 44 deletions(-) diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index 3259ce5711e6..a9b873a9dcae 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -1,29 +1,34 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, libressl -, libbsd -, libevent -, libuuid -, libossp_uuid -, libmd -, zlib -, ncurses -, bison -, autoPatchelfHook -, testers -, signify -, overrideSDK -, withSsh ? true, openssh -# Default editor to use when neither VISUAL nor EDITOR are defined -, defaultEditor ? null +{ + lib, + stdenv, + fetchurl, + pkg-config, + libressl, + libbsd, + libevent, + libuuid, + libossp_uuid, + libmd, + zlib, + ncurses, + bison, + autoPatchelfHook, + testers, + signify, + overrideSDK, + nix-update-script, + withSsh ? true, + openssh, + # Default editor to use when neither VISUAL nor EDITOR are defined + defaultEditor ? null, }: let - stdenv' = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 - then overrideSDK stdenv "11.0" - else stdenv; + stdenv' = + if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then + overrideSDK stdenv "11.0" + else + stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "got"; @@ -34,11 +39,20 @@ stdenv'.mkDerivation (finalAttrs: { hash = "sha256-MHnXQsElBH3jOd2SPXXQuWCZWjpLVn7QjvNtESvbB8w="; }; - nativeBuildInputs = [ pkg-config bison ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = [ + pkg-config + bison + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = [ libressl libbsd libevent libuuid libmd zlib ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libossp_uuid ]; + buildInputs = [ + libressl + libbsd + libevent + libuuid + libmd + zlib + ncurses + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libossp_uuid ]; preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' # The configure script assumes dependencies on Darwin are installed via @@ -48,22 +62,27 @@ stdenv'.mkDerivation (finalAttrs: { ''; env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals (defaultEditor != null) [ - ''-DGOT_DEFAULT_EDITOR="${lib.getExe defaultEditor}"'' - ] ++ lib.optionals withSsh [ - ''-DGOT_DIAL_PATH_SSH="${lib.getExe openssh}"'' - ''-DGOT_TAG_PATH_SSH_KEYGEN="${lib.getExe' openssh "ssh-keygen"}"'' - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - ''-DGOT_TAG_PATH_SIGNIFY="${lib.getExe signify}"'' - ] ++ lib.optionals stdenv.cc.isClang [ - "-Wno-error=implicit-function-declaration" - "-Wno-error=int-conversion" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # error: conflicting types for 'strmode' - "-DHAVE_STRMODE=1" - # Undefined symbols for architecture arm64: "_bsd_getopt" - "-include getopt.h" - ]); + lib.optionals (defaultEditor != null) [ + ''-DGOT_DEFAULT_EDITOR="${lib.getExe defaultEditor}"'' + ] + ++ lib.optionals withSsh [ + ''-DGOT_DIAL_PATH_SSH="${lib.getExe openssh}"'' + ''-DGOT_TAG_PATH_SSH_KEYGEN="${lib.getExe' openssh "ssh-keygen"}"'' + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + ''-DGOT_TAG_PATH_SIGNIFY="${lib.getExe signify}"'' + ] + ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=int-conversion" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # error: conflicting types for 'strmode' + "-DHAVE_STRMODE=1" + # Undefined symbols for architecture arm64: "_bsd_getopt" + "-include getopt.h" + ] + ); passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; @@ -83,7 +102,10 @@ stdenv'.mkDerivation (finalAttrs: { ''; homepage = "https://gameoftrees.org"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ abbe afh ]; + maintainers = with lib.maintainers; [ + abbe + afh + ]; mainProgram = "got"; platforms = with lib.platforms; darwin ++ linux; }; From eb454c6e989b64b238dd1cc21d420e457abb0771 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 2 Dec 2024 05:18:18 +0100 Subject: [PATCH 205/219] got: use nix-update-script --- pkgs/by-name/go/got/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index a9b873a9dcae..30eb0be47b6a 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -84,8 +84,13 @@ stdenv'.mkDerivation (finalAttrs: { ] ); - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--url=https://github.com/ThomasAdam/got-portable" ]; + }; + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; }; meta = { From 1eb49447c587d0c951d89dcfba1b4d051461dde0 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 25 Jan 2025 19:19:05 +0100 Subject: [PATCH 206/219] tbtools: init at v0.5.0 (#374988) Signed-off-by: Felix Singer --- pkgs/by-name/tb/tbtools/package.nix | 46 +++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/tb/tbtools/package.nix diff --git a/pkgs/by-name/tb/tbtools/package.nix b/pkgs/by-name/tb/tbtools/package.nix new file mode 100644 index 000000000000..eddbecc3313b --- /dev/null +++ b/pkgs/by-name/tb/tbtools/package.nix @@ -0,0 +1,46 @@ +{ + fetchFromGitHub, + lib, + nix-update-script, + pkg-config, + rustPlatform, + stdenv, + systemd, +}: + +rustPlatform.buildRustPackage rec { + pname = "tbtools"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "tbtools"; + tag = "v${version}"; + hash = "sha256-zq8q3JaoqWAQUat2gIW0Wimi/tZiC6XDphUVjH0viU4="; + }; + + cargoHash = "sha256-8uzbWJl3Bpvo/rlZnd7DzCNhL088v5pksY7K6yncC1s="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + systemd + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Thunderbolt/USB4 debugging tools"; + homepage = "https://github.com/intel/tbtools"; + license = lib.licenses.mit; + mainProgram = "tblist"; + maintainers = with lib.maintainers; [ + felixsinger + ]; + platforms = lib.platforms.linux; + }; +} From 1471bf60c8b8c71bcc5a33469b9e170ed494a8a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 18:38:36 +0000 Subject: [PATCH 207/219] pack: 0.36.2 -> 0.36.4 --- pkgs/by-name/pa/pack/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix index a1255102d26e..12f481c93a45 100644 --- a/pkgs/by-name/pa/pack/package.nix +++ b/pkgs/by-name/pa/pack/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "pack"; - version = "0.36.2"; + version = "0.36.4"; src = fetchFromGitHub { owner = "buildpacks"; repo = "pack"; rev = "v${version}"; - hash = "sha256-pITQAGt0aMhEfoauPWxAqnr8JxGi4DcqcmgqtooLkd4="; + hash = "sha256-6cWmBNlmPnNszmv6zaHlyd8GqncMtttKOMfQxxJGJ18="; }; - vendorHash = "sha256-51Qqq2Jpd1XxUoMN+6j4/VZ4fLCm4I9JwBeTcdSHgQw="; + vendorHash = "sha256-9fO/jwTpVvCdHIy1GrE2YZr7jN7Oyw64EbS2w08VOVI="; subPackages = [ "cmd/pack" ]; From 9a08314a190d08a26ba2c028f1e7a55ba7d27a04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 18:04:32 +0000 Subject: [PATCH 208/219] dotslash: 0.4.3 -> 0.5.0 --- pkgs/by-name/do/dotslash/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/dotslash/package.nix b/pkgs/by-name/do/dotslash/package.nix index 8fe0c96c8187..6766fe0e961c 100644 --- a/pkgs/by-name/do/dotslash/package.nix +++ b/pkgs/by-name/do/dotslash/package.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "dotslash"; - version = "0.4.3"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - hash = "sha256-EcYDMuAVSCzpHgekSQsQfv/PNDj0jB7Ht9LRgm+tgd0="; + hash = "sha256-QrqcUc0RJXrahWHGgJbJwD3wufa2829NNHqiZx9V+sU="; }; - cargoHash = "sha256-w2P1J2TDtGqrJYQWTrkaF41iTRDttB1pdfF11sCbHCA="; + cargoHash = "sha256-he8W+gnajScRgWy7cveqZ9vod3n4zBFSDPw8pUUHObY="; doCheck = false; # http tests passthru = { From ad2c044b6293b7e01f0b1681ca3a2c3031aaf6a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 19:44:03 +0000 Subject: [PATCH 209/219] python312Packages.cymem: 2.0.10 -> 2.0.11 --- pkgs/development/python-modules/cymem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index c5b35087b0e3..ee5bc22c3178 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cymem"; - version = "2.0.10"; + version = "2.0.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "explosion"; repo = "cymem"; tag = "release-v${version}"; - hash = "sha256-lMbovEIYdXYQvLeVaCm8KfYaQ2TFSAi6picu7Ju9peg="; + hash = "sha256-4srwdQS06KeBAIaJm6XxmsHEZto0eiXBznrCHgT/BAc="; }; build-system = [ From df5ec1a2e07ba61de62dd9401222e1f282daa340 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 25 Jan 2025 21:10:25 +0100 Subject: [PATCH 210/219] nixos/paperless: #242084 follow up to fix defaultText (#373472) --- nixos/modules/services/misc/paperless.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 69b8bd959eeb..b45f762f461d 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -259,7 +259,7 @@ in directory = lib.mkOption { type = lib.types.str; default = cfg.dataDir + "/export"; - defaultText = "\${dataDir}/export"; + defaultText = lib.literalExpression "\${config.services.paperless.dataDir}/export"; description = "Directory to store export."; }; From 4d96ec04543aa0885a5e12b86eb3ccfd93292c68 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Sat, 23 Dec 2023 22:12:29 +0100 Subject: [PATCH 211/219] gnustep: move GNUstep packages to by-name It used newScope before which doesn't work well if at all with overlays. --- pkgs/by-name/gn/gnustep-back/package.nix | 54 +++++++++++++++ .../gn/gnustep-base}/fixup-paths.patch | 0 .../gn/gnustep-base/package.nix} | 69 ++++++++++--------- .../gn/gnustep-gui}/fixup-all.patch | 0 .../gn/gnustep-gui/package.nix} | 18 ++--- .../gn/gnustep-libobjc/package.nix} | 10 +-- .../gn/gnustep-make}/GNUstep.conf | 0 .../gn/gnustep-make}/fixup-paths.patch | 0 .../gn/gnustep-make/package.nix} | 15 ++-- .../gn/gnustep-make}/setup-hook.sh | 0 .../gn/gnustep-systempreferences/package.nix} | 23 ++++--- .../go/gorm/package.nix} | 23 ++++--- .../gw/gworkspace/package.nix} | 30 ++++---- pkgs/by-name/ow/owl-compositor/package.nix | 14 ++-- pkgs/by-name/pi/pikopixel/package.nix | 14 ++-- .../pr/projectcenter/package.nix} | 30 ++++---- pkgs/by-name/so/sogo/package.nix | 20 +++--- pkgs/by-name/so/sope/package.nix | 15 ++-- .../wr/wrapGNUstepAppsHook/package.nix | 9 +++ .../wrapGNUstepAppsHook.sh | 0 pkgs/desktops/gnustep/back/default.nix | 36 ---------- pkgs/desktops/gnustep/default.nix | 26 ------- pkgs/desktops/gnustep/wrapGNUstepAppsHook.nix | 8 --- .../tools/analysis/hopper/default.nix | 4 +- pkgs/tools/archivers/unar/default.nix | 7 +- .../networking/openvpn/openvpn-auth-ldap.nix | 10 +-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 - 28 files changed, 228 insertions(+), 211 deletions(-) create mode 100644 pkgs/by-name/gn/gnustep-back/package.nix rename pkgs/{desktops/gnustep/base => by-name/gn/gnustep-base}/fixup-paths.patch (100%) rename pkgs/{desktops/gnustep/base/default.nix => by-name/gn/gnustep-base/package.nix} (94%) rename pkgs/{desktops/gnustep/gui => by-name/gn/gnustep-gui}/fixup-all.patch (100%) rename pkgs/{desktops/gnustep/gui/default.nix => by-name/gn/gnustep-gui/package.nix} (85%) rename pkgs/{desktops/gnustep/libobjc2/default.nix => by-name/gn/gnustep-libobjc/package.nix} (84%) rename pkgs/{desktops/gnustep/make => by-name/gn/gnustep-make}/GNUstep.conf (100%) rename pkgs/{desktops/gnustep/make => by-name/gn/gnustep-make}/fixup-paths.patch (100%) rename pkgs/{desktops/gnustep/make/default.nix => by-name/gn/gnustep-make/package.nix} (81%) rename pkgs/{desktops/gnustep/make => by-name/gn/gnustep-make}/setup-hook.sh (100%) rename pkgs/{desktops/gnustep/systempreferences/default.nix => by-name/gn/gnustep-systempreferences/package.nix} (79%) rename pkgs/{desktops/gnustep/gorm/default.nix => by-name/go/gorm/package.nix} (79%) rename pkgs/{desktops/gnustep/gworkspace/default.nix => by-name/gw/gworkspace/package.nix} (78%) rename pkgs/{desktops/gnustep/projectcenter/default.nix => by-name/pr/projectcenter/package.nix} (85%) create mode 100644 pkgs/by-name/wr/wrapGNUstepAppsHook/package.nix rename pkgs/{desktops/gnustep => by-name/wr/wrapGNUstepAppsHook}/wrapGNUstepAppsHook.sh (100%) delete mode 100644 pkgs/desktops/gnustep/back/default.nix delete mode 100644 pkgs/desktops/gnustep/default.nix delete mode 100644 pkgs/desktops/gnustep/wrapGNUstepAppsHook.nix diff --git a/pkgs/by-name/gn/gnustep-back/package.nix b/pkgs/by-name/gn/gnustep-back/package.nix new file mode 100644 index 000000000000..c36e773621bc --- /dev/null +++ b/pkgs/by-name/gn/gnustep-back/package.nix @@ -0,0 +1,54 @@ +{ + lib, + clangStdenv, + fetchzip, + cairo, + fontconfig, + freetype, + gnustep-base, + gnustep-gui, + gnustep-make, + libXft, + libXmu, + pkg-config, + wrapGNUstepAppsHook, +}: + +clangStdenv.mkDerivation (finalAttrs: { + pname = "gnustep-back"; + version = "0.31.0"; + + src = fetchzip { + url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-CjcoXlKiPVPJMOdrBKjxiNauTZvLcId5Lb8DzbgBbBg="; + }; + + nativeBuildInputs = [ + gnustep-make + pkg-config + wrapGNUstepAppsHook + ]; + + buildInputs = [ + cairo + fontconfig + freetype + gnustep-base + gnustep-gui + libXft + libXmu + ]; + + meta = { + description = "Generic backend for GNUstep"; + mainProgram = "gpbs"; + homepage = "https://gnustep.github.io/"; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ + ashalkhakov + dblsaiko + matthewbauer + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/gnustep/base/fixup-paths.patch b/pkgs/by-name/gn/gnustep-base/fixup-paths.patch similarity index 100% rename from pkgs/desktops/gnustep/base/fixup-paths.patch rename to pkgs/by-name/gn/gnustep-base/fixup-paths.patch diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/by-name/gn/gnustep-base/package.nix similarity index 94% rename from pkgs/desktops/gnustep/base/default.nix rename to pkgs/by-name/gn/gnustep-base/package.nix index bab6487cc988..7ce14203aad5 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/by-name/gn/gnustep-base/package.nix @@ -1,70 +1,75 @@ { lib, - stdenv, + clangStdenv, + fetchpatch, + fetchzip, aspell, audiofile, - make, - wrapGNUstepAppsHook, - cups, - fetchzip, - fetchpatch, - gmp, - gnutls, - libffi, binutils-unwrapped, - libjpeg, - libtiff, - libpng, + cups, giflib, + gmp, + gnustep-libobjc, + gnustep-make, + gnutls, + icu, + libffi, + libgcrypt, + libiberty, + libiconv, + libjpeg, + libpng, + libtiff, libxml2, libxslt, - libiconv, - libobjc, - libgcrypt, - icu, pkg-config, portaudio, - libiberty, + wrapGNUstepAppsHook, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "gnustep-base"; version = "1.29.0"; + src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${finalAttrs.version}.tar.gz"; hash = "sha256-4fjdsLBsYEDxLOFrq17dKii2sLKvOaFCu0cw3qQtM5U="; }; + outputs = [ "out" "dev" "lib" ]; + nativeBuildInputs = [ + gnustep-make pkg-config - make wrapGNUstepAppsHook ]; + propagatedBuildInputs = [ aspell audiofile - cups - gmp - gnutls - libffi binutils-unwrapped - libjpeg - libtiff - libpng + cups giflib + gmp + gnustep-libobjc + gnutls + icu + libffi + libgcrypt + libiberty + libiconv + libjpeg + libpng + libtiff libxml2 libxslt - libiconv - libobjc - libgcrypt - icu portaudio - libiberty ]; + patches = [ ./fixup-paths.patch # https://github.com/gnustep/libs-base/issues/212 / https://www.sogo.nu/bugs/view.php?id=5416#c15585 @@ -95,8 +100,8 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/desktops/gnustep/gui/fixup-all.patch b/pkgs/by-name/gn/gnustep-gui/fixup-all.patch similarity index 100% rename from pkgs/desktops/gnustep/gui/fixup-all.patch rename to pkgs/by-name/gn/gnustep-gui/fixup-all.patch diff --git a/pkgs/desktops/gnustep/gui/default.nix b/pkgs/by-name/gn/gnustep-gui/package.nix similarity index 85% rename from pkgs/desktops/gnustep/gui/default.nix rename to pkgs/by-name/gn/gnustep-gui/package.nix index 34694caf310a..a4a7208b94e7 100644 --- a/pkgs/desktops/gnustep/gui/default.nix +++ b/pkgs/by-name/gn/gnustep-gui/package.nix @@ -1,13 +1,13 @@ { lib, - stdenv, - make, - wrapGNUstepAppsHook, + clangStdenv, fetchzip, - base, + gnustep-base, + gnustep-make, + wrapGNUstepAppsHook, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { version = "0.31.1"; pname = "gnustep-gui"; @@ -17,14 +17,16 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - make + gnustep-make wrapGNUstepAppsHook ]; - buildInputs = [ base ]; + + buildInputs = [ gnustep-base ]; patches = [ ./fixup-all.patch ]; + meta = { changelog = "https://github.com/gnustep/libs-gui/releases/tag/gui-${ builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version @@ -34,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/pkgs/by-name/gn/gnustep-libobjc/package.nix similarity index 84% rename from pkgs/desktops/gnustep/libobjc2/default.nix rename to pkgs/by-name/gn/gnustep-libobjc/package.nix index 06e0b45095c0..3ab7e7ace001 100644 --- a/pkgs/desktops/gnustep/libobjc2/default.nix +++ b/pkgs/by-name/gn/gnustep-libobjc/package.nix @@ -1,13 +1,13 @@ { lib, - stdenv, + clangStdenv, fetchFromGitHub, cmake, robin-map, }: -stdenv.mkDerivation (finalAttrs: { - pname = "libobjc2"; +clangStdenv.mkDerivation (finalAttrs: { + pname = "gnustep-libobjc"; version = "2.2.1"; src = fetchFromGitHub { @@ -24,14 +24,14 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; + broken = clangStdenv.hostPlatform.isDarwin; description = "Objective-C runtime for use with GNUstep"; homepage = "https://gnustep.github.io/"; license = licenses.mit; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = platforms.unix; }; diff --git a/pkgs/desktops/gnustep/make/GNUstep.conf b/pkgs/by-name/gn/gnustep-make/GNUstep.conf similarity index 100% rename from pkgs/desktops/gnustep/make/GNUstep.conf rename to pkgs/by-name/gn/gnustep-make/GNUstep.conf diff --git a/pkgs/desktops/gnustep/make/fixup-paths.patch b/pkgs/by-name/gn/gnustep-make/fixup-paths.patch similarity index 100% rename from pkgs/desktops/gnustep/make/fixup-paths.patch rename to pkgs/by-name/gn/gnustep-make/fixup-paths.patch diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/by-name/gn/gnustep-make/package.nix similarity index 81% rename from pkgs/desktops/gnustep/make/default.nix rename to pkgs/by-name/gn/gnustep-make/package.nix index d29cc55c56a5..66fe1c42b1b3 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/by-name/gn/gnustep-make/package.nix @@ -1,12 +1,12 @@ { lib, - stdenv, + clangStdenv, fetchurl, + gnustep-libobjc, which, - libobjc, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "gnustep-make"; version = "2.9.2"; @@ -18,14 +18,17 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--with-layout=fhs-system" "--disable-install-p" - "--with-config-file=${placeholder "out"}/etc/GNUstep/GNUstep.conf" ]; + preConfigure = '' + configureFlags="$configureFlags --with-config-file=$out/etc/GNUstep/GNUstep.conf" + ''; + makeFlags = [ "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM" ]; - buildInputs = [ libobjc ]; + buildInputs = [ gnustep-libobjc ]; propagatedBuildInputs = [ which ]; @@ -41,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/desktops/gnustep/make/setup-hook.sh b/pkgs/by-name/gn/gnustep-make/setup-hook.sh similarity index 100% rename from pkgs/desktops/gnustep/make/setup-hook.sh rename to pkgs/by-name/gn/gnustep-make/setup-hook.sh diff --git a/pkgs/desktops/gnustep/systempreferences/default.nix b/pkgs/by-name/gn/gnustep-systempreferences/package.nix similarity index 79% rename from pkgs/desktops/gnustep/systempreferences/default.nix rename to pkgs/by-name/gn/gnustep-systempreferences/package.nix index d9262af36191..978aae80d3f2 100644 --- a/pkgs/desktops/gnustep/systempreferences/default.nix +++ b/pkgs/by-name/gn/gnustep-systempreferences/package.nix @@ -1,15 +1,15 @@ { lib, - stdenv, + clangStdenv, fetchurl, - make, + gnustep-back, + gnustep-base, + gnustep-gui, + gnustep-make, wrapGNUstepAppsHook, - back, - base, - gui, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "system-preferences"; version = "1.2.0"; @@ -19,13 +19,14 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - make + gnustep-make wrapGNUstepAppsHook ]; + buildInputs = [ - back - base - gui + gnustep-back + gnustep-base + gnustep-gui ]; meta = { @@ -35,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "SystemPreferences"; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/desktops/gnustep/gorm/default.nix b/pkgs/by-name/go/gorm/package.nix similarity index 79% rename from pkgs/desktops/gnustep/gorm/default.nix rename to pkgs/by-name/go/gorm/package.nix index 59c9c729f8be..079b75a8a12c 100644 --- a/pkgs/desktops/gnustep/gorm/default.nix +++ b/pkgs/by-name/go/gorm/package.nix @@ -1,15 +1,15 @@ { lib, - stdenv, + clangStdenv, fetchzip, - base, - back, - make, + gnustep-back, + gnustep-base, + gnustep-gui, + gnustep-make, wrapGNUstepAppsHook, - gui, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "gorm"; version = "1.4.0"; @@ -19,13 +19,14 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - make + gnustep-make wrapGNUstepAppsHook ]; + buildInputs = [ - base - back - gui + gnustep-back + gnustep-base + gnustep-gui ]; meta = { @@ -35,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "Gorm"; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/desktops/gnustep/gworkspace/default.nix b/pkgs/by-name/gw/gworkspace/package.nix similarity index 78% rename from pkgs/desktops/gnustep/gworkspace/default.nix rename to pkgs/by-name/gw/gworkspace/package.nix index 92f60105d1c8..28eaca21359f 100644 --- a/pkgs/desktops/gnustep/gworkspace/default.nix +++ b/pkgs/by-name/gw/gworkspace/package.nix @@ -1,16 +1,16 @@ { lib, - stdenv, - back, - base, - gui, - make, - wrapGNUstepAppsHook, + clangStdenv, fetchurl, - system_preferences, + gnustep-back, + gnustep-base, + gnustep-gui, + gnustep-make, + gnustep-systempreferences, + wrapGNUstepAppsHook, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "gworkspace"; version = "1.0.0"; @@ -23,15 +23,17 @@ stdenv.mkDerivation (finalAttrs: { # - PDFKit framework from http://gap.nongnu.org/ # - TODO: to --enable-gwmetadata, need libDBKit as well as sqlite! nativeBuildInputs = [ - make + gnustep-make wrapGNUstepAppsHook ]; + buildInputs = [ - back - base - gui - system_preferences + gnustep-back + gnustep-base + gnustep-gui + gnustep-systempreferences ]; + configureFlags = [ "--with-inotify" ]; meta = { @@ -41,8 +43,8 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "GWorkspace"; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ow/owl-compositor/package.nix b/pkgs/by-name/ow/owl-compositor/package.nix index 15ba9de7d753..8c7dc6192969 100644 --- a/pkgs/by-name/ow/owl-compositor/package.nix +++ b/pkgs/by-name/ow/owl-compositor/package.nix @@ -1,7 +1,10 @@ { lib , clangStdenv , fetchFromGitHub -, gnustep +, gnustep-make +, gnustep-base +, gnustep-gui +, wrapGNUstepAppsHook , libxkbcommon , makeWrapper , wayland @@ -41,8 +44,8 @@ stdenv.mkDerivation { darwin.DarwinTools darwin.bootstrap_cmds ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - gnustep.make - gnustep.wrapGNUstepAppsHook + gnustep-make + wrapGNUstepAppsHook ]; buildInputs = [ @@ -51,9 +54,8 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - gnustep.back - gnustep.base - gnustep.gui + gnustep-base + gnustep-gui ]; preConfigure = '' diff --git a/pkgs/by-name/pi/pikopixel/package.nix b/pkgs/by-name/pi/pikopixel/package.nix index c65353143368..5111cb24970d 100644 --- a/pkgs/by-name/pi/pikopixel/package.nix +++ b/pkgs/by-name/pi/pikopixel/package.nix @@ -1,7 +1,10 @@ { lib , clangStdenv , fetchurl -, gnustep +, gnustep-make +, gnustep-base +, gnustep-gui +, wrapGNUstepAppsHook }: clangStdenv.mkDerivation rec { @@ -16,14 +19,13 @@ clangStdenv.mkDerivation rec { sourceRoot = "PikoPixel.Sources.${version}/PikoPixel"; nativeBuildInputs = [ - gnustep.make - gnustep.wrapGNUstepAppsHook + gnustep-make + wrapGNUstepAppsHook ]; buildInputs = [ - gnustep.base - gnustep.gui - gnustep.back + gnustep-base + gnustep-gui ]; # Fix the Exec and Icon paths in the .desktop file, and save the file in the diff --git a/pkgs/desktops/gnustep/projectcenter/default.nix b/pkgs/by-name/pr/projectcenter/package.nix similarity index 85% rename from pkgs/desktops/gnustep/projectcenter/default.nix rename to pkgs/by-name/pr/projectcenter/package.nix index b93b5f073b6a..ececb3bcf066 100644 --- a/pkgs/desktops/gnustep/projectcenter/default.nix +++ b/pkgs/by-name/pr/projectcenter/package.nix @@ -1,18 +1,18 @@ { lib, - stdenv, + clangStdenv, fetchFromGitHub, - make, - wrapGNUstepAppsHook, - base, - back, - gui, - gorm, - gnumake, gdb, + gnumake, + gnustep-back, + gnustep-base, + gnustep-gui, + gnustep-make, + gorm, + wrapGNUstepAppsHook, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "projectcenter"; version = "0.7.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - make + gnustep-make wrapGNUstepAppsHook ]; @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { # 1. Framework/PCProjectLauncher.m, locate gdb (say among NIX_GNUSTEP_SYSTEM_TOOLS) # 2. Framework/PCProjectBuilder.m, locate gmake (similar) propagatedBuildInputs = [ - base - back - gui - gnumake gdb + gnumake + gnustep-back + gnustep-base + gnustep-gui gorm ]; @@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "ProjectCenter"; maintainers = with lib.maintainers; [ ashalkhakov - matthewbauer dblsaiko + matthewbauer ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/so/sogo/package.nix b/pkgs/by-name/so/sogo/package.nix index 4cd51f1307a0..2ce92f5d5b08 100644 --- a/pkgs/by-name/so/sogo/package.nix +++ b/pkgs/by-name/so/sogo/package.nix @@ -1,9 +1,12 @@ -{ gnustep, lib, fetchFromGitHub, makeWrapper, python3, lndir, libxcrypt +{ lib, clangStdenv, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir, libxcrypt , openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests , oath-toolkit +, gnustep-make +, gnustep-base , enableActiveSync ? false , libwbxml }: -gnustep.stdenv.mkDerivation rec { + +clangStdenv.mkDerivation rec { pname = "sogo"; version = "5.11.2"; @@ -15,8 +18,8 @@ gnustep.stdenv.mkDerivation rec { hash = "sha256-c+547x7ugYoLMgGVLcMmmb9rzquRJOv8n+Js2CuE7I0="; }; - nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ]; - buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip openldap oath-toolkit libxcrypt ] + nativeBuildInputs = [ gnustep-make makeWrapper python3 pkg-config ]; + buildInputs = [ gnustep-base sope openssl libmemcached curl libsodium libytnef libzip openldap oath-toolkit libxcrypt ] ++ lib.optional enableActiveSync libwbxml; patches = lib.optional enableActiveSync ./enable-activesync.patch; @@ -33,7 +36,7 @@ gnustep.stdenv.mkDerivation rec { # Move all GNUStep makefiles to a common directory mkdir -p makefiles - cp -r {${gnustep.make},${sope}}/share/GNUstep/Makefiles/* makefiles + cp -r {${gnustep-make},${sope}}/share/GNUstep/Makefiles/* makefiles # Modify the search path for GNUStep makefiles find . -type f -name GNUmakefile -exec sed -i "s:\\$.GNUSTEP_MAKEFILES.:$PWD/makefiles:g" {} + @@ -50,11 +53,11 @@ gnustep.stdenv.mkDerivation rec { preFixup = '' # Create gnustep.conf mkdir -p $out/share/GNUstep - cp ${gnustep.make}/etc/GNUstep/GNUstep.conf $out/share/GNUstep/ - sed -i "s:${gnustep.make}:$out:g" $out/share/GNUstep/GNUstep.conf + cp ${gnustep-make}/etc/GNUstep/GNUstep.conf $out/share/GNUstep/ + sed -i "s:${gnustep-make}:$out:g" $out/share/GNUstep/GNUstep.conf # Link in GNUstep base - ${lndir}/bin/lndir ${lib.getLib gnustep.base}/lib/GNUstep/ $out/lib/GNUstep/ + ${lndir}/bin/lndir ${lib.getLib gnustep-base}/lib/GNUstep/ $out/lib/GNUstep/ # Link in sope ${lndir}/bin/lndir ${sope}/ $out/ @@ -80,4 +83,3 @@ gnustep.stdenv.mkDerivation rec { maintainers = with maintainers; [ jceb ]; }; } - diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix index 67fcb756e9bc..b82c647c1740 100644 --- a/pkgs/by-name/so/sope/package.nix +++ b/pkgs/by-name/so/sope/package.nix @@ -1,7 +1,10 @@ -{ gnustep, lib, fetchFromGitHub, fetchpatch, libxml2, openssl -, openldap, mariadb, libmysqlclient, postgresql }: +{ lib, clangStdenv, fetchFromGitHub, fetchpatch, libxml2, openssl +, openldap, mariadb, libmysqlclient, postgresql +, gnustep-make +, gnustep-base +}: -gnustep.stdenv.mkDerivation rec { +clangStdenv.mkDerivation rec { pname = "sope"; version = "5.11.2"; @@ -12,8 +15,8 @@ gnustep.stdenv.mkDerivation rec { hash = "sha256-6vec2ZgpK5jcKr3c2SLn6fLAun56MDjupWtR6dMdjag="; }; - nativeBuildInputs = [ gnustep.make ]; - buildInputs = [ gnustep.base libxml2 openssl ] + nativeBuildInputs = [ gnustep-make ]; + buildInputs = [ gnustep-base libxml2 openssl ] ++ lib.optional (openldap != null) openldap ++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ] ++ lib.optional (postgresql != null) postgresql; @@ -24,7 +27,7 @@ gnustep.stdenv.mkDerivation rec { # installed to in the install phase. We move them over after the installation. preConfigure = '' mkdir -p /build/Makefiles - ln -s ${gnustep.make}/share/GNUstep/Makefiles/* /build/Makefiles + ln -s ${gnustep-make}/share/GNUstep/Makefiles/* /build/Makefiles cat < /build/GNUstep.conf GNUSTEP_MAKEFILES=/build/Makefiles EOF diff --git a/pkgs/by-name/wr/wrapGNUstepAppsHook/package.nix b/pkgs/by-name/wr/wrapGNUstepAppsHook/package.nix new file mode 100644 index 000000000000..1485f8a8ae1b --- /dev/null +++ b/pkgs/by-name/wr/wrapGNUstepAppsHook/package.nix @@ -0,0 +1,9 @@ +{ + makeBinaryWrapper, + makeSetupHook, +}: + +makeSetupHook { + name = "wrapGNUstepAppsHook"; + propagatedBuildInputs = [ makeBinaryWrapper ]; +} ./wrapGNUstepAppsHook.sh diff --git a/pkgs/desktops/gnustep/wrapGNUstepAppsHook.sh b/pkgs/by-name/wr/wrapGNUstepAppsHook/wrapGNUstepAppsHook.sh similarity index 100% rename from pkgs/desktops/gnustep/wrapGNUstepAppsHook.sh rename to pkgs/by-name/wr/wrapGNUstepAppsHook/wrapGNUstepAppsHook.sh diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix deleted file mode 100644 index e4ec5d03010a..000000000000 --- a/pkgs/desktops/gnustep/back/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, make -, wrapGNUstepAppsHook -, cairo -, fetchzip -, base -, gui -, fontconfig -, freetype -, pkg-config -, libXft -, libXmu -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gnustep-back"; - version = "0.31.0"; - - src = fetchzip { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-CjcoXlKiPVPJMOdrBKjxiNauTZvLcId5Lb8DzbgBbBg="; - }; - - nativeBuildInputs = [ make pkg-config wrapGNUstepAppsHook ]; - buildInputs = [ cairo base gui fontconfig freetype libXft libXmu ]; - - meta = { - description = "Generic backend for GNUstep"; - mainProgram = "gpbs"; - homepage = "https://gnustep.github.io/"; - license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ ashalkhakov matthewbauer dblsaiko ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/desktops/gnustep/default.nix b/pkgs/desktops/gnustep/default.nix deleted file mode 100644 index 53040ace672d..000000000000 --- a/pkgs/desktops/gnustep/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ newScope -, llvmPackages -}: - -let - callPackage = newScope self; - - self = { - stdenv = llvmPackages.stdenv; - - wrapGNUstepAppsHook = callPackage ./wrapGNUstepAppsHook.nix {}; - - make = callPackage ./make {}; - - libobjc = callPackage ./libobjc2 {}; - base = callPackage ./base {}; - back = callPackage ./back {}; - gui = callPackage ./gui {}; - - gorm = callPackage ./gorm {}; - projectcenter = callPackage ./projectcenter {}; - system_preferences = callPackage ./systempreferences {}; - gworkspace = callPackage ./gworkspace {}; - }; - -in self diff --git a/pkgs/desktops/gnustep/wrapGNUstepAppsHook.nix b/pkgs/desktops/gnustep/wrapGNUstepAppsHook.nix deleted file mode 100644 index 8a2339ddeb52..000000000000 --- a/pkgs/desktops/gnustep/wrapGNUstepAppsHook.nix +++ /dev/null @@ -1,8 +0,0 @@ -{makeBinaryWrapper, makeSetupHook}: - -makeSetupHook - { - name = "wrapGNUstepAppsHook"; - propagatedBuildInputs = [makeBinaryWrapper]; - } - ./wrapGNUstepAppsHook.sh diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index a3ceed9c43e0..6ea31a57c9e2 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -3,7 +3,7 @@ , lib , autoPatchelfHook , wrapQtAppsHook -, gnustep +, gnustep-libobjc , libbsd , libffi_3_3 , ncurses6 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnustep.libobjc + gnustep-libobjc libbsd libffi_3_3 ncurses6 diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index 445683555dc7..b9b205324ab0 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -2,7 +2,8 @@ , stdenv , fetchFromGitHub , installShellFiles -, gnustep +, gnustep-base +, gnustep-make , bzip2 , zlib , icu @@ -54,11 +55,11 @@ stdenv.mkDerivation rec { ''); buildInputs = [ bzip2 icu openssl wavpack zlib ] ++ - lib.optionals stdenv.hostPlatform.isLinux [ gnustep.base ] ++ + lib.optionals stdenv.hostPlatform.isLinux [ gnustep-base ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; nativeBuildInputs = [ installShellFiles ] ++ - lib.optionals stdenv.hostPlatform.isLinux [ gnustep.make ] ++ + lib.optionals stdenv.hostPlatform.isLinux [ gnustep-make ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuildHook ]; xcbuildFlags = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix index 385281b010ab..8c8f2004b81b 100644 --- a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix +++ b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -4,7 +4,9 @@ fetchFromGitHub, fetchpatch2, autoreconfHook, - gnustep, + gnustep-make, + gnustep-base, + gnustep-libobjc, re2c, openldap, openssl, @@ -40,9 +42,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - gnustep.base - gnustep.libobjc - gnustep.make + gnustep-libobjc + gnustep-make + gnustep-base re2c ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 79dc5dd6a318..beaf64a1fd3a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -522,6 +522,7 @@ mapAliases { gnuradio3_8 = throw "gnuradio3_8 has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18 gnuradio3_8Minimal = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18 gnuradio3_8Packages = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18 + gnustep = throw "The gnustep scope has been replaced with top-level packages: gnustep-back, -base, -gui, -libobjc, -make, -systempreferences; gorm, gworkspace, projectcenter."; # Added 2025-01-25 gn1924 = throw "gn1924 has been removed because it was broken and no longer used by envoy."; # Added 2024-11-03 gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17 gradle_6 = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17092f5dee69..94f307ae1464 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16792,9 +16792,6 @@ with pkgs; gnome-session-ctl = callPackage ../by-name/gn/gnome-session/ctl.nix { }; - # Using 43 to match Mutter used in Pantheon - gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { }); - lomiri = recurseIntoAttrs (callPackage ../desktops/lomiri { }); lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); From fcbacedbf22cc3d195f924fd66de8febff5692b5 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Sat, 23 Dec 2023 23:23:39 +0100 Subject: [PATCH 212/219] gnustep: propagate dependencies --- pkgs/by-name/gn/gnustep-back/package.nix | 7 ++----- pkgs/by-name/gn/gnustep-base/package.nix | 5 ++++- pkgs/by-name/gn/gnustep-gui/package.nix | 8 ++------ pkgs/by-name/gn/gnustep-libobjc/package.nix | 1 + .../gn/gnustep-systempreferences/package.nix | 14 ++------------ pkgs/by-name/go/gorm/package.nix | 14 ++------------ pkgs/by-name/gw/gworkspace/package.nix | 10 +--------- pkgs/by-name/ow/owl-compositor/package.nix | 8 ++------ pkgs/by-name/pi/pikopixel/package.nix | 8 ++------ pkgs/by-name/pr/projectcenter/package.nix | 10 +--------- pkgs/by-name/so/sogo/package.nix | 4 ++-- pkgs/by-name/so/sope/package.nix | 1 - pkgs/tools/archivers/unar/default.nix | 2 -- .../tools/networking/openvpn/openvpn-auth-ldap.nix | 6 +----- 14 files changed, 22 insertions(+), 76 deletions(-) diff --git a/pkgs/by-name/gn/gnustep-back/package.nix b/pkgs/by-name/gn/gnustep-back/package.nix index c36e773621bc..3ba7512c4b67 100644 --- a/pkgs/by-name/gn/gnustep-back/package.nix +++ b/pkgs/by-name/gn/gnustep-back/package.nix @@ -5,9 +5,7 @@ cairo, fontconfig, freetype, - gnustep-base, gnustep-gui, - gnustep-make, libXft, libXmu, pkg-config, @@ -24,7 +22,6 @@ clangStdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - gnustep-make pkg-config wrapGNUstepAppsHook ]; @@ -33,12 +30,12 @@ clangStdenv.mkDerivation (finalAttrs: { cairo fontconfig freetype - gnustep-base - gnustep-gui libXft libXmu ]; + propagatedBuildInputs = [ gnustep-gui ]; + meta = { description = "Generic backend for GNUstep"; mainProgram = "gpbs"; diff --git a/pkgs/by-name/gn/gnustep-base/package.nix b/pkgs/by-name/gn/gnustep-base/package.nix index 7ce14203aad5..e46150706bf0 100644 --- a/pkgs/by-name/gn/gnustep-base/package.nix +++ b/pkgs/by-name/gn/gnustep-base/package.nix @@ -43,11 +43,14 @@ clangStdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - gnustep-make pkg-config wrapGNUstepAppsHook ]; + propagatedNativeBuildInputs = [ + gnustep-make + ]; + propagatedBuildInputs = [ aspell audiofile diff --git a/pkgs/by-name/gn/gnustep-gui/package.nix b/pkgs/by-name/gn/gnustep-gui/package.nix index a4a7208b94e7..560daf72581f 100644 --- a/pkgs/by-name/gn/gnustep-gui/package.nix +++ b/pkgs/by-name/gn/gnustep-gui/package.nix @@ -3,7 +3,6 @@ clangStdenv, fetchzip, gnustep-base, - gnustep-make, wrapGNUstepAppsHook, }: @@ -16,12 +15,9 @@ clangStdenv.mkDerivation (finalAttrs: { sha256 = "sha256-+4XEJ6PKpantbIbyNroFMaNBTFffkuW/ajSocGQO9Mo="; }; - nativeBuildInputs = [ - gnustep-make - wrapGNUstepAppsHook - ]; + nativeBuildInputs = [ wrapGNUstepAppsHook ]; - buildInputs = [ gnustep-base ]; + propagatedBuildInputs = [ gnustep-base ]; patches = [ ./fixup-all.patch diff --git a/pkgs/by-name/gn/gnustep-libobjc/package.nix b/pkgs/by-name/gn/gnustep-libobjc/package.nix index 3ab7e7ace001..330e31bf7bb6 100644 --- a/pkgs/by-name/gn/gnustep-libobjc/package.nix +++ b/pkgs/by-name/gn/gnustep-libobjc/package.nix @@ -19,6 +19,7 @@ clangStdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; + buildInputs = [ robin-map ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; diff --git a/pkgs/by-name/gn/gnustep-systempreferences/package.nix b/pkgs/by-name/gn/gnustep-systempreferences/package.nix index 978aae80d3f2..55341d4f8ab2 100644 --- a/pkgs/by-name/gn/gnustep-systempreferences/package.nix +++ b/pkgs/by-name/gn/gnustep-systempreferences/package.nix @@ -3,9 +3,6 @@ clangStdenv, fetchurl, gnustep-back, - gnustep-base, - gnustep-gui, - gnustep-make, wrapGNUstepAppsHook, }: @@ -18,16 +15,9 @@ clangStdenv.mkDerivation (finalAttrs: { sha256 = "1fg7c3ihfgvl6n21rd17fs9ivx3l8ps874m80vz86n1callgs339"; }; - nativeBuildInputs = [ - gnustep-make - wrapGNUstepAppsHook - ]; + nativeBuildInputs = [ wrapGNUstepAppsHook ]; - buildInputs = [ - gnustep-back - gnustep-base - gnustep-gui - ]; + buildInputs = [ gnustep-back ]; meta = { description = "Settings manager for the GNUstep environment and its applications"; diff --git a/pkgs/by-name/go/gorm/package.nix b/pkgs/by-name/go/gorm/package.nix index 079b75a8a12c..1e883cebca0e 100644 --- a/pkgs/by-name/go/gorm/package.nix +++ b/pkgs/by-name/go/gorm/package.nix @@ -3,9 +3,6 @@ clangStdenv, fetchzip, gnustep-back, - gnustep-base, - gnustep-gui, - gnustep-make, wrapGNUstepAppsHook, }: @@ -18,16 +15,9 @@ clangStdenv.mkDerivation (finalAttrs: { sha256 = "sha256-B7NNRA3qA2PFbb03m58EBBONuIciLf6eU+YSR0qvaCo="; }; - nativeBuildInputs = [ - gnustep-make - wrapGNUstepAppsHook - ]; + nativeBuildInputs = [ wrapGNUstepAppsHook ]; - buildInputs = [ - gnustep-back - gnustep-base - gnustep-gui - ]; + buildInputs = [ gnustep-back ]; meta = { description = "Graphical Object Relationship Modeller is an easy-to-use interface designer for GNUstep"; diff --git a/pkgs/by-name/gw/gworkspace/package.nix b/pkgs/by-name/gw/gworkspace/package.nix index 28eaca21359f..0f12f00838b6 100644 --- a/pkgs/by-name/gw/gworkspace/package.nix +++ b/pkgs/by-name/gw/gworkspace/package.nix @@ -3,9 +3,6 @@ clangStdenv, fetchurl, gnustep-back, - gnustep-base, - gnustep-gui, - gnustep-make, gnustep-systempreferences, wrapGNUstepAppsHook, }: @@ -22,15 +19,10 @@ clangStdenv.mkDerivation (finalAttrs: { # additional dependencies: # - PDFKit framework from http://gap.nongnu.org/ # - TODO: to --enable-gwmetadata, need libDBKit as well as sqlite! - nativeBuildInputs = [ - gnustep-make - wrapGNUstepAppsHook - ]; + nativeBuildInputs = [ wrapGNUstepAppsHook ]; buildInputs = [ gnustep-back - gnustep-base - gnustep-gui gnustep-systempreferences ]; diff --git a/pkgs/by-name/ow/owl-compositor/package.nix b/pkgs/by-name/ow/owl-compositor/package.nix index 8c7dc6192969..320eccc35680 100644 --- a/pkgs/by-name/ow/owl-compositor/package.nix +++ b/pkgs/by-name/ow/owl-compositor/package.nix @@ -1,9 +1,7 @@ { lib , clangStdenv , fetchFromGitHub -, gnustep-make -, gnustep-base -, gnustep-gui +, gnustep-back , wrapGNUstepAppsHook , libxkbcommon , makeWrapper @@ -44,7 +42,6 @@ stdenv.mkDerivation { darwin.DarwinTools darwin.bootstrap_cmds ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - gnustep-make wrapGNUstepAppsHook ]; @@ -54,8 +51,7 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - gnustep-base - gnustep-gui + gnustep-back ]; preConfigure = '' diff --git a/pkgs/by-name/pi/pikopixel/package.nix b/pkgs/by-name/pi/pikopixel/package.nix index 5111cb24970d..f2b00cb90fca 100644 --- a/pkgs/by-name/pi/pikopixel/package.nix +++ b/pkgs/by-name/pi/pikopixel/package.nix @@ -1,9 +1,7 @@ { lib , clangStdenv , fetchurl -, gnustep-make -, gnustep-base -, gnustep-gui +, gnustep-back , wrapGNUstepAppsHook }: @@ -19,13 +17,11 @@ clangStdenv.mkDerivation rec { sourceRoot = "PikoPixel.Sources.${version}/PikoPixel"; nativeBuildInputs = [ - gnustep-make wrapGNUstepAppsHook ]; buildInputs = [ - gnustep-base - gnustep-gui + gnustep-back ]; # Fix the Exec and Icon paths in the .desktop file, and save the file in the diff --git a/pkgs/by-name/pr/projectcenter/package.nix b/pkgs/by-name/pr/projectcenter/package.nix index ececb3bcf066..b4b54d6b1d44 100644 --- a/pkgs/by-name/pr/projectcenter/package.nix +++ b/pkgs/by-name/pr/projectcenter/package.nix @@ -5,9 +5,6 @@ gdb, gnumake, gnustep-back, - gnustep-base, - gnustep-gui, - gnustep-make, gorm, wrapGNUstepAppsHook, }: @@ -23,10 +20,7 @@ clangStdenv.mkDerivation (finalAttrs: { hash = "sha256-uXT2UUvMZNc6Fqi2BUXQimbZk8b3IqXzB+A2btBOmms="; }; - nativeBuildInputs = [ - gnustep-make - wrapGNUstepAppsHook - ]; + nativeBuildInputs = [ wrapGNUstepAppsHook ]; # NOTE: need a patch for ProjectCenter to help it locate some necessary tools: # 1. Framework/PCProjectLauncher.m, locate gdb (say among NIX_GNUSTEP_SYSTEM_TOOLS) @@ -35,8 +29,6 @@ clangStdenv.mkDerivation (finalAttrs: { gdb gnumake gnustep-back - gnustep-base - gnustep-gui gorm ]; diff --git a/pkgs/by-name/so/sogo/package.nix b/pkgs/by-name/so/sogo/package.nix index 2ce92f5d5b08..d4d663c5e9ba 100644 --- a/pkgs/by-name/so/sogo/package.nix +++ b/pkgs/by-name/so/sogo/package.nix @@ -1,4 +1,4 @@ -{ lib, clangStdenv, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir, libxcrypt +{ lib, clangStdenv, fetchFromGitHub, makeWrapper, python3, lndir, libxcrypt , openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests , oath-toolkit , gnustep-make @@ -18,7 +18,7 @@ clangStdenv.mkDerivation rec { hash = "sha256-c+547x7ugYoLMgGVLcMmmb9rzquRJOv8n+Js2CuE7I0="; }; - nativeBuildInputs = [ gnustep-make makeWrapper python3 pkg-config ]; + nativeBuildInputs = [ makeWrapper python3 pkg-config ]; buildInputs = [ gnustep-base sope openssl libmemcached curl libsodium libytnef libzip openldap oath-toolkit libxcrypt ] ++ lib.optional enableActiveSync libwbxml; diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix index b82c647c1740..a6391e279f24 100644 --- a/pkgs/by-name/so/sope/package.nix +++ b/pkgs/by-name/so/sope/package.nix @@ -15,7 +15,6 @@ clangStdenv.mkDerivation rec { hash = "sha256-6vec2ZgpK5jcKr3c2SLn6fLAun56MDjupWtR6dMdjag="; }; - nativeBuildInputs = [ gnustep-make ]; buildInputs = [ gnustep-base libxml2 openssl ] ++ lib.optional (openldap != null) openldap ++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ] diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index b9b205324ab0..2f15a6abd764 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , installShellFiles , gnustep-base -, gnustep-make , bzip2 , zlib , icu @@ -59,7 +58,6 @@ stdenv.mkDerivation rec { lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; nativeBuildInputs = [ installShellFiles ] ++ - lib.optionals stdenv.hostPlatform.isLinux [ gnustep-make ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuildHook ]; xcbuildFlags = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix index 8c8f2004b81b..e046e861e8ef 100644 --- a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix +++ b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -4,9 +4,7 @@ fetchFromGitHub, fetchpatch2, autoreconfHook, - gnustep-make, gnustep-base, - gnustep-libobjc, re2c, openldap, openssl, @@ -42,9 +40,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - gnustep-libobjc - gnustep-make - gnustep-base re2c ]; @@ -52,6 +47,7 @@ stdenv.mkDerivation rec { openldap openssl openvpn + gnustep-base ]; configureFlags = [ From 437e81102f1fd010d5683cda019359bc92d2d572 Mon Sep 17 00:00:00 2001 From: illustris Date: Wed, 22 Jan 2025 14:08:59 +0530 Subject: [PATCH 213/219] bpftrace: remove llvm version patch --- pkgs/by-name/bp/bpftrace/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 9fa9faa0a658..4e648e80b5cb 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -58,10 +58,6 @@ stdenv.mkDerivation rec { "-DSYSTEM_INCLUDE_PATHS=${glibc.dev}/include" ]; - postPatch = '' - substituteInPlace CMakeLists.txt --replace "set(MAX_LLVM_MAJOR 18)" "set(MAX_LLVM_MAJOR 19)" - ''; - # Pull BPF scripts into $PATH (next to their bcc program equivalents), but do # not move them to keep `${pkgs.bpftrace}/share/bpftrace/tools/...` working. postInstall = '' From fdbbb617af0bf2948218db823aa6b4f99b31c014 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sun, 5 Jan 2025 15:44:12 +0100 Subject: [PATCH 214/219] got: 0.106 -> 0.108 --- pkgs/by-name/go/got/package.nix | 38 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index 30eb0be47b6a..4bed26de212a 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -15,7 +15,7 @@ autoPatchelfHook, testers, signify, - overrideSDK, + apple-sdk_15, nix-update-script, withSsh ? true, openssh, @@ -23,20 +23,13 @@ defaultEditor ? null, }: -let - stdenv' = - if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then - overrideSDK stdenv "11.0" - else - stdenv; -in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "got"; - version = "0.106"; + version = "0.108"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-MHnXQsElBH3jOd2SPXXQuWCZWjpLVn7QjvNtESvbB8w="; + hash = "sha256-bI0yCt01h65HwG2jLUH+5Ah+1mGTG6ZNxt53v0Mr0+I="; }; nativeBuildInputs = [ @@ -44,15 +37,20 @@ stdenv'.mkDerivation (finalAttrs: { bison ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = [ - libressl - libbsd - libevent - libuuid - libmd - zlib - ncurses - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libossp_uuid ]; + buildInputs = + [ + libressl + libbsd + libevent + libuuid + libmd + zlib + ncurses + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libossp_uuid + apple-sdk_15 + ]; preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' # The configure script assumes dependencies on Darwin are installed via From 329bbc7aeece310d893549efb2ad525f574c8240 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jan 2025 13:27:33 +0000 Subject: [PATCH 215/219] libdigidocpp: 4.0.0 -> 4.1.0 --- pkgs/by-name/li/libdigidocpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdigidocpp/package.nix b/pkgs/by-name/li/libdigidocpp/package.nix index 3fc8389bc35d..2a1c015910a4 100644 --- a/pkgs/by-name/li/libdigidocpp/package.nix +++ b/pkgs/by-name/li/libdigidocpp/package.nix @@ -18,12 +18,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.0"; + version = "4.1.0"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - hash = "sha256-0G7cjJEgLJ24SwHRznKJ18cRY0m50lr6HXstfbYq9f8="; + hash = "sha256-lY7UVAhdWadLUKR21ezUfWc1Xdv/MWhfI/by4btcvr8="; }; nativeBuildInputs = [ From a5ff9f5558169a67571b7d576060f86a2622fccd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jan 2025 10:00:49 +0000 Subject: [PATCH 216/219] pixelfed: 0.12.3 -> 0.12.4 --- pkgs/by-name/pi/pixelfed/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pixelfed/package.nix b/pkgs/by-name/pi/pixelfed/package.nix index 368501aa237d..5e648c685be7 100644 --- a/pkgs/by-name/pi/pixelfed/package.nix +++ b/pkgs/by-name/pi/pixelfed/package.nix @@ -9,16 +9,16 @@ php.buildComposerProject (finalAttrs: { pname = "pixelfed"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "pixelfed"; repo = "pixelfed"; rev = "v${finalAttrs.version}"; - hash = "sha256-CKjqnxp7p2z/13zfp4HQ1OAmaoUtqBKS6HFm6TV8Jwg="; + hash = "sha256-HEo0BOC/AEWhCApibxo2TBQF4kbLrbPEXqDygVQlVic="; }; - vendorHash = "sha256-zjIjGkR9MCnjRho/ViqZ5EbS9MJ7OQ1kkg93jBssuZU="; + vendorHash = "sha256-QkkSnQb9haH8SiXyLSS58VXSD4op7Hr4Z6vUAAYLIic="; postInstall = '' mv "$out/share/php/${finalAttrs.pname}"/* $out From 9d71dc7005c4d2b601bf2f5343746d57e89c25a3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 26 Jan 2025 00:03:45 +0100 Subject: [PATCH 217/219] nixos/pixelfed: bump php version --- nixos/modules/services/web-apps/pixelfed.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix index 62db479da3d4..4c64a10951ab 100644 --- a/nixos/modules/services/web-apps/pixelfed.nix +++ b/nixos/modules/services/web-apps/pixelfed.nix @@ -40,7 +40,7 @@ in { pixelfed = { enable = mkEnableOption "a Pixelfed instance"; package = mkPackageOption pkgs "pixelfed" { }; - phpPackage = mkPackageOption pkgs "php82" { }; + phpPackage = mkPackageOption pkgs "php83" { }; user = mkOption { type = types.str; From 25245681972fb5e186a5c9d7d0eabc6fef5f3733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 25 Jan 2025 21:16:07 +0100 Subject: [PATCH 218/219] headscale: 0.24.0 -> 0.24.1 Diff: https://github.com/juanfont/headscale/compare/v0.24.0...v0.24.1 --- pkgs/servers/headscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 8cc608dc228c..98c16ec36983 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "headscale"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - hash = "sha256-s9zzhN8NTC6YxOO6fyO+A0jleeY8bhN1wcbf4pvGkpI="; + hash = "sha256-s6s+0RHgAPxmSidfAoAne1d7DRwbC3d9udki3TlPmlY="; }; vendorHash = "sha256-SBfeixT8DQOrK2SWmHHSOBtzRdSZs+pwomHpw6Jd+qc="; From 614404df3e643f38102b662b8c53f296d41de384 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 26 Jan 2025 00:30:30 +0100 Subject: [PATCH 219/219] nixos/gdomap: fix eval --- nixos/modules/services/networking/gdomap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/gdomap.nix b/nixos/modules/services/networking/gdomap.nix index bfec51c616bb..f33f32430d03 100644 --- a/nixos/modules/services/networking/gdomap.nix +++ b/nixos/modules/services/networking/gdomap.nix @@ -24,8 +24,8 @@ description = "gdomap server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - path = [ pkgs.gnustep.base ]; - serviceConfig.ExecStart = "${pkgs.gnustep.base}/bin/gdomap -f"; + path = [ pkgs.gnustep-base ]; + serviceConfig.ExecStart = "${pkgs.gnustep-base}/bin/gdomap -f"; }; }; }