From f7cc5b280eaefb6a6f0c54c7c53b649ea876e694 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Mon, 20 Mar 2023 15:23:51 +0100 Subject: [PATCH 01/14] tor-browser-bundle-bin: 12.0.3 -> 12.0.4 https://blog.torproject.org/new-release-tor-browser-1204/ (cherry picked from commit 1907fe8d2558649df796ab40553b23aad2a7f911) --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index f857befa4f36..edf2d17a75da 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "12.0.3"; + version = "12.0.4"; lang = "ALL"; @@ -101,7 +101,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - hash = "sha256-bOGY/RdwD6O7QIuOiBw7OVnZfpumGGso6hwMJJwN2g0="; + hash = "sha256-VT0bD4v8SBq0emFYsxELreY4o+u+FQfyBEnSMzmRd7Y="; }; i686-linux = fetchurl { @@ -111,7 +111,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - hash = "sha256-t1tnEZtiRig2r8GNJpqT+J0XoxCLMyUsI9tX6aa0lYk="; + hash = "sha256-mi8btxI6de5iQ8HzNpvuFdJHjzi03zZJT65dsWEiDHA="; }; }; in From ec52f7c00717678b9d915a7225051e4e89fbc565 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 10 Mar 2023 22:35:21 -0300 Subject: [PATCH 02/14] shellhub-agent: 0.10.8 -> 0.11.6 Signed-off-by: Otavio Salvador (cherry picked from commit 160b8923daa94c79b2f350353c741bb41435541f) --- .../applications/networking/shellhub-agent/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 8d404d4ebd25..7b908075902e 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo120Module , fetchFromGitHub , gitUpdater , makeWrapper @@ -7,20 +7,20 @@ , libxcrypt }: -buildGoModule rec { +buildGo120Module rec { pname = "shellhub-agent"; - version = "0.10.8"; + version = "0.11.6"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "BtD22Ss5PuVx2RVLQIsUeGBJBl5lh1XHJ0vcM2bOEwk="; + sha256 = "eZLQzy3lWwGM6VWFbsJ6JuGC+/dZnoymZgNtM8CPBM4="; }; modRoot = "./agent"; - vendorSha256 = "sha256-tvKiTQioj999oIUDHUSXTMXOh/LKoykzu8JEUnrelws="; + vendorSha256 = "sha256-7kDPo24I58Nh7OiHj6Zy40jAEaXSOmbcczkgJPXBItU="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; From 39848abceb3687af3b36843df6f66753476139af Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 23 Mar 2023 18:20:09 -0300 Subject: [PATCH 03/14] shellhub-agent: 0.11.6 -> 0.11.7 Signed-off-by: Otavio Salvador (cherry picked from commit c6b64a9bfe371759fb52af271b09e1b3c1eb549c) --- pkgs/applications/networking/shellhub-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 7b908075902e..006ef3ea0a02 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -9,18 +9,18 @@ buildGo120Module rec { pname = "shellhub-agent"; - version = "0.11.6"; + version = "0.11.7"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "eZLQzy3lWwGM6VWFbsJ6JuGC+/dZnoymZgNtM8CPBM4="; + sha256 = "d5ESQQgBPUFe2tuCbeFIqiWPpr9wUczbXLc5QdXurXY="; }; modRoot = "./agent"; - vendorSha256 = "sha256-7kDPo24I58Nh7OiHj6Zy40jAEaXSOmbcczkgJPXBItU="; + vendorSha256 = "sha256-/85rIBfFBpXYrsCBDGVzXfAxO6xXQ8uTL2XeEPKQwDQ="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; From b4cce80b73b0529fc45e7b81afe0d0dcad4f6f4e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 24 Mar 2023 14:48:09 +0100 Subject: [PATCH 04/14] tailscale: 1.38.1 -> 1.38.2 (cherry picked from commit 76ca62d658eb749e4851e45d74c985febcb10bf4) --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 60815d8fab9b..998115f894c3 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.38.1"; + version = "1.38.2"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-2VTYZhC/U32fzEJCxkCB35IqQBALKXQA23SvhY57lSU="; + hash = "sha256-5WNP1wVaKKTauny/dANODMCiQmyzOcWRd83RUInoCuk="; }; vendorHash = "sha256-LIvaxSo+4LuHUk8DIZ27IaRQwaDnjW6Jwm5AEc/V95A="; From 593a0e1ebb0de7599b5b2755f9b50d242eb84fc5 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 19 Dec 2022 14:12:39 +0300 Subject: [PATCH 05/14] wsdd: add man (cherry picked from commit e8c9c38ddedfa7361fb85d19e236a0b2d108f51d) --- pkgs/servers/wsdd/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix index a0a8421a7c2b..9c6df7fedce4 100644 --- a/pkgs/servers/wsdd/default.nix +++ b/pkgs/servers/wsdd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3 }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, nixosTests, python3 }: stdenv.mkDerivation rec { pname = "wsdd"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-9cwzkF2mg6yOIsurLMXTLoEIOsKbPIWMicpWBQ0XVhE="; }; - nativeBuildInputs = [ makeWrapper ]; + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ python3 ]; @@ -22,7 +24,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' - install -Dm0755 src/wsdd.py $out/bin/wsdd + install -Dm0555 src/wsdd.py $out/bin/wsdd + installManPage man/wsdd.1 wrapProgram $out/bin/wsdd --prefix PYTHONPATH : "$PYTHONPATH" ''; From 018a60039d722d6afa75ae78b921db7df2551f91 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 24 Mar 2023 19:00:56 +0300 Subject: [PATCH 06/14] wsdd: 0.7.0 -> 0.7.1 (cherry picked from commit 376345c705ab9dfaf68cfcba68648d9c1aa71b4b) --- pkgs/servers/wsdd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix index 9c6df7fedce4..8e1f61dc5dd3 100644 --- a/pkgs/servers/wsdd/default.nix +++ b/pkgs/servers/wsdd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wsdd"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "christgau"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9cwzkF2mg6yOIsurLMXTLoEIOsKbPIWMicpWBQ0XVhE="; + hash = "sha256-xfZVGi3OxuRI+Zh6L3Ru4J4j5BB1EAN3fllRCVA/c5o="; }; outputs = [ "out" "man" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm0555 src/wsdd.py $out/bin/wsdd - installManPage man/wsdd.1 + installManPage man/wsdd.8 wrapProgram $out/bin/wsdd --prefix PYTHONPATH : "$PYTHONPATH" ''; From f476e80b1faa3166524747faf03b04660d6243d9 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 26 Mar 2023 15:27:15 +0200 Subject: [PATCH 07/14] mutt: 2.2.9 -> 2.2.10 Signed-off-by: Matthias Beyer (cherry picked from commit 3257a92f244ed8811f9fd64412583477d1325737) --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index dfa92fc42c98..131c699b54a5 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { pname = "mutt"; - version = "2.2.9"; + version = "2.2.10"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "+lMbIx1Y/h8wztoO1iZoPqnr37ds5H74uyfC93Qiz/s="; + sha256 = "sha256-TXc/IkIveQlve5S1e+5FZUrZolFl27NkY8WClbTNPYg="; }; patches = lib.optional smimeSupport (fetchpatch { From 950cdb9a606d30667f966810355ff403c41932f2 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Tue, 28 Mar 2023 03:57:11 -0300 Subject: [PATCH 08/14] argocd: 2.5.12 -> 2.5.16 Breaking change that fixes GHSA-2q5c-qw9c-fmvq https://github.com/argoproj/argo-cd/security/advisories/GHSA-2q5c-qw9c-fmvq https://github.com/argoproj/argo-cd/releases/tag/v2.5.16 https://github.com/argoproj/argo-cd/issues/13000 --- pkgs/applications/networking/cluster/argocd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 18b230f150a0..0d5d36d75324 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.5.12"; + version = "2.5.16"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-MoiXlWhPbCuD5Q/izKundNqFrbnykh1dH9eP9z9rq8M="; + sha256 = "sha256-EGCfJrfQV/c+5OZ4KQqH1+zYzKtj+7dryrPxvd0PhqY="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-rkgwfSmUmxmCxbS/0r5sU+XJTGZ6NTZ+VIXpBElT0uA="; + vendorHash = "sha256-2nITqgTI4itNBoBlLiRI5DoXQpQtaz5R4ldPNaH1OEQ="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 From 8ca81e21c7a401f6bc5a6fa00de323b9762e0676 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sun, 25 Dec 2022 20:42:42 +0100 Subject: [PATCH 09/14] stellarium: 1.1 -> 1.2 https://github.com/Stellarium/stellarium/releases/tag/v1.2 (cherry picked from commit f791b667ce8f4d041e51d7000012d7d879d3d655) --- pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 914b3f1f343c..89ba8bf0e9d9 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "stellarium"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "sha256-ellfBZWOkvlRauuwug96C7P/WjQ6dXiDnT0b3KH5zRM="; + sha256 = "sha256-0/ZSe6QfM2zVsqcbyqefl9hiuex72KPxJvVMRNCnpZg="; }; nativeBuildInputs = [ From bacc56f476a092570399bd346d90fa61b3395c0a Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 28 Mar 2023 00:03:32 +0200 Subject: [PATCH 10/14] calcmysky: 0.2.1 -> unstable-203-02-11 (cherry picked from commit 733e7c52c2f9ef8e083b7442a85e4e7711b37b89) --- pkgs/applications/science/astronomy/calcmysky/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/applications/science/astronomy/calcmysky/default.nix index 3b66284e8b0c..bcbc90fa3717 100644 --- a/pkgs/applications/science/astronomy/calcmysky/default.nix +++ b/pkgs/applications/science/astronomy/calcmysky/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "calcmysky"; - version = "0.2.1"; + version = "unstable-2023-02-11"; src = fetchFromGitHub { owner = "10110111"; repo = "CalcMySky"; - rev = "v${version}"; - hash = "sha256-7Yj6OlZ7weenekXYGhK5EWcME20oCHiLPOxz5KEuKy4="; + rev = "c5f281452816d8de775b13a70fb90e79427c93c4"; + hash = "sha256-mzxtu6YTaZpR17m2WGiSDo/bAPXGJdQskyz7aqtxGoQ="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; From 7534d6d885d7865cebad00d099eed7c037ba98ae Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 28 Mar 2023 00:13:23 +0200 Subject: [PATCH 11/14] stellarium: 1.2 -> 23.1 https://github.com/Stellarium/stellarium/releases/tag/v23.1 Mitigates https://github.com/advisories/GHSA-7vmm-m8vp-g5h3 (cherry picked from commit d19f5dedec60d27391fcadfeb61c4bcae07bf5b0) --- pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 89ba8bf0e9d9..c3880b0b1d2b 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "stellarium"; - version = "1.2"; + version = "23.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "sha256-0/ZSe6QfM2zVsqcbyqefl9hiuex72KPxJvVMRNCnpZg="; + hash = "sha256-7jzS3pRklPsCTgCr3nrywfHCNlBDHuyuGGvrVoI9+A0="; }; nativeBuildInputs = [ From 9285958fba65b19562a6828327d8dea602d422ee Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 28 Mar 2023 13:55:24 +0200 Subject: [PATCH 12/14] matrix-synapse: 1.79.0 -> 1.80.0 Signed-off-by: Sumner Evans (cherry picked from commit a991a71d04cb18241ee9cc4c7b613fe78cb86ce1) --- pkgs/servers/matrix-synapse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 9c4c2919b436..776847e43594 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,20 +11,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.79.0"; + version = "1.80.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-2MHP4Gu+C5yyXObbd7NLYWCy1E0L7fUwpzYsoD7ULDo="; + hash = "sha256-Lw6gmuI+ntOW54HQbmDoY9QYNDTu5vgtrJz6HMWWmMM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-yDKs6KRStjJMC/48dZcyQ4OmBXY1TombjH/ZDfBJbSc="; + hash = "sha256-KqPpaIJ8VuVV6f6n14/7wbA+Vtk7NvWm09bUBWuAAlY="; }; postPatch = '' From be093f200f6ac6404c5904ac4c3e745c18fffcc9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 15:03:36 -0400 Subject: [PATCH 13/14] [Backport release-22.11] Fix Rust sysroot (#222847) Co-authored-by: Astro --- .../rust/build-rust-package/sysroot/default.nix | 9 ++++++--- pkgs/build-support/rust/sysroot/Cargo.lock | 6 ++++-- pkgs/build-support/rust/sysroot/src.nix | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix b/pkgs/build-support/rust/build-rust-package/sysroot/default.nix index 1e0b901105cd..a6d53056d9c7 100644 --- a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix +++ b/pkgs/build-support/rust/build-rust-package/sysroot/default.nix @@ -1,10 +1,10 @@ -{ stdenv, rust, rustPlatform, buildPackages }: +{ lib, stdenv, rust, rustPlatform, buildPackages }: { shortTarget, originalCargoToml, target, RUSTFLAGS }: let cargoSrc = import ../../sysroot/src.nix { - inherit stdenv rustPlatform buildPackages originalCargoToml; + inherit lib stdenv rustPlatform buildPackages originalCargoToml; }; in rustPlatform.buildRustPackage { inherit target RUSTFLAGS; @@ -14,7 +14,7 @@ in rustPlatform.buildRustPackage { RUSTC_BOOTSTRAP = 1; __internal_dontAddSysroot = true; - cargoSha256 = "0y6dqfhsgk00y3fv5bnjzk0s7i30nwqc1rp0xlrk83hkh80x81mw"; + cargoSha256 = "sha256-zgkwevitxsu1C4OgGTsqNSc0gDxaNXYK1WPbfER48d0="; doCheck = false; @@ -29,4 +29,7 @@ in rustPlatform.buildRustPackage { host=${rust.toRustTarget stdenv.buildPlatform} cp -r $RUST_SYSROOT/lib/rustlib/$host $out ''; + + # allows support for cross-compilation + meta.platforms = lib.platforms.all; } diff --git a/pkgs/build-support/rust/sysroot/Cargo.lock b/pkgs/build-support/rust/sysroot/Cargo.lock index 6ec6da6ae6e2..d9b0c25d02f2 100644 --- a/pkgs/build-support/rust/sysroot/Cargo.lock +++ b/pkgs/build-support/rust/sysroot/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "alloc" version = "0.0.0" @@ -10,9 +12,9 @@ dependencies = [ [[package]] name = "compiler_builtins" -version = "0.1.52" +version = "0.1.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6591c2442ee984e2b264638a8b5e7ae44fd47b32d28e3a08e2e9c3cdb0c2fb0" +checksum = "f867ce54c09855ccd135ad4a50c777182a0c7af5ff20a8f537617bd648b10d50" dependencies = [ "rustc-std-workspace-core", ] diff --git a/pkgs/build-support/rust/sysroot/src.nix b/pkgs/build-support/rust/sysroot/src.nix index 3d11b62dd315..664702e82c31 100644 --- a/pkgs/build-support/rust/sysroot/src.nix +++ b/pkgs/build-support/rust/sysroot/src.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { + '' ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} mkdir -p $out/src - touch $out/src/lib.rs + echo '#![no_std]' > $out/src/lib.rs cp Cargo.toml $out/Cargo.toml cp ${./Cargo.lock} $out/Cargo.lock ''; From 76ccb80b90f40b7dee8d5ac4c338d5f30e870d8b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 28 Mar 2023 21:26:57 +0200 Subject: [PATCH 14/14] python3Packages.cairosvg: apply patch for CVE-2023-27586 https://github.com/Kozea/CairoSVG/security/advisories/GHSA-rwmf-w63j-p7gv --- pkgs/development/python-modules/cairosvg/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index df6600e3faac..5f0dc1c9dd67 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , isPy3k , cairocffi , cssselect2 @@ -20,6 +21,14 @@ buildPythonPackage rec { sha256 = "sha256-sLmSnPXboAUXjXRqgDb88AJVUPSYylTbYYczIjhHg7w="; }; + patches = [ + (fetchpatch { + name = "CVE-2023-27586.patch"; + url = "https://github.com/Kozea/CairoSVG/commit/12d31c653c0254fa9d9853f66b04ea46e7397255.patch"; + hash = "sha256-6ElTepPjEmhbv59jkzTnw+qhY7JlqS/lToIzZtfkh08="; + }) + ]; + propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; propagatedNativeBuildInputs = [ cairocffi ];