From 4f959fdb30615232c3417b0ebc9c525a2ff04c0a Mon Sep 17 00:00:00 2001 From: MinerSebas Date: Sun, 22 Sep 2024 15:08:19 +0200 Subject: [PATCH 001/106] raspberrypi-eeprom: Add flashrom to path The update script prefers to use flashrom to update raspberrypi 5 devices. --- pkgs/by-name/ra/raspberrypi-eeprom/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix index 8f46010cce05..8dc780eedfc1 100644 --- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix +++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix @@ -5,6 +5,7 @@ , python3 , binutils-unwrapped , findutils +, flashrom , gawk , kmod , pciutils @@ -52,6 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { --prefix PATH : "${lib.makeBinPath ([ binutils-unwrapped findutils + flashrom gawk kmod pciutils From 256d33ba46d12c16deb55eca6b989be69138ce45 Mon Sep 17 00:00:00 2001 From: Keto Date: Fri, 27 Sep 2024 22:25:00 -0400 Subject: [PATCH 002/106] archivemount: Migrate to `by-name` --- .../ar/archivemount/package.nix} | 14 ++++++++++++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 4 deletions(-) rename pkgs/{tools/filesystems/archivemount/default.nix => by-name/ar/archivemount/package.nix} (82%) diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/by-name/ar/archivemount/package.nix similarity index 82% rename from pkgs/tools/filesystems/archivemount/default.nix rename to pkgs/by-name/ar/archivemount/package.nix index 48e78fe7d108..026dddc46c24 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/by-name/ar/archivemount/package.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, pkg-config, fuse, libarchive }: +{ + lib, + stdenv, + fetchurl, + pkg-config, + fuse, + libarchive, +}: stdenv.mkDerivation rec { pname = "archivemount"; @@ -10,7 +17,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fuse libarchive ]; + buildInputs = [ + fuse + libarchive + ]; meta = { description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05c5985bd5c9..0d2eacc496a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3062,8 +3062,6 @@ with pkgs; archivebox = callPackage ../applications/misc/archivebox { }; - archivemount = callPackage ../tools/filesystems/archivemount { }; - archivy = callPackage ../applications/misc/archivy { }; arandr = callPackage ../tools/X11/arandr { }; From 2d19e4a770ae7843085eae36c2dc06933d2dc03d Mon Sep 17 00:00:00 2001 From: Keto Date: Fri, 27 Sep 2024 22:37:00 -0400 Subject: [PATCH 003/106] archivemount: 0.9.1 -> 1 --- pkgs/by-name/ar/archivemount/package.nix | 44 +++++++++++++++++++----- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ar/archivemount/package.nix b/pkgs/by-name/ar/archivemount/package.nix index 026dddc46c24..0a86748873ad 100644 --- a/pkgs/by-name/ar/archivemount/package.nix +++ b/pkgs/by-name/ar/archivemount/package.nix @@ -1,19 +1,22 @@ { lib, stdenv, - fetchurl, + fetchFromSourcehut, + fetchpatch, pkg-config, fuse, libarchive, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "archivemount"; - version = "0.9.1"; + version = "1"; - src = fetchurl { - url = "https://www.cybernoia.de/software/archivemount/archivemount-${version}.tar.gz"; - sha256 = "1cy5b6qril9c3ry6fv7ir87s8iyy5vxxmbyx90dm86fbra0vjaf5"; + src = fetchFromSourcehut { + owner = "~nabijaczleweli"; + repo = "archivemount-ng"; + rev = finalAttrs.version; + hash = "sha256-xuLtbqC9iS86BKz4jG8of4id+GTlBXoohONrkmIzOpY="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,10 +25,35 @@ stdenv.mkDerivation rec { libarchive ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "VERSION=${finalAttrs.version}" + ]; + + dontConfigure = true; + + # Fix missing standard struct stat on Darwin + # Already on upstream, but no new release made + patches = [ + (fetchpatch { + name = "fix-missing-standard-struct-stat-on-darwin.patch"; + url = "https://git.sr.ht/~nabijaczleweli/archivemount-ng/commit/53dd70f05fdb6ababe7c1ca70f0f62bcf4930b5a.patch"; + hash = "sha256-UqoALAJoNXihop6Mem4mu+W8REOV92Zyv7pPW20Ugz8="; + }) + ]; + + # Fix cross-compilation + postPatch = '' + substituteInPlace Makefile --replace-fail pkg-config "$PKG_CONFIG" + ''; + meta = { description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; mainProgram = "archivemount"; - license = lib.licenses.gpl2Only; + license = [ + lib.licenses.lgpl2Plus + lib.licenses.bsd0 + ]; platforms = lib.platforms.unix; }; -} +}) From 9e6c9ad0fe59dd0d7a185bc7d13613fd9d517c6f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 30 Sep 2024 15:45:55 -0300 Subject: [PATCH 004/106] live555: 2024.08.01 -> 2024.09.20 --- pkgs/by-name/li/live555/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index c425b9743f89..c558e806db9d 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2024.08.01"; + version = "2024.09.20"; src = fetchurl { urls = [ @@ -19,12 +19,12 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-g5q3Q30B5in4CU6h7Ix6e7UEx97tnt/J4XrDT5oaGT8="; + hash = "sha256-TrUneCGaJJxC+GgL1ZZ/ZcONeqDH05Bp44/3lkCs9tg="; }; patches = [ (fetchpatch { - name = "cflags-when-darwin.patch"; + name = "0000-cflags-when-darwin.patch"; url = "https://github.com/rgaufman/live555/commit/16701af5486bb3a2d25a28edaab07789c8a9ce57.patch?full_index=1"; hash = "sha256-IDSdByBu/EBLsUTBe538rWsDwH61RJfAEhvT68Nb9rU="; }) From ed72e91db150f2e3778dee5fa13f5802e14fd2e5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 2 Oct 2024 10:57:28 +0200 Subject: [PATCH 005/106] nixos/mihomo: fix option type --- nixos/modules/services/networking/mihomo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/mihomo.nix b/nixos/modules/services/networking/mihomo.nix index a425952b54ce..05d3d304d460 100644 --- a/nixos/modules/services/networking/mihomo.nix +++ b/nixos/modules/services/networking/mihomo.nix @@ -18,7 +18,7 @@ in package = lib.mkPackageOption pkgs "mihomo" { }; configFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; + type = lib.types.path; description = "Configuration file to use."; }; From 93da11def19632826d95ee7b148f20bf6baccc00 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 2 Oct 2024 10:58:02 +0200 Subject: [PATCH 006/106] nixos/tests/mihomo: implement check correctly, fix target value --- nixos/tests/mihomo.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/mihomo.nix b/nixos/tests/mihomo.nix index 472d10050f7f..a456facb4367 100644 --- a/nixos/tests/mihomo.nix +++ b/nixos/tests/mihomo.nix @@ -39,6 +39,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.fail("curl --fail --max-time 10 --proxy socks5://user:supervillain@localhost:7890 http://localhost") # Web UI - machine.succeed("curl --fail http://localhost:9090") == '{"hello":"clash"}' + result = machine.succeed("curl --fail http://localhost:9090") + target = '{"hello":"mihomo"}\n' + assert result == target, f"{result!r} != {target!r}" ''; }) From 8c80c2bd128f41a2a7bfbcd18588552bdcaa8ed0 Mon Sep 17 00:00:00 2001 From: tri-ler Date: Fri, 4 Oct 2024 18:29:30 -0400 Subject: [PATCH 007/106] octoprint.python.pkgs.OctoPrint-FileCheck-2021.2.23 -> 2024.3.27 --- pkgs/applications/misc/octoprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index a241a109091e..3b4020413855 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -66,13 +66,13 @@ let (self: super: { octoprint-filecheck = self.buildPythonPackage rec { pname = "OctoPrint-FileCheck"; - version = "2021.2.23"; + version = "2024.3.27"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-FileCheck"; rev = version; - sha256 = "sha256-e/QGEBa9+pjOdrZq3Zc6ifbSMClIyeTOi0Tji0YdVmI="; + sha256 = "sha256-2MK9whPpgwQC+WPbPf628Ocjz6t8HKozblP7dmjD7RQ="; }; doCheck = false; }; From 6a50f540270b150aa80afe2774bd9849c7b66d24 Mon Sep 17 00:00:00 2001 From: Cassie Cheung Date: Tue, 8 Oct 2024 18:02:54 +0800 Subject: [PATCH 008/106] writefreely: 0.15.0 -> 0.15.1 --- .../applications/misc/writefreely/default.nix | 10 ++---- .../writefreely/fix-go-version-error.patch | 36 ------------------- 2 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 pkgs/applications/misc/writefreely/fix-go-version-error.patch diff --git a/pkgs/applications/misc/writefreely/default.nix b/pkgs/applications/misc/writefreely/default.nix index 0f8d3b6fac29..55d4431a6215 100644 --- a/pkgs/applications/misc/writefreely/default.nix +++ b/pkgs/applications/misc/writefreely/default.nix @@ -2,20 +2,16 @@ buildGoModule rec { pname = "writefreely"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "writefreely"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7KTNimthtfmQCgyXevAEj+CZ2MS+uOby73OO1fGNXfs="; + sha256 = "sha256-Qr31XSbAckLElD81yxD+K7tngWECQ+wyuESC+biAbyw="; }; - vendorHash = "sha256-6RTshhxX+w/gdK53wCHVMpm6EkkRtEJ2/Fe7MfZ0WvY="; - - patches = [ - ./fix-go-version-error.patch - ]; + vendorHash = "sha256-HmEh8WmKbdAimvzsAiaXcqSXoU1DJx06+s1EH1JZmwo="; ldflags = [ "-s" "-w" "-X github.com/writefreely/writefreely.softwareVer=${version}" ]; diff --git a/pkgs/applications/misc/writefreely/fix-go-version-error.patch b/pkgs/applications/misc/writefreely/fix-go-version-error.patch deleted file mode 100644 index bfe7ba2dd5dc..000000000000 --- a/pkgs/applications/misc/writefreely/fix-go-version-error.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/go.mod b/go.mod -index c49d701..601443d 100644 ---- a/go.mod -+++ b/go.mod -@@ -89,4 +89,6 @@ require ( - gopkg.in/yaml.v3 v3.0.1 // indirect - ) - --go 1.19 -+go 1.21 -+ -+toolchain go1.21.6 -diff --git a/go.sum b/go.sum -index a9256ea..28ad24f 100644 ---- a/go.sum -+++ b/go.sum -@@ -72,6 +72,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw - github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= - github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= - github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= -+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= - github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= - github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= - github.com/gorilla/csrf v1.7.2 h1:oTUjx0vyf2T+wkrx09Trsev1TE+/EbDAeHtSTbtC2eI= -@@ -106,9 +107,11 @@ github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVY - github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= - github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= - github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= - github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= - github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= - github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= - github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec h1:ZXWuspqypleMuJy4bzYEqlMhJnGAYpLrWe5p7W3CdvI= - github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec/go.mod h1:voECJzdraJmolzPBgL9Z7ANwXf4oMXaTCsIkdiPpR/g= - github.com/mailgun/mailgun-go v2.0.0+incompatible h1:0FoRHWwMUctnd8KIR3vtZbqdfjpIMxOZgcSa51s8F8o= From 852a489ac7c45f12f0caf477214ef9cd8ef6c0a4 Mon Sep 17 00:00:00 2001 From: Cassie Cheung Date: Tue, 8 Oct 2024 18:04:56 +0800 Subject: [PATCH 009/106] writefreely: move to pkgs/by-name --- .../default.nix => by-name/wr/writefreely/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/writefreely/default.nix => by-name/wr/writefreely/package.nix} (100%) diff --git a/pkgs/applications/misc/writefreely/default.nix b/pkgs/by-name/wr/writefreely/package.nix similarity index 100% rename from pkgs/applications/misc/writefreely/default.nix rename to pkgs/by-name/wr/writefreely/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 787f20384e3c..3788e15cc606 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2906,8 +2906,6 @@ with pkgs; yaft = callPackage ../applications/terminal-emulators/yaft { }; - writefreely = callPackage ../applications/misc/writefreely { }; - iqueue = callPackage ../development/libraries/iqueue { }; lifecycled = callPackage ../tools/misc/lifecycled { }; From 85848e7d8bae32e63d13eb02abca687d12a10cf3 Mon Sep 17 00:00:00 2001 From: Cassie Cheung Date: Tue, 8 Oct 2024 18:13:04 +0800 Subject: [PATCH 010/106] writefreely: format with nixfmt --- pkgs/by-name/wr/writefreely/package.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wr/writefreely/package.nix b/pkgs/by-name/wr/writefreely/package.nix index 55d4431a6215..f952481f828d 100644 --- a/pkgs/by-name/wr/writefreely/package.nix +++ b/pkgs/by-name/wr/writefreely/package.nix @@ -1,4 +1,9 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, +}: buildGoModule rec { pname = "writefreely"; @@ -13,13 +18,19 @@ buildGoModule rec { vendorHash = "sha256-HmEh8WmKbdAimvzsAiaXcqSXoU1DJx06+s1EH1JZmwo="; - ldflags = [ "-s" "-w" "-X github.com/writefreely/writefreely.softwareVer=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/writefreely/writefreely.softwareVer=${version}" + ]; tags = [ "sqlite" ]; subPackages = [ "cmd/writefreely" ]; - passthru.tests = { inherit (nixosTests) writefreely; }; + passthru.tests = { + inherit (nixosTests) writefreely; + }; meta = with lib; { description = "Build a digital writing community"; From 49c56d3057619e07870d88f84169b126292ceac7 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Tue, 8 Oct 2024 16:38:00 +0200 Subject: [PATCH 011/106] Pin electron 27 until upstream is updated --- pkgs/by-name/lo/logseq/package.nix | 53 ++++++++++++++++-------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index 06fc0d3fd0a3..c99e04a36bf6 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -4,16 +4,17 @@ , appimageTools , unzip , makeWrapper -# Notice: graphs will not sync without matching upstream's major electron version -# the specific electron version is set at top-level file to preserve override interface. -# whenever updating this package also sync electron version at top-level file. -, electron + # Notice: graphs will not sync without matching upstream's major electron version + # the specific electron version is set at top-level file to preserve override interface. + # whenever updating this package also sync electron version at top-level file. +, electron_27 , autoPatchelfHook , git , nix-update-script }: -stdenv.mkDerivation (finalAttrs: let +stdenv.mkDerivation (finalAttrs: +let inherit (finalAttrs) pname version src; inherit (stdenv.hostPlatform) system; selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}"); @@ -27,7 +28,8 @@ stdenv.mkDerivation (finalAttrs: let x86_64-darwin = "sha256-0i9ozqBSeV/y8v+YEmQkbY0V6JHOv6tKub4O5Fdx2fQ="; aarch64-darwin = "sha256-Uvv96XWxpFj14wPH0DwPT+mlf3Z2dy1g/z8iBt5Te7Q="; }; -in { +in +{ pname = "logseq"; version = "0.10.9"; src = fetchurl { @@ -48,27 +50,28 @@ in { installPhase = '' runHook preInstall '' + lib.optionalString stdenv.hostPlatform.isLinux ( - let - appimageContents = appimageTools.extract { inherit pname src version; }; - in - '' - mkdir -p $out/bin $out/share/logseq $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/logseq - cp -a ${appimageContents}/Logseq.desktop $out/share/applications/logseq.desktop + let + appimageContents = appimageTools.extract { inherit pname src version; }; + in + '' + mkdir -p $out/bin $out/share/logseq $out/share/applications + cp -a ${appimageContents}/{locales,resources} $out/share/logseq + cp -a ${appimageContents}/Logseq.desktop $out/share/applications/logseq.desktop - # remove the `git` in `dugite` because we want the `git` in `nixpkgs` - chmod +w -R $out/share/logseq/resources/app/node_modules/dugite/git - chmod +w $out/share/logseq/resources/app/node_modules/dugite - rm -rf $out/share/logseq/resources/app/node_modules/dugite/git - chmod -w $out/share/logseq/resources/app/node_modules/dugite + # remove the `git` in `dugite` because we want the `git` in `nixpkgs` + chmod +w -R $out/share/logseq/resources/app/node_modules/dugite/git + chmod +w $out/share/logseq/resources/app/node_modules/dugite + rm -rf $out/share/logseq/resources/app/node_modules/dugite/git + chmod -w $out/share/logseq/resources/app/node_modules/dugite - mkdir -p $out/share/pixmaps - ln -s $out/share/logseq/resources/app/icons/logseq.png $out/share/pixmaps/logseq.png + mkdir -p $out/share/pixmaps + ln -s $out/share/logseq/resources/app/icons/logseq.png $out/share/pixmaps/logseq.png - substituteInPlace $out/share/applications/logseq.desktop \ - --replace Exec=Logseq Exec=logseq \ - --replace Icon=Logseq Icon=logseq - '') + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace $out/share/applications/logseq.desktop \ + --replace Exec=Logseq Exec=logseq \ + --replace Icon=Logseq Icon=logseq + '' + ) + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications/Logseq.app,bin} cp -R . $out/Applications/Logseq.app makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/logseq @@ -78,7 +81,7 @@ in { postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs - makeWrapper ${electron}/bin/electron $out/bin/logseq \ + makeWrapper ${electron_27}/bin/electron $out/bin/logseq \ --set "LOCAL_GIT_DIRECTORY" ${git} \ --add-flags $out/share/logseq/resources/app \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" From 6f115a07ce3ff2530dd1479310cdaae9a6edec79 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Thu, 10 Oct 2024 01:59:54 +0300 Subject: [PATCH 012/106] netbeans: 22 -> 23 --- pkgs/by-name/ne/netbeans/package.nix | 46 ++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ne/netbeans/package.nix b/pkgs/by-name/ne/netbeans/package.nix index cfd9e0ae7d46..f0a54453bbff 100644 --- a/pkgs/by-name/ne/netbeans/package.nix +++ b/pkgs/by-name/ne/netbeans/package.nix @@ -1,9 +1,19 @@ -{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, which, unzip, libicns, imagemagick -, jdk17, perl +{ + lib, + stdenv, + fetchurl, + makeWrapper, + makeDesktopItem, + which, + unzip, + libicns, + imagemagick, + jdk21, + perl, }: let - version = "22"; + version = "23"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +29,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - hash = "sha256-uuzC2iiTSn3czWod3aBbNh8mVM5bCvmjKUl0ptNdm3M="; + hash = "sha256-UNTW0K8JlkxOKz9oO3HUBPZ4yZY7uWBkFZd2uenXtZA="; }; buildCommand = '' @@ -34,9 +44,14 @@ stdenv.mkDerivation { mkdir -pv $out/bin cp -a netbeans $out makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ - --prefix PATH : ${lib.makeBinPath [ jdk17 which ]} \ - --prefix JAVA_HOME : ${jdk17.home} \ - --add-flags "--jdkhome ${jdk17.home} \ + --prefix PATH : ${ + lib.makeBinPath [ + jdk21 + which + ] + } \ + --prefix JAVA_HOME : ${jdk21.home} \ + --add-flags "--jdkhome ${jdk21.home} \ -J-Dawt.useSystemAAFontSettings=on -J-Dswing.aatext=true" # Extract pngs from the Apple icon image and create @@ -57,8 +72,15 @@ stdenv.mkDerivation { ln -s ${desktopItem}/share/applications/* $out/share/applications ''; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ perl libicns imagemagick ]; + nativeBuildInputs = [ + makeWrapper + unzip + ]; + buildInputs = [ + perl + libicns + imagemagick + ]; meta = { description = "Integrated development environment for Java, C, C++ and PHP"; @@ -68,7 +90,11 @@ stdenv.mkDerivation { binaryBytecode binaryNativeCode ]; - maintainers = with lib.maintainers; [ sander rszibele kashw2 ]; + maintainers = with lib.maintainers; [ + sander + rszibele + kashw2 + ]; platforms = lib.platforms.unix; mainProgram = "netbeans"; }; From 042afa604cfd90f5386ad25cfc90cb12442e43ec Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Thu, 10 Oct 2024 08:32:28 +0200 Subject: [PATCH 013/106] gpclient: add gio-networking for embedded browser Without this, login with the non-external browser results in: > 2024-10-10T06:15:23Z WARN gpauth::auth_window] Failed to load uri: with error: TLS/SSL support not available; install glib-networking The login flow seems to work after adding glib-networking to GIO_EXTRA_MODULES by wrapping the `gpclient` program. --- pkgs/by-name/gp/gpclient/package.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gp/gpclient/package.nix b/pkgs/by-name/gp/gpclient/package.nix index 786123e74d44..49277a0a2462 100644 --- a/pkgs/by-name/gp/gpclient/package.nix +++ b/pkgs/by-name/gp/gpclient/package.nix @@ -1,6 +1,8 @@ { rustPlatform, + glib-networking, gpauth, + makeWrapper, openconnect, openssl, perl, @@ -15,11 +17,15 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "apps/gpclient"; cargoHash = "sha256-aJYFBvVrj1n2+9WLLBH5WTRRzTle19LsdJ2DielJYik="; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ + perl + makeWrapper + ]; buildInputs = [ gpauth openconnect openssl + glib-networking ]; preConfigure = '' @@ -34,6 +40,11 @@ rustPlatform.buildRustPackage rec { cp packaging/files/usr/share/applications/gpgui.desktop $out/share/applications/gpgui.desktop ''; + preFixup = '' + wrapProgram "$out/bin/gpclient" \ + --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules + ''; + postFixup = '' substituteInPlace $out/share/applications/gpgui.desktop \ --replace-fail /usr/bin/gpclient $out/bin/gpclient From 70c36136dae134796a902de9ece4e9dadabf2d1a Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Thu, 10 Oct 2024 21:11:23 +0200 Subject: [PATCH 014/106] bazecor: 1.5.1 -> 1.5.2 --- pkgs/by-name/ba/bazecor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index 7561af663e20..343aa8da9163 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.5.1"; + version = "1.5.2"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-Vnbyq6NVJ/QtDqXT6IY/sjqsWqxs34C+ibebbx8Vp4E="; + hash = "sha256-Eq66tuRP/+TPLNDQRox8/dMT/7fGGrxmUUML8wJ3v+M="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 From 5db5954bb2648b067cf73fe19243d65941873d0c Mon Sep 17 00:00:00 2001 From: FabianRig <88741530+FabianRig@users.noreply.github.com> Date: Thu, 10 Oct 2024 22:06:16 +0200 Subject: [PATCH 015/106] technitium-dns-server: 13.0.1 --> 13.0.2 --- pkgs/by-name/te/technitium-dns-server/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix index d49899480e3b..ae5cccf2902e 100644 --- a/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/pkgs/by-name/te/technitium-dns-server/package.nix @@ -8,13 +8,13 @@ let technitium-library = buildDotnetModule rec { pname = "TechnitiumLibrary"; - version = "5af89bb453dd67ae3119771597451e438a938591"; + version = "13.0.2"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "TechnitiumLibrary"; - rev = version; - hash = "sha256-ezYC2Nh5lgaN95OEP4TYcH6+3AbHbyTfv1RU19DXI3c="; + rev = "refs/tags/dns-server-v${version}"; + hash = "sha256-mMNZZvM/UvQTiyeOgPHXXFxmsiGPe4Jal1aSEMEM5Xc="; name = "${pname}-${version}"; }; @@ -30,13 +30,13 @@ let in buildDotnetModule rec { pname = "technitium-dns-server"; - version = "13.0.1"; + version = "13.0.2"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "DnsServer"; rev = "refs/tags/v${version}"; - hash = "sha256-O5QJAo6GjoKes5W4ajMcsYpR3j7EcR1vVMiKtTLcwDE="; + hash = "sha256-2dFjr3f4ZlLBJzuObSYIkSdtcyZ8dC6M7/S1p7WoG0c="; name = "${pname}-${version}"; }; From 34254e38eaf8deef928a5c614a8bfd7a79e0c0c1 Mon Sep 17 00:00:00 2001 From: Benjamin Manuel Date: Thu, 10 Oct 2024 15:34:17 -0500 Subject: [PATCH 016/106] jfrog-cli: 2.56.1 -> 2.70.0, update go version --- pkgs/tools/misc/jfrog-cli/default.nix | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index ac6696bbb7fe..39a3e0ad8582 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -1,37 +1,22 @@ { lib -, buildGoModule +, buildGo123Module , fetchFromGitHub , nodejs , nix-update-script }: -buildGoModule rec { +buildGo123Module rec { pname = "jfrog-cli"; - version = "2.56.1"; + version = "2.70.0"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-oUICnpVHRNCauWEplz7xH6AdP6CbbYX/Uy/QUPjwGHc="; + hash = "sha256-ddwGmXb616kDNNNTNUykiEWX/2ihUpgetZ/va943RiQ="; }; - vendorHash = "sha256-zQjOOUlqL0Mj2DKHiG9rOfu41SKMO7C99JBJDycXAs4="; - - # Upgrade the Go version during the vendoring FOD build because it fails otherwise. - overrideModAttrs = _: { - preBuild = '' - substituteInPlace go.mod --replace-fail 'go 1.20' 'go 1.21' - ''; - postInstall = '' - cp go.mod "$out/go.mod" - ''; - }; - - # Copy the modified go.mod we got from the vendoring process. - preBuild = '' - cp vendor/go.mod go.mod - ''; + vendorHash = "sha256-CT+flwvPC9IRWBMyCHtj25F/szeeno9OHMs3+D0J58g="; postPatch = '' # Patch out broken test cleanup. From 25bea19c7130240c2ce607238c0fb92360c5179c Mon Sep 17 00:00:00 2001 From: Benjamin Manuel Date: Thu, 10 Oct 2024 15:34:27 -0500 Subject: [PATCH 017/106] jfrog-cli: set proxyVendor due to case sensitivity issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jonas Köhnen --- pkgs/tools/misc/jfrog-cli/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index 39a3e0ad8582..e3b06b2f76e4 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -16,7 +16,8 @@ buildGo123Module rec { hash = "sha256-ddwGmXb616kDNNNTNUykiEWX/2ihUpgetZ/va943RiQ="; }; - vendorHash = "sha256-CT+flwvPC9IRWBMyCHtj25F/szeeno9OHMs3+D0J58g="; + proxyVendor = true; + vendorHash = "sha256-1xUCQF2UDHAmzibixv9pR6G2gvXxIStCyBuz608UpIQ="; postPatch = '' # Patch out broken test cleanup. From 233d422887dd66530e2b6234f1ee39f0aec79ee1 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 11 Oct 2024 10:59:49 +0200 Subject: [PATCH 018/106] nixos/tailscale: document tailscale-autoconnect --- nixos/modules/services/networking/tailscale.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 859da5be81dd..aaff9221d5f0 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -57,6 +57,7 @@ in { example = "/run/secrets/tailscale_key"; description = '' A file containing the auth key. + Tailscale will be automatically started if provided. ''; }; From 2fc61b161dfaddc4455fce44749e391934ce58e1 Mon Sep 17 00:00:00 2001 From: Matthew Kenigsberg Date: Wed, 9 Oct 2024 16:26:24 -0600 Subject: [PATCH 019/106] granted: fix wrapping of assume script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a few problems with the assume script in the granted package. - assume is currently being exec'ed by a wrapper script created with wrapProgram, but it should be sourced. This causes the error: ``` line 172: return: can only `return' from a function or sourced script ``` - assume inspects argv[0] to check if an alias has been added to the user's shell profile. This means a wrapper of any kind won't work, even if it called source instead of exec, because source will still set argv[0]. This means assume always tries to add the alias, but it fails when it has already added the alias. ``` [i] To assume roles with Granted, we need to add an alias to your shell profile (https://docs.commonfate.io/granted/internals/shell-alias) ? Install zsh alias at /Users/matthew/.zshenv Yes [✘] the Granted alias has already been added to /Users/matthew/.zshenv ``` - assume depends on assumego, so if it is run directly from e.g. a result directory created with `nix build`, it will output ``` line 22: assumego: command not found ``` Fix all of these problems by dropping the wrapper around assume, and instead insert a few lines into the start of the assume script that add xdg-utils and granted to assume's PATH. --- pkgs/by-name/gr/granted/package.nix | 40 +++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix index 9c9454bf1779..43a32eb4d180 100644 --- a/pkgs/by-name/gr/granted/package.nix +++ b/pkgs/by-name/gr/granted/package.nix @@ -38,17 +38,41 @@ buildGoModule rec { "cmd/granted" ]; - postInstall = '' - ln -s $out/bin/granted $out/bin/assumego + postInstall = + let + # assume depends on assumego, so we add (placeholder "out") to its path + addToAssumePath = lib.makeBinPath [ + xdg-utils + (placeholder "out") + ]; + in + '' + ln -s $out/bin/granted $out/bin/assumego - # Install shell script - install -Dm755 $src/scripts/assume $out/bin/assume - substituteInPlace $out/bin/assume \ - --replace /bin/bash ${bash}/bin/bash + # Create script with correct permissions + install -Dm755 /dev/null $out/bin/assume - wrapProgram $out/bin/assume \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + # assume is a script that must be sourced + # We can't wrap it because it inspects $0 and calls return, which can only + # be done in sourced scripts. + # So instead we insert the following snippet into the beginning of the + # script to add to PATH. + # This is borrowed from wrapProgram --suffix PATH : + addToPath="$(cat << 'EOF' + PATH=''${PATH:+':'$PATH':'} + if [[ $PATH != *':'''${addToAssumePath}''':'* ]]; then + PATH=$PATH'${addToAssumePath}' + fi + PATH=''${PATH#':'} + PATH=''${PATH%':'} + export PATH + + EOF + )" + + # Insert below the #!/bin/sh shebang + echo "$addToPath" | sed "/#!\/bin\/sh/r /dev/stdin" $src/scripts/assume >> $out/bin/assume '' + lib.optionalString withFish '' # Install fish script install -Dm755 $src/scripts/assume.fish $out/share/assume.fish From 4d70ac234b07c7e9bcd597a11ca5b40c3d48cd1a Mon Sep 17 00:00:00 2001 From: jfvillablanca <31008330+jfvillablanca@users.noreply.github.com> Date: Sat, 12 Oct 2024 08:53:27 +0800 Subject: [PATCH 020/106] mavproxy: 1.80.70 -> 1.8.71 https://github.com/ArduPilot/MAVProxy/releases/tag/v1.8.71 --- .../science/robotics/mavproxy/default.nix | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index e36b3d62b696..86afe4e5ffdb 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -1,14 +1,28 @@ -{ stdenv, lib, buildPythonApplication, fetchPypi, lxml, matplotlib, numpy -, opencv4, pymavlink, pyserial, setuptools, wxpython, billiard -, gnureadline }: +{ stdenv +, lib +, buildPythonApplication +, fetchFromGitHub +, lxml +, matplotlib +, numpy +, opencv4 +, pymavlink +, pyserial +, setuptools +, wxpython +, billiard +, gnureadline +}: buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.70"; + version = "1.8.71"; - src = fetchPypi { - inherit pname version; - hash = "sha256-U5K+0lxJbBvwETnJ3MTMkk47CMOSlJBeFrCLHW9OSh8="; + src = fetchFromGitHub { + owner = "ArduPilot"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-A7tqV1kBCSuWHJUTdUZGcPY/r7X1edGZs6xDctpMbMI="; }; postPatch = '' From 77d670ed72eef1928b6c954978a92dca0c5da751 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Sat, 12 Oct 2024 10:32:12 +0200 Subject: [PATCH 021/106] errands: 46.2.5 -> 46.2.6 --- pkgs/by-name/er/errands/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/er/errands/package.nix b/pkgs/by-name/er/errands/package.nix index d983a41b29aa..88372821b179 100644 --- a/pkgs/by-name/er/errands/package.nix +++ b/pkgs/by-name/er/errands/package.nix @@ -17,7 +17,7 @@ }: python3Packages.buildPythonApplication rec { pname = "errands"; - version = "46.2.5"; + version = "46.2.6"; pyproject = false; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "mrvladus"; repo = "Errands"; rev = "refs/tags/${version}"; - hash = "sha256-peIsTSmqjLHdmd5Xrqh6XKXjEbwhNE+FOH/pEY0QqdI="; + hash = "sha256-NIhDMsKPxxPJfDHXOpPl7NPUCO/M5wA2T72ej/+w+Z0="; }; nativeBuildInputs = [ From 1feb53c231ad5f5d4da71642262a1582727287f2 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Thu, 10 Oct 2024 14:26:29 +0200 Subject: [PATCH 022/106] appflowy: 0.6.8 -> 0.7.1 https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.7.1 --- pkgs/applications/office/appflowy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 0790cb44d1f3..cd9335f1d97b 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -17,11 +17,11 @@ let rec { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; - hash = "sha256-sQ3dxwPWHLUoWgnR9+oHaFoDzXxtwKRiBvz2wkFB01g="; + hash = "sha256-fn1UK8+7+vFL4nTnnRbfjCgttVYSw6pmmqabeHqTY3g="; }; x86_64-darwin = { urlSuffix = "macos-universal.zip"; - hash = "sha256-4bU/qecZBrTr34SZAjDDgwpXAAHDITz6lV6mJGjElko="; + hash = "sha256-MoK6GlGmRVRp6feH8hab4CYpP4bXJN3XH7eHHSnhpS4="; }; aarch64-darwin = x86_64-darwin; } @@ -30,7 +30,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.6.8"; + version = "0.7.1"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; From 7d52f9c721aacb96f4ea14bf611f9a1d1b79ad5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20H=C3=A4ring?= Date: Sat, 12 Oct 2024 13:59:26 +0200 Subject: [PATCH 023/106] depotdownloader: 2.5.0 -> 2.7.2 --- pkgs/tools/misc/depotdownloader/default.nix | 7 ++++-- pkgs/tools/misc/depotdownloader/deps.nix | 24 ++++++++++++--------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/depotdownloader/default.nix b/pkgs/tools/misc/depotdownloader/default.nix index 419b58bfa722..25c250b83f42 100644 --- a/pkgs/tools/misc/depotdownloader/default.nix +++ b/pkgs/tools/misc/depotdownloader/default.nix @@ -1,21 +1,24 @@ { lib , buildDotnetModule , fetchFromGitHub +, dotnetCorePackages }: buildDotnetModule rec { pname = "depotdownloader"; - version = "2.5.0"; + version = "2.7.2"; src = fetchFromGitHub { owner = "SteamRE"; repo = "DepotDownloader"; rev = "DepotDownloader_${version}"; - sha256 = "Kgi0u+H5BIAhrjk9e+8H1h0p5Edm3+2twYBPY3JQGps="; + sha256 = "c8hgeFTgOjRTjaOSrUazko74GdTW5p9i7+YJIqR28hw="; }; projectFile = "DepotDownloader.sln"; nugetDeps = ./deps.nix; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; passthru.updateScript = ./update.sh; diff --git a/pkgs/tools/misc/depotdownloader/deps.nix b/pkgs/tools/misc/depotdownloader/deps.nix index 58e2f63ba01d..0970c8ba3799 100644 --- a/pkgs/tools/misc/depotdownloader/deps.nix +++ b/pkgs/tools/misc/depotdownloader/deps.nix @@ -2,14 +2,18 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "protobuf-net"; version = "3.2.16"; sha256 = "0pwlqlq2p8my2sr8b0cvdav5cm8wpwf3s4gy7s1ba701ac2zyb9y"; }) - (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.16"; sha256 = "00znhikq7valr3jaxg66cwli9hf75wkmmpf6rf8p790hf8lxq0c5"; }) - (fetchNuGet { pname = "QRCoder"; version = "1.4.3"; sha256 = "1hmlqbdyq5n9bsmns5h0dwcxpd2jvqr9a2y6dyc9kbjmc8j1dpla"; }) - (fetchNuGet { pname = "SteamKit2"; version = "2.5.0-beta.1"; sha256 = "0691285g4z12hv5kpv72l36h45086n14rw56x3dnixcvrjzg2q01"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) + (fetchNuGet { pname = "Microsoft.Windows.CsWin32"; version = "0.3.106"; hash = "sha256-S1uQa684taPb6uh69784ebVpXoirMoX+pxBRA+Rrzlg="; }) + (fetchNuGet { pname = "Microsoft.Windows.SDK.Win32Docs"; version = "0.1.42-alpha"; hash = "sha256-6DvzmNzrGVfWmNJNqooj+Ya+7bAQlyeg7pmyKaUlIws="; }) + (fetchNuGet { pname = "Microsoft.Windows.SDK.Win32Metadata"; version = "60.0.34-preview"; hash = "sha256-KdRe73sXipzMvm2BLmwwBZGh+l9isZDC9l8WFyUR1zM="; }) + (fetchNuGet { pname = "Microsoft.Windows.WDK.Win32Metadata"; version = "0.11.4-experimental"; hash = "sha256-b3oKUKbr+3Udfl7RWzUY9BR/XWNsN+VmEkBxk6KiFo0="; }) + (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; hash = "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="; }) + (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; hash = "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="; }) + (fetchNuGet { pname = "QRCoder"; version = "1.6.0"; hash = "sha256-2Ev/6d7PH6K4dVYQQHlZ+ZggkCnDtrlaGygs65mDo28="; }) + (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.3"; hash = "sha256-G3Apy5g0TT273Ake6/4DnrJGY4lWrTbyHDJMntiSuzE="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "8.0.0"; hash = "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) ] From 490cb91ec4b5027c245961b63655f063a6cd1b40 Mon Sep 17 00:00:00 2001 From: aktaboot Date: Sat, 12 Oct 2024 15:23:25 +0200 Subject: [PATCH 024/106] halloy: 2024.11 -> 2024.12 --- pkgs/by-name/ha/halloy/Cargo.lock | 95 ++++++++++++++++++++++++++---- pkgs/by-name/ha/halloy/package.nix | 6 +- 2 files changed, 85 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ha/halloy/Cargo.lock b/pkgs/by-name/ha/halloy/Cargo.lock index 6bbad6819849..932ee1bdc8f2 100644 --- a/pkgs/by-name/ha/halloy/Cargo.lock +++ b/pkgs/by-name/ha/halloy/Cargo.lock @@ -794,6 +794,15 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -1012,6 +1021,7 @@ dependencies = [ "bytes", "chrono", "const_format", + "derive_more", "dirs-next", "flate2", "futures", @@ -1031,6 +1041,7 @@ dependencies = [ "serde", "serde_json", "sha2", + "strum", "thiserror", "timeago", "tokio", @@ -1056,6 +1067,28 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "syn 2.0.74", + "unicode-xid", +] + [[package]] name = "detect-desktop-environment" version = "0.2.0" @@ -1788,9 +1821,11 @@ dependencies = [ "palette", "rfd", "rodio", + "strum", "thiserror", "timeago", "tokio", + "tokio-stream", "unicode-segmentation", "uuid", "windows_exe_info", @@ -1836,6 +1871,12 @@ 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" @@ -2005,7 +2046,7 @@ dependencies = [ [[package]] name = "iced" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "iced_core", "iced_futures", @@ -2019,7 +2060,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "bitflags 2.6.0", "bytes", @@ -2038,7 +2079,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "futures", "iced_core", @@ -2052,7 +2093,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2073,7 +2114,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2085,7 +2126,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "bytes", "iced_core", @@ -2097,7 +2138,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "bytemuck", "cosmic-text", @@ -2112,7 +2153,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2131,7 +2172,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "iced_renderer", "iced_runtime", @@ -2146,7 +2187,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced?rev=9628dc20d5dab128b9fff2c4b73cc66b0071e149#9628dc20d5dab128b9fff2c4b73cc66b0071e149" +source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" dependencies = [ "iced_futures", "iced_graphics", @@ -3218,7 +3259,7 @@ version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd" dependencies = [ - "heck", + "heck 0.4.1", "itertools 0.12.1", "proc-macro2", "proc-macro2-diagnostics", @@ -3906,6 +3947,12 @@ dependencies = [ "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.14.1" @@ -4312,6 +4359,28 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.74", +] + [[package]] name = "subtle" version = "2.6.1" @@ -4648,9 +4717,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index 04af62588db5..2fc97ae6ad9d 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/pkgs/by-name/ha/halloy/package.nix @@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec { pname = "halloy"; - version = "2024.11"; + version = "2024.12"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; rev = "refs/tags/${version}"; - hash = "sha256-kmdsC0SQoL5gppzBhnF0LfOFj14zeI3C6SdCBiVoKj0="; + hash = "sha256-NEm6qsU/Kes1rtNCsEauShpJZzrhBtOqo70uzrWpYtE="; }; cargoLock = { @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { outputHashes = { "dpi-0.1.1" = "sha256-25sOvEBhlIaekTeWvy3UhjPI1xrJbOQvw/OkTg12kQY="; "glyphon-0.5.0" = "sha256-OGXLqiMjaZ7gR5ANkuCgkfn/I7c/4h9SRE6MZZMW3m4="; - "iced-0.13.0-dev" = "sha256-XQUaI16lGEMGFxqK3UNd8jQfUiBzomxlT/I+yeZncFo="; + "iced-0.13.0-dev" = "sha256-VXaE4+qXakYSyO5rcBbCe4QuJv/oguxdqUEbhXfmh2U="; }; }; From 73056028755cb9e482e7e0501a84789d7b3a728e Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 13 Oct 2024 04:33:32 +0200 Subject: [PATCH 025/106] pkgsStatic.krb5: fix build --- pkgs/development/libraries/kerberos/krb5.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index a384d49fed03..cf429432c447 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -43,6 +43,10 @@ stdenv.mkDerivation rec { # stdenv will take care of overriding bindir, sbindir, etc. such that "out" contains the binaries. prefix = builtins.placeholder "lib"; + env = lib.optionalAttrs stdenv.hostPlatform.isStatic { + NIX_CFLAGS_COMPILE = "-fcommon"; + }; + configureFlags = [ "--localstatedir=/var/lib" (lib.withFeature withLdap "ldap") From f72464305ffd9a5cf7f7502a53bf7b79e984923e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez?= Date: Sun, 13 Oct 2024 07:04:42 +0100 Subject: [PATCH 026/106] binsider: 0.1.0 -> 0.2.0 This disables `binsider`'s default features when building for macOS, granting support for that platform. I have tested it builds and runs for `x86_64-linux`, `aarch64-linux` and `aarch64-darwin`. It also generally disables a pair of tests that fail on these platforms, the same approach followed by `binsider` itself on its own flake (before it moved to `naersk`. See: https://github.com/orhun/binsider/commit/ffb35ea96683e0f324eeb25906d086e709cf1768) instead of just running a `cargo build` for the `preCheck`. --- pkgs/by-name/bi/binsider/package.nix | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix index b5a1b5503666..b4cf8848b3f7 100644 --- a/pkgs/by-name/bi/binsider/package.nix +++ b/pkgs/by-name/bi/binsider/package.nix @@ -1,26 +1,38 @@ { lib, + darwin, rustPlatform, fetchFromGitHub, stdenv, }: rustPlatform.buildRustPackage rec { pname = "binsider"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "orhun"; repo = "binsider"; rev = "v${version}"; - hash = "sha256-+QgbSpiDKPTVdSm0teEab1O6OJZKEDpC2ZIZ728e69Y="; + hash = "sha256-VnWLslelEAXuSy7XnxrdgSkXqTrd+Ni7lQFsB2P+ILs="; }; - cargoHash = "sha256-lXYTZ3nvLrfEgo7AY/qSQYpXsyrdJuQQw43xREezNn0="; + cargoHash = "sha256-eBZ7zUOucarzdxTjHecUxGqUsKTQPaaotOfs/v0MxHk="; - # Tests need the executable in target/debug/ - preCheck = '' - cargo build - ''; + buildNoDefaultFeatures = stdenv.isDarwin; + + buildInputs = lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AppKit + CoreServices + ] + ); + + checkType = "debug"; + checkFlags = [ + "--skip=test_extract_strings" + "--skip=test_init" + ]; meta = with lib; { description = "Analyzer of executables using a terminal user interface"; @@ -31,6 +43,5 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with maintainers; [ samueltardieu ]; mainProgram = "binsider"; - broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; }; } From f87eb089bc41362ebaa87f90a033d0a45dd9f45c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez?= Date: Sun, 13 Oct 2024 07:13:23 +0100 Subject: [PATCH 027/106] build: no default features for all non-linux --- pkgs/by-name/bi/binsider/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix index b4cf8848b3f7..02d29d61ee6d 100644 --- a/pkgs/by-name/bi/binsider/package.nix +++ b/pkgs/by-name/bi/binsider/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-eBZ7zUOucarzdxTjHecUxGqUsKTQPaaotOfs/v0MxHk="; - buildNoDefaultFeatures = stdenv.isDarwin; + buildNoDefaultFeatures = !stdenv.isLinux; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; From f294f05bd9b7b62a44195dc22a364ba596d614b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Oct 2024 06:40:54 +0000 Subject: [PATCH 028/106] xlog: 2.0.24 -> 2.0.25 --- pkgs/applications/radio/xlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 7e67de130101..e591c98f30de 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, glib, gtk2, pkg-config, hamlib }: stdenv.mkDerivation rec { pname = "xlog"; - version = "2.0.24"; + version = "2.0.25"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz"; - sha256 = "sha256-jUU6xt3H9bY9CAQRTFQjprlsC77VwjIB/6sSRNzE+Lw="; + sha256 = "sha256-NYC3LgoLXnJQURcZTc2xHOzOleotrWtOETMBgadf2qU="; }; # glib-2.62 deprecations From 0fe83f8cb116581319a513de7d064e98bd84ce59 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sun, 13 Oct 2024 16:30:43 +0200 Subject: [PATCH 029/106] tautulli: 2.14.5 -> 2.14.6 --- pkgs/servers/tautulli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index c71f91e353e8..c0759da351f4 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.14.5"; + version = "2.14.6"; format = "other"; pythonPath = [ setuptools ]; @@ -11,8 +11,8 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "Tautulli"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-Xb8sby56U6Tc+OlxN7yKdhGGxrkmn6VfSPBhc1/YH24="; + rev = "v${version}"; + sha256 = "sha256-sZHrEDb3uuogSjG2qKSm6V+nHZq/FdMq9xQgTIerjuE="; }; installPhase = '' From 1747c62f4b3d164e8c2915a803ae39a91aea453f Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Mon, 14 Oct 2024 14:37:42 +0200 Subject: [PATCH 030/106] crystfel: 0.11.0 -> 0.11.1 --- .../science/physics/crystfel/default.nix | 7 ++--- .../physics/crystfel/gui-path-issue.patch | 27 ------------------- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 pkgs/applications/science/physics/crystfel/gui-path-issue.patch diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index b6f8a0d6f13c..a8f2b65b669f 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -187,10 +187,10 @@ let in stdenv.mkDerivation rec { pname = "crystfel"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { url = "https://www.desy.de/~twhite/crystfel/crystfel-${version}.tar.gz"; - sha256 = "sha256-ogNHWYfbxRmB5TdK8K0JpcCnYOOyXapQGSPh8mfp+Tc="; + sha256 = "sha256-vZuN9dYnowySC/OX0EZB0mbhoBOyRiOWfX9d6sl1lKQ="; }; nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers makeWrapper ] ++ lib.optionals withGui [ wrapGAppsHook3 ]; @@ -220,9 +220,6 @@ stdenv.mkDerivation rec { # on darwin at least, we need to link to a separate argp library; # this patch adds a test for this and the necessary linker options ./link-to-argp-standalone-if-needed.patch - # hotfix for an issue that occurs (at least) on NixOS: - # if the temporary path is too long, we get a segfault - ./gui-path-issue.patch ]; # CrystFEL calls mosflm by searching PATH for it. We could've create a wrapper script that sets the PATH, but diff --git a/pkgs/applications/science/physics/crystfel/gui-path-issue.patch b/pkgs/applications/science/physics/crystfel/gui-path-issue.patch deleted file mode 100644 index 28cd0280e8f6..000000000000 --- a/pkgs/applications/science/physics/crystfel/gui-path-issue.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/src/gui_index.c b/src/gui_index.c -index 2cc8e8db..13be77d5 100644 ---- a/src/gui_index.c -+++ b/src/gui_index.c -@@ -540,6 +540,7 @@ static void delete_gui_tempdir(char *tmpdir) - { - char *path; - int i; -+ size_t pathlen; - - /* List of files which it's safe to delete */ - char *files[] = {"gmon.out", "mosflm.lp", "SUMMARY", "XDS.INP", -@@ -552,11 +553,12 @@ static void delete_gui_tempdir(char *tmpdir) - - if ( tmpdir == NULL ) return; - -- path = calloc(strlen(tmpdir)+64, 1); -+ pathlen = strlen(tmpdir)+64; -+ path = calloc(pathlen, 1); - if ( path == NULL ) return; - - for ( i=0; i Date: Mon, 14 Oct 2024 15:41:21 +0300 Subject: [PATCH 031/106] telepresence2: 2.19.1 -> 2.20.1 --- pkgs/tools/networking/telepresence2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index 47c9f6dc1bca..a9179fd4548f 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -27,13 +27,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.19.1"; + version = "2.20.1"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-gOoIvPvCc4wcTNhfsOGqYsvM2eibtDcvp986Dkx099A="; + hash = "sha256-ubMlCN7dGCKxBCFNzfnpaDzKCYUNwWwj/84gq/tbw9o="; }; propagatedBuildInputs = [ @@ -47,7 +47,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-3FJ7doC+KIkSY3DZ7ObtlOtDZy0MsPp+Oh9zX1xmhKI="; + vendorHash = "sha256-pz0a0w4SBPJVLWlZi6tsWysiJmwSzroF61nsFxg3R4g="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" From 5aa5a319b7d6d2e1bf36967c9ead67be740dde5a Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 14 Oct 2024 09:24:31 -0400 Subject: [PATCH 032/106] xwayland-satellite: format with nixfmt --- .../by-name/xw/xwayland-satellite/package.nix | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix index 428cc3a86598..21acf3a1373a 100644 --- a/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -1,12 +1,13 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, xwayland -, xcb-util-cursor -, libxcb -, nix-update-script -, makeWrapper +{ + lib, + fetchFromGitHub, + libxcb, + makeWrapper, + nix-update-script, + pkg-config, + rustPlatform, + xcb-util-cursor, + xwayland, }: rustPlatform.buildRustPackage rec { @@ -23,9 +24,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-nKPSkHbh73xKWNpN/OpDmLnVmA3uygs3a+ejOhwU3yA="; nativeBuildInputs = [ + makeWrapper pkg-config rustPlatform.bindgenHook - makeWrapper ]; buildInputs = [ @@ -46,7 +47,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/xwayland-satellite \ - --prefix PATH : "${lib.makeBinPath [xwayland]}" + --prefix PATH : "${lib.makeBinPath [ xwayland ]}" ''; passthru.updateScript = nix-update-script { }; @@ -55,7 +56,10 @@ rustPlatform.buildRustPackage rec { description = "Rootless Xwayland integration to any Wayland compositor implementing xdg_wm_base"; homepage = "https://github.com/Supreeeme/xwayland-satellite"; license = licenses.mpl20; - maintainers = with maintainers; [ if-loop69420 sodiboo ]; + maintainers = with maintainers; [ + if-loop69420 + sodiboo + ]; mainProgram = "xwayland-satellite"; platforms = platforms.linux; }; From ed3a3b00721774bbb6514fa8fa79e298d54b9fe5 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 14 Oct 2024 09:35:40 -0400 Subject: [PATCH 033/106] xwayland-satellite: 0.4 -> 0.4-unstable-2024-09-15 Diff: https://github.com/Supreeeme/xwayland-satellite/compare/v0.4...b962a0f33b503aa39c9cf6919f488b664e5b79b4 --- .../by-name/xw/xwayland-satellite/package.nix | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix index 21acf3a1373a..c862b91ca4a9 100644 --- a/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -3,25 +3,31 @@ fetchFromGitHub, libxcb, makeWrapper, - nix-update-script, pkg-config, rustPlatform, + unstableGitUpdater, xcb-util-cursor, xwayland, + withSystemd ? true, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "xwayland-satellite"; - version = "0.4"; + version = "0.4-unstable-2024-09-15"; src = fetchFromGitHub { owner = "Supreeeme"; repo = "xwayland-satellite"; - rev = "v${version}"; - hash = "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI="; + rev = "b962a0f33b503aa39c9cf6919f488b664e5b79b4"; + hash = "sha256-OANPb73V/RQDqtpIcbzeJ93KuOHKFQv+1xXC44Ut7tY="; }; - cargoHash = "sha256-nKPSkHbh73xKWNpN/OpDmLnVmA3uygs3a+ejOhwU3yA="; + postPatch = '' + substituteInPlace resources/xwayland-satellite.service \ + --replace-fail '/usr/local/bin' "$out/bin" + ''; + + cargoHash = "sha256-1EtwGMoLfYK0VZj8jdQiweO/RHGBzyEoeMEI4pmqfu8="; nativeBuildInputs = [ makeWrapper @@ -34,23 +40,22 @@ rustPlatform.buildRustPackage rec { xcb-util-cursor ]; - # disable Xwayland integration tests which need a running display server - checkFlags = [ - "--exact" - "--skip=copy_from_wayland" - "--skip=copy_from_x11" - "--skip=input_focus" - "--skip=quick_delete" - "--skip=reparent" - "--skip=toplevel_flow" - ]; + buildNoDefaultFeatures = true; + buildFeatures = lib.optional withSystemd "systemd"; - postInstall = '' + # All integration tests require a running display server + doCheck = false; + + postInstall = lib.optionalString withSystemd '' + install -Dm0644 resources/xwayland-satellite.service -t $out/lib/systemd/user + ''; + + postFixup = '' wrapProgram $out/bin/xwayland-satellite \ --prefix PATH : "${lib.makeBinPath [ xwayland ]}" ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; meta = with lib; { description = "Rootless Xwayland integration to any Wayland compositor implementing xdg_wm_base"; From 44a9fdce36be4e6265bd0a88f5330155a1b15328 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 14 Oct 2024 11:50:10 -0300 Subject: [PATCH 034/106] stern: 1.30.0 -> 1.31.0 Release: https://github.com/stern/stern/releases/tag/v1.31.0 - nixfmt format - add version test - add meta.changelog - replace sha256 with hash - order attributes by alphabetical order and phases order --- .../networking/cluster/stern/default.nix | 48 ++++++++++++++----- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index eeacf4c0fe3a..b12003f8008a 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -1,27 +1,41 @@ -{ stdenv, lib, buildPackages, buildGoModule, fetchFromGitHub, installShellFiles }: +{ + buildGoModule, + buildPackages, + fetchFromGitHub, + installShellFiles, + lib, + stdenv, + stern, + testers, +}: buildGoModule rec { pname = "stern"; - version = "1.30.0"; + version = "1.31.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-sqRPX+NC58mQi0wvs3u3Lb81LBntaY1FzzlY1TIiz18="; + hash = "sha256-1jwjd9enO2rQnC+04brzfJKSutnkWLMPyZD0wAqHBfg="; }; - vendorHash = "sha256-RLcF7KfKtkwB+nWzaQb8Va9pau+TS2uE9AmJ0aFNsik="; + vendorHash = "sha256-IBOkx+y7EFQeQ0sumXiVRqKqHts4SOxB138Uz644cnc="; subPackages = [ "." ]; + ldflags = [ + "-s" + "-w" + "-X github.com/stern/stern/cmd.version=${version}" + ]; + nativeBuildInputs = [ installShellFiles ]; - ldflags = [ "-s" "-w" "-X github.com/stern/stern/cmd.version=${version}" ]; - - postInstall = let - stern = if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else buildPackages.stern; - in + postInstall = + let + stern = if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else buildPackages.stern; + in '' for shell in bash zsh fish; do ${stern}/bin/stern --completion $shell > stern.$shell @@ -29,11 +43,19 @@ buildGoModule rec { done ''; - meta = with lib; { + passthru.tests.version = testers.testVersion { + package = stern; + }; + + meta = { description = "Multi pod and container log tailing for Kubernetes"; - mainProgram = "stern"; + changelog = "https://github.com/stern/stern/releases/tag/v${version}"; homepage = "https://github.com/stern/stern"; - license = licenses.asl20; - maintainers = with maintainers; [ mbode preisschild ]; + license = lib.licenses.asl20; + mainProgram = "stern"; + maintainers = with lib.maintainers; [ + mbode + preisschild + ]; }; } From 049ee0417517497be8537edf77c488c01932cc32 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 14 Oct 2024 11:51:20 -0300 Subject: [PATCH 035/106] stern: move to pkgs/by-name --- .../cluster/stern/default.nix => by-name/st/stern/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/cluster/stern/default.nix => by-name/st/stern/package.nix} (100%) diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/by-name/st/stern/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/stern/default.nix rename to pkgs/by-name/st/stern/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 491f6c861dea..d6d18d1e978c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37921,8 +37921,6 @@ with pkgs; stepreduce = callPackage ../applications/misc/stepreduce { }; - stern = callPackage ../applications/networking/cluster/stern { }; - streamripper = callPackage ../applications/audio/streamripper { }; sqsh = callPackage ../development/tools/sqsh { }; From 8248bb94fa6335c5f0cd1314380a0f0b133efb3c Mon Sep 17 00:00:00 2001 From: diniamo Date: Sat, 12 Oct 2024 12:36:54 +0200 Subject: [PATCH 036/106] catppuccin-kvantum: unstable-2022-07-04 -> 0-unstable-2024-10-10 Also removes `with lib;`. --- .../themes/catppuccin-kvantum/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/data/themes/catppuccin-kvantum/default.nix b/pkgs/data/themes/catppuccin-kvantum/default.nix index 0588695b5bdf..169ac2147151 100644 --- a/pkgs/data/themes/catppuccin-kvantum/default.nix +++ b/pkgs/data/themes/catppuccin-kvantum/default.nix @@ -2,37 +2,40 @@ lib, stdenvNoCC, fetchFromGitHub, - accent ? "Blue", - variant ? "Frappe", + unstableGitUpdater, + accent ? "blue", + variant ? "frappe", }: let pname = "catppuccin-kvantum"; in - lib.checkListOfEnum "${pname}: theme accent" ["Blue" "Flamingo" "Green" "Lavender" "Maroon" "Mauve" "Peach" "Pink" "Red" "Rosewater" "Sapphire" "Sky" "Teal" "Yellow"] [accent] - lib.checkListOfEnum "${pname}: color variant" ["Latte" "Frappe" "Macchiato" "Mocha"] [variant] + lib.checkListOfEnum "${pname}: theme accent" ["blue" "flamingo" "green" "lavender" "maroon" "mauve" "peach" "pink" "red" "rosewater" "sapphire" "sky" "teal" "yellow"] [accent] + lib.checkListOfEnum "${pname}: color variant" ["latte" "frappe" "macchiato" "mocha"] [variant] stdenvNoCC.mkDerivation { inherit pname; - version = "unstable-2022-07-04"; + version = "0-unstable-2024-10-10"; src = fetchFromGitHub { owner = "catppuccin"; repo = "Kvantum"; - rev = "d1e174c85311de9715aefc1eba4b8efd6b2730fc"; - sha256 = "sha256-IrHo8pnR3u90bq12m7FEXucUF79+iub3I9vgH5h86Lk="; + rev = "bdaa531318d5756cea5674a750a99134dad0bbbc"; + hash = "sha256-O85y8Gg0l+xQP1eQi9GizuKfLEGePZ3wPdBNR+0V4ZQ="; }; installPhase = '' runHook preInstall mkdir -p $out/share/Kvantum - cp -a src/Catppuccin-${variant}-${accent} $out/share/Kvantum + cp -a themes/catppuccin-${variant}-${accent} $out/share/Kvantum runHook postInstall ''; - meta = with lib; { + passthru.updateScript = unstableGitUpdater { }; + + meta = { description = "Soothing pastel theme for Kvantum"; homepage = "https://github.com/catppuccin/Kvantum"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ bastaynav ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.bastaynav ]; }; } From 113c82de3388a7926f4efc5caa3c7b5cd7862a1f Mon Sep 17 00:00:00 2001 From: Abdennour Zahaf Date: Mon, 14 Oct 2024 18:00:54 +0100 Subject: [PATCH 037/106] hubstaff: symlink HubstaffCLI binary --- pkgs/applications/misc/hubstaff/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 0c457655c44c..e642cecf69d6 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation { done ln -s $opt/x86_64/HubstaffClient.bin.x86_64 $out/bin/HubstaffClient + ln -s $opt/x86_64/HubstaffCLI.bin.x86_64 $out/bin/HubstaffCLI # Why is this needed? SEGV otherwise. ln -s $opt/data/resources $opt/x86_64/resources From 5e629ac8de1a047b6fcb86968889624c133766ba Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Mon, 14 Oct 2024 18:21:34 +0100 Subject: [PATCH 038/106] pcsx2-bin: 2.1.136 -> 2.1.205 --- pkgs/by-name/pc/pcsx2-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix index 6a343140cab7..335cf8353f08 100644 --- a/pkgs/by-name/pc/pcsx2-bin/package.nix +++ b/pkgs/by-name/pc/pcsx2-bin/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "pcsx2-bin"; - version = "2.1.136"; + version = "2.1.205"; src = fetchurl { url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz"; - hash = "sha256-TAyOQLBOHOe+EBjirmST7Dmg6F13e/9SACr24/7FVgE="; + hash = "sha256-m5OSxAUBJhokNd7AamQJmkKSMYd1JRidHVYLHpyb0IQ="; }; nativeBuildInputs = [ makeWrapper ]; From 88ae9f3ab2e574fce290282d02c3b48cb1bb1222 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 13 Oct 2024 12:33:14 -0300 Subject: [PATCH 039/106] fceux: use standard callPackage --- pkgs/applications/emulators/fceux/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/fceux/default.nix b/pkgs/applications/emulators/fceux/default.nix index c5b3188b3ca4..10ed884b79a6 100644 --- a/pkgs/applications/emulators/fceux/default.nix +++ b/pkgs/applications/emulators/fceux/default.nix @@ -5,11 +5,14 @@ , lua , minizip , pkg-config +, qt5 , stdenv -, wrapQtAppsHook , x264 }: +let + inherit (qt5) wrapQtAppsHook; +in stdenv.mkDerivation (finalAttrs: { pname = "fceux"; version = "2.6.6-unstable-2024-01-19"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d325c2dfeadb..a27557fd9b12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2519,7 +2519,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa; }; - fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; + fceux = callPackage ../applications/emulators/fceux { }; firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; From 3edaf1f09b53d59572061b156bcd0a574933cbdd Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 14 Oct 2024 21:10:06 -0300 Subject: [PATCH 040/106] fceux: nixfmt-rfc-style --- pkgs/applications/emulators/fceux/default.nix | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/emulators/fceux/default.nix b/pkgs/applications/emulators/fceux/default.nix index 10ed884b79a6..1897e9380497 100644 --- a/pkgs/applications/emulators/fceux/default.nix +++ b/pkgs/applications/emulators/fceux/default.nix @@ -1,13 +1,14 @@ -{ lib -, SDL2 -, cmake -, fetchFromGitHub -, lua -, minizip -, pkg-config -, qt5 -, stdenv -, x264 +{ + lib, + SDL2, + cmake, + fetchFromGitHub, + lua, + minizip, + pkg-config, + qt5, + stdenv, + x264, }: let @@ -40,10 +41,13 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://www.fceux.com/"; description = "Nintendo Entertainment System (NES) Emulator"; - mainProgram = "fceux"; changelog = "https://github.com/TASEmulators/blob/fceux/${finalAttrs.src.rev}/changelog.txt"; license = with lib.licenses; [ gpl2Plus ]; - maintainers = with lib.maintainers; [ AndersonTorres sbruder ]; + mainProgram = "fceux"; + maintainers = with lib.maintainers; [ + AndersonTorres + sbruder + ]; platforms = lib.platforms.linux; }; }) From 7bb6a0437b19df281da6128d5224ba1f289401ee Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 13 Oct 2024 12:40:09 -0300 Subject: [PATCH 041/106] fceux: migrate to by-name --- .../fceux/default.nix => by-name/fc/fceux/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/emulators/fceux/default.nix => by-name/fc/fceux/package.nix} (100%) diff --git a/pkgs/applications/emulators/fceux/default.nix b/pkgs/by-name/fc/fceux/package.nix similarity index 100% rename from pkgs/applications/emulators/fceux/default.nix rename to pkgs/by-name/fc/fceux/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a27557fd9b12..431fe28fece4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2519,8 +2519,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa; }; - fceux = callPackage ../applications/emulators/fceux { }; - firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; flycast = callPackage ../applications/emulators/flycast { }; From d9de98d7e9fd8e189c67cfea415ecdde32fb7322 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 14 Oct 2024 21:40:38 -0300 Subject: [PATCH 042/106] fceux: fix missing dependencies strictDeps to the rescue! --- pkgs/by-name/fc/fceux/package.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fc/fceux/package.nix b/pkgs/by-name/fc/fceux/package.nix index 1897e9380497..b4263fb52f26 100644 --- a/pkgs/by-name/fc/fceux/package.nix +++ b/pkgs/by-name/fc/fceux/package.nix @@ -3,7 +3,11 @@ SDL2, cmake, fetchFromGitHub, - lua, + ffmpeg, + libX11, + libXdmcp, + libxcb, + lua5_1, minizip, pkg-config, qt5, @@ -12,7 +16,7 @@ }: let - inherit (qt5) wrapQtAppsHook; + inherit (qt5) qttools wrapQtAppsHook; in stdenv.mkDerivation (finalAttrs: { pname = "fceux"; @@ -33,11 +37,18 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 - lua + ffmpeg + libX11 + libXdmcp + libxcb + lua5_1 minizip + qttools x264 ]; + strictDeps = true; + meta = { homepage = "http://www.fceux.com/"; description = "Nintendo Entertainment System (NES) Emulator"; From 1f2b8bb21f1daf0b85abe894da1ca864dd4046b3 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 14 Oct 2024 22:12:53 -0300 Subject: [PATCH 043/106] fceux: select Qt version --- pkgs/by-name/fc/fceux/package.nix | 13 ++++++++++++- pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fc/fceux/package.nix b/pkgs/by-name/fc/fceux/package.nix index b4263fb52f26..8fd0b924edf0 100644 --- a/pkgs/by-name/fc/fceux/package.nix +++ b/pkgs/by-name/fc/fceux/package.nix @@ -11,13 +11,24 @@ minizip, pkg-config, qt5, + qt6, stdenv, x264, + # Configurable options + ___qtVersion ? "5", }: let - inherit (qt5) qttools wrapQtAppsHook; + qtVersionDictionary = { + "5" = qt5; + "6" = qt6; + }; + inherit (qtVersionDictionary.${___qtVersion}) qttools wrapQtAppsHook; in +assert lib.elem ___qtVersion [ + "5" + "6" +]; stdenv.mkDerivation (finalAttrs: { pname = "fceux"; version = "2.6.6-unstable-2024-01-19"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 431fe28fece4..04ee9515a0a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2519,6 +2519,9 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa; }; + fceux-qt5 = fceux.override { ___qtVersion = "5"; }; + fceux-qt6 = fceux.override { ___qtVersion = "6"; }; + firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; flycast = callPackage ../applications/emulators/flycast { }; From 34ab01c663ad9918e68e73b53e8e047e813c37ce Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 14 Oct 2024 21:50:37 -0300 Subject: [PATCH 044/106] fceux: 2.6.6-unstable-2024-01-19 -> 2.6.6-unstable-2024-06-09 --- pkgs/by-name/fc/fceux/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fc/fceux/package.nix b/pkgs/by-name/fc/fceux/package.nix index 8fd0b924edf0..c0355e9e30ec 100644 --- a/pkgs/by-name/fc/fceux/package.nix +++ b/pkgs/by-name/fc/fceux/package.nix @@ -31,13 +31,13 @@ assert lib.elem ___qtVersion [ ]; stdenv.mkDerivation (finalAttrs: { pname = "fceux"; - version = "2.6.6-unstable-2024-01-19"; + version = "2.6.6-unstable-2024-06-09"; src = fetchFromGitHub { owner = "TASEmulators"; repo = "fceux"; - rev = "2fce5ffe745bb89be471e450d9cd6284cd5614d9"; - hash = "sha256-5uUTw7ZkmBrGuntSQFNAp1Xz69ANmmIxNGd0/enPoW8="; + rev = "f980ec2bc7dc962f6cd76b9ae3131f2eb902c9e7"; + hash = "sha256-baAjrTzRp61Lw1p5axKJ97PuFiuBNQewXrlN0s8o7us="; }; nativeBuildInputs = [ From 9f6d95afb4414e3f549c0f9916d9804f3854341b Mon Sep 17 00:00:00 2001 From: Dixon Sean Low Yan Feng Date: Tue, 15 Oct 2024 12:35:01 +0800 Subject: [PATCH 045/106] catppuccin-cursors: 0.3.1 -> 0.4.0 --- pkgs/by-name/ca/catppuccin-cursors/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin-cursors/package.nix b/pkgs/by-name/ca/catppuccin-cursors/package.nix index 604b04e50e0c..95531507df76 100644 --- a/pkgs/by-name/ca/catppuccin-cursors/package.nix +++ b/pkgs/by-name/ca/catppuccin-cursors/package.nix @@ -15,7 +15,7 @@ let }; variantName = { palette, color }: palette + color; variants = lib.mapCartesianProduct variantName dimensions; - version = "0.3.1"; + version = "0.4.0"; in stdenvNoCC.mkDerivation { pname = "catppuccin-cursors"; @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation { owner = "catppuccin"; repo = "cursors"; rev = "v${version}"; - hash = "sha256-CuzD6O/RImFKLWzJoiUv7nlIdoXNvwwl+k5mTeVIY10="; + hash = "sha256-VxLwZkZdV1xH4jeqtszqSnhNrgF3uamEXBLPKIc4lXE="; }; nativeBuildInputs = [ just inkscape xcursorgen hyprcursor xcur2png ]; From 44c0faf56bfa57f75436fff815586fe5bbd94eb9 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Mon, 14 Oct 2024 23:03:06 +0300 Subject: [PATCH 046/106] zine: fix build with rust 1.80+ - add patch to Cargo.lock after running "cargo update time", updates `time` crate to `0.3.36` fixing build error on rust 1.80+ --- pkgs/applications/misc/zine/default.nix | 7 +- .../misc/zine/update-time-crate.patch | 189 ++++++++++++++++++ 2 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/zine/update-time-crate.patch diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index 40d8b6160365..95d4b1963ebd 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -16,7 +16,12 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pUoMMgZQ+oDs9Yhc1rQuy9cUWiR800DlIe8wxQjnIis="; }; - cargoHash = "sha256-dXq8O0jVpr0xxvLTrsLJbiyyOMXXtEz7OMINqDEfG4U="; + cargoHash = "sha256-B0yPTyZ+d+s0Mdgeb23IammuABpEYWvAksyP7d+MEig="; + + cargoPatches = [ + # fix build with rust 1.80+ + ./update-time-crate.patch + ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/zine/update-time-crate.patch b/pkgs/applications/misc/zine/update-time-crate.patch new file mode 100644 index 000000000000..739f36f1e2dc --- /dev/null +++ b/pkgs/applications/misc/zine/update-time-crate.patch @@ -0,0 +1,189 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 30a7f9b1b5..dd3f0104cd 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -103,7 +103,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -376,7 +376,7 @@ + checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" + dependencies = [ + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -394,6 +394,16 @@ + ] + + [[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++ "serde", ++] ++ ++[[package]] + name = "derive_more" + version = "0.99.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -445,7 +455,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1383,6 +1393,12 @@ + ] + + [[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ ++[[package]] + name = "num_cpus" + version = "1.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1441,7 +1457,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1623,7 +1639,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -1659,6 +1675,12 @@ + ] + + [[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ ++[[package]] + name = "ppv-lite86" + version = "0.2.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -2090,22 +2112,22 @@ + + [[package]] + name = "serde" +-version = "1.0.166" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" ++checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.166" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" ++checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -2243,9 +2265,9 @@ + + [[package]] + name = "syn" +-version = "2.0.23" ++version = "2.0.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" ++checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" + dependencies = [ + "proc-macro2", + "quote", +@@ -2345,7 +2367,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] +@@ -2361,11 +2383,14 @@ + + [[package]] + name = "time" +-version = "0.3.22" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa 1.0.8", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -2373,16 +2398,17 @@ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.9" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -2422,7 +2448,7 @@ + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.23", ++ "syn 2.0.32", + ] + + [[package]] From 47a747747bfc12f59bdc4c2615bea2387033fb7a Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 15 Oct 2024 10:03:54 +0200 Subject: [PATCH 047/106] vt323: init at 2.0 --- pkgs/by-name/vt/vt323/package.nix | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/vt/vt323/package.nix diff --git a/pkgs/by-name/vt/vt323/package.nix b/pkgs/by-name/vt/vt323/package.nix new file mode 100644 index 000000000000..865b11b077ec --- /dev/null +++ b/pkgs/by-name/vt/vt323/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchFromGitHub, + ... +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vt323"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "phoikoi"; + repo = "VT323"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Abq0/hU/BXJMxQxzhZG1SEGIZYt+qofuXwy5/A9byQ8="; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp fonts/ttf/VT323-Regular.ttf $out/share/fonts/truetype + ''; + + meta = { + changelog = "https://github.com/phoikoi/VT323/releases/tag/v${finalAttrs.version}"; + description = "Monospaced typeface designed to look like the VT320 text terminal glyphs"; + homepage = "https://github.com/phoikoi/VT323"; + license = with lib.licenses; [ ofl ]; + maintainers = with lib.maintainers; [ marcel ]; + }; +}) From d337b4e2f5da5eb711eb414d5feb99fe49be4066 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sun, 13 Oct 2024 13:14:32 +0200 Subject: [PATCH 048/106] swayimg: 3.2 -> 3.4 --- pkgs/by-name/sw/swayimg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index b05395fc4c7c..3c546c23914b 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -26,13 +26,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "3.2"; + version = "3.4"; src = fetchFromGitHub { owner = "artemsen"; repo = "swayimg"; rev = "v${finalAttrs.version}"; - hash = "sha256-Eqs8U2BpjcweDi4oGS9nWpoyoXeuiD+6jviPA3s9/YY="; + hash = "sha256-bUU4s7nlN48rYMX4SleUDAOCVz2fowGctEfP6KhMdoA="; }; strictDeps = true; From 3a23b88c5b664a4677fdb412004e8b5d6e8eb7ea Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sun, 13 Oct 2024 13:15:09 +0200 Subject: [PATCH 049/106] swayimg: reformat --- pkgs/by-name/sw/swayimg/package.nix | 58 ++++++++++++++++------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index 3c546c23914b..3a347ce9580f 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -1,28 +1,29 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, wayland-scanner -, wayland -, wayland-protocols -, json_c -, libxkbcommon -, fontconfig -, giflib -, libheif -, libjpeg -, libwebp -, libtiff -, librsvg -, libpng -, libjxl -, libexif -, libavif -, openexr_3 -, bash-completion -, testers +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + wayland-scanner, + wayland, + wayland-protocols, + json_c, + libxkbcommon, + fontconfig, + giflib, + libheif, + libjpeg, + libwebp, + libtiff, + librsvg, + libpng, + libjxl, + libexif, + libavif, + openexr_3, + bash-completion, + testers, }: stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; @@ -41,7 +42,12 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + wayland-scanner + ]; mesonFlags = [ (lib.mesonOption "version" finalAttrs.version) From b036dc5b8e1ddc0e00d332f4c74444ce18606cf2 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Tue, 15 Oct 2024 16:33:45 +0300 Subject: [PATCH 050/106] dclib: fix build after libxml2 update - add zlib to buildInputs as libxml2 no longer propagates it --- pkgs/development/libraries/dclib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix index 05ea7db2cacc..083e968c11bb 100644 --- a/pkgs/development/libraries/dclib/default.nix +++ b/pkgs/development/libraries/dclib/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libxml2, openssl, bzip2}: +{lib, stdenv, fetchurl, libxml2, openssl, bzip2, zlib}: stdenv.mkDerivation rec { pname = "dclib"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02jdzm5hqzs1dv2rd596vgpcjaapm55pqqapz5m94l30v4q72rfc"; }; - buildInputs = [libxml2 openssl bzip2]; + buildInputs = [libxml2 openssl bzip2 zlib]; meta = with lib; { description = "Peer-to-Peer file sharing client"; From 5e98b259ca44be14710a8a7301b497bfe485b818 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 15 Oct 2024 12:32:14 -0400 Subject: [PATCH 051/106] svix-server: 1.30.0 -> 1.38.0 --- pkgs/by-name/sv/svix-server/Cargo.lock | 20 +++++++++++++++++++- pkgs/by-name/sv/svix-server/package.nix | 4 ++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sv/svix-server/Cargo.lock b/pkgs/by-name/sv/svix-server/Cargo.lock index 4363c3ef350f..02b7c8802205 100644 --- a/pkgs/by-name/sv/svix-server/Cargo.lock +++ b/pkgs/by-name/sv/svix-server/Cargo.lock @@ -2100,6 +2100,23 @@ dependencies = [ "tower-layer", ] +[[package]] +name = "hyper-proxy" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" +dependencies = [ + "bytes", + "futures", + "headers", + "http 0.2.12", + "hyper 0.14.28", + "openssl", + "tokio", + "tokio-openssl", + "tower-service", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -4830,7 +4847,7 @@ dependencies = [ [[package]] name = "svix-server" -version = "1.30.0" +version = "1.38.0" dependencies = [ "aide", "anyhow", @@ -4857,6 +4874,7 @@ dependencies = [ "http 0.2.12", "hyper 0.14.28", "hyper-openssl", + "hyper-proxy", "hyper-socks2", "indexmap 1.9.3", "ipnet", diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix index 655214744904..6b9dfe2f1315 100644 --- a/pkgs/by-name/sv/svix-server/package.nix +++ b/pkgs/by-name/sv/svix-server/package.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "svix-server"; - version = "1.30.0"; + version = "1.38.0"; src = fetchFromGitHub { owner = "svix"; repo = "svix-webhooks"; rev = "v${version}"; - hash = "sha256-W5oLN0rMG2c8h05sIEOf4h95SQrFrs/7vLpsHH91sIA="; + hash = "sha256-gi6Jm0tf1lP10UYpouCleN32K71upYOudxjOoRgsGLg="; }; sourceRoot = "${src.name}/server"; From b54e66bf39e5604764a19134ab21b29171c00fec Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 15 Oct 2024 20:00:20 +0200 Subject: [PATCH 052/106] python312Packages.frozendict: 2.4.5 -> 2.4.6 Changelog: https://github.com/Marco-Sulla/python-frozendict/releases/tag/v2.4.6 --- pkgs/development/python-modules/frozendict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index eaf5e2fd7b62..092cf21301c7 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.4.5"; + version = "2.4.6"; pyproject = true; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Marco-Sulla"; repo = "python-frozendict"; rev = "refs/tags/v${version}"; - hash = "sha256-/lsf5lF+3uzE6KvP1GJQ5gymyKAVX4CflgLXnB7qeeY="; + hash = "sha256-cdKI0wIr0w6seV12cigqyJL6PSkLVzwVxASUB8n7lFY="; }; # build C version if it exists From 1b89990e784d5723b3e6ec54b6f24c932d16751c Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 21 Sep 2024 23:35:37 -0400 Subject: [PATCH 053/106] podman-desktop: 0.12.0 -> 1.12.0 This also fixes a build failure on darwin due to read-only permissions on some Electron.app files, which apparently breaks electron-builder. Closes: #343328 --- .../virtualization/podman-desktop/default.nix | 50 ++++-- ...s-bump-adm-zip-from-0.5.14-to-0.5.15.patch | 170 ++++++++++++++++++ .../extension-no-download-podman.patch | 14 +- .../patches/fix-yarn-lock-deterministic.patch | 18 +- pkgs/top-level/all-packages.nix | 4 +- 5 files changed, 227 insertions(+), 29 deletions(-) create mode 100644 pkgs/applications/virtualization/podman-desktop/patches/0001-chore-deps-bump-adm-zip-from-0.5.14-to-0.5.15.patch diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index ce7d993d39de..cfd63ba72655 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -1,31 +1,40 @@ { lib , stdenv , fetchFromGitHub +, applyPatches , fetchYarnDeps , yarn , fixup-yarn-lock , nodejs , makeWrapper , copyDesktopItems -, desktopToDarwinBundle , electron , makeDesktopItem +, xcbuild +, autoSignDarwinBinariesHook }: stdenv.mkDerivation (finalAttrs: { pname = "podman-desktop"; - version = "0.12.0"; + version = "1.12.0"; - src = fetchFromGitHub { - owner = "containers"; - repo = "podman-desktop"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-gEjcI+bfETYZB/pHDXRcNxNVDsbwuqQL1E22fMkIJHI="; + src = applyPatches { + src = fetchFromGitHub { + owner = "containers"; + repo = "podman-desktop"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-AdiomKM2RfJQKnyrcsdh8FtX7NuAj3g0KQ3pzy76gYI="; + }; + # fix handling of Unix epoch timestamps for zip header, https://github.com/cthackers/adm-zip/pull/518 + # apply the patch early so that fetchYarnDeps can pull the patched yarn.lock + patches = [ + ./patches/0001-chore-deps-bump-adm-zip-from-0.5.14-to-0.5.15.patch + ]; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - sha256 = "sha256-x0hqNxi6r1i3vBe1tJQl+Oht2St9VIH3Eq27MZLkojA="; + sha256 = "sha256-y3ftK2SrysaWoHKEUeTF7aFp3yKmKcdVEJtOOKLr2G0="; }; patches = [ @@ -49,10 +58,11 @@ stdenv.mkDerivation (finalAttrs: { fixup-yarn-lock nodejs makeWrapper + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - desktopToDarwinBundle + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + xcbuild.xcrun + autoSignDarwinBinariesHook ]; configurePhase = '' @@ -71,9 +81,17 @@ stdenv.mkDerivation (finalAttrs: { runHook preBuild yarn --offline run build + + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Disable code signing during build on macOS. + export CSC_IDENTITY_AUTO_DISCOVERY=false + sed -i "/afterSign/d" .electron-builder.config.cjs + '' + '' yarn --offline run electron-builder --dir \ --config .electron-builder.config.cjs \ - -c.electronDist=${electron.dist} \ + -c.electronDist=electron-dist \ -c.electronVersion=${electron.version} runHook postBuild @@ -83,6 +101,13 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p "$out/share/lib/podman-desktop" + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + mv dist/mac*/Podman\ Desktop.app $out/Applications + ln -s $out/Applications/Podman\ Desktop.app/Contents/Resources "$out/share/lib/podman-desktop/resources" + + makeWrapper "$out/Applications/Podman Desktop.app/Contents/MacOS/Podman Desktop" $out/bin/podman-desktop + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/podman-desktop" install -Dm644 buildResources/icon.svg "$out/share/icons/hicolor/scalable/apps/podman-desktop.svg" @@ -91,6 +116,7 @@ stdenv.mkDerivation (finalAttrs: { --add-flags "$out/share/lib/podman-desktop/resources/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --inherit-argv0 + '' + '' runHook postInstall ''; diff --git a/pkgs/applications/virtualization/podman-desktop/patches/0001-chore-deps-bump-adm-zip-from-0.5.14-to-0.5.15.patch b/pkgs/applications/virtualization/podman-desktop/patches/0001-chore-deps-bump-adm-zip-from-0.5.14-to-0.5.15.patch new file mode 100644 index 000000000000..3704df01d380 --- /dev/null +++ b/pkgs/applications/virtualization/podman-desktop/patches/0001-chore-deps-bump-adm-zip-from-0.5.14-to-0.5.15.patch @@ -0,0 +1,170 @@ +From 4712fa5535ff32fccc24743c67708a34c8d621b3 Mon Sep 17 00:00:00 2001 +From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> +Date: Mon, 12 Aug 2024 06:11:35 +0000 +Subject: [PATCH] chore(deps): bump adm-zip from 0.5.14 to 0.5.15 + +Bumps [adm-zip](https://github.com/cthackers/adm-zip) from 0.5.14 to 0.5.15. +- [Release notes](https://github.com/cthackers/adm-zip/releases) +- [Changelog](https://github.com/cthackers/adm-zip/blob/master/history.md) +- [Commits](https://github.com/cthackers/adm-zip/compare/v0.5.14...v0.5.15) + +--- +updated-dependencies: +- dependency-name: adm-zip + dependency-type: direct:production + update-type: version-update:semver-patch +... + +Signed-off-by: dependabot[bot] +--- + extensions/compose/package.json | 2 +- + extensions/docker/package.json | 2 +- + extensions/kind/package.json | 2 +- + extensions/kube-context/package.json | 2 +- + extensions/kubectl-cli/package.json | 2 +- + extensions/lima/package.json | 2 +- + extensions/podman/package.json | 2 +- + extensions/registries/package.json | 2 +- + package.json | 2 +- + yarn.lock | 8 ++++---- + 10 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/extensions/compose/package.json b/extensions/compose/package.json +index f9e706770b..f1837ef285 100644 +--- a/extensions/compose/package.json ++++ b/extensions/compose/package.json +@@ -157,7 +157,7 @@ + "devDependencies": { + "@podman-desktop/api": "^0.0.1", + "@types/mustache": "^4.2.5", +- "adm-zip": "^0.5.14", ++ "adm-zip": "^0.5.15", + "mkdirp": "^3.0.1", + "vite": "^5.3.5", + "vitest": "^1.6.0" +diff --git a/extensions/docker/package.json b/extensions/docker/package.json +index 148c792c4b..e762cdc8b7 100644 +--- a/extensions/docker/package.json ++++ b/extensions/docker/package.json +@@ -20,7 +20,7 @@ + "@podman-desktop/api": "^0.0.1" + }, + "devDependencies": { +- "adm-zip": "^0.5.14", ++ "adm-zip": "^0.5.15", + "@podman-desktop/api": "^0.0.1", + "mkdirp": "^3.0.1", + "vite": "^5.3.5", +diff --git a/extensions/kind/package.json b/extensions/kind/package.json +index 2a3aebc146..8f62a0c314 100644 +--- a/extensions/kind/package.json ++++ b/extensions/kind/package.json +@@ -108,7 +108,7 @@ + "yaml": "^2.5.0" + }, + "devDependencies": { +- "adm-zip": "^0.5.14", ++ "adm-zip": "^0.5.15", + "mkdirp": "^3.0.1", + "tmp-promise": "^3.0.3", + "tsx": "^4.17.0", +diff --git a/extensions/kube-context/package.json b/extensions/kube-context/package.json +index cc783d1270..a9ce1df721 100644 +--- a/extensions/kube-context/package.json ++++ b/extensions/kube-context/package.json +@@ -42,7 +42,7 @@ + "js-yaml": "^4.1.0" + }, + "devDependencies": { +- "adm-zip": "^0.5.14", ++ "adm-zip": "^0.5.15", + "@types/js-yaml": "^4.0.9", + "mkdirp": "^3.0.1", + "vite": "^5.3.5", +diff --git a/extensions/kubectl-cli/package.json b/extensions/kubectl-cli/package.json +index 4ad90d77ac..252d9e630e 100644 +--- a/extensions/kubectl-cli/package.json ++++ b/extensions/kubectl-cli/package.json +@@ -152,7 +152,7 @@ + }, + "devDependencies": { + "@types/semver": "^7.5.8", +- "adm-zip": "^0.5.14", ++ "adm-zip": "^0.5.15", + "byline": "^5.0.0", + "copyfiles": "^2.4.1", + "mkdirp": "^3.0.1", +diff --git a/extensions/lima/package.json b/extensions/lima/package.json +index 375426f6ba..4203715800 100644 +--- a/extensions/lima/package.json ++++ b/extensions/lima/package.json +@@ -67,7 +67,7 @@ + "@podman-desktop/api": "^0.0.1" + }, + "devDependencies": { +- "adm-zip": "^0.5.14", ++ "adm-zip": "^0.5.15", + "mkdirp": "^3.0.1", + "vite": "^5.3.5", + "vitest": "^1.6.0", +diff --git a/extensions/podman/package.json b/extensions/podman/package.json +index 1c2491d173..8456532d62 100644 +--- a/extensions/podman/package.json ++++ b/extensions/podman/package.json +@@ -391,7 +391,7 @@ + "devDependencies": { + "@types/ssh2": "^1.15.0", + "@types/sshpk": "^1.17.4", +- "adm-zip": "^0.5.14", ++ "adm-zip": "^0.5.15", + "hasha": "^6.0.0", + "mkdirp": "^3.0.1", + "nock": "^14.0.0-beta.7", +diff --git a/extensions/registries/package.json b/extensions/registries/package.json +index 6b2fa237f9..36051db6f9 100644 +--- a/extensions/registries/package.json ++++ b/extensions/registries/package.json +@@ -21,7 +21,7 @@ + "@podman-desktop/api": "^0.0.1" + }, + "devDependencies": { +- "adm-zip": "^0.5.14", ++ "adm-zip": "^0.5.15", + "mkdirp": "^3.0.1", + "vite": "^5.3.5", + "vitest": "^1.6.0" +diff --git a/package.json b/package.json +index f14bca5363..8c3f767ecf 100644 +--- a/package.json ++++ b/package.json +@@ -177,7 +177,7 @@ + "@segment/analytics-node": "^2.1.2", + "@types/semver": "^7.5.8", + "@types/stream-json": "^1.7.7", +- "adm-zip": "^0.5.14", ++ "adm-zip": "^0.5.15", + "check-disk-space": "^3.4.0", + "chokidar": "^3.6.0", + "compare-versions": "^6.1.1", +diff --git a/yarn.lock b/yarn.lock +index 023b8df270..81f672d028 100644 +--- a/yarn.lock ++++ b/yarn.lock +@@ -7325,10 +7325,10 @@ address@^1.0.1, address@^1.1.2: + resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" + integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA== + +-adm-zip@^0.5.14: +- version "0.5.14" +- resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.14.tgz#2c557c0bf12af4311cf6d32970f4060cf8133b2a" +- integrity sha512-DnyqqifT4Jrcvb8USYjp6FHtBpEIz1mnXu6pTRHZ0RL69LbQYiO+0lDFg5+OKA7U29oWSs3a/i8fhn8ZcceIWg== ++adm-zip@^0.5.15: ++ version "0.5.15" ++ resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.15.tgz#c2c9b3d4f3b1c911e72b2394e84fd91bcc81e08e" ++ integrity sha512-jYPWSeOA8EFoZnucrKCNihqBjoEGQSU4HKgHYQgKNEQ0pQF9a/DYuo/+fAxY76k4qe75LUlLWpAM1QWcBMTOKw== + + agent-base@6: + version "6.0.2" +-- +2.46.0 + diff --git a/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch b/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch index 89633b57290e..25574c019f28 100644 --- a/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch +++ b/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch @@ -1,13 +1,13 @@ diff --git a/extensions/podman/package.json b/extensions/podman/package.json -index 5f86bbe9..92c0ef3b 100644 +index 3c827750e0..ce7b79d119 100644 --- a/extensions/podman/package.json +++ b/extensions/podman/package.json -@@ -86,7 +86,7 @@ +@@ -376,7 +376,7 @@ } }, "scripts": { -- "build": "rollup --bundleConfigAsCjs --config rollup.config.js --compact --environment BUILD:production && npx ts-node ./scripts/download.ts && node ./scripts/build.js", -+ "build": "rollup --bundleConfigAsCjs --config rollup.config.js --compact --environment BUILD:production && node ./scripts/build.js", - "watch": "rollup --bundleConfigAsCjs --config rollup.config.js -w", - "test": "vitest run --passWithNoTests" - }, +- "build": "vite build && tsx ./scripts/download.ts && node ./scripts/build.cjs", ++ "build": "vite build && node ./scripts/build.cjs", + "test": "vitest run --coverage --passWithNoTests", + "test:watch": "vitest watch --coverage --passWithNoTests", + "watch": "vite build -w" diff --git a/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch b/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch index 5b69f5e4e78d..357534683d99 100644 --- a/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch +++ b/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch @@ -1,13 +1,13 @@ diff --git a/yarn.lock b/yarn.lock -index ae340d04..5acc3fed 100644 +index 0a3e336a2c..a39e473631 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -12753,7 +12753,7 @@ ws@^7.3.1: - resolved "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz" - integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== +@@ -17736,7 +17736,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.1: + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== --ws@^8.11.0, ws@^8.4.2: -+ws@^8.11.0, ws@^8.12.0, ws@^8.4.2: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" - integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== +-semver@^7.2.1, semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.1, semver@^7.6.2, semver@^7.6.3: ++semver@^7.2.1, semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.5.8, semver@^7.6.0, semver@^7.6.1, semver@^7.6.2, semver@^7.6.3: + version "7.6.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" + integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5d6cac78946..49030e570006 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11418,7 +11418,9 @@ with pkgs; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose { }; - podman-desktop = callPackage ../applications/virtualization/podman-desktop {}; + podman-desktop = callPackage ../applications/virtualization/podman-desktop { + inherit (darwin) autoSignDarwinBinariesHook; + }; pods = callPackage ../applications/virtualization/pods { }; From d4e06ddc97cc67876cef4d21b3b58186482046d8 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 16 Oct 2024 02:22:36 +0000 Subject: [PATCH 054/106] podman-desktop: 0.12.0 -> 1.13.2 --- .../virtualization/podman-desktop/default.nix | 63 +++---- ...s-bump-adm-zip-from-0.5.14-to-0.5.15.patch | 170 ------------------ .../extension-no-download-podman.patch | 21 ++- .../patches/fix-yarn-lock-deterministic.patch | 13 -- 4 files changed, 36 insertions(+), 231 deletions(-) delete mode 100644 pkgs/applications/virtualization/podman-desktop/patches/0001-chore-deps-bump-adm-zip-from-0.5.14-to-0.5.15.patch delete mode 100644 pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index cfd63ba72655..8488c7e02749 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -1,50 +1,42 @@ { lib , stdenv , fetchFromGitHub -, applyPatches -, fetchYarnDeps -, yarn -, fixup-yarn-lock -, nodejs , makeWrapper , copyDesktopItems , electron +, nodejs +, pnpm , makeDesktopItem , xcbuild , autoSignDarwinBinariesHook +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { pname = "podman-desktop"; - version = "1.12.0"; + version = "1.13.2"; - src = applyPatches { - src = fetchFromGitHub { - owner = "containers"; - repo = "podman-desktop"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-AdiomKM2RfJQKnyrcsdh8FtX7NuAj3g0KQ3pzy76gYI="; - }; - # fix handling of Unix epoch timestamps for zip header, https://github.com/cthackers/adm-zip/pull/518 - # apply the patch early so that fetchYarnDeps can pull the patched yarn.lock - patches = [ - ./patches/0001-chore-deps-bump-adm-zip-from-0.5.14-to-0.5.15.patch - ]; + passthru.updateScript = nix-update-script { }; + + src = fetchFromGitHub { + owner = "containers"; + repo = "podman-desktop"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-07lf9jy22JUT+Vc5y9Tu1nkWaXU5RTdu3GibcvQsSs8="; }; - offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; - sha256 = "sha256-y3ftK2SrysaWoHKEUeTF7aFp3yKmKcdVEJtOOKLr2G0="; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-mkWbFFv0IdLtog6uZM6xgTNlQPC+ytUQD8po8yiv/6Y="; }; patches = [ # podman should be installed with nix; disable auto-installation ./patches/extension-no-download-podman.patch - ./patches/fix-yarn-lock-deterministic.patch ]; postPatch = '' - for file in packages/main/src/tray-animate-icon.ts extensions/podman/src/util.ts packages/main/src/plugin/certificates.ts; do + for file in packages/main/src/tray-animate-icon.ts extensions/podman/packages/extension/src/util.ts packages/main/src/plugin/certificates.ts; do substituteInPlace "$file" \ --replace 'process.resourcesPath' "'$out/share/lib/podman-desktop/resources'" \ --replace '(process as any).resourcesPath' "'$out/share/lib/podman-desktop/resources'" @@ -54,10 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; nativeBuildInputs = [ - yarn - fixup-yarn-lock - nodejs - makeWrapper + makeWrapper nodejs pnpm.configHook ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -65,23 +54,9 @@ stdenv.mkDerivation (finalAttrs: { autoSignDarwinBinariesHook ]; - configurePhase = '' - runHook preConfigure - - export HOME="$TMPDIR" - yarn config --offline set yarn-offline-mirror "$offlineCache" - fixup-yarn-lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules/ - - runHook postConfigure - ''; - buildPhase = '' runHook preBuild - yarn --offline run build - cp -r ${electron.dist} electron-dist chmod -R u+w electron-dist '' + lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -89,7 +64,9 @@ stdenv.mkDerivation (finalAttrs: { export CSC_IDENTITY_AUTO_DISCOVERY=false sed -i "/afterSign/d" .electron-builder.config.cjs '' + '' - yarn --offline run electron-builder --dir \ + pnpm build + ./node_modules/.bin/electron-builder \ + --dir \ --config .electron-builder.config.cjs \ -c.electronDist=electron-dist \ -c.electronVersion=${electron.version} @@ -138,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A graphical tool for developing on containers and Kubernetes"; homepage = "https://podman-desktop.io"; - changelog = "https://github.com/containers/podman-desktop/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/containers/podman-desktop/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ panda2134 ]; inherit (electron.meta) platforms; diff --git a/pkgs/applications/virtualization/podman-desktop/patches/0001-chore-deps-bump-adm-zip-from-0.5.14-to-0.5.15.patch b/pkgs/applications/virtualization/podman-desktop/patches/0001-chore-deps-bump-adm-zip-from-0.5.14-to-0.5.15.patch deleted file mode 100644 index 3704df01d380..000000000000 --- a/pkgs/applications/virtualization/podman-desktop/patches/0001-chore-deps-bump-adm-zip-from-0.5.14-to-0.5.15.patch +++ /dev/null @@ -1,170 +0,0 @@ -From 4712fa5535ff32fccc24743c67708a34c8d621b3 Mon Sep 17 00:00:00 2001 -From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> -Date: Mon, 12 Aug 2024 06:11:35 +0000 -Subject: [PATCH] chore(deps): bump adm-zip from 0.5.14 to 0.5.15 - -Bumps [adm-zip](https://github.com/cthackers/adm-zip) from 0.5.14 to 0.5.15. -- [Release notes](https://github.com/cthackers/adm-zip/releases) -- [Changelog](https://github.com/cthackers/adm-zip/blob/master/history.md) -- [Commits](https://github.com/cthackers/adm-zip/compare/v0.5.14...v0.5.15) - ---- -updated-dependencies: -- dependency-name: adm-zip - dependency-type: direct:production - update-type: version-update:semver-patch -... - -Signed-off-by: dependabot[bot] ---- - extensions/compose/package.json | 2 +- - extensions/docker/package.json | 2 +- - extensions/kind/package.json | 2 +- - extensions/kube-context/package.json | 2 +- - extensions/kubectl-cli/package.json | 2 +- - extensions/lima/package.json | 2 +- - extensions/podman/package.json | 2 +- - extensions/registries/package.json | 2 +- - package.json | 2 +- - yarn.lock | 8 ++++---- - 10 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/extensions/compose/package.json b/extensions/compose/package.json -index f9e706770b..f1837ef285 100644 ---- a/extensions/compose/package.json -+++ b/extensions/compose/package.json -@@ -157,7 +157,7 @@ - "devDependencies": { - "@podman-desktop/api": "^0.0.1", - "@types/mustache": "^4.2.5", -- "adm-zip": "^0.5.14", -+ "adm-zip": "^0.5.15", - "mkdirp": "^3.0.1", - "vite": "^5.3.5", - "vitest": "^1.6.0" -diff --git a/extensions/docker/package.json b/extensions/docker/package.json -index 148c792c4b..e762cdc8b7 100644 ---- a/extensions/docker/package.json -+++ b/extensions/docker/package.json -@@ -20,7 +20,7 @@ - "@podman-desktop/api": "^0.0.1" - }, - "devDependencies": { -- "adm-zip": "^0.5.14", -+ "adm-zip": "^0.5.15", - "@podman-desktop/api": "^0.0.1", - "mkdirp": "^3.0.1", - "vite": "^5.3.5", -diff --git a/extensions/kind/package.json b/extensions/kind/package.json -index 2a3aebc146..8f62a0c314 100644 ---- a/extensions/kind/package.json -+++ b/extensions/kind/package.json -@@ -108,7 +108,7 @@ - "yaml": "^2.5.0" - }, - "devDependencies": { -- "adm-zip": "^0.5.14", -+ "adm-zip": "^0.5.15", - "mkdirp": "^3.0.1", - "tmp-promise": "^3.0.3", - "tsx": "^4.17.0", -diff --git a/extensions/kube-context/package.json b/extensions/kube-context/package.json -index cc783d1270..a9ce1df721 100644 ---- a/extensions/kube-context/package.json -+++ b/extensions/kube-context/package.json -@@ -42,7 +42,7 @@ - "js-yaml": "^4.1.0" - }, - "devDependencies": { -- "adm-zip": "^0.5.14", -+ "adm-zip": "^0.5.15", - "@types/js-yaml": "^4.0.9", - "mkdirp": "^3.0.1", - "vite": "^5.3.5", -diff --git a/extensions/kubectl-cli/package.json b/extensions/kubectl-cli/package.json -index 4ad90d77ac..252d9e630e 100644 ---- a/extensions/kubectl-cli/package.json -+++ b/extensions/kubectl-cli/package.json -@@ -152,7 +152,7 @@ - }, - "devDependencies": { - "@types/semver": "^7.5.8", -- "adm-zip": "^0.5.14", -+ "adm-zip": "^0.5.15", - "byline": "^5.0.0", - "copyfiles": "^2.4.1", - "mkdirp": "^3.0.1", -diff --git a/extensions/lima/package.json b/extensions/lima/package.json -index 375426f6ba..4203715800 100644 ---- a/extensions/lima/package.json -+++ b/extensions/lima/package.json -@@ -67,7 +67,7 @@ - "@podman-desktop/api": "^0.0.1" - }, - "devDependencies": { -- "adm-zip": "^0.5.14", -+ "adm-zip": "^0.5.15", - "mkdirp": "^3.0.1", - "vite": "^5.3.5", - "vitest": "^1.6.0", -diff --git a/extensions/podman/package.json b/extensions/podman/package.json -index 1c2491d173..8456532d62 100644 ---- a/extensions/podman/package.json -+++ b/extensions/podman/package.json -@@ -391,7 +391,7 @@ - "devDependencies": { - "@types/ssh2": "^1.15.0", - "@types/sshpk": "^1.17.4", -- "adm-zip": "^0.5.14", -+ "adm-zip": "^0.5.15", - "hasha": "^6.0.0", - "mkdirp": "^3.0.1", - "nock": "^14.0.0-beta.7", -diff --git a/extensions/registries/package.json b/extensions/registries/package.json -index 6b2fa237f9..36051db6f9 100644 ---- a/extensions/registries/package.json -+++ b/extensions/registries/package.json -@@ -21,7 +21,7 @@ - "@podman-desktop/api": "^0.0.1" - }, - "devDependencies": { -- "adm-zip": "^0.5.14", -+ "adm-zip": "^0.5.15", - "mkdirp": "^3.0.1", - "vite": "^5.3.5", - "vitest": "^1.6.0" -diff --git a/package.json b/package.json -index f14bca5363..8c3f767ecf 100644 ---- a/package.json -+++ b/package.json -@@ -177,7 +177,7 @@ - "@segment/analytics-node": "^2.1.2", - "@types/semver": "^7.5.8", - "@types/stream-json": "^1.7.7", -- "adm-zip": "^0.5.14", -+ "adm-zip": "^0.5.15", - "check-disk-space": "^3.4.0", - "chokidar": "^3.6.0", - "compare-versions": "^6.1.1", -diff --git a/yarn.lock b/yarn.lock -index 023b8df270..81f672d028 100644 ---- a/yarn.lock -+++ b/yarn.lock -@@ -7325,10 +7325,10 @@ address@^1.0.1, address@^1.1.2: - resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" - integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA== - --adm-zip@^0.5.14: -- version "0.5.14" -- resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.14.tgz#2c557c0bf12af4311cf6d32970f4060cf8133b2a" -- integrity sha512-DnyqqifT4Jrcvb8USYjp6FHtBpEIz1mnXu6pTRHZ0RL69LbQYiO+0lDFg5+OKA7U29oWSs3a/i8fhn8ZcceIWg== -+adm-zip@^0.5.15: -+ version "0.5.15" -+ resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.15.tgz#c2c9b3d4f3b1c911e72b2394e84fd91bcc81e08e" -+ integrity sha512-jYPWSeOA8EFoZnucrKCNihqBjoEGQSU4HKgHYQgKNEQ0pQF9a/DYuo/+fAxY76k4qe75LUlLWpAM1QWcBMTOKw== - - agent-base@6: - version "6.0.2" --- -2.46.0 - diff --git a/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch b/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch index 25574c019f28..0fd41fa221c1 100644 --- a/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch +++ b/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch @@ -1,8 +1,17 @@ -diff --git a/extensions/podman/package.json b/extensions/podman/package.json -index 3c827750e0..ce7b79d119 100644 ---- a/extensions/podman/package.json -+++ b/extensions/podman/package.json -@@ -376,7 +376,7 @@ +From f6dfc258742d03bd0270e9fded925ffa75cc60b0 Mon Sep 17 00:00:00 2001 +From: Ihar Hrachyshka +Date: Sat, 21 Sep 2024 18:56:02 -0400 +Subject: [PATCH] Don't download podman + +--- + extensions/podman/packages/extension/package.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extensions/podman/packages/extension/package.json b/extensions/podman/packages/extension/package.json +index 1824d817f1..d1cc9a5dbf 100644 +--- a/extensions/podman/packages/extension/package.json ++++ b/extensions/podman/packages/extension/package.json +@@ -369,7 +369,7 @@ } }, "scripts": { @@ -11,3 +20,5 @@ index 3c827750e0..ce7b79d119 100644 "test": "vitest run --coverage --passWithNoTests", "test:watch": "vitest watch --coverage --passWithNoTests", "watch": "vite build -w" +-- +2.46.0 diff --git a/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch b/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch deleted file mode 100644 index 357534683d99..000000000000 --- a/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/yarn.lock b/yarn.lock -index 0a3e336a2c..a39e473631 100644 ---- a/yarn.lock -+++ b/yarn.lock -@@ -17736,7 +17736,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.1: - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" - integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== - --semver@^7.2.1, semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.1, semver@^7.6.2, semver@^7.6.3: -+semver@^7.2.1, semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.5.8, semver@^7.6.0, semver@^7.6.1, semver@^7.6.2, semver@^7.6.3: - version "7.6.3" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" - integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== From 9f7fc2bdd7bc19a2ded3030a7e03913d422460d9 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 16 Oct 2024 02:41:54 +0000 Subject: [PATCH 055/106] maintainers: add booxter Also, add booxter to maintainers for podman-desktop. --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/virtualization/podman-desktop/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a2a689a9f61b..4332090c66f3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2952,6 +2952,12 @@ githubId = 68566724; name = "bootstrap-prime"; }; + booxter = { + email = "ihar.hrachyshka@gmail.com"; + github = "booxter"; + githubId = 90200; + name = "Ihar Hrachyshka"; + }; boozedog = { email = "code@booze.dog"; github = "boozedog"; diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 8488c7e02749..964a485845c4 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://podman-desktop.io"; changelog = "https://github.com/containers/podman-desktop/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ panda2134 ]; + maintainers = with maintainers; [ booxter panda2134 ]; inherit (electron.meta) platforms; mainProgram = "podman-desktop"; }; From f40a7a80c46993f6e7888e8fdf3589af9a8de4b9 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Tue, 15 Oct 2024 16:44:09 -0300 Subject: [PATCH 056/106] komac: remove `with lib` from meta --- pkgs/by-name/ko/komac/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 3e5186ec4851..3dc39722343c 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -51,12 +51,12 @@ rustPlatform.buildRustPackage { command = "komac --version"; }; - meta = with lib; { + meta = { description = "Community Manifest Creator for WinGet"; homepage = "https://github.com/russellbanks/Komac"; changelog = "https://github.com/russellbanks/Komac/releases/tag/${src.rev}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ kachick HeitorAugustoLN ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ kachick HeitorAugustoLN ]; mainProgram = "komac"; }; } From 6c2ee694512055358ff39b3a96c7730116f38a1c Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Tue, 15 Oct 2024 17:03:58 -0300 Subject: [PATCH 057/106] komac: format with nixfmt-rfc-style --- pkgs/by-name/ko/komac/package.nix | 46 +++++++++++++++++-------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 3dc39722343c..9af2040d63b5 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, openssl -, rustPlatform -, darwin -, testers -, komac -, dbus -, zstd +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + openssl, + rustPlatform, + darwin, + testers, + komac, + dbus, + zstd, }: let @@ -29,14 +30,16 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - dbus - openssl - zstd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = + [ + dbus + openssl + zstd + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; env = { OPENSSL_NO_VENDOR = true; @@ -56,7 +59,10 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/russellbanks/Komac"; changelog = "https://github.com/russellbanks/Komac/releases/tag/${src.rev}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ kachick HeitorAugustoLN ]; + maintainers = with lib.maintainers; [ + kachick + HeitorAugustoLN + ]; mainProgram = "komac"; }; } From 91abcc044641b7aa3616a9ec9beddb59040ba395 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Tue, 15 Oct 2024 17:17:36 -0300 Subject: [PATCH 058/106] komac: add version check --- pkgs/by-name/ko/komac/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 9af2040d63b5..44b490516d2c 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -10,6 +10,7 @@ komac, dbus, zstd, + versionCheckHook, }: let @@ -47,6 +48,10 @@ rustPlatform.buildRustPackage { ZSTD_SYS_USE_PKG_CONFIG = true; }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/komac"; + passthru.tests.version = testers.testVersion { inherit version; From 96562536ca9a60ad69b1fe3cc6bc8a9208f31110 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Tue, 15 Oct 2024 17:34:37 -0300 Subject: [PATCH 059/106] komac: add updateScript --- pkgs/by-name/ko/komac/package.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 44b490516d2c..efa648804f35 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -11,6 +11,7 @@ dbus, zstd, versionCheckHook, + nix-update-script, }: let @@ -52,11 +53,15 @@ rustPlatform.buildRustPackage { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/komac"; - passthru.tests.version = testers.testVersion { - inherit version; + passthru = { + tests.version = testers.testVersion { + inherit version; - package = komac; - command = "komac --version"; + package = komac; + command = "komac --version"; + }; + + updateScript = nix-update-script { }; }; meta = { From d1893e8cde1cc389fb22a988e7b0a97072379793 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Tue, 15 Oct 2024 23:52:04 -0300 Subject: [PATCH 060/106] komac: ensure that source is a tag --- pkgs/by-name/ko/komac/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index efa648804f35..bb0da2db7abb 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -19,7 +19,7 @@ let src = fetchFromGitHub { owner = "russellbanks"; repo = "Komac"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-YFaa2kU42NlhRivBEPV1mSr3j95P4NFwUKM0Xx8tpfg="; }; in From 2ec2f2a6eea879bcea296bb902e412d9c881b985 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 15 Oct 2024 23:17:45 -0400 Subject: [PATCH 061/106] podman-desktop: don't disable signing for electron config This was fixed in podman-desktop 1.13.0 and is no longer needed. --- pkgs/applications/virtualization/podman-desktop/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 964a485845c4..b9802ad2d4d3 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -59,11 +59,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r ${electron.dist} electron-dist chmod -R u+w electron-dist - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Disable code signing during build on macOS. - export CSC_IDENTITY_AUTO_DISCOVERY=false - sed -i "/afterSign/d" .electron-builder.config.cjs - '' + '' + pnpm build ./node_modules/.bin/electron-builder \ --dir \ From c1afccdb826f4f2ddcf05ffafd43cda1a4dc153b Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 15 Oct 2024 23:24:59 -0400 Subject: [PATCH 062/106] podman-desktop: use --replace-fail instead of --replace --- .../applications/virtualization/podman-desktop/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index b9802ad2d4d3..834199011490 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -36,11 +36,12 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - for file in packages/main/src/tray-animate-icon.ts extensions/podman/packages/extension/src/util.ts packages/main/src/plugin/certificates.ts; do + for file in packages/main/src/tray-animate-icon.ts packages/main/src/plugin/certificates.ts; do substituteInPlace "$file" \ - --replace 'process.resourcesPath' "'$out/share/lib/podman-desktop/resources'" \ - --replace '(process as any).resourcesPath' "'$out/share/lib/podman-desktop/resources'" + --replace-fail 'process.resourcesPath' "'$out/share/lib/podman-desktop/resources'" done + substituteInPlace "extensions/podman/packages/extension/src/util.ts" \ + --replace-fail '(process as any).resourcesPath' "'$out/share/lib/podman-desktop/resources'" ''; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; From af71af6e870edc17b7ecd31761d8808fa75afcd8 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 15 Oct 2024 23:29:51 -0400 Subject: [PATCH 063/106] podman-desktop: remove xcrun dependency --- pkgs/applications/virtualization/podman-desktop/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 834199011490..8b27d6323d4a 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -7,7 +7,6 @@ , nodejs , pnpm , makeDesktopItem -, xcbuild , autoSignDarwinBinariesHook , nix-update-script }: @@ -51,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - xcbuild.xcrun autoSignDarwinBinariesHook ]; From 537028927ae347b6a9995728a5c2e83db601870d Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 4 Oct 2024 18:55:52 -0700 Subject: [PATCH 064/106] envision: Fix WMR build --- pkgs/by-name/en/envision/package.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix index 1136b959d794..223d81992b7e 100644 --- a/pkgs/by-name/en/envision/package.nix +++ b/pkgs/by-name/en/envision/package.nix @@ -1,4 +1,7 @@ -{ buildFHSEnv, envision-unwrapped }: +{ + buildFHSEnv, + envision-unwrapped, +}: buildFHSEnv { name = "envision"; @@ -7,6 +10,7 @@ buildFHSEnv { strictDeps = true; + # TODO: I'm pretty suspicious of this list of additonal required dependencies. Are they all really needed? targetPkgs = pkgs: [ pkgs.envision-unwrapped ] @@ -20,7 +24,7 @@ buildFHSEnv { ) ++ ( # OpenComposite dependencies - pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs ++ [ pkgs.boost ] + pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs ++ [ pkgs.boost186 ] ) ++ ( # Monado dependencies @@ -36,6 +40,17 @@ buildFHSEnv { xorg.libXrandr xorg.libXrender xorg.xorgproto + # Additional dependencies required for Monado WMR support + bc + fmt + fmt.dev + git-lfs + gtest + jq + libepoxy + lz4.dev + tbb + libxkbcommon ]) ) ) From 9212e492411e8d49a92154379c62e3a53cd90ccf Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Wed, 16 Oct 2024 20:48:06 +0200 Subject: [PATCH 065/106] keymapp: 1.3.2 -> 1.3.3 --- pkgs/by-name/ke/keymapp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keymapp/package.nix b/pkgs/by-name/ke/keymapp/package.nix index 5438236d1a7b..632f829f978f 100644 --- a/pkgs/by-name/ke/keymapp/package.nix +++ b/pkgs/by-name/ke/keymapp/package.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "keymapp"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz"; - hash = "sha256-9umi9QWWSG0W3w9d7eRwtZHUraqInkqJbE+Lkdn3TU8="; + hash = "sha256-KJZ6KlsMmKal4gRzDKh7E8fulphCx2eviJMiyypbagY="; }; nativeBuildInputs = [ From dc55dab2ae3daa16df7bfc143760006922c0a65e Mon Sep 17 00:00:00 2001 From: Alexey Naidyonov Date: Wed, 16 Oct 2024 21:30:45 +0200 Subject: [PATCH 066/106] stylelint-lsp: fix script launch issue on macOS A leading space before the shebang doesn't affect script execution when run from the shell or via exec on Linux. However, on macOS, it results in an ENOEXEC (File format error) when using exec. This fix removes the space to ensure stylelint-lsp can be launched from nixvim on macOS without errors. Thanks to @gepbird for suggesting the proper fix. --- pkgs/by-name/st/stylelint-lsp/package.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/st/stylelint-lsp/package.nix b/pkgs/by-name/st/stylelint-lsp/package.nix index 2bf7195d83c9..1a2c67b3f49a 100644 --- a/pkgs/by-name/st/stylelint-lsp/package.nix +++ b/pkgs/by-name/st/stylelint-lsp/package.nix @@ -1,5 +1,4 @@ { - bash, fetchFromGitHub, lib, nodejs, @@ -18,8 +17,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-mzhY6MKkXb1jFYZvs/VkGipBjBfUY3GukICb9qVQI80="; }; - nativeBuildInputs = [ + buildInputs = [ nodejs + ]; + + nativeBuildInputs = [ pnpm_9.configHook ]; @@ -41,11 +43,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir -p $out/{bin,lib/${finalAttrs.pname}} mv {dist,node_modules} $out/lib/${finalAttrs.pname} - echo " - #!${lib.getExe bash} - ${lib.getExe nodejs} $out/lib/${finalAttrs.pname}/dist/index.js \$@ - " > $out/bin/stylelint-lsp - chmod +x $out/bin/stylelint-lsp + chmod a+x $out/lib/${finalAttrs.pname}/dist/index.js + ln -s $out/lib/${finalAttrs.pname}/dist/index.js $out/bin/stylelint-lsp runHook postInstall ''; From fcb6fce9be039b144fb285165ff179a5a7206b9d Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 14 Oct 2024 09:48:31 -0400 Subject: [PATCH 067/106] xwayland-satellite: cleanup meta --- pkgs/by-name/xw/xwayland-satellite/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix index c862b91ca4a9..75a98268cf46 100644 --- a/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -57,15 +57,18 @@ rustPlatform.buildRustPackage { passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; - meta = with lib; { - description = "Rootless Xwayland integration to any Wayland compositor implementing xdg_wm_base"; + meta = { + description = "Xwayland outside your Wayland compositor"; + longDescription = '' + Grants rootless Xwayland integration to any Wayland compositor implementing xdg_wm_base. + ''; homepage = "https://github.com/Supreeeme/xwayland-satellite"; - license = licenses.mpl20; - maintainers = with maintainers; [ + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ if-loop69420 sodiboo ]; mainProgram = "xwayland-satellite"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } From 9d53ad1f97072648259f2db9c14c9d62dfc42934 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 14 Oct 2024 09:50:50 -0400 Subject: [PATCH 068/106] xwayland-satellite: add getchoo as maintainer --- pkgs/by-name/xw/xwayland-satellite/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix index 75a98268cf46..7d4348c55295 100644 --- a/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -67,6 +67,7 @@ rustPlatform.buildRustPackage { maintainers = with lib.maintainers; [ if-loop69420 sodiboo + getchoo ]; mainProgram = "xwayland-satellite"; platforms = lib.platforms.linux; From c6dc80048dd660b145afb1eb8d351714841700e6 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 14 Oct 2024 09:58:28 -0400 Subject: [PATCH 069/106] xwayland-satellite: use binary wrapper We don't require the overhead of a shell wrapper here as we're only manipulating $PATH --- pkgs/by-name/xw/xwayland-satellite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix index 7d4348c55295..19194ffabd85 100644 --- a/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, libxcb, - makeWrapper, + makeBinaryWrapper, pkg-config, rustPlatform, unstableGitUpdater, @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-1EtwGMoLfYK0VZj8jdQiweO/RHGBzyEoeMEI4pmqfu8="; nativeBuildInputs = [ - makeWrapper + makeBinaryWrapper pkg-config rustPlatform.bindgenHook ]; From 9728b040962b3d650cdbda8a6e412eb07cfcef59 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Sat, 12 Oct 2024 23:46:15 +0800 Subject: [PATCH 070/106] python3Packages.biliass: 2.0.0-beta.1 -> 2.0.0-rc4 --- pkgs/development/python-modules/biliass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index 43cb84bac0ed..bae2e926d4eb 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "biliass"; - version = "2.0.0-beta.1"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "yutto-dev"; repo = "yutto"; rev = "refs/tags/biliass@${version}"; - hash = "sha256-Clma0Ggkphk6F+K+h3TdMUX4WyWQorh9g2uAT4+Fc9I="; + hash = "sha256-PlZD+988KdJqYC1I1K7i+YAH1Tzr6zfXcJFR/M4mQRA="; }; sourceRoot = "source/packages/biliass"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src ; sourceRoot = "${sourceRoot}/${cargoRoot}"; - hash = "sha256-h/UOolWQ2k5krOZy/kPywpeiLyXWLzvNu+pcn97or1A="; + hash = "sha256-DMKUbJSVME5siSPybdO5bOluPn3obVq1/6822uoSsDQ="; }; nativeBuildInputs = with rustPlatform; [ From 266d4c22f778e3a973cbeb7040205b99ee37905d Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Sat, 12 Oct 2024 23:46:36 +0800 Subject: [PATCH 071/106] yutto: 2.0.0-beta.43 -> 2.0.0-rc.4 --- pkgs/by-name/yu/yutto/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yu/yutto/package.nix b/pkgs/by-name/yu/yutto/package.nix index 2ce2c6042f2c..8c08f19adf4f 100644 --- a/pkgs/by-name/yu/yutto/package.nix +++ b/pkgs/by-name/yu/yutto/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "yutto"; - version = "2.0.0-beta.43"; + version = "2.0.0-rc.4"; pyproject = true; disabled = python3Packages.pythonOlder "3.9"; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { owner = "yutto-dev"; repo = "yutto"; rev = "refs/tags/v${version}"; - hash = "sha256-ND3uE4vsFa7gPr1E2UfiebExsrj+ELN0+hqnxxOQu8Y="; + hash = "sha256-QP3sbZANsyYeZmLZSwQz6E1eysCVojRYHu/z9Szdb6U="; }; build-system = with python3Packages; [ hatchling ]; @@ -32,6 +32,7 @@ python3Packages.buildPythonApplication rec { dict2xml colorama typing-extensions + pydantic ] ++ (with httpx.optional-dependencies; http2 ++ socks); From 844301ec743a42b8b2b077b4de222c0e87708304 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:47:17 +0800 Subject: [PATCH 072/106] biliass: fix darwin build --- pkgs/development/python-modules/biliass/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index bae2e926d4eb..8fbdd5541f78 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -1,9 +1,11 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, rustPlatform, pytestCheckHook, + libiconv, }: buildPythonPackage rec { @@ -36,6 +38,10 @@ buildPythonPackage rec { maturinBuildHook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; + doCheck = false; # test artifacts missing nativeCheckInputs = [ pytestCheckHook ]; From c6b5facae8e69c1d2de54e0a57cfbd3305e64919 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Tue, 8 Oct 2024 01:02:57 +0200 Subject: [PATCH 073/106] maintainers: add cholli --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 73b917770384..ba7b0f3d34e5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3823,6 +3823,12 @@ github = "CHN-beta"; githubId = 35858462; }; + cholli = { + email = "christoph.hollizeck@hey.com"; + github = "Daholli"; + githubId = 25060097; + name = "Christoph Hollizeck"; + }; choochootrain = { email = "hurshal@imap.cc"; github = "choochootrain"; From 65c965f047b699a9ebd51afa95031c5b33f2a40a Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Tue, 15 Oct 2024 23:06:39 +0200 Subject: [PATCH 074/106] pyfa: init at 2.60.1 --- pkgs/by-name/py/pyfa/package.nix | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/py/pyfa/package.nix diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix new file mode 100644 index 000000000000..f056ee9e99a0 --- /dev/null +++ b/pkgs/by-name/py/pyfa/package.nix @@ -0,0 +1,31 @@ +{ + lib, + appimageTools, + fetchurl, +}: +let + version = "2.60.1"; +in +appimageTools.wrapType2 { + inherit version; + pname = "pyfa"; + + src = fetchurl { + name = "pyfa-appimage-${version}"; + url = "https://github.com/pyfa-org/Pyfa/releases/download/v${version}/pyfa-v${version}-linux.AppImage"; + hash = "sha256-+nyIG6pweIgC6ZiWJaO4E2Fp0/zP+DhQrUWzHnIBQXk="; + }; + + meta = { + description = "Python fitting assistant, cross-platform fitting tool for EVE Online"; + homepage = "https://github.com/pyfa-org/Pyfa"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + toasteruwu + cholli + ]; + mainProgram = "pyfa"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.platforms.linux; + }; +} From 62b23983870e46df67778514ac0641d9e37a8e4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Oct 2024 13:04:40 +0000 Subject: [PATCH 075/106] apt: 2.9.7 -> 2.9.8 --- pkgs/by-name/ap/apt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index 431eb04af4a4..ba1b532bd7d9 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "apt"; - version = "2.9.7"; + version = "2.9.8"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz"; - hash = "sha256-y5mvbh/hPZdcjUbJYK9xTTuv3P7Y4VHdkKlGld1KwVs="; + hash = "sha256-VPt7NL25PqIIESOrNfiTwm/g8+gApU6Onsy18+LslxA="; }; # cycle detection; lib can't be split From e40871126a7dfb6257aa13eb164a6598a507701c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Oct 2024 15:37:04 +0000 Subject: [PATCH 076/106] python312Packages.drf-yasg: 1.21.7 -> 1.21.8 --- pkgs/development/python-modules/drf-yasg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index 5870655c5b07..98046f8b5174 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "drf-yasg"; - version = "1.21.7"; + version = "1.21.8"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-TDuTBos9/KaWmrERFV5N1vey1oC5h3jej9Rgt4N72w0="; + hash = "sha256-y7f4HD0UDyIHOStLxd3mU4TutY4bfuoabWQd7C9zUqk="; }; postPatch = '' From 5160edc348fa0fcf7980b53f14891c1fca305948 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 17 Oct 2024 17:05:40 -0400 Subject: [PATCH 077/106] virtscreen: drop --- pkgs/tools/admin/virtscreen/default.nix | 56 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 pkgs/tools/admin/virtscreen/default.nix diff --git a/pkgs/tools/admin/virtscreen/default.nix b/pkgs/tools/admin/virtscreen/default.nix deleted file mode 100644 index a1558248f802..000000000000 --- a/pkgs/tools/admin/virtscreen/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, python3Packages -, x11vnc -, xrandr -, libGL -, qt5 -}: - -python3Packages.buildPythonApplication rec { - pname = "virtscreen"; - version = "0.3.1"; - - disabled = python3Packages.pythonOlder "3.6"; - - # No tests - doCheck = false; - - src = fetchFromGitHub { - owner = "kbumsik"; - repo = pname; - rev = version; - sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08"; - }; - - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - - propagatedBuildInputs = with python3Packages; [ - netifaces - pyqt5 - quamash - x11vnc - xrandr - ]; - - dontWrapQtApps = true; - - makeWrapperArgs = [ - "\${qtWrapperArgs[@]}" - # import Qt.labs.platform failed without this - "--prefix QML2_IMPORT_PATH : ${qt5.qtquickcontrols2.bin}/${qt5.qtbase.qtQmlPrefix}" - ]; - - postPatch = '' - substituteInPlace virtscreen/__main__.py \ - --replace "'GL'" "'${libGL}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}'" \ - ''; - - meta = with lib; { - description = "Make your iPad/tablet/computer as a secondary monitor on Linux"; - homepage = "https://github.com/kbumsik/VirtScreen"; - license = licenses.gpl3; - maintainers = with maintainers; [ borisbabic ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 87cec31134e5..b66387c00266 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1694,6 +1694,7 @@ mapAliases { vinegar = throw "'vinegar' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2023-09-10 + virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17 vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25 vkBasalt = vkbasalt; # Added 2022-11-22 vkdt-wayland = vkdt; # Added 2024-04-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec449d917a51..5d2890d0d12b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33211,8 +33211,6 @@ with pkgs; qtermwidget = lxqt.qtermwidget_1_4; }; - virtscreen = callPackage ../tools/admin/virtscreen { }; - virtual-ans = callPackage ../applications/audio/virtual-ans { }; virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { From 0fbe6fec88ff2c8bd633147ce2677f624b98aaf2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 17 Oct 2024 17:07:31 -0400 Subject: [PATCH 078/106] python312Packages.quamash: drop --- .../python-modules/quamash/default.nix | 48 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 pkgs/development/python-modules/quamash/default.nix diff --git a/pkgs/development/python-modules/quamash/default.nix b/pkgs/development/python-modules/quamash/default.nix deleted file mode 100644 index b920d7421f8e..000000000000 --- a/pkgs/development/python-modules/quamash/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pytest, - isPy3k, - pyqt5, - pyqt ? pyqt5, - fetchpatch, -}: - -buildPythonPackage rec { - pname = "quamash"; - version = "0.6.1"; - format = "setuptools"; - - disabled = !isPy3k; - - # No tests in PyPi tarball - src = fetchFromGitHub { - owner = "harvimt"; - repo = "quamash"; - rev = "version-${version}"; - sha256 = "117rp9r4lz0kfz4dmmpa35hp6nhbh6b4xq0jmgvqm68g9hwdxmqa"; - }; - - patches = [ - # add 3.10 compatibility, merged remove on next update - (fetchpatch { - url = "https://github.com/harvimt/quamash/pull/126/commits/1e9047bec739dbc9d6ab337fc1a111a8b1090244.patch"; - hash = "sha256-6gomY82AOKkrt32SEBKnRugzhnC5FAyKDs6K5xaxnRM="; - }) - ]; - - propagatedBuildInputs = [ pyqt ]; - - nativeCheckInputs = [ pytest ]; - checkPhase = '' - pytest -k 'test_qthreadexec.py' # the others cause the test execution to be aborted, I think because of asyncio - ''; - - meta = with lib; { - description = "Implementation of the PEP 3156 event-loop (asyncio) api using the Qt Event-Loop"; - homepage = "https://github.com/harvimt/quamash"; - license = licenses.bsd2; - maintainers = with maintainers; [ borisbabic ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 322711518c5b..dc53fcb6da71 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -542,6 +542,7 @@ mapAliases ({ qds-sdk = throw "qds-sdk was removed as it is unmaintained upstream and depends on the removed boto package"; # Added 2024-09-22 qds_sdk = qds-sdk; # added 2023-10-21 Quandl = quandl; # added 2023-02-19 + quamash = throw "'quamash' has been removed, since it is unmaintained and broken"; # added 2024-10-17 querystring_parser = querystring-parser; # added 2024-01-07 qcodes-loop = throw "qcodes-loop has been removed due to deprecation"; # added 2023-11-30 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf85502d987a..691734694a25 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13329,8 +13329,6 @@ self: super: with self; { qualysclient = callPackage ../development/python-modules/qualysclient { }; - quamash = callPackage ../development/python-modules/quamash { }; - quandl = callPackage ../development/python-modules/quandl { }; quantile-forest = callPackage ../development/python-modules/quantile-forest { }; From 25deb1eec3237ae5675bfb2ab5082102c3372260 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Oct 2024 23:40:04 +0200 Subject: [PATCH 079/106] python312Packages.msgraph-sdk: 1.9.0 -> 1.11.0 Diff: https://github.com/microsoftgraph/msgraph-sdk-python/compare/refs/tags/v1.9.0...v1.11.0 Changelog: https://github.com/microsoftgraph/msgraph-sdk-python/blob/v1.11.0/CHANGELOG.md --- pkgs/development/python-modules/msgraph-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index e6d5a47b0f2b..b5cc00a669fc 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.9.0"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-9i0AUljcU4dZSNkgqJnKtKobWCSkBGP8vwCbVSbxw/E="; + hash = "sha256-SBQ99NJFVwsqyExadw/jvToeZuUzi7+/wQxS8YMwrNM="; }; build-system = [ flit-core ]; From b07dfc312038a7d83bc5873f876d57e03b97a937 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Oct 2024 00:00:24 +0200 Subject: [PATCH 080/106] python312Packages.twilio: 9.3.3 -> 9.3.4 Diff: https://github.com/twilio/twilio-python/compare/refs/tags/9.3.3...9.3.4 Changelog: https://github.com/twilio/twilio-python/blob/9.3.4/CHANGES.md --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 6340a655cfe3..894fb118e01c 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.3.3"; + version = "9.3.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-Yb5eeg8m21gjx9ZS7Z/N46p7LGfIBCdrmGoHpD+B+as="; + hash = "sha256-74tJt3BfSKfsl0A1gz7XVzlvumQ8H++Nfp+SEknMYcY="; }; build-system = [ setuptools ]; From a9e1f4e0abe8f8b5f6b6169323d990a0954280e4 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 17 Oct 2024 21:31:37 -0300 Subject: [PATCH 081/106] aliases.nix: throw aliases before 2022 --- pkgs/top-level/aliases.nix | 281 ++++++++++++++++++------------------- 1 file changed, 140 insertions(+), 141 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 87cec31134e5..8a97dbda0d65 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -98,14 +98,14 @@ mapAliases { airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream"; # Added 2023-07-28 alsa-project = throw "alsa-project was removed and its sub-attributes were promoted to top-level."; # Added 2023-11-12 - alsaLib = alsa-lib; # Added 2021-06-09 - alsaOss = alsa-oss; # Added 2021-06-10 - alsaPluginWrapper = alsa-plugins-wrapper; # Added 2021-06-10 - alsaPlugins = alsa-plugins; # Added 2021-06-10 - alsaTools = alsa-tools; # Added 2021-06-10 - alsaUtils = alsa-utils; # Added 2021-06-10 + alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17 + alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17 + alsaPluginWrapper = throw "'alsaPluginWrapper' has been renamed to/replaced by 'alsa-plugins-wrapper'"; # Converted to throw 2024-10-17 + alsaPlugins = throw "'alsaPlugins' has been renamed to/replaced by 'alsa-plugins'"; # Converted to throw 2024-10-17 + alsaTools = throw "'alsaTools' has been renamed to/replaced by 'alsa-tools'"; # Converted to throw 2024-10-17 + alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17 amtk = throw "amtk has been renamed to libgedit-amtk and is now maintained by Gedit Technology"; # Added 2023-12-31 - angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06 + angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17 ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 @@ -121,7 +121,7 @@ mapAliases { apacheKafka_3_3 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 apacheKafka_3_4 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-06-13 - antimicroX = antimicrox; # Added 2021-10-31 + antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17 appthreat-depscan = dep-scan; # Added 2024-04-10 arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07 arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 @@ -141,7 +141,7 @@ mapAliases { auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02 aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14 authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19 - avldrums-lv2 = x42-avldrums; # Added 2020-03-29 + avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2024-10-17 avrlibcCross = avrlibc; # Added 2024-09-06 awesome-4-0 = awesome; # Added 2022-05-05 aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11 @@ -152,8 +152,8 @@ mapAliases { badtouch = authoscope; # Project was renamed, added 20210626 baget = throw "'baget' has been removed due to being unmaintained"; ballAndPaddle = throw "'ballAndPaddle' has been removed because it was broken and abandoned upstream"; # Added 2023-10-16 - bashInteractive_5 = bashInteractive; # Added 2021-08-20 - bash_5 = bash; # Added 2021-08-20 + bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17 + bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17 bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 bazel_4 = throw "'bazel_4' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-23 BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12 @@ -189,7 +189,7 @@ mapAliases { boost18x = throw "boost18x has been deprecated in favor of the latest version"; # Added 2023-07-13 boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01 bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 - bpftool = bpftools; # Added 2021-05-03 + bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17 bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 brasero-original = lib.warn "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29 bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 @@ -282,21 +282,21 @@ mapAliases { clash = throw "'clash' has been removed, upstream gone. Consider using 'mihomo' instead."; # added 2023-11-10 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 - claws-mail-gtk3 = claws-mail; # Added 2021-07-10 + claws-mail-gtk3 = throw "'claws-mail-gtk3' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2024-10-17 clucene_core_1 = throw "'clucene_core_1' has been renamed to/replaced by 'clucene_core'"; # Added 2023-12-09 cntk = throw "'cntk' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09 cockroachdb-bin = cockroachdb; # 2024-03-15 - codimd = hedgedoc; # Added 2020-11-29 + codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2024-10-17 inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17 compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10 - concurrencykit = libck; # Added 2021-03 + concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17 connmanPackages = throw "'connmanPackages' was removed and their subpackages/attributes were promoted to top level."; # Added 2023-10-08 containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09 convoy = throw "'convoy' has been removed from nixpkgs, as it was archived upstream"; # Added 2023-12-27 crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11 crda = throw "'crda' has been removed from nixpkgs, as it is needed only for kernels before 4.16"; # Added 2024-02-06 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 - cvs_fast_export = cvs-fast-export; # Added 2021-06-10 + cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17 # these are for convenience, not for backward compat and shouldn't expire clang6Stdenv = throw "clang6Stdenv has been removed from nixpkgs"; # Added 2024-01-08 @@ -341,15 +341,15 @@ mapAliases { ### D ### dagger = throw "'dagger' has been removed from nixpkgs, as the trademark policy of the upstream project is incompatible"; # Added 2023-10-16 - dart_stable = dart; # Added 2020-01-15 + dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2024-10-17 dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as is now included in Dart Sass itself."; dat = nodePackages.dat; dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16 deadcode = throw "'deadcode' has been removed, as upstream is abandoned since 2019-04-27. Use the official deadcode from 'gotools' package."; # Added 2023-12-28 deadpixi-sam = deadpixi-sam-unstable; - debugedit-unstable = debugedit; # Added 2021-11-22 - deltachat-electron = deltachat-desktop; # added 2021-07-18 + debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17 + deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17 demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 dep = throw "'dep' has been removed, because it is deprecated and archived in favor of Go modules"; # Added 2023-12-26 @@ -359,7 +359,7 @@ mapAliases { dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 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 - dnnl = oneDNN; # Added 2020-04-22 + 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 docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29 docker-distribution = distribution; # Added 2023-12-26 @@ -370,27 +370,27 @@ mapAliases { dogecoin = throw "'dogecoin' has been removed, as it was broken and unmaintained"; # Added 2024-03-11 dogecoind = throw "'dogecoind' has been removed, as it was broken and unmaintained"; # Added 2024-03-11 dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 - dolphinEmu = dolphin-emu; # Added 2021-11-10 - dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 + dolphinEmu = throw "'dolphinEmu' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2024-10-17 + dolphinEmuMaster = throw "'dolphinEmuMaster' has been renamed to/replaced by 'dolphin-emu-beta'"; # Converted to throw 2024-10-17 dot-http = throw "'dot-http' has been removed: abandoned by upstream. Use hurl instead."; # Added 2023-01-16 dotty = scala_3; # Added 2023-08-20 - dotnet-netcore = dotnet-runtime; # Added 2021-10-07 - dotnet-sdk_2 = dotnetCorePackages.sdk_2_1; # Added 2020-01-19 - dotnet-sdk_3 = dotnetCorePackages.sdk_3_1; # Added 2020-01-19 - dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; # Added 2020-09-11 + dotnet-netcore = throw "'dotnet-netcore' has been renamed to/replaced by 'dotnet-runtime'"; # Converted to throw 2024-10-17 + dotnet-sdk_2 = throw "'dotnet-sdk_2' has been renamed to/replaced by 'dotnetCorePackages.sdk_2_1'"; # Converted to throw 2024-10-17 + dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17 + dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17 drgeo = throw "'drgeo' has been removed as it is outdated and unmaintained"; # Added 2023-10-15 drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03 dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03 du-dust = dust; # Added 2024-01-19 - dylibbundler = macdylibbundler; # Added 2021-04-24 + dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2024-10-17 ### E ### EBTKS = ebtks; # Added 2024-01-21 eask = eask-cli; # Added 2024-09-05 - ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08 - ec2_api_tools = ec2-api-tools; # Added 2021-10-08 + ec2_ami_tools = throw "'ec2_ami_tools' has been renamed to/replaced by 'ec2-ami-tools'"; # Converted to throw 2024-10-17 + ec2_api_tools = throw "'ec2_api_tools' has been renamed to/replaced by 'ec2-api-tools'"; # Converted to throw 2024-10-17 ec2-utils = amazon-ec2-utils; # Added 2022-02-01 edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01 @@ -436,19 +436,19 @@ mapAliases { # Emacs emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20 emacs28NativeComp = emacs28; # Added 2022-06-08 - emacs28Packages = emacs28.pkgs; # Added 2021-10-04 - emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 + emacs28Packages = throw "'emacs28Packages' has been renamed to/replaced by 'emacs28.pkgs'"; # Converted to throw 2024-10-17 + emacs28WithPackages = throw "'emacs28WithPackages' has been renamed to/replaced by 'emacs28.pkgs.withPackages'"; # Converted to throw 2024-10-17 emacsMacport = emacs-macport; # Added 2023-08-10 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 emacsPackagesNg = throw "'emacsPackagesNg' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2023-09-10 emacsPackagesNgFor = throw "'emacsPackagesNgFor' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2023-09-10 - emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 + emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17 empathy = throw "empathy was removed as it is unmaintained and no longer launches due to libsoup3 migration"; # Added 2023-01-20 EmptyEpsilon = empty-epsilon; # Added 2024-07-14 enchant1 = throw "enchant1 has been removed from nixpkgs, as it was unmaintained"; # Added 2023-01-18 enyo-doom = enyo-launcher; # Added 2022-09-09 - epoxy = libepoxy; # Added 2021-11-11 + epoxy = throw "'epoxy' has been renamed to/replaced by 'libepoxy'"; # Converted to throw 2024-10-17 erlang_27-rc3 = throw "erlang_27-rc3 has been removed in favor of erlang_27"; # added 2024-05-20 erlangR24 = throw "erlangR24 has been removed in favor of erlang_24"; # added 2024-05-24 @@ -479,7 +479,7 @@ mapAliases { fam = throw "'fam' (aliased to 'gamin') has been removed as it is unmaintained upstream"; # Added 2024-04-19 fancypp = throw "'fancypp' was removed because it and its dependants are unmaintained"; # Added 2024-02-14 faustStk = faustPhysicalModeling; # Added 2023-05-16 - fastnlo = fastnlo-toolkit; # Added 2021-04-24 + fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2024-10-17 fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03 fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19 inherit (luaPackages) fennel; # Added 2022-09-24 @@ -509,7 +509,7 @@ mapAliases { flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter322 = throw "flutter322 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter323 = throw "flutter323 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 - foldingathome = fahclient; # Added 2020-09-03 + 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 foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 @@ -539,7 +539,7 @@ mapAliases { ### G ### g4music = gapless; # Added 2024-07-26 - g4py = python3Packages.geant4; # Added 2020-06-06 + g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17 gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19 garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 @@ -594,7 +594,7 @@ mapAliases { glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08 globalprotect-openconnect = throw "'globalprotect-openconnect' has been renamed to/replaced by 'gpauth' and 'gpclient'"; # Added 2024-09-21 glxinfo = mesa-demos; # Added 2024-07-04 - gmailieer = lieer; # Added 2020-04-19 + gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17 gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02 gnatboot11 = gnat-bootstrap11; gnatboot12 = gnat-bootstrap12; @@ -635,9 +635,9 @@ mapAliases { gnuradio3_7Packages; }; # Added 2020-10-16 - gmock = gtest; # moved from top-level 2021-03-14 + gmock = throw "'gmock' has been renamed to/replaced by 'gtest'"; # Converted to throw 2024-10-17 - gnome3 = gnome; # Added 2021-05-07 + gnome3 = throw "'gnome3' has been renamed to/replaced by 'gnome'"; # Converted to throw 2024-10-17 gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16 gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 @@ -649,7 +649,7 @@ mapAliases { gnuradio-osmosdr = throw "'gnuradio-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2023-09-10 gnuradio-rds = throw "'gnuradio-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 go2nix = throw "'go2nix' has been removed as it was archived upstream"; # Added 2023-12-27 - gobby5 = gobby; # Added 2021-02-01 + gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17 #godot godot = throw "godot has been renamed to godot3 to distinguish from version 4"; # Added 2023-07-16 @@ -724,7 +724,7 @@ mapAliases { hip-nvidia = throw "'hip-nvidia' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 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 - ht-rust = xh; # Added 2021-02-13 + ht-rust = throw "'ht-rust' has been renamed to/replaced by 'xh'"; # Converted to throw 2024-10-17 hydra_unstable = hydra; # Added 2024-08-22 hydron = throw "hydron has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability"; @@ -740,9 +740,9 @@ mapAliases { icedtea_web = throw "'icedtea_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 ignite = throw "'ignite' has been removed as the upstream project was archived, please use 'flintlock' instead"; # Added 2024-01-07 imag = throw "'imag' has been removed, upstream gone"; # Added 2023-01-13 - imagemagick7Big = imagemagickBig; # Added 2021-02-22 - imagemagick7 = imagemagick; # Added 2021-02-22 - imagemagick7_light = imagemagick_light; # Added 2021-02-22 + imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17 + imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17 + imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17 imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04 immersed-vr = lib.warn "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11 indiepass-desktop = throw "indiepass-desktop has been dropped because it does not work with recent Electron versions"; # Added 2024-03-14 @@ -753,13 +753,13 @@ mapAliases { index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17 infiniband-diags = throw "'infiniband-diags' has been renamed to/replaced by 'rdma-core'"; # Converted to throw 2023-09-10 inotifyTools = inotify-tools; - inter-ui = inter; # Added 2021-03-27 + inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2024-10-17 iouyap = throw "'iouyap' is deprecated and archived by upstream, use 'ubridge' instead"; # Added 2023-09-21 ipfs = kubo; # Added 2022-09-27 ipfs-migrator-all-fs-repo-migrations = kubo-migrator-all-fs-repo-migrations; # Added 2022-09-27 ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27 ipfs-migrator = kubo-migrator; # Added 2022-09-27 - iproute = iproute2; # moved from top-level 2021-03-14 + iproute = throw "'iproute' has been renamed to/replaced by 'iproute2'"; # Converted to throw 2024-10-17 irrlichtmt = throw "irrlichtmt has been removed because it was moved into the Minetest repo"; # Added 2024-08-12 isl_0_11 = throw "isl_0_11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 isl_0_14 = throw "isl_0_14 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 @@ -768,7 +768,7 @@ mapAliases { ### J ### - jack2Full = jack2; # moved from top-level 2021-03-14 + jack2Full = throw "'jack2Full' has been renamed to/replaced by 'jack2'"; # Converted to throw 2024-10-17 jami-client-qt = jami-client; # Added 2022-11-06 jami-client = jami; # Added 2023-02-10 jami-daemon = jami.daemon; # Added 2023-02-10 @@ -794,18 +794,18 @@ mapAliases { # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04 # now kube3d/k3d will take it's place kube3d = k3d; # Added 2022-0705 - kafkacat = kcat; # Added 2021-10-07 + kafkacat = throw "'kafkacat' has been renamed to/replaced by 'kcat'"; # Converted to throw 2024-10-17 kak-lsp = kakoune-lsp; # Added 2024-04-01 kargo = throw "kargo was removed as it is deprecated upstream and depends on the removed boto package"; # Added 2024-09-22 kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06 - kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28 + kdeconnect = throw "'kdeconnect' has been renamed to/replaced by 'plasma5Packages.kdeconnect-kde'"; # Converted to throw 2024-10-17 keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 keepkey_agent = keepkey-agent; # added 2024-01-06 - kerberos = krb5; # moved from top-level 2021-03-14 - kexectools = kexec-tools; # Added 2021-09-03 + kerberos = throw "'kerberos' has been renamed to/replaced by 'krb5'"; # Converted to throw 2024-10-17 + kexectools = throw "'kexectools' has been renamed to/replaced by 'kexec-tools'"; # Converted to throw 2024-10-17 keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25 - keysmith = libsForQt5.kdeGear.keysmith; # Added 2021-07-14 + keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17 kfctl = throw "kfctl is broken and has been archived by upstream"; # Added 2023-08-21 kgx = gnome-console; # Added 2022-02-19 kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-30-10 @@ -816,9 +816,9 @@ mapAliases { kodiPlain = kodi; kodiPlainWayland = kodi-wayland; kodiPlugins = kodiPackages; # Added 2021-03-09; - kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23 + kramdown-rfc2629 = throw "'kramdown-rfc2629' has been renamed to/replaced by 'rubyPackages.kramdown-rfc2629'"; # Converted to throw 2024-10-17 krb5Full = krb5; - krita-beta = krita; # moved from top-level 2021-12-23 + krita-beta = throw "'krita-beta' has been renamed to/replaced by 'krita'"; # Converted to throw 2024-10-17 kubei = kubeclarity; # Added 2023-05-20 kuma-prometheus-sd = throw "kuma-prometheus-sd has been deprecated upstream"; # Added 2023-07-02 @@ -849,12 +849,12 @@ mapAliases { libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23 libgme = game-music-emu; # Added 2022-07-20 libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 - libgpgerror = libgpg-error; # Added 2021-09-04 + libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17 libheimdal = heimdal; # Added 2022-11-18 libintlOrEmpty = throw "'libintlOrEmpty' has been replaced by gettext"; # Converted to throw 2023-09-10 libixp_hg = libixp; - libjpeg_drop = libjpeg_original; # Added 2020-06-05 - liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 + libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17 + liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17 libmongo-client = throw "'libmongo-client' has been removed, upstream gone"; # Added 2023-06-22 liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14 libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02 @@ -862,22 +862,22 @@ mapAliases { libquotient = libsForQt5.libquotient; # Added 2023-11-11 librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as it's upstream is unmaintained"; # Added 2024-06-10 libraw_unstable = throw "'libraw_unstable' has been removed, please use libraw"; # Added 2023-01-30 - librdf = lrdf; # Added 2020-03-22 + librdf = throw "'librdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2024-10-17 LibreArp = librearp; # Added 2024-06-12 LibreArp-lv2 = librearp-lv2; # Added 2024-06-12 libreddit = throw "'libreddit' has been removed because it is unmaintained upstream. Consider using 'redlib', a maintained fork"; # Added 2024-07-17 libressl_3_5 = throw "'libressl_3_5' has reached end-of-life "; # Added 2023-05-07 librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 - libseat = seatd; # Added 2021-06-24 + libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17 libsigcxx12 = throw "'libsigcxx12' has been removed, please use newer versions"; # Added 2023-10-20 libsForQt515 = libsForQt5; # Added 2022-11-24 libtensorflow-bin = libtensorflow; # Added 2022-09-25 - libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20 - libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # Added 2020-12-20 - libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # Added 2020-12-20 - libungif = giflib; # Added 2020-02-12 - libusb = libusb1; # Added 2020-04-28 + libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17 + libtorrentRasterbar-1_2_x = throw "'libtorrentRasterbar-1_2_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_2_x'"; # Converted to throw 2024-10-17 + libtorrentRasterbar-2_0_x = throw "'libtorrentRasterbar-2_0_x' has been renamed to/replaced by 'libtorrent-rasterbar-2_0_x'"; # Converted to throw 2024-10-17 + libungif = throw "'libungif' has been renamed to/replaced by 'giflib'"; # Converted to throw 2024-10-17 + libusb = throw "'libusb' has been renamed to/replaced by 'libusb1'"; # Converted to throw 2024-10-17 libvpx_1_8 = throw "libvpx_1_8 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libvpx'"; # Added 2024-07-26 libwnck3 = libwnck; libyamlcpp = yaml-cpp; # Added 2023-01-29 @@ -993,13 +993,13 @@ mapAliases { llvm_10 = throw "llvm_10 has been removed from nixpkgs"; # Added 2024-01-26 llvm_11 = throw "llvm_11 has been removed from nixpkgs"; # Added 2024-01-24 - lobster-two = google-fonts; # Added 2021-07-22 + lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17 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 luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 lxd = lib.warn "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 lxd-unwrapped = lib.warn "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 - lzma = xz; # moved from top-level 2021-03-14 + lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17 ### M ### @@ -1021,7 +1021,7 @@ mapAliases { mathematica9 = throw "mathematica9 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 mathematica11 = throw "mathematica11 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 - matrique = spectral; # Added 2020-01-27 + matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17 matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09 matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21 maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17 @@ -1029,7 +1029,7 @@ mapAliases { mbox = throw "'mbox' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 mcomix3 = mcomix; # Added 2022-06-05 mdt = md-tui; # Added 2024-09-03 - meme = meme-image-generator; # Added 2021-04-21 + meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17 mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 mhwaveedit = throw "'mkwaveedit' has been removed due to lack of maintenance upstream. Consider using 'audacity' or 'tenacity' instead"; microcodeAmd = microcode-amd; # Added 2024-09-08 @@ -1050,19 +1050,19 @@ mapAliases { minizip2 = pkgs.minizip-ng; # Added 2022-12-28 mirage-im = throw "'mirage-im' has been removed, as it was broken and unmaintained"; # Added 2023-11-26 mlton20210107 = throw "'mlton20210107' has been renamed to 'mlton20210117', correcting the version number"; # Added 2024-03-31 - mod_dnssd = apacheHttpdPackages.mod_dnssd; # Added 2014-11-07 - mod_fastcgi = apacheHttpdPackages.mod_fastcgi; # Added 2014-11-07 - mod_python = apacheHttpdPackages.mod_python; # Added 2014-11-07 - mod_wsgi = apacheHttpdPackages.mod_wsgi; # Added 2014-11-07 - mod_ca = apacheHttpdPackages.mod_ca; # Added 2019-12-24 - mod_crl = apacheHttpdPackages.mod_crl; # Added 2019-12-24 - mod_csr = apacheHttpdPackages.mod_csr; # Added 2019-12-24 - mod_ocsp = apacheHttpdPackages.mod_ocsp; # Added 2019-12-24 - mod_scep = apacheHttpdPackages.mod_scep; # Added 2019-12-24 - mod_spkac = apacheHttpdPackages.mod_spkac; # Added 2019-12-24 - mod_pkcs12 = apacheHttpdPackages.mod_pkcs12; # Added 2019-12-24 - mod_timestamp = apacheHttpdPackages.mod_timestamp; # Added 2019-12-24 - monero = monero-cli; # Added 2021-11-28 + mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17 + mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17 + mod_python = throw "'mod_python' has been renamed to/replaced by 'apacheHttpdPackages.mod_python'"; # Converted to throw 2024-10-17 + mod_wsgi = throw "'mod_wsgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_wsgi'"; # Converted to throw 2024-10-17 + mod_ca = throw "'mod_ca' has been renamed to/replaced by 'apacheHttpdPackages.mod_ca'"; # Converted to throw 2024-10-17 + mod_crl = throw "'mod_crl' has been renamed to/replaced by 'apacheHttpdPackages.mod_crl'"; # Converted to throw 2024-10-17 + mod_csr = throw "'mod_csr' has been renamed to/replaced by 'apacheHttpdPackages.mod_csr'"; # Converted to throw 2024-10-17 + mod_ocsp = throw "'mod_ocsp' has been renamed to/replaced by 'apacheHttpdPackages.mod_ocsp'"; # Converted to throw 2024-10-17 + mod_scep = throw "'mod_scep' has been renamed to/replaced by 'apacheHttpdPackages.mod_scep'"; # Converted to throw 2024-10-17 + mod_spkac = throw "'mod_spkac' has been renamed to/replaced by 'apacheHttpdPackages.mod_spkac'"; # Converted to throw 2024-10-17 + mod_pkcs12 = throw "'mod_pkcs12' has been renamed to/replaced by 'apacheHttpdPackages.mod_pkcs12'"; # Converted to throw 2024-10-17 + mod_timestamp = throw "'mod_timestamp' has been renamed to/replaced by 'apacheHttpdPackages.mod_timestamp'"; # Converted to throw 2024-10-17 + monero = throw "'monero' has been renamed to/replaced by 'monero-cli'"; # Converted to throw 2024-10-17 moneyplex = throw "'moneyplex' has been removed, as it was broken and unmaintained"; # Added 2024-02-28 mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05 mongodb-4_2 = throw "mongodb-4_2 has been removed, it's end of life since April 2023"; # Added 2023-06-06 @@ -1074,7 +1074,7 @@ mapAliases { mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 - mpd_clientlib = libmpdclient; # Added 2021-02-11 + 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 msp430NewlibCross = msp430Newlib; # Added 2024-09-06 @@ -1083,7 +1083,7 @@ mapAliases { murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2023-09-10 mutt-with-sidebar = mutt; # Added 2022-09-17 mysql-client = hiPrio mariadb.client; - mysql = mariadb; # moved from top-level 2021-03-14 + mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2024-10-17 mesa_drivers = throw "'mesa_drivers' has been removed, use 'pkgs.mesa' or 'pkgs.mesa.drivers' depending on target use case."; # Converted to throw 2024-07-11 ### N ### @@ -1124,7 +1124,7 @@ mapAliases { nix-simple-deploy = throw "'nix-simple-deploy' has been removed as it is broken and unmaintained"; # Added 2024-08-17 nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained"; # Added 2023-11-20 nix-universal-prefetch = throw "The nix-universal-prefetch package was dropped since it was unmaintained."; # Added 2024-06-21 - nixFlakes = nixVersions.stable; # Added 2021-05-21 + nixFlakes = throw "'nixFlakes' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2024-10-17 nixStable = nixVersions.stable; # Added 2022-01-24 nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22 nix_2_3 = nixVersions.nix_2_3; @@ -1136,7 +1136,7 @@ mapAliases { nixops_unstable = throw "nixops_unstable has been replaced. Please use for example 'nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ps.nixops-encrypted-links ])' instead"; # Added 2024-02-28 nixosTest = testers.nixosTest; # Added 2022-05-05 - nmap-unfree = nmap; # Added 2021-04-06 + nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17 nodejs_14 = throw "nodejs_14 has been removed as it is EOL."; # Added 2023-10-30 nodejs-slim_14 = throw "nodejs-slim_14 has been removed as it is EOL."; # Added 2023-10-30 nodejs-14_x = nodejs_14; # Added 2022-11-06 @@ -1150,7 +1150,7 @@ mapAliases { nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 nomad_1_2 = throw "nomad_1_2 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02 nomad_1_3 = throw "nomad_1_3 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02 - noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 + noto-fonts-cjk = throw "'noto-fonts-cjk' has been renamed to/replaced by 'noto-fonts-cjk-sans'"; # Converted to throw 2024-10-17 noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09 noto-fonts-extra = noto-fonts; # Added 2023-04-08 NSPlist = nsplist; # Added 2024-01-05 @@ -1167,7 +1167,7 @@ mapAliases { o = orbiton; # Added 2023-04-09 oathToolkit = oath-toolkit; # Added 2022-04-04 - oauth2_proxy = oauth2-proxy; # Added 2021-04-18 + oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17 obinskit = throw "'obinskit' has been removed from nixpkgs, because the package was unmaintained and depended on an insecure version of electron"; # Added 2024-03-20 octant = throw "octant has been dropped due to being archived and vulnerable"; # Added 2023-09-29 octant-desktop = throw "octant-desktop has been dropped due to being archived and vulnerable"; # Added 2023-09-29 @@ -1190,12 +1190,12 @@ mapAliases { openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01 opendylan = throw "opendylan has been removed from nixpkgs as it was broken"; # Added 2024-07-15 opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15 - openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 + openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2024-10-17 openethereum = throw "openethereum development has ceased by upstream. Use alternate clients such as go-ethereum, erigon, or nethermind"; # Added 2024-05-13 openimagedenoise_1_2_x = throw "'openimagedenoise_1_2_x' has been renamed to/replaced by 'openimagedenoise'"; # Added 2023-06-07 openimageio2 = openimageio; # Added 2023-01-05 openimageio_1 = throw "'openimageio_1' has been removed, please update to 'openimageio' 2"; # Added 2023-06-14 - openisns = open-isns; # Added 2020-01-28 + openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2024-10-17 openjdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01 openjdk19_headless = openjdk19; # Added 2024-08-01 jdk19 = openjdk19; # Added 2024-08-01 @@ -1207,14 +1207,14 @@ mapAliases { openjfx11 = throw "OpenJFX 11 was removed as it has reached its end of life"; # Added 2024-10-07 openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01 openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01 - openjpeg_2 = openjpeg; # Added 2021-01-25 + openjpeg_2 = throw "'openjpeg_2' has been renamed to/replaced by 'openjpeg'"; # Converted to throw 2024-10-17 openlens = throw "Lens Closed its source code, package obsolete/stale - consider lens as replacement"; # Added 2024-09-04 openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29 - openmpt123 = libopenmpt; # Added 2021-09-05 + openmpt123 = throw "'openmpt123' has been renamed to/replaced by 'libopenmpt'"; # Converted to throw 2024-10-17 openssl_3_0 = openssl_3; # Added 2022-06-27 openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23 optparse-bash = throw "'optparse-bash' (GitHub: nk412/optparse) has been removed. Use 'argparse' instead"; # Added 2024-01-12 - orchis = orchis-theme; # Added 2021-06-09 + orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17 oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15 onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20 onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03 @@ -1223,7 +1223,7 @@ mapAliases { openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24 oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10 OSCAR = oscar; # Added 2024-06-12 - osxfuse = macfuse-stubs; # Added 2021-03-20 + osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17 ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24 oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09 oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23 @@ -1232,15 +1232,14 @@ 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 = metal-cli; # Added 2021-10-25 + packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17 paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14 packet = throw "packet has been removed as it is no longer working and unmaintained"; # Added 2024-03-29 palemoon = throw "palemoon has been dropped due to python2 being EOL and marked insecure. Use 'palemoon-bin' instead"; # Added 2023-05-18 pam_usb = throw "'pam_usb' has been removed: abandoned by upstream since 2015."; # Added 2023-10-30 paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03 - paperless = paperless-ngx; # Added 2021-06-06 + 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 - parity = throw "parity, renamed to openethereum, has been terminated by upstream"; # Added 2020-08-01 partition-manager = libsForQt5.partitionmanager; # Added 2024-01-08 pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 patchelfStable = patchelf; # Added 2024-01-25 @@ -1274,7 +1273,7 @@ mapAliases { pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; pkgconfig = throw "'pkgconfig' has been renamed to/replaced by 'pkg-config'"; # Converted to throw 2023-09-10 playwright = lib.warn "'playwright' will reference playwright-driver in 25.05. Reference 'python3Packages.playwright' for the python test launcher" python3Packages.toPythonApplication python3Packages.playwright; # Added 2024-10-04 - pleroma-otp = pleroma; # Added 2021-07-10 + pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17 pltScheme = racket; # just to be sure pmdk = throw "'pmdk' is discontinued, no further support or maintenance is planned by upstream"; # Added 2023-02-06 pomotroid = throw "pomotroid has been removed from nixpkgs, because it depended on an insecure version of electron"; # Added 2023-09-12 @@ -1314,7 +1313,7 @@ mapAliases { pinentry_gnome = throw "'pinentry_gnome' has been renamed to/replaced by 'pinentry-gnome'"; # Converted to throw 2023-09-10 pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10 pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10 - pinentry_qt5 = pinentry-qt; # Added 2020-02-11 + pinentry_qt5 = throw "'pinentry_qt5' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2024-10-17 pivx = throw "pivx has been removed as it was marked as broken"; # Added 2024-07-15 pivxd = throw "pivxd has been removed as it was marked as broken"; # Added 2024-07-15 @@ -1353,23 +1352,23 @@ mapAliases { pypolicyd-spf = spf-engine; # Added 2022-10-09 python = python2; # Added 2022-01-11 python-language-server = throw "python-language-server has been removed as it is no longer maintained. Use e.g. python-lsp-server instead"; # Added 2023-01-07 - python-swiftclient = swiftclient; # Added 2021-09-09 + python-swiftclient = throw "'python-swiftclient' has been renamed to/replaced by 'swiftclient'"; # Converted to throw 2024-10-17 pythonFull = python2Full; # Added 2022-01-11 pythonPackages = python.pkgs; # Added 2022-01-11 ### Q ### qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30 - qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 + qcsxcad = throw "'qcsxcad' has been renamed to/replaced by 'libsForQt5.qcsxcad'"; # Converted to throw 2024-10-17 qtcreator-qt6 = throw "'qtcreator-qt6' has been renamed to/replaced by 'qtcreator', since qt5 version has been removed"; # Added 2023-07-25 qflipper = qFlipper; # Added 2022-02-11 qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17 qscintilla = libsForQt5.qscintilla; # Added 2023-09-20 qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20 qt515 = qt5; # Added 2022-11-24 - qt5ct = libsForQt5.qt5ct; # Added 2021-12-27 + qt5ct = throw "'qt5ct' has been renamed to/replaced by 'libsForQt5.qt5ct'"; # Converted to throw 2024-10-17 qt6ct = qt6Packages.qt6ct; # Added 2023-03-07 - qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 + qtcurve = throw "'qtcurve' has been renamed to/replaced by 'libsForQt5.qtcurve'"; # Converted to throw 2024-10-17 qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12 quantum-espresso-mpi = quantum-espresso; # Added 2023-11-23 quicklispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 @@ -1386,7 +1385,7 @@ mapAliases { ### R ### rabbitvcs = throw "rabbitvcs has been removed from nixpkgs, because it was broken"; # Added 2024-07-15 - radare2-cutter = cutter; # Added 2021-03-30 + radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17 radicle-cli = throw "'radicle-cli' was removed in favor of 'radicle-node'"; # Added 2024-05-04 radicle-upstream = throw "'radicle-upstream' was sunset, see "; # Added 2024-05-04 railway-travel = diebahn; # Added 2024-04-01 @@ -1407,7 +1406,7 @@ mapAliases { retroshare06 = retroshare; ricochet = throw "ricochet has been deprecated in favor of ricochet-refresh"; # Added 2024-02-26 rigsofrods = rigsofrods-bin; # Added 2023-03-22 - ring-daemon = jami-daemon; # Added 2021-10-26 + ring-daemon = throw "'ring-daemon' has been renamed to/replaced by 'jami-daemon'"; # Converted to throw 2024-10-17 rnix-lsp = throw "'rnix-lsp' has been removed as it is unmaintained"; # Added 2024-03-09 rockbox_utility = rockbox-utility; # Added 2022-03-17 rocalution = throw "'rocalution' has been replaced with 'rocmPackages.rocalution'"; # Added 2023-10-08 @@ -1440,7 +1439,7 @@ mapAliases { rocm-thunk = throw "'rocm-thunk' has been replaced with 'rocmPackages.rocm-thunk'"; # Added 2023-10-08 rocr-debug-agent = throw "'rocr-debug-agent' has been replaced with 'rocmPackages.rocr-debug-agent'"; # Added 2023-10-08 rome = throw "rome is no longer maintained, consider using biome instead"; # Added 2023-09-12 - rpiboot-unstable = rpiboot; # Added 2021-07-30 + 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 rtl8723bs-firmware = throw "rtl8723bs-firmware was added in mainline kernel version 4.12"; # Added 2023-07-03 rtsp-simple-server = throw "rtsp-simple-server is rebranded as mediamtx, including default config path update"; # Added 2023-04-11 @@ -1449,21 +1448,21 @@ mapAliases { runCommandNoCCLocal = runCommandLocal; rustc-wasm32 = rustc; # Added 2023-12-01 rustic-rs = rustic; # Added 2024-08-02 - rxvt_unicode = rxvt-unicode-unwrapped; # Added 2020-02-02 - rxvt_unicode-with-plugins = rxvt-unicode; # Added 2020-02-02 + rxvt_unicode = throw "'rxvt_unicode' has been renamed to/replaced by 'rxvt-unicode-unwrapped'"; # Converted to throw 2024-10-17 + rxvt_unicode-with-plugins = throw "'rxvt_unicode-with-plugins' has been renamed to/replaced by 'rxvt-unicode'"; # Converted to throw 2024-10-17 # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix, # due to it being inside the linuxPackagesFor function. - rtlwifi_new-firmware = rtw88-firmware; # Added 2021-03-14 + rtlwifi_new-firmware = throw "'rtlwifi_new-firmware' has been renamed to/replaced by 'rtw88-firmware'"; # Converted to throw 2024-10-17 rtw88-firmware = throw "rtw88-firmware has been removed because linux-firmware now contains it."; # Added 2024-06-28 rtw89-firmware = throw "rtw89-firmware has been removed because linux-firmware now contains it."; # Added 2023-02-19 ### S ### SDL_classic = SDL1; # Added 2024-09-03 - s2n = s2n-tls; # Added 2021-03-03 + s2n = throw "'s2n' has been renamed to/replaced by 's2n-tls'"; # Converted to throw 2024-10-17 sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06 - sane-backends-git = sane-backends; # Added 2021-02-19 + sane-backends-git = throw "'sane-backends-git' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2024-10-17 scantailor = scantailor-advanced; # Added 2022-05-26 schildichat-web = throw '' schildichat has been removed as it is severely lacking behind the Element upstream and does not receive regular security fixes. @@ -1494,7 +1493,7 @@ mapAliases { skk-dicts = throw "'skk-dicts' has been split into multiple packages under 'skkDictionaries'"; # Added 2023-11-08 sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21 SkypeExport = skypeexport; # Added 2024-06-12 - slack-dark = slack; # Added 2020-03-27 + slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17 slmenu = throw "slmenu has been removed (upstream is gone)"; # Added 2023-04-06 slurm-llnl = slurm; # renamed July 2017 smesh = throw "'smesh' has been removed as it's unmaintained and depends on opencascade-oce, which is also unmaintained"; # Added 2023-09-18 @@ -1536,15 +1535,15 @@ mapAliases { spacegun = throw "'spacegun' has been removed as unmaintained"; # Added 2023-05-20 - spectral = neochat; # Added 2020-12-27 + spectral = throw "'spectral' has been renamed to/replaced by 'neochat'"; # Converted to throw 2024-10-17 speedtest-exporter = throw "'speedtest-exporter' has been removed as unmaintained"; # Added 2023-07-31 spice-gtk_libsoup2 = throw "'spice-gtk_libsoup2' has been renamed to/replaced by 'spice-gtk'"; # Added 2023-02-21 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell - spidermonkey = spidermonkey_78; # Added 2020-10-09 + spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_78'"; # Converted to throw 2024-10-17 spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07 spotify-tui = throw "'spotify-tui' has been removed, as it was broken and unmaintained"; # Added 2024-03-12 spotify-unwrapped = spotify; # added 2022-11-06 - spring-boot = spring-boot-cli; # added 2020-04-24 + spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17 squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09 ssb = throw "'ssb' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 @@ -1571,17 +1570,17 @@ mapAliases { swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-09-12 swig4 = swig; # Added 2024-09-12 swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12 - swtpm-tpm2 = swtpm; # Added 2021-02-26 + swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2024-10-17 Sylk = sylk; # Added 2024-06-12 symbiyosys = sby; # Added 2024-08-18 sync = taler-sync; # Added 2024-09-04 - syncthing-cli = syncthing; # Added 2021-04-06 + syncthing-cli = throw "'syncthing-cli' has been renamed to/replaced by 'syncthing'"; # Converted to throw 2024-10-17 syncthingtray-qt6 = syncthingtray; # Added 2024-03-06 ### T ### tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 - tangogps = foxtrotgps; # Added 2020-01-26 + tangogps = throw "'tangogps' has been renamed to/replaced by 'foxtrotgps'"; # Converted to throw 2024-10-17 taskwarrior = lib.warn "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstream's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2; taplo-cli = taplo; # Added 2022-07-30 taplo-lsp = taplo; # Added 2022-07-30 @@ -1606,7 +1605,7 @@ mapAliases { tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 thrift-0_10 = throw "'thrift-0_10' has been removed because it is impacted by security issues and not used in nixpkgs, move to 'thrift'"; # Added 2024-03-17 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 - timescale-prometheus = promscale; # Added 2020-09-29 + timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17 tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25 tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17 @@ -1640,8 +1639,8 @@ mapAliases { ### U ### uade123 = uade; # Added 2022-07-30 - uberwriter = apostrophe; # Added 2020-04-23 - ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 + uberwriter = throw "'uberwriter' has been renamed to/replaced by 'apostrophe'"; # Converted to throw 2024-10-17 + ubootBeagleboneBlack = throw "'ubootBeagleboneBlack' has been renamed to/replaced by 'ubootAmx335xEVM'"; # Converted to throw 2024-10-17 ubuntu_font_family = ubuntu-classic; # Added 2024-02-19 uclibc = uclibc-ng; # Added 2022-06-16 uclibcCross = uclibc-ng; # Added 2022-06-16 @@ -1649,7 +1648,7 @@ mapAliases { uefi-firmware-parser = throw "The uefi-firmware-parser package was dropped since it was unmaintained."; # Added 2024-06-21 uhd3_5 = throw "uhd3_5 has been removed, because it was no longer needed"; # Added 2023-10-07 uhhyou.lv2 = throw "'uhhyou.lv2' has been removed, upstream gone"; # Added 2023-06-21 - unicorn-emu = unicorn; # Added 2020-10-29 + unicorn-emu = throw "'unicorn-emu' has been renamed to/replaced by 'unicorn'"; # Converted to throw 2024-10-17 uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; unifi-poller = unpoller; # Added 2022-11-24 unifi-video = throw "unifi-video has been removed as it has been unsupported upstream since 2021"; # Added 2024-10-01 @@ -1658,20 +1657,20 @@ mapAliases { unifi7 = throw "'unifi7' has been removed since it is vulnerable to CVE-2024-42025 and its required MongoDB version is EOL."; # Added 2024-10-01 unifiLTS = throw "'unifiLTS' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Added 2024-04-11 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 - untrunc = untrunc-anthwlock; # Added 2021-02-01 + untrunc = throw "'untrunc' has been renamed to/replaced by 'untrunc-anthwlock'"; # Converted to throw 2024-10-17 urlview = throw "'urlview' has been dropped because it's unmaintained. Consider switching to an alternative such as `pkgs.extract_url` or `pkgs.urlscan`."; # Added 2023-12-14 - urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # Added 2020-02-02 - urxvt_bidi = rxvt-unicode-plugins.bidi; # Added 2020-02-02 - urxvt_font_size = rxvt-unicode-plugins.font-size; # Added 2020-02-02 - urxvt_perl = rxvt-unicode-plugins.perl; # Added 2020-02-02 - urxvt_perls = rxvt-unicode-plugins.perls; # Added 2020-02-02 - urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # Added 2020-02-02 - urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # Added 2020-02-02 - urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # Added 2020-02-02 + 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 + urxvt_perl = throw "'urxvt_perl' has been renamed to/replaced by 'rxvt-unicode-plugins.perl'"; # Converted to throw 2024-10-17 + urxvt_perls = throw "'urxvt_perls' has been renamed to/replaced by 'rxvt-unicode-plugins.perls'"; # Converted to throw 2024-10-17 + urxvt_tabbedex = throw "'urxvt_tabbedex' has been renamed to/replaced by 'rxvt-unicode-plugins.tabbedex'"; # Converted to throw 2024-10-17 + urxvt_theme_switch = throw "'urxvt_theme_switch' has been renamed to/replaced by 'rxvt-unicode-plugins.theme-switch'"; # Converted to throw 2024-10-17 + urxvt_vtwheel = throw "'urxvt_vtwheel' has been renamed to/replaced by 'rxvt-unicode-plugins.vtwheel'"; # Converted to throw 2024-10-17 usbguard-nox = throw "'usbguard-nox' has been renamed to/replaced by 'usbguard'"; # Converted to throw 2023-09-10 utahfs = throw "utahfs has been removed, as it is broken and lack of maintenance from upstream"; # Added 2023-09-29 util-linuxCurses = util-linux; # Added 2022-04-12 - utillinux = util-linux; # Added 2020-11-24 + utillinux = throw "'utillinux' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2024-10-17 ### V ### @@ -1747,10 +1746,10 @@ mapAliases { ### X ### - xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19 + xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17 xcbuild6Hook = throw "'xcbuild6Hook has been renamed to/replaced by 'xcbuildHook'"; # Added 2023-12-10 xcodebuild6 = throw "'xcodebuild6' has been renamed to/replaced by 'xcodebuild'"; # Added 2023-12-10 - xdg_utils = xdg-utils; # Added 2021-02-01 + xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2024-10-17 xen-light = throw "'xen-light' has been renamed to/replaced by 'xen-slim'"; # Added 2024-06-30 xen-slim = throw "'xen-slim' has been renamed to 'xen'. The old Xen package with built-in components no longer exists"; # Added 2024-10-05 xen_4_16 = throw "While Xen 4.16 was still security-supported when it was removed from Nixpkgs, it would have reached its End of Life a couple of days after NixOS 24.11 released. To avoid shipping an insecure version of Xen, the Xen Project Hypervisor Maintenance Team decided to delete the derivation entirely"; # Added 2024-10-05 @@ -1758,8 +1757,8 @@ mapAliases { xen_4_18 = throw "Due to technical challenges involving building older versions of Xen with newer dependencies, the Xen Project Hypervisor Maintenance Team decided to switch to a latest-only support cycle. As Xen 4.18 would have been the 'n-1' version, it was removed"; # Added 2024-10-05 xen_4_19 = throw "Use 'xen' instead"; # Added 2024-10-05 xenPackages = throw "The attributes in the xenPackages set have been promoted to the top-level. (xenPackages.xen_4_19 -> xen)"; - xineLib = xine-lib; # Added 2021-04-27 - xineUI = xine-ui; # Added 2021-04-27 + xineLib = throw "'xineLib' has been renamed to/replaced by 'xine-lib'"; # Converted to throw 2024-10-17 + xineUI = throw "'xineUI' has been renamed to/replaced by 'xine-ui'"; # Converted to throw 2024-10-17 xmlada = gnatPackages.xmlada; # Added 2024-02-25 xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15 xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10 @@ -1767,12 +1766,12 @@ mapAliases { xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 - xvfb_run = xvfb-run; # Added 2021-05-07 + 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 ### Y ### - yacc = bison; # moved from top-level 2021-03-14 + yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17 yafaray-core = libyafaray; # Added 2022-09-23 yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04 yi = throw "'yi' has been removed, as it was broken and unmaintained"; # added 2024-05-09 @@ -1799,13 +1798,13 @@ mapAliases { zeroc_ice = throw "'zeroc_ice' has been renamed to/replaced by 'zeroc-ice'"; # Converted to throw 2023-09-10 - dina-font-pcf = dina-font; # Added 2020-02-09 + dina-font-pcf = throw "'dina-font-pcf' has been renamed to/replaced by 'dina-font'"; # Converted to throw 2024-10-17 dnscrypt-proxy2 = dnscrypt-proxy; # Added 2023-02-02 gnatsd = throw "'gnatsd' has been renamed to/replaced by 'nats-server'"; # Converted to throw 2023-09-10 - posix_man_pages = man-pages-posix; # Added 2021-04-15 - ttyrec = ovh-ttyrec; # Added 2021-01-02 - zplugin = zinit; # Added 2021-01-30 + posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17 + ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2024-10-17 + zplugin = throw "'zplugin' has been renamed to/replaced by 'zinit'"; # Converted to throw 2024-10-17 zyn-fusion = zynaddsubfx; # Added 2022-08-05 inherit (stdenv.hostPlatform) system; # Added 2021-10-22 From 62fdd02bc43748a1dbe91c395e4441065faf2169 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 18 Oct 2024 12:27:27 +0000 Subject: [PATCH 082/106] mimir: 2.13.0 -> 2.14.0 https://github.com/grafana/mimir/releases/tag/mimir-2.14.0 --- pkgs/servers/monitoring/mimir/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index 1656ec909ea6..521224bb7c22 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,15 +1,13 @@ -{ lib, buildGo122Module, fetchFromGitHub, nixosTests, nix-update-script }: -# Does not build with Go 1.23 -# FIXME: check again for next release -buildGo122Module rec { +{ lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: +buildGoModule rec { pname = "mimir"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - hash = "sha256-XBCwc3jpLx8uj+UitFsoIAWVgC/2G8rgjOqrrLLyYdM="; + hash = "sha256-XALr755tFYaMnI913NCjwFPieedS00RXv4KhjXfOPfw="; }; vendorHash = null; From 61290de65d000c2933a386b8db228395fbaa4b1e Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 18 Oct 2024 10:10:54 -0400 Subject: [PATCH 083/106] mimir: move to by-name --- .../mimir/default.nix => by-name/mi/mimir/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/monitoring/mimir/default.nix => by-name/mi/mimir/package.nix} (100%) diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/by-name/mi/mimir/package.nix similarity index 100% rename from pkgs/servers/monitoring/mimir/default.nix rename to pkgs/by-name/mi/mimir/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6e143b53a80..8dc337176a6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24295,8 +24295,6 @@ with pkgs; grafana-loki = callPackage ../servers/monitoring/loki { }; promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; - mimir = callPackage ../servers/monitoring/mimir { }; - phlare = callPackage ../servers/monitoring/phlare { }; grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; From f1fd37250269d1b35b4351405dd4f2d32ebec59c Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 18 Oct 2024 10:11:30 -0400 Subject: [PATCH 084/106] mimir: add adamcstephens to maintainers --- pkgs/by-name/mi/mimir/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix index 521224bb7c22..82b6c120b5cd 100644 --- a/pkgs/by-name/mi/mimir/package.nix +++ b/pkgs/by-name/mi/mimir/package.nix @@ -51,6 +51,6 @@ buildGoModule rec { "Grafana Mimir provides horizontally scalable, highly available, multi-tenant, long-term storage for Prometheus. "; homepage = "https://github.com/grafana/mimir"; license = licenses.agpl3Only; - maintainers = with maintainers; [ happysalada bryanhonof ]; + maintainers = with maintainers; [ happysalada bryanhonof adamcstephens ]; }; } From 75dc360a03d2a7d06910b8a82912edd4d0e4a09b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 18 Oct 2024 17:28:56 +0200 Subject: [PATCH 085/106] python312Packages.amaranth: 0.5.2 -> 0.5.3 --- pkgs/development/python-modules/amaranth/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index bac25d70f040..e79be265ba46 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -21,20 +21,18 @@ buildPythonPackage rec { pname = "amaranth"; format = "pyproject"; - version = "0.5.2"; + version = "0.5.3"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; rev = "refs/tags/v${version}"; - hash = "sha256-pf9X1B60FgqTbSw7D80ERHp4GCvCe5lqrlS96xPXLNo="; + hash = "sha256-lPQw7fAVM7URdyC/9c/UIYsRxVXrLjvHODvhYBdlkkg="; }; - nativeBuildInputs = [ - git - pdm-backend - ]; + nativeBuildInputs = [ git ]; + build-system = [ pdm-backend ]; dependencies = [ From 0f79dd4197e3570ff7435e382346b9a3bf15db5b Mon Sep 17 00:00:00 2001 From: ruby0b <106119328+ruby0b@users.noreply.github.com> Date: Fri, 18 Oct 2024 17:53:42 +0200 Subject: [PATCH 086/106] python3Packages.js2py: remove unmaintained and insecure: https://github.com/Marven11/CVE-2024-28397-js2py-Sandbox-Escape --- .../networking/pyload-ng/default.nix | 36 +++++++------- .../django-js-reverse/default.nix | 5 +- .../python-modules/js2py/default.nix | 47 ------------------- .../python-modules/jupysql/default.nix | 5 +- .../python-modules/lark/default.nix | 2 +- .../python-modules/pyjsparser/default.nix | 10 +--- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 8 files changed, 26 insertions(+), 82 deletions(-) delete mode 100644 pkgs/development/python-modules/js2py/default.nix diff --git a/pkgs/applications/networking/pyload-ng/default.nix b/pkgs/applications/networking/pyload-ng/default.nix index aae05e4cf10b..75f70393205c 100644 --- a/pkgs/applications/networking/pyload-ng/default.nix +++ b/pkgs/applications/networking/pyload-ng/default.nix @@ -30,25 +30,23 @@ python3.pkgs.buildPythonApplication rec { sed -i -E 's/([A-z0-9]*)~=[^;]*(.*)/\1\2/' setup.cfg ''; - dependencies = - with python3.pkgs; - [ - bitmath - certifi - cheroot - cryptography - filetype - flask - flask-babel - flask-caching - flask-compress - flask-session - flask-themes2 - pycurl - semver - setuptools - ] - ++ (if pythonOlder "3.12" then [ js2py ] else [ dukpy ]); + dependencies = with python3.pkgs; [ + bitmath + certifi + cheroot + cryptography + dukpy + filetype + flask + flask-babel + flask-caching + flask-compress + flask-session + flask-themes2 + pycurl + semver + setuptools + ]; optional-dependencies = { plugins = with python3.pkgs; [ diff --git a/pkgs/development/python-modules/django-js-reverse/default.nix b/pkgs/development/python-modules/django-js-reverse/default.nix index 3e344f881395..49a6e3cb6b5b 100644 --- a/pkgs/development/python-modules/django-js-reverse/default.nix +++ b/pkgs/development/python-modules/django-js-reverse/default.nix @@ -7,7 +7,6 @@ django, packaging, nodejs, - js2py, six, }: @@ -25,9 +24,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ] ++ lib.optionals (pythonAtLeast "3.7") [ packaging ]; + # Js2py is needed for tests but it's unmaintained and insecure + doCheck = false; + nativeCheckInputs = [ nodejs - js2py six ]; diff --git a/pkgs/development/python-modules/js2py/default.nix b/pkgs/development/python-modules/js2py/default.nix deleted file mode 100644 index 1ecceaf8329e..000000000000 --- a/pkgs/development/python-modules/js2py/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - fetchPypi, - buildPythonPackage, - pythonAtLeast, - setuptools, - tzlocal, - six, - pyjsparser, -}: - -buildPythonPackage rec { - pname = "js2py"; - version = "0.74"; - pyproject = true; - - # broken with Python 3.12 - # https://github.com/PiotrDabkowski/Js2Py/issues/317 - disabled = pythonAtLeast "3.12"; - - src = fetchPypi { - pname = "Js2Py"; - inherit version; - hash = "sha256-OfOmqoRpGA77o8hncnHfJ8MTMv0bRx3xryr1i4e4ly8="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - pyjsparser - six - tzlocal - ]; - - # Test require network connection - doCheck = false; - - pythonImportsCheck = [ "js2py" ]; - - meta = with lib; { - description = "JavaScript to Python Translator & JavaScript interpreter written in 100% pure Python"; - homepage = "https://github.com/PiotrDabkowski/Js2Py"; - license = licenses.mit; - maintainers = with maintainers; [ onny ]; - knownVulnerabilities = [ "CVE-2024-28397" ]; - }; -} diff --git a/pkgs/development/python-modules/jupysql/default.nix b/pkgs/development/python-modules/jupysql/default.nix index ec9f51237679..350c2e43c8f2 100644 --- a/pkgs/development/python-modules/jupysql/default.nix +++ b/pkgs/development/python-modules/jupysql/default.nix @@ -22,7 +22,6 @@ grpcio, ipython, ipywidgets, - js2py, matplotlib, numpy, pandas, @@ -69,7 +68,6 @@ buildPythonPackage rec { grpcio ipython ipywidgets - js2py matplotlib numpy pandas @@ -101,6 +99,9 @@ buildPythonPackage rec { "src/tests/test_plot.py" "src/tests/test_magic.py" "src/tests/test_magic_plot.py" + + # require js2py (which is unmaintained and insecure) + "src/tests/test_widget.py" ]; preCheck = '' diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix index 85f690d93d31..30cdce6885cf 100644 --- a/pkgs/development/python-modules/lark/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { "lark.grammars" ]; - # Js2py is needed for tests but it's marked as insecure + # Js2py is needed for tests but it's unmaintained and insecure doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/pyjsparser/default.nix b/pkgs/development/python-modules/pyjsparser/default.nix index 0b6eab26b5c3..b0988585e21b 100644 --- a/pkgs/development/python-modules/pyjsparser/default.nix +++ b/pkgs/development/python-modules/pyjsparser/default.nix @@ -3,7 +3,6 @@ fetchFromGitHub, buildPythonPackage, pytestCheckHook, - js2py, }: let @@ -21,18 +20,11 @@ let nativeCheckInputs = [ pytestCheckHook - js2py ]; - # escape infinite recursion with js2py + # js2py is needed for tests but it's unmaintained and insecure doCheck = false; - passthru.tests = { - check = pyjsparser.overridePythonAttrs (_: { - doCheck = true; - }); - }; - pythonImportsCheck = [ "pyjsparser" ]; meta = with lib; { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 322711518c5b..1322de0d75e4 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -286,6 +286,7 @@ mapAliases ({ jinja2_pluralize = jinja2-pluralize; # added 2023-11-01 jinja2_time = jinja2-time; # added 2022-11-07 JPype1 = jpype1; # added 2023-02-19 + js2py = throw "js2py has been removed, as it is unmaintained and insecure"; # added 2024-10-17 jsonpath_rw = jsonpath-rw; # added 2024-01-06 jsonschema_3 = throw "jsonschema 3 is neither the latest version nor needed inside nixpkgs anymore"; # added 2023-06-28 jupyter_client = jupyter-client; # added 2021-10-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf85502d987a..035bdb382678 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6476,8 +6476,6 @@ self: super: with self; { inherit (pkgs) jq; }; - js2py = callPackage ../development/python-modules/js2py { }; - jsbeautifier = callPackage ../development/python-modules/jsbeautifier { }; jschema-to-python = callPackage ../development/python-modules/jschema-to-python { }; From e0f63ad971803b4d9457b1578902e39cadef6b29 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 18 Oct 2024 18:13:17 +0200 Subject: [PATCH 087/106] wiki-js: 2.5.304 -> 2.5.305 ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.305 --- pkgs/servers/web-apps/wiki-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 5816e1dd91be..23d96bc39ef7 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.304"; + version = "2.5.305"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-w89+X3sqZPlX7EuK/g2oATHqlpx1br/Njh81vZt8zYM="; + sha256 = "sha256-beP9k1msJjg9IQbU/CmzTodjMvUnWrLYcw0EleR1OJk="; }; sourceRoot = "."; From 50c9e0ee1702b1d4a127fc05120bc6d088536f06 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 18 Oct 2024 17:29:19 +0200 Subject: [PATCH 088/106] python312Packages.amaranth-soc: 0.1a-unstable-2024-06-10 -> 0.1a-unstable-2024-10-12 --- .../python-modules/amaranth-soc/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index 597a1829161f..a33128a376d1 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -9,22 +9,24 @@ buildPythonPackage rec { pname = "amaranth-soc"; - version = "0.1a-unstable-2024-06-10"; + version = "0.1a-unstable-2024-10-12"; pyproject = true; # from `pdm show` - realVersion = let - tag = builtins.elemAt (lib.splitString "-" version) 0; - rev = lib.substring 0 7 src.rev; - in "${tag}1.dev1+g${rev}"; + realVersion = + let + tag = builtins.elemAt (lib.splitString "-" version) 0; + rev = lib.substring 0 7 src.rev; + in + "${tag}1.dev1+g${rev}"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "e1b842800533f44924f21c3867bc2290084d100f"; - hash = "sha256-GAGQEncONY566v8hLjGeZ7CRlOt36vHg+0a5xcB+g1Y="; + rev = "5c43cf58f15d9cd9c69ff83c97997708d386b2dc"; + hash = "sha256-o9xjH/nmV7ovw6bQ6PaFGLcjz5gDGb+eQ9eGNRPnBV8="; }; - nativeBuildInputs = [ pdm-backend ]; + build-system = [ pdm-backend ]; dependencies = [ amaranth ]; preBuild = '' From 6b1750e42972aec2c82c5a72064b1559e4a3d4e1 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 18 Oct 2024 17:29:37 +0200 Subject: [PATCH 089/106] python312Packages.amaranth-boards: 0-unstable-2024-05-01 -> 0-unstable-2024-10-18 --- .../amaranth-boards/default.nix | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix index a010d3570b7c..cfd76b23a8ad 100644 --- a/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/pkgs/development/python-modules/amaranth-boards/default.nix @@ -3,38 +3,36 @@ buildPythonPackage, fetchFromGitHub, amaranth, - setuptools, - setuptools-scm, + pdm-backend, unstableGitUpdater, }: buildPythonPackage rec { pname = "amaranth-boards"; - version = "0-unstable-2024-05-01"; + version = "0-unstable-2024-10-18"; pyproject = true; - # python setup.py --version - realVersion = "0.1.dev202+g${lib.substring 0 7 src.rev}"; + # from `pdm show` + realVersion = + let + tag = builtins.elemAt (lib.splitString "-" version) 0; + rev = lib.substring 0 7 src.rev; + in + "${tag}1.dev1+g${rev}"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-boards"; - rev = "aba2300dc83216523e1c98fdb22471cb4bac5027"; + rev = "23c66d68045831de0a372c8c237274d74c71ef4e"; # these files change depending on git branch status postFetch = "rm -f $out/.git_archival.txt $out/.gitattributes"; - hash = "sha256-jldXyMJtuSGcZKmtwpZBYrR/UBe4ufblPYRYpBmReM8="; + hash = "sha256-cC7uvj9+6h3RPbFdu3/T1t/jhw5CuLOF8aKwDSkRE54="; }; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; - dependencies = [ - setuptools - amaranth - ]; + build-system = [ pdm-backend ]; + dependencies = [ amaranth ]; preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" + export PDM_BUILD_SCM_VERSION="${realVersion}" ''; # no tests From 277827ca06a4399505f9e5452267e3fb33cf4381 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Oct 2024 18:28:19 +0000 Subject: [PATCH 090/106] python312Packages.python-benedict: 0.33.2 -> 0.34.0 --- pkgs/development/python-modules/python-benedict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 3bdb639be493..e00f202b18a3 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.33.2"; + version = "0.34.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = "python-benedict"; rev = "refs/tags/${version}"; - hash = "sha256-1/eLJFXACn1W5Yz43BIhdqqUVk3t9285d8aLwH+VmAE="; + hash = "sha256-HQ9VVgRfF5qA36yOyKT63gXuKNLLjouqYKz5EuqGA2E="; }; pythonRelaxDeps = [ "boto3" ]; From 50cb719406de741592ee8d40b1075e71063c95c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Oct 2024 18:46:08 +0000 Subject: [PATCH 091/106] python312Packages.pydeps: 1.12.20 -> 2.0.1 --- pkgs/development/python-modules/pydeps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index 23f9353ac9ca..54d379b1b6de 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.12.20"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = "pydeps"; rev = "refs/tags/v${version}"; - hash = "sha256-d6EeeNem+HfuipKF5ZOI48c11j0ozGrBP4XlqTx+fJ4="; + hash = "sha256-ZLFcaWzu8iYBnbSh1Ua4fvFyYD5q71R/iIqzRUKRn1E="; }; nativeBuildInputs = [ setuptools ]; From 948be822d284e76d955f5293f460d355ea282bb3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Oct 2024 12:42:24 +0200 Subject: [PATCH 092/106] python312Packages.numpy-stl: refactor --- .../python-modules/numpy-stl/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index fd1911a81875..ef46c1724e03 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,28 +2,31 @@ lib, buildPythonPackage, cython, - enum34, fetchPypi, - nine, numpy, pytestCheckHook, python-utils, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "numpy-stl"; version = "3.1.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-947qYsgJOL9T6pFPpbbJL0SPDqtWCeDlpzfd4DlAQzQ="; }; - propagatedBuildInputs = [ - cython - enum34 - nine + build-system = [ setuptools ]; + + nativeBuildInputs = [ cython ]; + + dependencies = [ numpy python-utils ]; @@ -35,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to make reading, writing and modifying both binary and ascii STL files easy"; homepage = "https://github.com/WoLpH/numpy-stl/"; + changelog = "https://github.com/wolph/numpy-stl/releases/tag/v${version}"; license = licenses.bsd3; maintainers = [ ]; }; From d1fb047a9c420202d001ac98522d2f246f74c01f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Oct 2024 12:45:30 +0200 Subject: [PATCH 093/106] python312Packages.numpy-stl: 3.1.1 -> 3.1.2 Changelog: https://github.com/wolph/numpy-stl/releases/tag/v3.1.2 --- pkgs/development/python-modules/numpy-stl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index ef46c1724e03..bf7bac7f9950 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -12,14 +12,15 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "3.1.1"; + version = "3.1.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-947qYsgJOL9T6pFPpbbJL0SPDqtWCeDlpzfd4DlAQzQ="; + pname = "numpy_stl"; + inherit version; + hash = "sha256-crRpUN+jZC3xx7hzz6eKVIUzckuQdHjFZ9tC/fV+49I="; }; build-system = [ setuptools ]; From d5c9d7c54036242a846b5cf8af2992c7682845ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Oct 2024 21:42:43 +0200 Subject: [PATCH 094/106] python312Packages.python-benedict: refactor --- .../python-modules/python-benedict/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index e00f202b18a3..5f488ef1741e 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { version = "0.34.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fabiocaccamo"; @@ -39,11 +39,9 @@ buildPythonPackage rec { pythonRelaxDeps = [ "boto3" ]; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ python-fsutil python-slugify requests From 6f826631587b63fc813bb08fbf0b9ef08edd3468 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Oct 2024 21:44:23 +0200 Subject: [PATCH 095/106] python312Packages.pydeps: refactor --- pkgs/development/python-modules/pydeps/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index 54d379b1b6de..f2633d060b14 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { version = "2.0.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "thebjorn"; @@ -25,11 +25,11 @@ buildPythonPackage rec { hash = "sha256-ZLFcaWzu8iYBnbSh1Ua4fvFyYD5q71R/iIqzRUKRn1E="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; buildInputs = [ graphviz ]; - propagatedBuildInputs = [ + dependencies = [ graphviz stdlib-list ]; @@ -55,10 +55,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python module dependency visualization"; - mainProgram = "pydeps"; homepage = "https://github.com/thebjorn/pydeps"; changelog = "https://github.com/thebjorn/pydeps/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; + mainProgram = "pydeps"; }; } From 2a15e1fdf30ca1da966b97763aefe9d5ba2d7aa0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Oct 2024 19:53:04 +0000 Subject: [PATCH 096/106] svdtools: 0.3.18 -> 0.3.19 --- pkgs/by-name/sv/svdtools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix index b8eb3c609636..e5b37a527a60 100644 --- a/pkgs/by-name/sv/svdtools/package.nix +++ b/pkgs/by-name/sv/svdtools/package.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.3.18"; + version = "0.3.19"; src = fetchCrate { inherit version pname; - hash = "sha256-Pf5OCeIbrVtwEeo6x2xpPpbbAEnHuScC0pUb0NLdtfg="; + hash = "sha256-5s4CPV6Tke37QlyMzI6WFDb9EdRfcFDoFrmuWblbp20="; }; - cargoHash = "sha256-nQWxhfupbAE4W4hCn4KOP8MEoTfia+BfgA1QQsV9YyI="; + cargoHash = "sha256-VrOFu7LNFeH70VPdz9uJxXuRtTvxKiS1dlhCdr++7+g="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; From 3dc2d959720359f2e61254d237dc1e8ede3d883f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 18 Oct 2024 18:22:17 +0200 Subject: [PATCH 097/106] wiki-js: unpack into `source` We effectively copy everything into `$out` (but this isn't using `buildCommand` to allow applying custom patches). However, this had the effect that `env-vars` was also copied into `$out` retaining a reference to the source tarball. Removing that reduces the closure size from 765.5M to 388.8M, i.e. by about 50.7%. --- pkgs/servers/web-apps/wiki-js/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 23d96bc39ef7..362230da8dd2 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-beP9k1msJjg9IQbU/CmzTodjMvUnWrLYcw0EleR1OJk="; }; + # Unpack the tarball into a subdir. All the contents are copied into `$out`. + # Unpacking into the parent directory would also copy `env-vars` into `$out` + # in the `installPhase` which ultimately means that the package retains + # references to build tools and the tarball. + preUnpack = '' + mkdir source + cd source + ''; + sourceRoot = "."; dontBuild = true; From 06901941793d8249c4758aa7b78bf49902d59277 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 18 Oct 2024 22:51:03 +0200 Subject: [PATCH 098/106] grafana-image-renderer: 3.11.5 -> 3.11.6 ChangeLog: https://github.com/grafana/grafana-image-renderer/releases/tag/v3.11.6 --- pkgs/servers/monitoring/grafana-image-renderer/default.nix | 6 +++--- pkgs/servers/monitoring/grafana-image-renderer/package.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 0c949ed7ce9f..833553b24e20 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -7,18 +7,18 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.11.5"; + version = "3.11.6"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-ARrK6eL5G/IdJ4AgcpgyfCNA0cDBdj4bM1elFuXDCmM="; + hash = "sha256-jHACiSTZHNHj61kN8zEjGb3NpkhRJrJ7Mp0pNmJXDXY="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-+WxZ5gJgRBhKy9igkw8r/J7r1R/L/EYL3AGjCuwmMb0="; + hash = "sha256-h4i27yNnVU+h5/oboAq6S4+dqjkvJ6TFqtljM3ffgTI="; }; packageJSON = ./package.json; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index 48e49521f942..e662b6b4645c 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -30,8 +30,8 @@ "@hapi/boom": "^10.0.0", "@puppeteer/browsers": "^2.3.1", "chokidar": "^3.5.2", - "dompurify": "^2.4.0", - "express": "^4.21.0", + "dompurify": "^2.5.4", + "express": "^4.21.1", "express-prom-bundle": "^6.5.0", "jimp": "^0.22.12", "jsdom": "20.0.0", From 5d9990a7fe231ae2fdf04e480ca4b526c1bca4be Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 18 Oct 2024 13:44:09 -0700 Subject: [PATCH 099/106] dnslookup: init at 1.11.1 --- pkgs/by-name/dn/dnslookup/package.nix | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/dn/dnslookup/package.nix diff --git a/pkgs/by-name/dn/dnslookup/package.nix b/pkgs/by-name/dn/dnslookup/package.nix new file mode 100644 index 000000000000..8491c0597a69 --- /dev/null +++ b/pkgs/by-name/dn/dnslookup/package.nix @@ -0,0 +1,28 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "dnslookup"; + version = "1.11.1"; + + src = fetchFromGitHub { + owner = "ameshkov"; + repo = "dnslookup"; + rev = "refs/tags/v${version}"; + hash = "sha256-zgEW4ANIlwF0f6YqTQicGhGgLc9RaL7Xy0wg/ICzOK4="; + }; + + vendorHash = "sha256-pdnKYsXBw/IjakUyQym4thnO3gXgvwNm80Ha8AUVt54="; + + meta = { + changelog = "https://github.com/ameshkov/dnslookup/releases/tag/v${version}"; + description = "Simple command line utility to make DNS lookups to the specified server"; + homepage = "https://github.com/ameshkov/dnslookup"; + license = lib.licenses.mit; + mainProgram = "dnslookup"; + maintainers = [ lib.maintainers.philiptaron ]; + }; +} From 346b6ef4d9cab3c082124ca0b6b791c0c102f2c0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 18 Oct 2024 23:05:04 +0200 Subject: [PATCH 100/106] python312Packages.cohere: 5.11.0 -> 5.11.1 Diff: https://github.com/cohere-ai/cohere-python/compare/refs/tags/5.11.0...5.11.1 Changelog: https://github.com/cohere-ai/cohere-python/releases/tag/5.11.1 --- pkgs/development/python-modules/cohere/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 90b3423ac353..9c28b1abc040 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -7,7 +7,6 @@ poetry-core, # dependencies - boto3, fastavro, httpx, httpx-sse, @@ -15,7 +14,6 @@ pydantic, pydantic-core, requests, - sagemaker, tokenizers, types-requests, typing-extensions, @@ -23,20 +21,19 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.11.0"; + version = "5.11.1"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; rev = "refs/tags/${version}"; - hash = "sha256-KhONCdIGKYbIcFG+zv6uXSiX+crsmgPZUU+5NsSWaA8="; + hash = "sha256-3fYc0jOfmQ8wnKb5JZY+fXoN+8dXhJi5bj2TJHJaOEo="; }; build-system = [ poetry-core ]; dependencies = [ - boto3 fastavro httpx httpx-sse @@ -44,7 +41,6 @@ buildPythonPackage rec { pydantic pydantic-core requests - sagemaker tokenizers types-requests typing-extensions From b5408dc9b6eaef8ad1e675827d5cd45d87fe761c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 19 Oct 2024 00:47:53 +0200 Subject: [PATCH 101/106] typst: format --- pkgs/by-name/ty/typst/package.nix | 45 ++++++++++++++++++------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix index de06edfee2f3..a7cb34ccb9e0 100644 --- a/pkgs/by-name/ty/typst/package.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -1,13 +1,14 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -, pkg-config -, openssl -, xz -, stdenv -, darwin -, nix-update-script +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + pkg-config, + openssl, + xz, + stdenv, + darwin, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -33,14 +34,16 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ - openssl - xz - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = + [ + openssl + xz + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.Security + ]; env = { GEN_ARTIFACTS = "artifacts"; @@ -73,6 +76,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/typst/typst"; license = lib.licenses.asl20; mainProgram = "typst"; - maintainers = with lib.maintainers; [ drupol figsoda kanashimia ]; + maintainers = with lib.maintainers; [ + drupol + figsoda + kanashimia + ]; }; } From 453c8177dcca7e0f149e97e40390ee671b3b8204 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 19 Oct 2024 00:48:06 +0200 Subject: [PATCH 102/106] typst: 0.11.1 -> 0.12.0 Diff: https://github.com/typst/typst/compare/v0.11.1...v0.12.0 Changelog: https://github.com/typst/typst/releases/tag/v0.12.0 --- pkgs/by-name/ty/typst/Cargo.lock | 1431 ++++++++++++++++------------- pkgs/by-name/ty/typst/package.nix | 18 +- 2 files changed, 828 insertions(+), 621 deletions(-) diff --git a/pkgs/by-name/ty/typst/Cargo.lock b/pkgs/by-name/ty/typst/Cargo.lock index a613f4d957ba..5685a9cd2202 100644 --- a/pkgs/by-name/ty/typst/Cargo.lock +++ b/pkgs/by-name/ty/typst/Cargo.lock @@ -3,16 +3,28 @@ version = 3 [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "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.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -34,47 +46,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -94,24 +107,27 @@ name = "arbitrary" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "az" @@ -121,21 +137,15 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "biblatex" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27fe7285040d0227cd8b5395e1c4783f44f0b673eca5a657f4432ae401f2b7b8" +checksum = "a35a7317fcbdbef94b60d0dd0a658711a936accfce4a631fea4bf8e527eff3c2" dependencies = [ "numerals", "paste", @@ -176,9 +186,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -197,15 +207,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +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.14.3" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -214,13 +230,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] -name = "cc" -version = "1.0.90" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "cc" +version = "1.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -249,14 +272,14 @@ checksum = "7588475145507237ded760e52bf2f1085495245502033756d28ea72ade0e498b" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -288,19 +311,19 @@ dependencies = [ [[package]] name = "citationberg" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d259fe9fd78ffa05a119581d20fddb50bfba428311057b12741ffb9015123d0b" +checksum = "92fea693c83bd967604be367dc1e1b4895625eabafec2eec66c51092e18e700e" dependencies = [ - "quick-xml", + "quick-xml 0.36.2", "serde", ] [[package]] name = "clap" -version = "4.5.2" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" dependencies = [ "clap_builder", "clap_derive", @@ -308,30 +331,31 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" dependencies = [ "anstream", "anstyle", "clap_lex", "strsim", + "terminal_size", ] [[package]] name = "clap_complete" -version = "4.5.1" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" +checksum = "74a01f4f9ee6c066d42a1c8dedf0dcddad16c72a8981a309d6398de3a75b0c39" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", "proc-macro2", @@ -341,15 +365,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clap_mangen" -version = "0.2.20" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dd95b5ebb5c1c54581dd6346f3ed6a79a3eef95dd372fc2ac13d535535300e" +checksum = "f17415fd4dfbea46e3274fcd8d368284519b358654772afb700dc2e8d2b24eeb" dependencies = [ "clap", "roff", @@ -371,6 +395,27 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "color-print" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee543c60ff3888934877a5671f45494dd27ed4ba25c6670b9a7576b7ed7a8c0" +dependencies = [ + "color-print-proc-macro", +] + +[[package]] +name = "color-print-proc-macro" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ff1a80c5f3cb1ca7c06ffdd71b6a6dd6d8f896c42141fbd43f50ed28dcdb93" +dependencies = [ + "nom", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -379,9 +424,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "comemo" @@ -392,7 +437,7 @@ dependencies = [ "comemo-macros", "once_cell", "parking_lot", - "siphasher 1.0.0", + "siphasher 1.0.1", ] [[package]] @@ -418,9 +463,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core_maths" @@ -433,18 +478,18 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -470,9 +515,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -516,6 +561,17 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "dirs" version = "5.0.1" @@ -539,9 +595,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -550,24 +606,24 @@ dependencies = [ [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "ecow" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba31a30727c42ff5e60468d695c7f21e43a6db2808b7195adcab908fbd9f794" +checksum = "54bfbb1708988623190a6c4dbedaeaf0f53c20c6395abd6a01feb327b3146f4b" dependencies = [ "serde", ] [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embedded-io" @@ -575,6 +631,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "enum-ordinalize" version = "4.3.0" @@ -613,9 +675,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -639,45 +701,36 @@ checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" [[package]] name = "fastrand" -version = "1.9.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" dependencies = [ "simd-adler32", ] [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -697,18 +750,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ "roxmltree", ] [[package]] name = "fontdb" -version = "0.16.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +checksum = "37be9fc20d966be438cd57a45767f73349477fb0f85ce86e000557f787298afb" dependencies = [ "fontconfig-parser", "log", @@ -774,25 +827,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +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" @@ -805,9 +848,9 @@ dependencies = [ [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -821,24 +864,33 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" [[package]] name = "hayagriva" -version = "0.5.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0d20c98b77b86ce737876b2a1653e2e6abbeee84afbb39d72111091191c97a" +checksum = "7a3635c2577f77499c9dc3dceeef2e64e6c146e711b1861507a0f15b20641348" dependencies = [ "biblatex", "ciborium", "citationberg", - "indexmap 2.2.5", + "indexmap 2.6.0", "numerals", "paste", "serde", - "serde_yaml 0.9.32", + "serde_yaml 0.9.34+deprecated", "thiserror", "unic-langid", "unicode-segmentation", @@ -848,9 +900,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hypher" @@ -860,9 +912,9 @@ checksum = "3b24ad5637230df201ab1034d593f1d09bf7f2a9274f2e8897638078579f4265" [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -883,9 +935,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "137d96353afc8544d437e8a99eceb10ab291352699573b0de5b08bda38c78c60" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" dependencies = [ "displaydoc", "serde", @@ -896,9 +948,9 @@ dependencies = [ [[package]] name = "icu_locid" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" dependencies = [ "displaydoc", "litemap", @@ -909,9 +961,9 @@ dependencies = [ [[package]] name = "icu_locid_transform" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" dependencies = [ "displaydoc", "icu_locid", @@ -923,15 +975,15 @@ dependencies = [ [[package]] name = "icu_locid_transform_data" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" [[package]] name = "icu_properties" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976e296217453af983efa25f287a4c1da04b9a63bf1ed63719455068e4453eb5" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" dependencies = [ "displaydoc", "icu_collections", @@ -945,15 +997,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a86c0e384532b06b6c104814f9c1b13bcd5b64409001c0d05713a1f3529d99" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" [[package]] name = "icu_provider" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" dependencies = [ "displaydoc", "icu_locid", @@ -970,9 +1022,9 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a229f978260da7c3aabb68cb7dc7316589936680570fe55e50fdd3f97711a4dd" +checksum = "d6324dfd08348a8e0374a447ebd334044d766b1839bb8d5ccf2482a99a77c0bc" dependencies = [ "icu_locid", "icu_locid_transform", @@ -983,9 +1035,9 @@ dependencies = [ [[package]] name = "icu_provider_blob" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7202cddda672db167c6352719959e9b01cb1ca576d32fa79103f61b5a73601" +checksum = "c24b98d1365f55d78186c205817631a4acf08d7a45bdf5dc9dcf9c5d54dccf51" dependencies = [ "icu_provider", "postcard", @@ -997,9 +1049,9 @@ dependencies = [ [[package]] name = "icu_provider_macros" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", @@ -1008,9 +1060,9 @@ dependencies = [ [[package]] name = "icu_segmenter" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2dc1e8f4ba33a6a4956770ac5c08570f255d6605519fb3a859a0c0a270a2f8f" +checksum = "a717725612346ffc2d7b42c94b820db6908048f39434504cb130e8b46256b0de" dependencies = [ "core_maths", "displaydoc", @@ -1025,9 +1077,9 @@ dependencies = [ [[package]] name = "icu_segmenter_data" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3673d6698dcffce08cfe8fc5da3c11c3f2c663d5d6137fd58ab2cbf44235ab46" +checksum = "f739ee737260d955e330bc83fdeaaf1631f7fb7ed218761d3c04bb13bb7d79df" [[package]] name = "idna" @@ -1047,24 +1099,35 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "image" -version = "0.24.9" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", - "gif 0.13.1", - "jpeg-decoder", + "gif", "num-traits", "png", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +dependencies = [ + "byteorder-lite", + "quick-error", ] [[package]] name = "imagesize" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" +checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" [[package]] name = "indexmap" @@ -1078,12 +1141,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.15.0", "rayon", "serde", ] @@ -1114,15 +1177,6 @@ dependencies = [ "libc", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "is-docker" version = "0.2.0" @@ -1143,31 +1197,31 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.10" +name = "is_terminal_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] -[[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" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1203,39 +1257,34 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.9.5" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f" dependencies = [ "arrayvec", + "smallvec", ] -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - [[package]] name = "libc" -version = "0.2.153" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libdeflate-sys" -version = "1.19.3" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9caa76c8cc6ee8c4efcf8f4514a812ebcad3aa7d3b548efe4d26da1203f177" +checksum = "7b14a6afa4e2e1d343fd793a1c0a7e5857a73a2697c2ff2c98ac00d6c4ecc820" dependencies = [ "cc", ] [[package]] name = "libdeflater" -version = "1.19.3" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265a985bd31e5f22e2b2ac107cbed44c6ccf40ae236e46963cd00dd213e4bd03" +checksum = "a17fe2badabdaf756f620748311e99ef99a5fdd681562dfd343fdb16ed7d4797" dependencies = [ "libdeflate-sys", ] @@ -1259,24 +1308,15 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "libc", "redox_syscall", ] -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -1285,15 +1325,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lipsum" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5e9ef2d2ad6fe67a59ace27c203c8d3a71d195532ee82e3bbe0d5f9a9ca541" +checksum = "636860251af8963cc40f6b4baadee105f02e21b28131d76eba8e40ce84ab8064" dependencies = [ "rand", "rand_chacha", @@ -1301,28 +1341,34 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" dependencies = [ "serde", ] [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", ] [[package]] -name = "log" -version = "0.4.21" +name = "lockfree-object-pool" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lzma-sys" @@ -1337,26 +1383,32 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] [[package]] -name = "miniz_oxide" -version = "0.7.2" +name = "minimal-lexical" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", "simd-adler32", ] @@ -1372,6 +1424,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "multi-stash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685a9ac4b61f4e728e1d2c6a7844609c16527aeb5e6c865915c08e619c16410f" + [[package]] name = "mutate_once" version = "0.1.1" @@ -1380,11 +1438,10 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -1396,13 +1453,23 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "notify" version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -1417,11 +1484,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -1432,6 +1498,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "num-integer" version = "0.1.46" @@ -1443,9 +1520,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1458,15 +1535,18 @@ checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] [[package]] name = "open" -version = "5.1.1" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b3fbb0d52bf0cbb5225ba3d2c303aa136031d43abff98284332a9981ecddec" +checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" dependencies = [ "is-wsl", "libc", @@ -1475,11 +1555,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -1507,18 +1587,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.3+3.2.1" +version = "300.3.2+3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.101" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -1535,14 +1615,16 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "oxipng" -version = "9.0.0" +version = "9.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28e5c341ef78a228e47a551bfd15ff885d8c501af49f953358763a538c01f14d" +checksum = "ec25597808aff9f632f018f0fe8985c6f670598ac5241d220a9f2d32ff46812e" dependencies = [ "bitvec", + "clap", + "clap_mangen", "crossbeam-channel", "filetime", - "indexmap 2.2.5", + "indexmap 2.6.0", "libdeflater", "log", "rayon", @@ -1554,9 +1636,9 @@ dependencies = [ [[package]] name = "palette" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" +checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6" dependencies = [ "approx", "fast-srgb8", @@ -1566,10 +1648,11 @@ dependencies = [ [[package]] name = "palette_derive" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" +checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30" dependencies = [ + "by_address", "proc-macro2", "quote", "syn", @@ -1577,9 +1660,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1587,22 +1670,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" @@ -1612,11 +1695,11 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pdf-writer" -version = "0.9.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644b654f2de28457bf1e25a4905a76a563d1128a33ce60cf042f721f6818feaf" +checksum = "be17f48d7fbbd22c6efedb58af5d409aa578e407f40b29a0bcb4e66ed84c5c98" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "itoa", "memchr", "ryu", @@ -1678,38 +1761,37 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pixglyph" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e0f8ad4c197db38125b880c3c44544788665c7d5f4c42f5a35da44bca1a712" +checksum = "d15afa937836bf3d876f5a04ce28810c06045857bf46c3d0d31073b8aada5494" dependencies = [ "ttf-parser", ] [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plist" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", - "indexmap 2.2.5", - "line-wrap", - "quick-xml", + "base64", + "indexmap 2.6.0", + "quick-xml 0.32.0", "serde", "time", ] [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -1720,18 +1802,19 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "postcard" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" dependencies = [ "cobs", - "embedded-io", + "embedded-io 0.4.0", + "embedded-io 0.6.1", "serde", ] @@ -1743,24 +1826,27 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "psm" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" dependencies = [ "cc", ] @@ -1771,7 +1857,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "getopts", "memchr", "unicase", @@ -1784,10 +1870,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edecfcd5d755a5e5d98e24cf43113e7cdaec5a070edd0f6b250c03a573da30fa" [[package]] -name = "quick-xml" -version = "0.31.0" +name = "quick-error" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quick-xml" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", "serde", @@ -1795,9 +1896,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -1835,9 +1936,9 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "rayon" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -1855,18 +1956,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -1875,9 +1976,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -1887,9 +1988,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -1898,47 +1999,57 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "resvg" -version = "0.38.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c34501046959e06470ba62a2dc7f31c15f94ac250d842a45f9e012f4ee40c1e" +checksum = "c7314563c59c7ce31c18e23ad3dd092c37b928a0fa4e1c0a1a6504351ab411d1" dependencies = [ - "gif 0.12.0", - "jpeg-decoder", + "gif", + "image-webp", "log", "pico-args", - "png", "rgb", "svgtypes", "tiny-skia", "usvg", + "zune-jpeg", ] [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] [[package]] name = "roff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" +checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" [[package]] name = "roxmltree" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" + +[[package]] +name = "rust_decimal" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" +dependencies = [ + "arrayvec", + "num-traits", +] [[package]] name = "rustc-hash" @@ -1948,20 +2059,20 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -1970,18 +2081,20 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustybuzz" -version = "0.12.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +checksum = "c85d1ccd519e61834798eb52c4e886e8c2d7d698dd3d6ce0b1b47eb8557f1181" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "bytemuck", + "core_maths", + "log", "smallvec", "ttf-parser", "unicode-bidi-mirroring", @@ -1992,15 +2105,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -2013,11 +2120,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2028,11 +2135,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -2041,9 +2148,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -2051,35 +2158,35 @@ dependencies = [ [[package]] name = "self-replace" -version = "1.3.7" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525db198616b2bcd0f245daf7bfd8130222f7ee6af9ff9984c19a61bf1160c55" +checksum = "03ec815b5eab420ab893f63393878d89c90fdd94c0bcc44c07abb8ad95552fb7" dependencies = [ - "fastrand 1.9.0", + "fastrand", "tempfile", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -2088,20 +2195,21 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -2120,11 +2228,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.32" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.6.0", "itoa", "ryu", "serde", @@ -2137,6 +2245,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "simd-adler32" version = "0.3.7" @@ -2160,9 +2274,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "siphasher" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slotmap" @@ -2175,9 +2289,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "spin" @@ -2193,15 +2307,15 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" dependencies = [ "cc", "cfg-if", "libc", "psm", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -2214,25 +2328,36 @@ dependencies = [ ] [[package]] -name = "strsim" -version = "0.11.0" +name = "string-interner" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "1c6a0d765f5807e98a091107bae0a56ea3799f66a5de47b2c84c94a39c09974e" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.1" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ "heck", "proc-macro2", @@ -2243,40 +2368,45 @@ dependencies = [ [[package]] name = "subsetter" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" +checksum = "74f98178f34057d4d4de93d68104007c6dea4dfac930204a69ab4622daefa648" [[package]] name = "svg2pdf" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba36b330062be8497fd96597227a757b621b86c4d24d164b06e4522b52b3693e" +checksum = "5014c9dadcf318fb7ef8c16438e95abcc9de1ae24d60d5bccc64c55100c50364" dependencies = [ + "fontdb", "image", + "log", "miniz_oxide", "once_cell", "pdf-writer", "resvg", + "siphasher 1.0.1", + "subsetter", "tiny-skia", + "ttf-parser", "usvg", ] [[package]] name = "svgtypes" -version = "0.13.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" dependencies = [ "kurbo", - "siphasher 0.3.11", + "siphasher 1.0.1", ] [[package]] name = "syn" -version = "2.0.52" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -2324,9 +2454,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -2335,14 +2465,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", - "fastrand 2.0.1", + "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2355,19 +2486,35 @@ dependencies = [ ] [[package]] -name = "thiserror" -version = "1.0.57" +name = "terminal_size" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +dependencies = [ + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thin-vec" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" + +[[package]] +name = "thiserror" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -2433,9 +2580,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", "serde", @@ -2444,9 +2591,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -2459,9 +2606,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.10" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -2471,20 +2618,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", @@ -2493,15 +2640,18 @@ dependencies = [ [[package]] name = "ttf-parser" -version = "0.20.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" +dependencies = [ + "core_maths", +] [[package]] name = "two-face" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37bed2135b2459c7eefba72c906d374697eb15949c205f2f124e3636a46b5eeb" +checksum = "0ccd4843ea031c609fe9c16cae00e9657bad8a9f735a3cc2e420955d802b4268" dependencies = [ "once_cell", "serde", @@ -2516,15 +2666,18 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typst" -version = "0.11.1" +version = "0.12.0" dependencies = [ + "arrayvec", "az", - "bitflags 2.4.2", + "bitflags 2.6.0", + "bumpalo", "chinese-number", "ciborium", "comemo", "csv", "ecow", + "flate2", "fontdb", "hayagriva", "hypher", @@ -2535,7 +2688,7 @@ dependencies = [ "icu_segmenter", "if_chain", "image", - "indexmap 2.2.5", + "indexmap 2.6.0", "kamadak-exif", "kurbo", "lipsum", @@ -2549,11 +2702,12 @@ dependencies = [ "rayon", "regex", "roxmltree", + "rust_decimal", "rustybuzz", "serde", "serde_json", - "serde_yaml 0.9.32", - "siphasher 1.0.0", + "serde_yaml 0.9.34+deprecated", + "siphasher 1.0.1", "smallvec", "stacker", "syntect", @@ -2567,41 +2721,41 @@ dependencies = [ "typst-macros", "typst-syntax", "typst-timing", + "typst-utils", "unicode-bidi", "unicode-math-class", "unicode-script", "unicode-segmentation", + "unscanny", "usvg", "wasmi", + "xmlwriter", ] [[package]] name = "typst-assets" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3061f8d268e8eec7481c9ab24540455cb4912983c49aae38fa6e8bf8ef4d9c" +checksum = "4fe00da1b24da2c4a7da532fc33d0c3bd43a902ca4c408ee2c36eabe70f2f4ba" [[package]] name = "typst-cli" -version = "0.11.1" +version = "0.12.0" dependencies = [ "chrono", "clap", "clap_complete", "clap_mangen", "codespan-reporting", + "color-print", "comemo", "dirs", "ecow", - "env_proxy", - "flate2", - "fontdb", "fs_extra", "native-tls", "notify", "once_cell", "open", - "openssl", "parking_lot", "pathdiff", "rayon", @@ -2610,13 +2764,14 @@ dependencies = [ "semver", "serde", "serde_json", - "serde_yaml 0.9.32", + "serde_yaml 0.9.34+deprecated", "shell-escape", "tar", "tempfile", "toml", "typst", "typst-assets", + "typst-kit", "typst-macros", "typst-pdf", "typst-render", @@ -2629,12 +2784,12 @@ dependencies = [ [[package]] name = "typst-dev-assets" -version = "0.11.1" -source = "git+https://github.com/typst/typst-dev-assets?tag=v0.11.1#35caed3a870d46e827cffaa9dc450e38bede2a37" +version = "0.12.0" +source = "git+https://github.com/typst/typst-dev-assets?tag=v0.12.0#b07d1560143d6883887358d30edb25cb12fcf5b9" [[package]] name = "typst-docs" -version = "0.11.1" +version = "0.12.0" dependencies = [ "clap", "comemo", @@ -2644,7 +2799,7 @@ dependencies = [ "pulldown-cmark", "serde", "serde_json", - "serde_yaml 0.9.32", + "serde_yaml 0.9.34+deprecated", "syntect", "typed-arena", "typst", @@ -2657,7 +2812,7 @@ dependencies = [ [[package]] name = "typst-fuzz" -version = "0.11.1" +version = "0.12.0" dependencies = [ "comemo", "libfuzzer-sys", @@ -2669,7 +2824,7 @@ dependencies = [ [[package]] name = "typst-ide" -version = "0.11.1" +version = "0.12.0" dependencies = [ "comemo", "ecow", @@ -2683,9 +2838,29 @@ dependencies = [ "unscanny", ] +[[package]] +name = "typst-kit" +version = "0.12.0" +dependencies = [ + "dirs", + "ecow", + "env_proxy", + "flate2", + "fontdb", + "native-tls", + "once_cell", + "openssl", + "tar", + "typst", + "typst-assets", + "typst-timing", + "typst-utils", + "ureq", +] + [[package]] name = "typst-macros" -version = "0.11.1" +version = "0.12.0" dependencies = [ "heck", "proc-macro2", @@ -2695,16 +2870,19 @@ dependencies = [ [[package]] name = "typst-pdf" -version = "0.11.1" +version = "0.12.0" dependencies = [ - "base64 0.22.0", + "arrayvec", + "base64", "bytemuck", "comemo", "ecow", "image", + "indexmap 2.6.0", "miniz_oxide", "once_cell", "pdf-writer", + "serde", "subsetter", "svg2pdf", "ttf-parser", @@ -2712,18 +2890,16 @@ dependencies = [ "typst-assets", "typst-macros", "typst-timing", - "unicode-properties", "unscanny", "xmp-writer", ] [[package]] name = "typst-render" -version = "0.11.1" +version = "0.12.0" dependencies = [ "bytemuck", "comemo", - "flate2", "image", "pixglyph", "resvg", @@ -2738,9 +2914,9 @@ dependencies = [ [[package]] name = "typst-svg" -version = "0.11.1" +version = "0.12.0" dependencies = [ - "base64 0.22.0", + "base64", "comemo", "ecow", "flate2", @@ -2754,12 +2930,13 @@ dependencies = [ [[package]] name = "typst-syntax" -version = "0.11.1" +version = "0.12.0" dependencies = [ - "comemo", "ecow", "once_cell", "serde", + "toml", + "typst-utils", "unicode-ident", "unicode-math-class", "unicode-script", @@ -2769,7 +2946,7 @@ dependencies = [ [[package]] name = "typst-tests" -version = "0.11.1" +version = "0.12.0" dependencies = [ "clap", "comemo", @@ -2778,6 +2955,7 @@ dependencies = [ "oxipng", "parking_lot", "rayon", + "regex", "tiny-skia", "ttf-parser", "typst", @@ -2792,7 +2970,7 @@ dependencies = [ [[package]] name = "typst-timing" -version = "0.11.1" +version = "0.12.0" dependencies = [ "parking_lot", "serde", @@ -2800,20 +2978,31 @@ dependencies = [ "typst-syntax", ] +[[package]] +name = "typst-utils" +version = "0.12.0" +dependencies = [ + "once_cell", + "portable-atomic", + "rayon", + "siphasher 1.0.1", + "thin-vec", +] + [[package]] name = "unic-langid" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" dependencies = [ "unic-langid-impl", ] [[package]] name = "unic-langid-impl" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" dependencies = [ "serde", "tinystr", @@ -2830,27 +3019,27 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-bidi-mirroring" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f" [[package]] name = "unicode-ccc" -version = "0.1.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" +checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-math-class" @@ -2860,30 +3049,30 @@ checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-script" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" +checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-vo" @@ -2893,15 +3082,15 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "unscanny" @@ -2911,11 +3100,11 @@ checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" [[package]] name = "ureq" -version = "2.9.6" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ - "base64 0.21.7", + "base64", "flate2", "log", "native-tls", @@ -2927,9 +3116,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -2939,62 +3128,29 @@ dependencies = [ [[package]] name = "usvg" -version = "0.38.0" +version = "0.43.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" +checksum = "6803057b5cbb426e9fb8ce2216f3a9b4ca1dd2c705ba3cbebc13006e437735fd" dependencies = [ + "base64", "data-url", "flate2", + "fontdb", "imagesize", "kurbo", "log", + "pico-args", "roxmltree", - "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 = [ + "simplecss", + "siphasher 1.0.1", "strict-num", "svgtypes", "tiny-skia-path", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "xmlwriter", ] [[package]] @@ -3005,9 +3161,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "vcpkg" @@ -3017,9 +3173,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -3039,19 +3195,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -3064,9 +3221,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3074,9 +3231,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -3087,34 +3244,43 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasmi" -version = "0.31.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" +checksum = "dbaac6e702fa7b52258e5ac90d6e20a40afb37a1fbe7c645d0903ee42c5f85f4" dependencies = [ + "arrayvec", + "multi-stash", + "num-derive", + "num-traits", "smallvec", "spin", - "wasmi_arena", + "wasmi_collections", "wasmi_core", "wasmparser-nostd", ] [[package]] -name = "wasmi_arena" -version = "0.4.1" +name = "wasmi_collections" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" +checksum = "8ff59e30e550a509cc689ec638e5042be4d78ec9f6dd8a71fd02ee28776a74fd" +dependencies = [ + "ahash", + "hashbrown 0.14.5", + "string-interner", +] [[package]] name = "wasmi_core" -version = "0.13.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +checksum = "13e10c674add0f92f47bf8ad57c55ee3ac1762a0d9baf07535e27e22b758a916" dependencies = [ "downcast-rs", "libm", @@ -3124,9 +3290,9 @@ dependencies = [ [[package]] name = "wasmparser-nostd" -version = "0.100.1" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" dependencies = [ "indexmap-nostd", ] @@ -3137,44 +3303,22 @@ 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.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "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.4", + "windows-targets 0.52.6", ] [[package]] @@ -3192,7 +3336,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "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]] @@ -3212,17 +3365,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "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]] @@ -3233,9 +3387,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3245,9 +3399,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -3257,9 +3411,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +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" @@ -3269,9 +3429,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -3281,9 +3441,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -3293,9 +3453,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -3305,24 +3465,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] [[package]] name = "writeable" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "wyz" @@ -3358,9 +3518,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xmp-writer" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4543ba138f64a94b19e1e9c66c165bca7e03d470e1c066cb76ea279d9d0e1989" +checksum = "8254499146a4fd0c86e3e99cf4a9f468f595808fb49ff8f3e495f2b117bf4ebc" [[package]] name = "xz2" @@ -3392,9 +3552,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" dependencies = [ "serde", "stable_deref_trait", @@ -3404,9 +3564,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", @@ -3415,19 +3575,40 @@ dependencies = [ ] [[package]] -name = "zerofrom" -version = "0.1.3" +name = "zerocopy" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +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.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", @@ -3437,9 +3618,9 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0594125a0574fb93059c92c588ab209cc036a23d1baeb3410fa9181bea551a0" +checksum = "fb594dd55d87335c5f60177cee24f19457a5ec10a065e0a3014722ad252d0a1f" dependencies = [ "displaydoc", "litemap", @@ -3449,9 +3630,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.10.1" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" dependencies = [ "serde", "yoke", @@ -3461,9 +3642,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", @@ -3472,24 +3653,46 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.6" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ - "byteorder", + "arbitrary", "crc32fast", "crossbeam-utils", + "displaydoc", "flate2", + "indexmap 2.6.0", + "memchr", + "thiserror", + "zopfli", ] [[package]] name = "zopfli" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c1f48f3508a3a3f2faee01629564400bc12260f6214a056d06a3aaaa6ef0736" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" dependencies = [ + "bumpalo", "crc32fast", + "lockfree-object-pool", "log", + "once_cell", "simd-adler32", - "typed-arena", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +dependencies = [ + "zune-core", ] diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix index a7cb34ccb9e0..9415daee69ca 100644 --- a/pkgs/by-name/ty/typst/package.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -9,23 +9,24 @@ stdenv, darwin, nix-update-script, + versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "typst"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "typst"; repo = "typst"; - rev = "v${version}"; - hash = "sha256-FagjVU8BJZStE/geexZERuV2P28iF/pPn2mTi1Gu9iU="; + rev = "refs/tags/v${version}"; + hash = "sha256-OfTMJ7ylVOJjL295W3Flj2upTiUQXmfkyDFSE1v8+a4="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "typst-dev-assets-0.11.1" = "sha256-SMRtitDHFpdMEoOuPBnC3RBTyZ96hb4KmMSCXpAyKfU="; + "typst-dev-assets-0.12.0" = "sha256-YLxLuhpAUzktjyprZAhZ4GjcXEDUDdLtSzc5onzLuto="; }; }; @@ -54,9 +55,6 @@ rustPlatform.buildRustPackage rec { # Fix for "Found argument '--test-threads' which wasn't expected, or isn't valid in this context" substituteInPlace tests/src/tests.rs --replace-fail 'ARGS.num_threads' 'ARGS.test_threads' substituteInPlace tests/src/args.rs --replace-fail 'num_threads' 'test_threads' - - # Fix build with Rust 1.80; remove on next release - ln -sf ${./Cargo.lock} Cargo.lock ''; postInstall = '' @@ -68,6 +66,12 @@ rustPlatform.buildRustPackage rec { cargoTestFlags = [ "--workspace" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru.updateScript = nix-update-script { }; meta = { From 3787f846140a593d5f4fb8e624e43408d02880f3 Mon Sep 17 00:00:00 2001 From: jfvillablanca <31008330+jfvillablanca@users.noreply.github.com> Date: Sat, 19 Oct 2024 08:33:40 +0800 Subject: [PATCH 103/106] pre-commit: 3.7.1 -> 4.0.1 https://github.com/pre-commit/pre-commit/releases/tag/v4.0.1 --- pkgs/tools/misc/pre-commit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 4901663d0d02..0b645519a0f5 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -18,7 +18,7 @@ with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "3.7.1"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonApplication rec { owner = "pre-commit"; repo = "pre-commit"; rev = "refs/tags/v${version}"; - hash = "sha256-+9NNXM4i6saxktF1pl93dmkrqjsErqMB6kEK3IPQTNQ="; + hash = "sha256-qMNnzAxJOS7mabHmGYZ/VkDrpaZbqTJyETSCxq/OrGQ="; }; patches = [ @@ -165,6 +165,7 @@ buildPythonApplication rec { "test_installed_from_venv" "test_uninstall_restores_legacy_hooks" "test_dotnet_" + "test_health_check_" # Expects `git commit` to fail when `pre-commit` is not in the `$PATH`, # but we use an absolute path so it's not an issue. From 2410546948c7ad76aa4142c8cdc204f2abb605eb Mon Sep 17 00:00:00 2001 From: Charles Date: Fri, 18 Oct 2024 23:10:48 -0400 Subject: [PATCH 104/106] sngrep: build with SSL support Add configure argument to build sngrep against openssl for SSL connection sniffing support --- pkgs/applications/networking/sniffers/sngrep/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index f1661582549e..1e841d10327f 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { "--enable-unicode" "--enable-ipv6" "--enable-eep" + "--with-openssl" ]; preConfigure = '' From 0cd4c27f34bca00dd3d0594a9dae3a4e1727dc7c Mon Sep 17 00:00:00 2001 From: Pierre-Etienne Meunier Date: Sat, 19 Oct 2024 05:17:12 +0200 Subject: [PATCH 105/106] Fixing JOE, the fully functional text editor, on macOS (#346118) joe: fix build on darwin Adding guards for apple --- pkgs/by-name/jo/joe/macos-fix.patch | 13 +++++++++++++ pkgs/by-name/jo/joe/package.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/by-name/jo/joe/macos-fix.patch diff --git a/pkgs/by-name/jo/joe/macos-fix.patch b/pkgs/by-name/jo/joe/macos-fix.patch new file mode 100644 index 000000000000..ff6ef95846c8 --- /dev/null +++ b/pkgs/by-name/jo/joe/macos-fix.patch @@ -0,0 +1,13 @@ +diff -Naru i/joe/tty.c w/joe/tty.c +--- ./joe/tty.c 2018-01-10 17:28:34 ++++ ../joe-i-4.6/joe/tty.c 2024-10-02 14:08:22 +@@ -6,6 +6,9 @@ + * This file is part of JOE (Joe's Own Editor) + */ + #include "types.h" ++#if defined(__APPLE__) && defined(__MACH__) ++#include ++#endif + + /* Needed for TIOCGWINSZ detection below */ + #ifdef GWINSZ_IN_SYS_IOCTL diff --git a/pkgs/by-name/jo/joe/package.nix b/pkgs/by-name/jo/joe/package.nix index 9059fe69bdce..245f8b13ea19 100644 --- a/pkgs/by-name/jo/joe/package.nix +++ b/pkgs/by-name/jo/joe/package.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1pmr598xxxm9j9dl93kq4dv36zyw0q2dh6d7x07hf134y9hhlnj9"; }; + patches = [ ./macos-fix.patch ]; + meta = with lib; { description = "Full featured terminal-based screen editor"; longDescription = '' From 5c1a387a285cd1d8c5550fab20f1a7a85488dc9d Mon Sep 17 00:00:00 2001 From: Hayden Gray <35206453+A1029384756@users.noreply.github.com> Date: Sat, 19 Oct 2024 00:05:10 -0400 Subject: [PATCH 106/106] odin: 0-unstable-2024-08-05 -> 0-unstable-2024-10-12 (#348138) --- pkgs/by-name/od/odin/package.nix | 6 +++--- pkgs/by-name/ol/ols/package.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix index 4a14bfa443aa..2e54d5e9c450 100644 --- a/pkgs/by-name/od/odin/package.nix +++ b/pkgs/by-name/od/odin/package.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation { pname = "odin"; - version = "0-unstable-2024-08-05"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; - rev = "a1c3c38f0453dcf94ba13d572fa392cb5331a878"; - hash = "sha256-LYUy/llW3BFnRx6sdTF/8QdvK/v+5/ShKJR+ZXocC+4="; + rev = "af9ae4897ad9e526d74489ddd12cfae179639ff3"; + hash = "sha256-ky3jiVk2KfOW4JjXqiCTdnbEu7bnmTVupw2r5fwyB00="; }; postPatch = diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix index ba4256065072..d6f7e9664dc2 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-08-05"; + version = "0-unstable-2024-10-12"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "5f53ba1670b4bd44f6faf589823aa404f3c1a62b"; - hash = "sha256-4Rw3eNXkmdRMLz9k1UaK6xr0KS4g4AnFpOcrWLos2jg="; + rev = "834ec9ad3f50add0ee8e44071275c318a9f35abb"; + hash = "sha256-K32coqh6eCId+Rdfbu9TnN2RHDlvxF+BDsxAoP3Xk30="; }; postPatch = ''