From 311da9300a53e5893730408880218c4681029c28 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 8 Jun 2023 09:12:00 +0300 Subject: [PATCH 01/37] monkeysAudio: 10.13 -> 10.14 --- pkgs/applications/audio/monkeys-audio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 078173025630..e20e90493054 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { - version = "10.13"; + version = "10.14"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip"; - sha256 = "sha256-r+Xjp5q7ehrF34j1FndiKZ+y+FTG1ORXS+9p+R2KbOQ="; + sha256 = "sha256-AsWBcEVyHAFzJd9PhbEA866yCGAmgJedvDUP1G7JfUY="; stripRoot = false; }; nativeBuildInputs = [ From fee71b7f5970f5c46b18ac8f0beffb8bb400c26c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 8 Jun 2023 16:58:28 +0800 Subject: [PATCH 02/37] telegram-desktop: patch for failing to open links on wayland --- .../telegram/telegram-desktop/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 3fa19c21ba7f..7f1d7f30a4a5 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -94,6 +94,15 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch"; hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y="; }) + # Bring custom xdg-activation implementation back + # Fixes https://github.com/telegramdesktop/tdesktop/issues/2635: TG desktop doen't open links + # https://github.com/desktop-app/lib_base/pull/180 + (fetchpatch { + url = "https://github.com/desktop-app/lib_base/commit/6041498fbafcd0a22df88b7973d9e8f9bdf16958.patch"; + extraPrefix = "Telegram/lib_base/"; + stripLen = 1; + hash = "sha256-9IV1T/tjN2VA7wcpbt2GRpOMC76yOzRlGWuIAa8HTX0="; + }) ]; postPatch = '' From 4101d605ceaefec0aa50b16a0428cd591ea4b722 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Jun 2023 11:34:31 +0000 Subject: [PATCH 03/37] kubeconform: 0.6.1 -> 0.6.2 --- pkgs/applications/networking/cluster/kubeconform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix index 47c6451238d1..06624f2b29f4 100644 --- a/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-98wSFntt5ERbQ7URMlRz3iMTuL1beuX2nXbdWe+6Quw="; + sha256 = "sha256-TPT+zO5WHW/D04dLMJLJ7uAYoDLky75kWqaN7PsyzEo="; }; vendorHash = null; From d5994dc91c226cc7ca9e869bad464805cf3d65c0 Mon Sep 17 00:00:00 2001 From: s1341 Date: Thu, 8 Jun 2023 14:52:17 +0300 Subject: [PATCH 04/37] python3Packages.frida-python: init at 16.0.19 --- .../python-modules/frida-python/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/frida-python/default.nix diff --git a/pkgs/development/python-modules/frida-python/default.nix b/pkgs/development/python-modules/frida-python/default.nix new file mode 100644 index 000000000000..11be528b4055 --- /dev/null +++ b/pkgs/development/python-modules/frida-python/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, fetchPypi, buildPythonPackage, typing-extensions }: +let + version = "16.0.19"; + devkit = fetchurl { + url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-linux-x86_64.tar.xz"; + hash = "sha256-yNXNqv8eCbpdQKFShpAh6rUCEuItrOSNNLOjESimPdk="; + }; +in buildPythonPackage rec { + pname = "frida-python"; + inherit version; + + src = fetchPypi { + pname = "frida"; + inherit version; + hash = "sha256-rikIjjn9wA8VL/St/2JJTcueimn+q/URbt9lw/+nalY="; + }; + + postPatch = '' + mkdir assets + pushd assets + tar xvf ${devkit} + export FRIDA_CORE_DEVKIT=$PWD + popd + ''; + + propagatedBuildInputs = [ typing-extensions ]; + + pythonImportsCheck = [ "frida" ]; + + passthru = { inherit devkit; }; + + meta = { + description = "Dynamic instrumentation toolkit for developers, reverse-engineers, and security researchers (Python bindings)"; + homepage = "https://www.frida.re"; + license = lib.licenses.wxWindows; + maintainers = with lib.maintainers; [ s1341 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e7a81ab193cd..159c399f7c43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3832,6 +3832,8 @@ self: super: with self; { freezegun = callPackage ../development/python-modules/freezegun { }; + frida-python = callPackage ../development/python-modules/frida-python { }; + frigidaire = callPackage ../development/python-modules/frigidaire { }; frilouz = callPackage ../development/python-modules/frilouz { }; From dd695d2d3a9d711d2fab669a222169ae5e96127c Mon Sep 17 00:00:00 2001 From: s1341 Date: Thu, 8 Jun 2023 14:52:36 +0300 Subject: [PATCH 05/37] frida-tools: init at 12.1.2 --- pkgs/tools/security/frida-tools/default.nix | 25 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/frida-tools/default.nix diff --git a/pkgs/tools/security/frida-tools/default.nix b/pkgs/tools/security/frida-tools/default.nix new file mode 100644 index 000000000000..dc25d3c23532 --- /dev/null +++ b/pkgs/tools/security/frida-tools/default.nix @@ -0,0 +1,25 @@ +{ lib, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "frida-tools"; + version = "12.1.2"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + hash = "sha256-9SlDyp1fLOzLqu6sxVqY2jwEzQjrnbzfQXIRoyviPJY="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + pygments + prompt_toolkit + colorama + frida-python + ]; + + meta = { + description = "Dynamic instrumentation toolkit for developers, reverse-engineers, and security researchers (client tools)"; + homepage = "https://www.frida.re/"; + maintainers = with lib.maintainers; [ s1341 ]; + license = lib.licenses.wxWindows; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 422b07501ecb..54d20ea66a1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -569,6 +569,8 @@ with pkgs; frece = callPackage ../development/tools/frece { }; + frida-tools = callPackage ../tools/security/frida-tools { }; + frink = callPackage ../development/tools/frink { }; frugal = callPackage ../development/tools/frugal { }; From d4886a06894ea17d7f908a64184a72e44c8e58ed Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 8 Jun 2023 19:56:25 +0800 Subject: [PATCH 06/37] julia_19: 1.9.0 -> 1.9.1 Diff: https://github.com/JuliaLang/julia/compare/v1.9.0...v1.9.1 --- pkgs/development/compilers/julia/1.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix index 03d7163f5c40..ba8e94e1eaac 100644 --- a/pkgs/development/compilers/julia/1.9.nix +++ b/pkgs/development/compilers/julia/1.9.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-Ii61M8ncVHNJSes6QWn1Su+hvCC+OF/Bz3mMghn+ZAA="; + hash = "sha256-oTznFrY9PkbZEIOV4f/Iod5xLmqEimA6xZK88IDqATk="; }; patches = [ From 6ea0aa6814839f3a5236c90712ecc98837ca0561 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 8 Jun 2023 16:36:27 +0300 Subject: [PATCH 07/37] julia_19-bin: 1.9.0 -> 1.9.1 --- pkgs/development/compilers/julia/1.9-bin.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/julia/1.9-bin.nix b/pkgs/development/compilers/julia/1.9-bin.nix index f80b5aaaa2b0..94a6c5d880c4 100644 --- a/pkgs/development/compilers/julia/1.9-bin.nix +++ b/pkgs/development/compilers/julia/1.9-bin.nix @@ -24,24 +24,24 @@ let in stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.9.0"; + version = "1.9.1"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - hash = "sha256-AMYURm75gJwusjSA440ZaixXf/8nMMT4PRNbkT1HM1k="; + hash = "sha256-zeFKWPiZJR8wz87YcFVib0SEV4Blnr6NUMvExnsxmXw="; }; aarch64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz"; - hash = "sha256-ChQxW1Os2X8i0m1Kj9LCN+Uk6Vw77JjS14tU2Awrw2Q="; + hash = "sha256-tkPM0+Kllg985wVSQ3Q9Cjm63aOXS849d4Yd02O63RA="; }; x86_64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz"; - hash = "sha256-ALxMJ+6xvr01BZcxL/CRkXYxX9MZnGPslj+0HjsEv68="; + hash = "sha256-STaN2u9ON+1gaAimyli6DxpEUaJ7ggGu1NnXskwnaBc="; }; aarch64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz"; - hash = "sha256-U+YncKaZDVqJ56AB72iqJd4lEmo76DggDEyacF2uo3w="; + hash = "sha256-nj4CymVGUT3OJlN5q+lXyytbDM9AZiGUhtoOuHLdzrw="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From e92a5c7766ec2138670e7decf504ed78cb89ea53 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 8 Jun 2023 10:43:13 -0400 Subject: [PATCH 08/37] sniffnet: 1.2.0 -> 1.2.1 Diff: https://github.com/gyulyvgc/sniffnet/compare/refs/tags/v1.2.0...v1.2.1 Changelog: https://github.com/gyulyvgc/sniffnet/blob/v1.2.1/CHANGELOG.md --- pkgs/applications/networking/sniffnet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/applications/networking/sniffnet/default.nix index 4b9ba6e19b65..300970402b43 100644 --- a/pkgs/applications/networking/sniffnet/default.nix +++ b/pkgs/applications/networking/sniffnet/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffnet"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "gyulyvgc"; repo = "sniffnet"; rev = "refs/tags/v${version}"; - hash = "sha256-hZK+lLH9fCEvujLuvAqkVVmRCRM9DfhCUv7JbirTIu4="; + hash = "sha256-IJfXQ/d1amm6rCdArWoHXFhN9s//7hYoWMt66mv4Bbw="; }; - cargoHash = "sha256-hAxIS9gc5EBDy00U1JSnLZYifCzJAEcwhaalzrUjT9M="; + cargoHash = "sha256-FMpTHm8eEXnVfMMY1iUkJPnRRK10u9l8tCaemM6L1gE="; nativeBuildInputs = [ pkg-config ]; From 8369ba89a06d231ec5a583584d8584107d224fab Mon Sep 17 00:00:00 2001 From: QJoly Date: Thu, 8 Jun 2023 17:21:07 +0200 Subject: [PATCH 09/37] kubetail: 1.6.16 -> 1.6.18 --- pkgs/applications/networking/cluster/kubetail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index dbf32808f941..c7858cf994d3 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kubetail"; - version = "1.6.16"; + version = "1.6.18"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; rev = version; - sha256 = "sha256-kkbhhAaiKP01LR7F5JVMgy6Ujji8JDc+Aaho1vft3XQ="; + sha256 = "sha256-Gde5thEpMX3h0e1eoC8SeDdkZfa02CmQf3ELLMeEWGU="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/johanhaleby/kubetail"; license = licenses.asl20; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ kalbasit qjoly ]; platforms = platforms.all; }; } From 7c99d4b1dc320e0c79bcbe447dbebb086f607989 Mon Sep 17 00:00:00 2001 From: QJoly Date: Thu, 8 Jun 2023 17:29:04 +0200 Subject: [PATCH 10/37] driftctl: 0.38.2 -> 0.39.0 --- pkgs/applications/networking/cluster/driftctl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index c90c93f20624..4104c40bf045 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.38.2"; + version = "0.39.0"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-PPzoZypTP3yrgU50Uv7yBNCc2nAa84quCTWjxyq9h/c="; + sha256 = "sha256-1i5x05q0Mo3E3ExM9qONRtQCH3nO7pXyNqOaAtz7qYE="; }; - vendorHash = "sha256-XVEXWBVqYoAlK4DP0GdWqJDcLy9WxCaUdNbVESJ9zoM="; + vendorHash = "sha256-H/+LORl7Bjy1NshjtWDzj13YCrlQQgtBr4+Rz/rxQkY="; nativeBuildInputs = [ installShellFiles ]; @@ -51,6 +51,6 @@ buildGoModule rec { and fills in the missing piece in your DevSecOps toolbox. ''; license = licenses.asl20; - maintainers = with maintainers; [ kaction jk ]; + maintainers = with maintainers; [ kaction jk qjoly ]; }; } From 081b93ab2e742e821f2e8c77a211ff5ba1be2bce Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Thu, 8 Jun 2023 18:41:41 +0300 Subject: [PATCH 11/37] regreet: 0.1.0 -> 0.1.1 --- pkgs/applications/display-managers/greetd/regreet.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/applications/display-managers/greetd/regreet.nix index 9fce7911a36d..a520ad88d6e1 100644 --- a/pkgs/applications/display-managers/greetd/regreet.nix +++ b/pkgs/applications/display-managers/greetd/regreet.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "regreet"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "rharish101"; repo = "ReGreet"; rev = version; - hash = "sha256-9Wae2sYiRpWYXdBKsSNKhG5RhIun/Ro9xIV4yl1/pUc="; + hash = "sha256-MPLlHYTfDyL2Uy50A4lVke9SblXCErgJ24SP3kFuIPw="; }; - cargoHash = "sha256-yDfUD5Uag3UM/2Q7ofvh6iGcB3n21m1gKo7SKqTWamc="; + cargoHash = "sha256-dR6veXCGVMr5TbCvP0EqyQKTG2XM65VHF9U2nRWyzfA="; buildFeatures = [ "gtk4_8" ]; From b9af135b1b08f18fcb87b9649f8be85ff0fe0869 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 8 Jun 2023 11:57:40 -0400 Subject: [PATCH 12/37] typos: 1.14.12 -> 1.15.0 Diff: https://github.com/crate-ci/typos/compare/v1.14.12...v1.15.0 Changelog: https://github.com/crate-ci/typos/blob/v1.15.0/CHANGELOG.md --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index eeb0179d2103..6cc5c2d8abc4 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.14.12"; + version = "1.15.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-mHgGNSG0mKuI3fIgbfcTI6rnsLiL41g6GZAyN8ZRXI0="; + hash = "sha256-SbWwrvfLawWoVuCG9b4PrA5cdc+DLqJw2uSF3oha9Po="; }; - cargoHash = "sha256-mHmnQ2hntP/FRHgKrwQHcY1+l9ukIvu8SNUSzuRbyf4="; + cargoHash = "sha256-XLnN6kCjHntqZu80Uvm95pCabjR5QMvsumb+V002N2Y="; meta = with lib; { description = "Source code spell checker"; From 13306bfd753d86233abc1dd8c6d2bb72efbb56eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Thu, 8 Jun 2023 19:56:29 +0200 Subject: [PATCH 13/37] tor-browser-bundle-bin: 12.0.6 -> 12.0.7 --- .../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 02186cc8ea2c..033bce15e173 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 = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "12.0.6"; + version = "12.0.7"; 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-MLy/T8A+udasITWYSzaqXSFhA3PJsG7DnKJG0b9UYvA="; + hash = "sha256-lo+Iy6I7S1NV1E9CBPqJjRFzuEXGC80NRUUlpZfG5wU="; }; 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-njJB5k7rQxRyL7foU8fLCQxy43dJvV26oKvQ+fw6U0o="; + hash = "sha256-aLHZUFDZZ4i7BXoM5YxPrznYw812/OGmhG97t9okOvs="; }; }; From 939969f44c5cb843bc7c9231d9fafbb70d4696eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Thu, 8 Jun 2023 20:02:12 +0200 Subject: [PATCH 14/37] tor-browser-bundle-bin: remove inactive maintainers --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 033bce15e173..1a4850cd4e96 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -469,7 +469,7 @@ stdenv.mkDerivation rec { homepage = "https://www.torproject.org/"; changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; platforms = attrNames sources; - maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 KarlJoad ]; + maintainers = with maintainers; [ joachifm hax404 ]; mainProgram = "tor-browser"; # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain From 55dbe9fbd23a8fd8fbbbecf549489f2300015497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Thu, 8 Jun 2023 20:03:07 +0200 Subject: [PATCH 15/37] tor-browser-bundle-bin: add felschr & panicgh as maintainers --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1a4850cd4e96..30fb5c538b57 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -469,7 +469,7 @@ stdenv.mkDerivation rec { homepage = "https://www.torproject.org/"; changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; platforms = attrNames sources; - maintainers = with maintainers; [ joachifm hax404 ]; + maintainers = with maintainers; [ felschr panicgh joachifm hax404 ]; mainProgram = "tor-browser"; # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain From a754690981b3eb0c09460c2bcbf14331db18a352 Mon Sep 17 00:00:00 2001 From: geri1701 Date: Thu, 8 Jun 2023 20:06:22 +0200 Subject: [PATCH 16/37] amdgpu_top: 0.1.8 -> 0.1.9 --- pkgs/tools/system/amdgpu_top/Cargo.lock | 11 +++++++---- pkgs/tools/system/amdgpu_top/default.nix | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/amdgpu_top/Cargo.lock b/pkgs/tools/system/amdgpu_top/Cargo.lock index 296f2e77cf63..3b0788defce7 100644 --- a/pkgs/tools/system/amdgpu_top/Cargo.lock +++ b/pkgs/tools/system/amdgpu_top/Cargo.lock @@ -38,7 +38,7 @@ dependencies = [ [[package]] name = "amdgpu_top" -version = "0.1.8" +version = "0.1.9" dependencies = [ "amdgpu_top_gui", "amdgpu_top_json", @@ -896,7 +896,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libamdgpu_top" -version = "0.1.7" +version = "0.1.9" dependencies = [ "anyhow", "libdrm_amdgpu_sys", @@ -910,9 +910,12 @@ checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "libdrm_amdgpu_sys" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57f94df94d4505d89064895cd70d0ac0adb70fd9cac7a14bf53f3ce78785c4a" +checksum = "fbba2720dc87ad23aaa9bbfb7f8cc25a826edfbe0fcfbb99fec1774ad1fb81a0" +dependencies = [ + "libc", +] [[package]] name = "libloading" diff --git a/pkgs/tools/system/amdgpu_top/default.nix b/pkgs/tools/system/amdgpu_top/default.nix index 25f2f8d9769c..f6397fa28ce1 100644 --- a/pkgs/tools/system/amdgpu_top/default.nix +++ b/pkgs/tools/system/amdgpu_top/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "amdgpu_top"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "Umio-Yasuno"; repo = pname; rev = "v${version}"; - hash = "sha256-QsoOqkRtIwkLn7zg4hggGLNzyjdneYYs0XfQMdIEcCM="; + hash = "sha256-RR+YK8LyrPz7Pfv8moSOPei+56088lhoz8HxoB6+0B8="; }; cargoLock.lockFile = ./Cargo.lock; From 4f78d9544a71ab8c3811092801f739d93d765154 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jun 2023 20:08:02 +0200 Subject: [PATCH 17/37] python311Packages.aiohomekit: 2.6.4 -> 2.6.5 Changelog: https://github.com/Jc2k/aiohomekit/releases/tag/2.6.5 --- pkgs/development/python-modules/aiohomekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 705e47946f26..da20aa064d81 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.6.4"; + version = "2.6.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-98VoRo3gxS70M/R0HYEK5VItJWcwMi8Z3r2eJ5lEeMw="; + hash = "sha256-Q5pz/irC+yA/A2GhGCug+jmxr4tCnPpkAV/AZEhd64A="; }; nativeBuildInputs = [ From 5be7d1d23898b0ad7acd142ec13552a98f9a1ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?= =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= Date: Thu, 8 Jun 2023 21:00:50 +0200 Subject: [PATCH 18/37] go2tv: 1.14.1 -> 1.15.0 * New Logo! * Added relative time and end time next to the slider bar * Various fixes and API improvements * Fix Android 13 issue where device discovery is not working https://github.com/alexballas/go2tv/releases/tag/v1.15.0 --- pkgs/applications/video/go2tv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/go2tv/default.nix b/pkgs/applications/video/go2tv/default.nix index 7d64d9788980..fb0db20990e4 100644 --- a/pkgs/applications/video/go2tv/default.nix +++ b/pkgs/applications/video/go2tv/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "go2tv" + lib.optionalString (!withGui) "-lite"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "alexballas"; repo = "go2tv"; rev = "v${version}"; - sha256 = "sha256-t+T3zerFvEdMYoe8GYSCGgwiXw528Lrs/EjPsXr6I98="; + sha256 = "sha256-5GOhTDlUpzInMm8hVcBjbf1CXRw2GQITRtj6UaxYHtE="; }; vendorHash = null; From 0f40577f8b3b465d67c543c20e3732bdf42574cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jun 2023 21:09:26 +0200 Subject: [PATCH 19/37] python311Packages.aioairzone-cloud: 0.1.7 -> 0.1.8 Diff: https://github.com/Noltari/aioairzone-cloud/compare/refs/tags/0.1.7...0.1.8 Changelog: https://github.com/Noltari/aioairzone-cloud/releases/tag/0.1.8 --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index eed58dbc8e49..32d6a2062cee 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.1.7"; + version = "0.1.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-IkV0gwsd/87GZ9LSQu6azQuoxPXuKNbjZMekVKxAl/A="; + hash = "sha256-VuUvutotxkC0Xur7kBBTwjzE+F1I3JSydcHkjrpbeUg="; }; nativeBuildInputs = [ From cde6018d83a8a9d5427045896919eaf3ccfeb971 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jun 2023 21:12:04 +0200 Subject: [PATCH 20/37] python311Packages.python-roborock: 0.23.4 -> 0.23.6 Diff: https://github.com/humbertogontijo/python-roborock/compare/refs/tags/v0.23.4...v0.23.6 Changelog: https://github.com/humbertogontijo/python-roborock/blob/v0.23.6/CHANGELOG.md --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 637a5e589855..860bcb383c62 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.23.4"; + version = "0.23.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-8rcttFo1kkx0JfySjcKchlPc0RjutF6MuA/DVSpclKo="; + hash = "sha256-5WgCVdmEhFrKYT7Uflnjv6OIISk//VH2aoxVwlWuPTk="; }; nativeBuildInputs = [ From 9c6b825963e11307d995965f6d3b659b17509625 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jun 2023 21:14:40 +0200 Subject: [PATCH 21/37] python311Packages.pyunifiprotect: 4.10.1 -> 4.10.2 Diff: https://github.com/briis/pyunifiprotect/compare/refs/tags/v4.10.1...v4.10.2 Changelog: https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v4.10.2 --- pkgs/development/python-modules/pyunifiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index a7c6c9b78aaf..1fa78ef9f72a 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.10.1"; + version = "4.10.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DJxfr4pQna+up5XYi4zs66oTuHzLVz0bEuql6mW2e70="; + hash = "sha256-q54TLmPVo7dz9IkTZfz2qk13TQkMIopWhxlPac0IBGA="; }; postPatch = '' From 83cd2017b1d001bfef8a54ad8296f47bd90bb335 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 8 Jun 2023 17:57:46 -0400 Subject: [PATCH 22/37] runme: 1.2.2 -> 1.2.4 Diff: https://github.com/stateful/runme/compare/v1.2.2...v1.2.4 Changelog: https://github.com/stateful/runme/releases/tag/vv1.2.4 --- pkgs/development/tools/misc/runme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index 506648005bd8..5080e0832da4 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "runme"; - version = "1.2.2"; + version = "1.2.4"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-SVYxFutmDDHEbYLExy0IxqZZZO13gUVPAA0X1ehVXME="; + hash = "sha256-AhGApOUzmdf9TOF0cESrvg8CVT918nzolVHriVNxsaE="; }; vendorHash = "sha256-el+gM3GRN5KU4RlSAx02rn+22xj28IZq3erZUzPbUUw="; From 02f3bd9ef0573b065315233ab1b632aeb8a73405 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Jun 2023 00:09:00 +0200 Subject: [PATCH 23/37] gotestwaf: 0.4.0 -> 0.4.3 Diff: https://github.com/wallarm/gotestwaf/compare/refs/tags/v0.4.0...v0.4.3 Changelog: https://github.com/wallarm/gotestwaf/releases/tag/v0.4.3 --- pkgs/tools/security/gotestwaf/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index 6ff958aa53d4..0ccc2b9c3b1d 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.4.0"; + version = "0.4.3"; src = fetchFromGitHub { owner = "wallarm"; repo = pname; - rev = "v${version}"; - hash = "sha256-waYX7DMyLW0eSzpFRyiCJQdYLFGaAKSlvGYrdcRfCl4="; + rev = "refs/tags/v${version}"; + hash = "sha256-NalXG4I4BtDU7vfKb4H3gJERDQ92Y/46OWIgdg+7+MA="; }; vendorHash = null; @@ -22,7 +22,7 @@ buildGoModule rec { doCheck = false; ldflags = [ - "-X github.com/wallarm/gotestwaf/internal/version.Version=v${version}" + "-X=github.com/wallarm/gotestwaf/internal/version.Version=v${version}" ]; postFixup = '' @@ -39,6 +39,7 @@ buildGoModule rec { meta = with lib; { description = "Tool for API and OWASP attack simulation"; homepage = "https://github.com/wallarm/gotestwaf"; + changelog = "https://github.com/wallarm/gotestwaf/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From cbf5bf89d556e38710f3622d540e890e29696a10 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 8 Jun 2023 17:12:41 -0500 Subject: [PATCH 24/37] Revert "Merge pull request #235852 from thoughtpolice/nixpkgs/gvisor-update" This reverts commit 3ea10b9d2c39d59533eded44818694b479f1a3a1, reversing changes made to 9688969ecbbacf510d622a30fec715942a6159bb. These changes weren't ready yet -- they cause a failure in the NixOS gvisor test, but I didn't mark the PR as a draft. --- .../virtualization/gvisor/default.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index f97be741af7f..a07c98be49f5 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -9,31 +9,20 @@ buildGoModule rec { pname = "gvisor"; - version = "20230529.0"; + version = "20221102.1"; # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go) # that can be used to build gvisor without bazel. - # # For updates, you should stick to the commits labeled "Merge release-** (automated)" - # Make sure to check that the tagged commit for a release aligns with the version in - # the message for good measure; e.g. the commit - # - # 142d38d770a07291877dc0d50b88b719dbef76dc is "Merge release-20230522.0-11-g919cfd12b (automated)" - # - # on the 'go' branch. But the mentioned commit, 919cfd12b..., is actually tagged as release-20230529.0 - # - # https://github.com/google/gvisor/releases/tag/release-202329.0 - # - # Presumably this is a result of the release process. Handle with care. src = fetchFromGitHub { owner = "google"; repo = "gvisor"; - rev = "142d38d770a07291877dc0d50b88b719dbef76dc"; - hash = "sha256-Ukcjlz/6iUmDAUpQpIVfZHKbwK90Mt6fukcFaw64hQI="; + rev = "bf8eeee3a9eb966bc72c773da060a3c8bb73b8ff"; + sha256 = "sha256-rADQsJ+AnBVlfQURGJl1xR6Ad5NyRWSrBSpOFMRld+o="; }; - vendorHash = "sha256-COr47mZ4tsbzMjkv63l+fexo0RL5lrBXeewak9CuZVk="; + vendorSha256 = "sha256-iGLWxx/Kn1QaJTNOZcc+mwoF3ecEDOkaqmA0DH4pdgU="; nativeBuildInputs = [ makeWrapper ]; From 7d02d8d3c9e6d6b37ba721c1c4be2e3c7fd96591 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Jun 2023 00:28:18 +0200 Subject: [PATCH 25/37] goblob: init at 1.2.2 --- pkgs/tools/security/goblob/default.nix | 31 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/security/goblob/default.nix diff --git a/pkgs/tools/security/goblob/default.nix b/pkgs/tools/security/goblob/default.nix new file mode 100644 index 000000000000..401a655d65ab --- /dev/null +++ b/pkgs/tools/security/goblob/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "goblob"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "Macmod"; + repo = "goblob"; + rev = "refs/tags/v${version}"; + hash = "sha256-FnSlfLi40VwDyQY77PvhV7EbhUDs1uGx0VsgP8HgKTw="; + }; + + vendorHash = null; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Enumeration tool for publicly exposed Azure Storage blobs"; + homepage = "https://github.com/Macmod/goblob"; + changelog = "https://github.com/Macmod/goblob/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 177d3eeea3e9..19ad01912c3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15609,6 +15609,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; }; + goblob = callPackage ../tools/security/goblob { }; + gogetdoc = callPackage ../development/tools/gogetdoc { }; gox = callPackage ../development/tools/gox { }; From ab73a8f0fbecae1c5feed47a08103f2390cbb444 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 9 Jun 2023 00:46:25 +0200 Subject: [PATCH 26/37] arx-libertatis: 2020-10-20 -> 1.2.1 --- pkgs/games/arx-libertatis/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index edeacdec2a1c..de597163a3d1 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -10,15 +10,15 @@ with lib; -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "arx-libertatis"; - version = "2020-10-20"; + version = "1.2.1"; src = fetchFromGitHub { owner = "arx"; repo = "ArxLibertatis"; - rev = "21df2e37664de79e117eff2af164873f05600f4c"; - sha256 = "06plyyh0ddqv1j04m1vclz9j72609pgrp61v8wfjdcln8djm376i"; + rev = version; + sha256 = "GBJcsibolZP3oVOTSaiVqG2nMmvXonKTp5i/0NNODKY="; }; nativeBuildInputs = [ From dad6320407c2970f6d1f590c693ccb2619231ec1 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 23 May 2023 21:49:17 -0400 Subject: [PATCH 27/37] fish: fix build with Darwin sandbox enabled --- pkgs/shells/fish/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index cd8fe4d0ca26..a6284298155c 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -210,6 +210,12 @@ let "-DMAC_CODESIGN_ID=OFF" ]; + # Fish’s test suite needs to be able to look up process information and send signals. + sandboxProfile = lib.optionalString stdenv.isDarwin '' + (allow mach-lookup mach-task-name) + (allow signal (target children)) + ''; + # The optional string is kind of an inelegant way to get fish to cross compile. # Fish needs coreutils as a runtime dependency, and it gets put into # CMAKE_PREFIX_PATH, which cmake uses to look up build time programs, so it From 19aec0cbcb71d2cec5f78d3c32b7039cdc531b36 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 8 Jun 2023 21:24:53 -0400 Subject: [PATCH 28/37] cairo: update outdated patch link --- pkgs/development/libraries/cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index f36adbda8920..24c15ce8cb5b 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -49,8 +49,8 @@ in { (fetchpatch { name = "CVE-2020-35492.patch"; includes = [ "src/cairo-image-compositor.c" ]; - url = "https://github.com/freedesktop/cairo/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch"; - sha256 = "048nzfz7rkgqb9xs0dfs56qdw7ckkxr87nbj3p0qziqdq4nb6wki"; + url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch"; + hash = "sha256-cXKzLMENx4/BHXLZg3Kfkx3esCnaNaB7WvjNfL77FhE="; }) # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121 From 450f033b012df75591c8b42b49538b07a40c9f58 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 8 Jun 2023 21:54:56 -0400 Subject: [PATCH 29/37] cairo: modernize patches --- pkgs/development/libraries/cairo/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 24c15ce8cb5b..69a8978ae628 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -32,15 +32,15 @@ in { # This patch is the merged commit from the above PR. (fetchpatch { name = "CVE-2018-19876.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch"; - sha256 = "112hgrrsmcwxh1r52brhi5lksq4pvrz4xhkzcf2iqp55jl2pb7n1"; + url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch"; + hash = "sha256-wZ51BZWlXByFY3/CTn7el2A9aYkwL1FygJ2zqnN+UIQ="; }) # Fix PDF output. # https://gitlab.freedesktop.org/cairo/cairo/issues/342 (fetchpatch { - url = "https://gitlab.freedesktop.org/cairo/cairo/commit/5e34c5a9640e49dcc29e6b954c4187cfc838dbd1.patch"; - sha256 = "yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o="; + url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/5e34c5a9640e49dcc29e6b954c4187cfc838dbd1.patch"; + hash = "sha256-yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o="; }) # Fixes CVE-2020-35492; see https://github.com/NixOS/nixpkgs/issues/120364. @@ -60,7 +60,7 @@ in { # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/issues/420 (fetchpatch { url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/e22d7212acb454daccc088619ee147af03883974.diff"; - sha256 = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s="; + hash = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s="; }) # Fix clang build failures on newer LLVM versions @@ -68,7 +68,7 @@ in { (fetchpatch { name = "fix-types.patch"; url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/38e486b34d435130f2fb38c429e6016c3c82cd53.patch"; - sha256 = "sha256-vmluOJSuTRiQHmbBBVCxOIkZ0O0ZEo0J4mgrUPn0SIo="; + hash = "sha256-vmluOJSuTRiQHmbBBVCxOIkZ0O0ZEo0J4mgrUPn0SIo="; }) # Fix unexpected color addition on grayscale images (usually text). @@ -77,7 +77,7 @@ in { (fetchpatch { name = "fix-grayscale-anialias.patch"; url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/4f4d89506f58a64b4829b1bb239bab9e46d63727.diff"; - sha256 = "sha256-mbTg67e7APfdELsuMAgXdY3xokWbGtHF7VDD5UyYqKM="; + hash = "sha256-mbTg67e7APfdELsuMAgXdY3xokWbGtHF7VDD5UyYqKM="; }) ]; From 60df441affa43c5ca7554cccec7aa44fbfcfd35c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Jun 2023 02:19:19 +0000 Subject: [PATCH 30/37] python310Packages.wasabi: 1.1.1 -> 1.1.2 --- pkgs/development/python-modules/wasabi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 3c1611a15d99..618e0490605b 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "wasabi"; - version = "1.1.1"; + version = "1.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9e58YJAngRvRbmIPL9enMZRmAFhI5BsFGmIFOrj9cNY="; + hash = "sha256-Gq7zrOqjLtuckTMNKdOTbAw5/blldDVJwXPLVLFsMLU="; }; nativeCheckInputs = [ From 23fc7d64220042d1fd6ef51c3be540f94bb3ac38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Jun 2023 03:02:09 +0000 Subject: [PATCH 31/37] squirrel-sql: 4.5.1 -> 4.6.0 --- pkgs/development/tools/database/squirrel-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 1a931b2b10c3..0f866d5e5ae7 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { pname = "squirrel-sql"; - version = "4.5.1"; + version = "4.6.0"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "sha256-LKX8yNSLs60546ZcvLlQF3e++VxHmPsczui4cfrpia0="; + sha256 = "sha256-MMRn83yAi9saUI3/QHggj4s2t0uzZ1oJf9+CIqf4dGc="; }; nativeBuildInputs = [ makeWrapper unzip ]; From a8b62c1c2911f10fd597896311aacd51ea2a1267 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 8 Jun 2023 23:14:25 -0400 Subject: [PATCH 32/37] cargo-vet: 0.6.1 -> 0.7.0 Diff: https://github.com/mozilla/cargo-vet/compare/0.6.1...0.7.0 --- pkgs/development/tools/rust/cargo-vet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/development/tools/rust/cargo-vet/default.nix index 51d33f517d69..147268dbf262 100644 --- a/pkgs/development/tools/rust/cargo-vet/default.nix +++ b/pkgs/development/tools/rust/cargo-vet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-vet"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mozilla"; repo = pname; rev = version; - sha256 = "sha256-PAqpVixBdytHvSUu03OyoA1QGBxmmoeV78x6wCiCemQ="; + sha256 = "sha256-URTWfV/weXWvgaZv7RWKqr7w3dnad2Pr5wNv0rcm2eg="; }; - cargoSha256 = "sha256-dsaDpDa/BNqnL3K4a1mg3uEyM094/UO73MzJD9YaAwE="; + cargoSha256 = "sha256-cnxVcq5v6MXH7hrdT4kE+8DxJY5z2fGCF3G6GGJx8pw="; buildInputs = lib.optional stdenv.isDarwin Security; From 9743d70e8fd87a0d9e3de840367fbd1d9a469eea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Jun 2023 03:12:58 +0000 Subject: [PATCH 33/37] terraform-providers.exoscale: 0.48.0 -> 0.49.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d238c491d2fd..fd0d28f4859e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -363,11 +363,11 @@ "vendorHash": "sha256-2iVEcpESaEdgTcmlQ6Wynuxv8RmPFlhF+BVDSjHmclM=" }, "exoscale": { - "hash": "sha256-wWGqEwo8dMD+2UeaHSzoo+uXrsHNZRDrGhgneACScPM=", + "hash": "sha256-DD6CkdZ9KCCkPCgPyWXaAvHfHyn9rYXRsXg9BVJkELM=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.48.0", + "rev": "v0.49.0", "spdx": "MPL-2.0", "vendorHash": null }, From 607e12a54c2ca1e183fb4d6d00c5f7851f71ba35 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Jun 2023 03:14:11 +0000 Subject: [PATCH 34/37] terraform-providers.keycloak: 4.3.0 -> 4.3.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fd0d28f4859e..d75652f90fe6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -620,11 +620,11 @@ "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=" }, "keycloak": { - "hash": "sha256-557IxT6Zpfig7XLpWG0DahsWsgnTD7XAlIgU9CmQH5c=", + "hash": "sha256-itnXalLx5Bku7sxM5wKJs2vCvDeJnhR1bQ55ye1tpKs=", "homepage": "https://registry.terraform.io/providers/mrparkers/keycloak", "owner": "mrparkers", "repo": "terraform-provider-keycloak", - "rev": "v4.3.0", + "rev": "v4.3.1", "spdx": "MIT", "vendorHash": "sha256-GhmawLENmRuG5ZbXEZAw8pYmHn2SN2ONzfSIVEyN4U4=" }, From 025e9159f2d879ea4f736bc238d6cd8e4e4000af Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Jun 2023 03:15:10 +0000 Subject: [PATCH 35/37] terraform-providers.newrelic: 3.24.0 -> 3.24.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d75652f90fe6..9263e050ce58 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -764,11 +764,11 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-Dz+aVO6RpGcgo9LCPHFdYCiJ3ja+ftJFii5wWQm0/jc=", + "hash": "sha256-Qm5rMgJ4SN3gmhoMaDDcXg75r7mYHavQzoiscsUk6Vk=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.24.0", + "rev": "v3.24.1", "spdx": "MPL-2.0", "vendorHash": "sha256-WjiTfHs+MEc06aNstblGKvd3cTj49JF1fvm+tuR2WH8=" }, From 6f85caa2bd7d2f4647cac0ce78a40f5dd622d7e0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Jun 2023 03:16:39 +0000 Subject: [PATCH 36/37] terraform-providers.selectel: 3.9.1 -> 3.10.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9263e050ce58..e75a4afebf1d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -981,13 +981,13 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-gZiDFcrQZsOE0R74LYwoitAjuPqPZCPLTEL3giom+c8=", + "hash": "sha256-Mpf7BcT7uRqqDNHk+IqfjIuRgrzMMcGn71exKBbymd8=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v3.9.1", + "rev": "v3.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-+Duf/wdjmw6NBhmy1KmNRJ+ZEjjwtJoXXQCw2lJzxS4=" + "vendorHash": "sha256-mIIp9+jGfCEe2HFdlARVFldNYBNPTRP8s/G0/URgxVA=" }, "sentry": { "hash": "sha256-L/aZ4/xCVZk3C6AGglzCj5T9XnoI/uiLbRASNAHwcro=", From 7c7827cf57547fa3a0c3231eac2ccaa1cf545add Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Jun 2023 03:18:30 +0000 Subject: [PATCH 37/37] terraform-providers.rancher2: 3.0.0 -> 3.0.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e75a4afebf1d..94ea173fece1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -927,11 +927,11 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-UDVKmOON190eQzGrxzVtq7gDYeKBBM1nnL2ujU1wDo8=", + "hash": "sha256-tkr1zqHeIMrselvnlv+n7kTM89T7zYW82UeQPucG50I=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v3.0.0", + "rev": "v3.0.1", "spdx": "MPL-2.0", "vendorHash": "sha256-RSHI994zW7rzA/SJ/Ioilg7mQB/VbDInSeZ9IaEYVIc=" },