From 833bd514a247269d9e4896edc43b3e14f50105b0 Mon Sep 17 00:00:00 2001 From: Martin Puppe Date: Sun, 5 Mar 2023 15:29:42 +0100 Subject: [PATCH 01/17] dehydrated: apply nixpkgs-fmt --- pkgs/tools/admin/dehydrated/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index e53141be7014..5ecb40f3c395 100644 --- a/pkgs/tools/admin/dehydrated/default.nix +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -a dehydrated $out/bin wrapProgram "$out/bin/dehydrated" --prefix PATH : "${lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}" - ''; + ''; meta = with lib; { inherit (src.meta) homepage; From 1e1a1e0e853da0d66285398d85fc5b4cdb7f72c6 Mon Sep 17 00:00:00 2001 From: Martin Puppe Date: Sun, 5 Mar 2023 15:30:33 +0100 Subject: [PATCH 02/17] dehydrated: add missing dependency hexdump --- pkgs/tools/admin/dehydrated/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index 5ecb40f3c395..d36028e3b227 100644 --- a/pkgs/tools/admin/dehydrated/default.nix +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, hexdump, openssl, makeWrapper, fetchFromGitHub, installShellFiles }: stdenv.mkDerivation rec { pname = "dehydrated"; version = "0.7.1"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -a dehydrated $out/bin - wrapProgram "$out/bin/dehydrated" --prefix PATH : "${lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}" + wrapProgram "$out/bin/dehydrated" --prefix PATH : "${lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk hexdump ]}" ''; meta = with lib; { From 2d29afdcf3c6676d148c1710513400e2714d0f59 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 26 Apr 2023 14:31:03 +0100 Subject: [PATCH 03/17] obs-studio-plugins.obs-3d-effect: init at 0.0.2 --- .../video/obs-studio/plugins/default.nix | 2 + .../obs-studio/plugins/obs-3d-effect.nix | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 7a9b5bd48f3d..f4cc1e1e655c 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -14,6 +14,8 @@ looking-glass-obs = callPackage ./looking-glass-obs.nix { }; + obs-3d-effect = callPackage ./obs-3d-effect.nix { }; + obs-backgroundremoval = callPackage ./obs-backgroundremoval { }; obs-gstreamer = callPackage ./obs-gstreamer.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix new file mode 100644 index 000000000000..c17cd1ec502b --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-3d-effect"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "exeldro"; + repo = "obs-3d-effect"; + rev = version; + sha256 = "sha256-1frLQo+0/HxTIkZ57rnQjVOos5+bv2cLojslSCGo+gU="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + + cmakeFlags = [ + "-DBUILD_OUT_OF_TREE=On" + ]; + + postInstall = '' + rm -rf $out/obs-plugins $out/data + ''; + + meta = with lib; { + description = "Plugin for OBS Studio adding 3D effect filter"; + homepage = "https://github.com/exeldro/obs-3d-effect"; + maintainers = with maintainers; [ flexiondotorg ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} From 2a09cfbf29367c801213c2bf842803608bbc9fa3 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 26 Apr 2023 16:44:31 +0100 Subject: [PATCH 04/17] obs-studio-plugins.obs-command-source: init at 0.4.0 --- .../video/obs-studio/plugins/default.nix | 2 ++ .../obs-studio/plugins/obs-command-source.nix | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-command-source.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 7a9b5bd48f3d..9f7c3ea40259 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -16,6 +16,8 @@ obs-backgroundremoval = callPackage ./obs-backgroundremoval { }; + obs-command-source = callPackage ./obs-command-source.nix { }; + obs-gstreamer = callPackage ./obs-gstreamer.nix { }; obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix new file mode 100644 index 000000000000..f38d53a14101 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-command-source"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "norihiro"; + repo = "obs-command-source"; + rev = version; + sha256 = "sha256-rBGMQb7iGtxF54bBOK5lHI6VFYCSEyeSq2Arz0T0DPo="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + + postInstall = '' + mkdir $out/lib $out/share + mv $out/obs-plugins/64bit $out/lib/obs-plugins + rm -rf $out/obs-plugins + mv $out/data $out/share/obs + ''; + + meta = with lib; { + description = "OBS Studio plugin that provides a dummy source to execute arbitrary commands when a scene is switched."; + homepage = "https://github.com/norihiro/command-source"; + maintainers = with maintainers; [ flexiondotorg ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} From f3b1c3a6290266534559e1f07a0250e9a08d72f8 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Thu, 27 Apr 2023 11:38:36 +0100 Subject: [PATCH 05/17] obs-studio-plugins.obs-vintage-filter: init at 1.0.0 --- .../video/obs-studio/plugins/default.nix | 2 ++ .../obs-studio/plugins/obs-vintage-filter.nix | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 90206246b38e..bd9b59ab4833 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -38,6 +38,8 @@ obs-vaapi = callPackage ./obs-vaapi { }; + obs-vintage-filter = callPackage ./obs-vintage-filter.nix { }; + obs-vkcapture = callPackage ./obs-vkcapture.nix { obs-vkcapture32 = pkgsi686Linux.obs-studio-plugins.obs-vkcapture; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix new file mode 100644 index 000000000000..6c5e97cc1588 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-vintage-filter"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "cg2121"; + repo = "obs-vintage-filter"; + rev = version; + sha256 = "sha256-K7AxvwVLe4G+75aY430lygSRB7rMtsGi17pGzdygEac="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; + + postInstall = '' + mkdir $out/lib $out/share + mv $out/obs-plugins/64bit $out/lib/obs-plugins + rm -rf $out/obs-plugins + mv $out/data $out/share/obs + ''; + + meta = with lib; { + description = "An OBS Studio filter where the source can be set to be black & white or sepia."; + homepage = "https://github.com/cg2121/obs-vintage-filter"; + maintainers = with maintainers; [ flexiondotorg ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} From 8b0215f79c3d300af37fcf686cd62ea5628c7d27 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 26 Apr 2023 22:56:29 +0100 Subject: [PATCH 06/17] obs-studio-plugins.obs-shaderfilter: init at v1.22 --- .../video/obs-studio/plugins/default.nix | 2 + .../obs-studio/plugins/obs-shaderfilter.nix | 41 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 90206246b38e..65c2ecfd5d79 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -32,6 +32,8 @@ obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix { }; + obs-shaderfilter = qt6Packages.callPackage ./obs-shaderfilter.nix { }; + obs-source-clone = callPackage ./obs-source-clone.nix { }; obs-source-record = callPackage ./obs-source-record.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix new file mode 100644 index 000000000000..ea412261e0ab --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, obs-studio +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "obs-shaderfilter"; + version = "v1.22"; + + src = fetchFromGitHub { + owner = "exeldro"; + repo = "obs-shaderfilter"; + rev = version; + sha256 = "sha256-CqqYzGRhlHO8Zva+so8uo9+EIlzTfoFVl3NzZMsE7Xc="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio qtbase ]; + + cmakeFlags = [ + "-DBUILD_OUT_OF_TREE=On" + ]; + + dontWrapQtApps = true; + + postInstall = '' + rm -rf $out/obs-plugins + mv $out/data $out/share/obs + ''; + + meta = with lib; { + description = "OBS Studio filter for applying an arbitrary shader to a source."; + homepage = "https://github.com/exeldro/obs-shaderfilter"; + maintainers = with maintainers; [ flexiondotorg ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} From 699e707e90a89fb06a9880df6b83c22428fd8deb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 30 Apr 2023 21:19:04 +0200 Subject: [PATCH 07/17] spotify: Fix login with firefox - Spotify uses `LD_LIBRARY_PATH` environment variable to load dependencies. - One of those dependencies is `nss_esr`. - Firefox is linked against `nss_latest`. - Spotify opens a URL in web browser to log in. - Firefox process executed as a child will inherit environment variables from Spotify. - NSS library will be replaced, resulting in missing symbols. firefox.desktop[2946438]: XPCOMGlueLoad error for file /nix/store/8yc9g32afmgcv1j02y1zh69rhskpkcdc-firefox-112.0.2/lib/firefox/libxul.so: firefox.desktop[2946438]: /nix/store/br95hq0v4l2akqi1x7474ni3fm6nzp7v-nss-3.79.4/lib/libssl3.so: version `NSS_3.80' not found (required by /nix/store/8yc9g32afmgcv1j02y1zh69rhskpkcdc-firefox-112.0.2/lib/firefox/libxul.so) firefox.desktop[2946438]: Couldn't load XPCOM. Ideally, we would not use `LD_LIBRARY_PATH` but switching to the same nss version as Firefox uses is an easy workaround. --- pkgs/applications/audio/spotify/linux.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index df50e3bd28fc..bd869cc543bc 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook, openssl, freetype -, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify +, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon , pname, meta, harfbuzz @@ -47,7 +47,7 @@ let libpulseaudio libxkbcommon mesa - nss + nss_latest pango stdenv.cc.cc systemd From 136fd119a857372e8f73b5c1602c4f901f2083a1 Mon Sep 17 00:00:00 2001 From: Hugh O'Brien Date: Wed, 3 May 2023 18:05:52 -0400 Subject: [PATCH 08/17] openai-whisper-cpp: 1.2.1 -> 1.4.0 --- pkgs/tools/audio/openai-whisper-cpp/default.nix | 4 ++-- pkgs/tools/audio/openai-whisper-cpp/download-models.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index 17aa6c5444da..9de1d75e7c01 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "whisper-cpp"; - version = "1.2.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; rev = "refs/tags/v${version}" ; - hash = "sha256-gcw+tcrwCt2CynNXQZxb+WxN/0chIQIJnwUAw9JGkYA="; + hash = "sha256-176MpooVQrq1dXC62h8Yyyhw6IjCA50tp1J4DQPSePQ="; }; # The upstream download script tries to download the models to the diff --git a/pkgs/tools/audio/openai-whisper-cpp/download-models.patch b/pkgs/tools/audio/openai-whisper-cpp/download-models.patch index 11498e6c75ee..39cb00c3a0c3 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/download-models.patch +++ b/pkgs/tools/audio/openai-whisper-cpp/download-models.patch @@ -1,15 +1,15 @@ diff --git a/models/download-ggml-model.sh b/models/download-ggml-model.sh -index 7075080..5e9c905 100755 +index 749b409..831f4c0 100755 --- a/models/download-ggml-model.sh +++ b/models/download-ggml-model.sh @@ -9,18 +9,6 @@ - src="https://huggingface.co/datasets/ggerganov/whisper.cpp" + src="https://huggingface.co/ggerganov/whisper.cpp" pfx="resolve/main/ggml" -# get the path of this script -function get_script_path() { - if [ -x "$(command -v realpath)" ]; then -- echo "$(dirname $(realpath $0))" +- echo "$(dirname "$(realpath "$0")")" - else - local ret="$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)" - echo "$ret" From 805a245f2c4847835c70323cdd855d669addb15b Mon Sep 17 00:00:00 2001 From: Hugh O'Brien Date: Wed, 3 May 2023 18:06:04 -0400 Subject: [PATCH 09/17] openai-whisper-cpp: add hughobrien to maintainers --- pkgs/tools/audio/openai-whisper-cpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index 9de1d75e7c01..5ebfcbec8286 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ggerganov/whisper.cpp"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ dit7ya hughobrien ]; }; } From 4788eaa366b4595c3283db12d1d9ded2a49fea3f Mon Sep 17 00:00:00 2001 From: pacien Date: Thu, 4 May 2023 14:30:04 +0200 Subject: [PATCH 10/17] mercurial: 6.4.2 -> 6.4.3 Release notes: https://wiki.mercurial-scm.org/Release6.4 --- pkgs/applications/version-management/mercurial/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 5f2f9837cc01..73d481845ff8 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.4.2"; + version = "6.4.3"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-W59qPDX05GlchU73FCjPlGHKGlKfaRwG3G97SOe7MzU="; + sha256 = "sha256-p3+2LTJZNKg6ALL8bbEJ9ExnuGdo/EBJA2b1E2QMf2Q="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-dRajIqM91fESEm4EEa9qvS8h6/HlLZIJZztVGoS/G+M="; + sha256 = "sha256-nm9RZZHtmPfeJ7StHZmfxcFqKeJHACQQeA/Evv3wYD8="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; From cb6d46b993b32a8a2378014ac242273bc8c9b7ba Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 4 May 2023 10:47:01 -0400 Subject: [PATCH 11/17] hurl: 2.0.1 -> 3.0.0 Diff: https://github.com/Orange-OpenSource/hurl/compare/2.0.1...3.0.0 Changelog: https://github.com/Orange-OpenSource/hurl/blob/3.0.0/CHANGELOG.md --- pkgs/tools/networking/hurl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/hurl/default.nix b/pkgs/tools/networking/hurl/default.nix index 5b598bba1d23..ed1b38d8f85f 100644 --- a/pkgs/tools/networking/hurl/default.nix +++ b/pkgs/tools/networking/hurl/default.nix @@ -11,15 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - sha256 = "sha256-sY2bSCcC+mMuYqLmh+oH76nqg/ybh/nyz3trNH2xPQM="; + hash = "sha256-m9hAGm5vmo+J+ntQOK5R4vFEVRhW097D1gvjcE/1CnM="; }; + cargoHash = "sha256-KYlax3Q7w27Q6TNwuDmzJhoiFMWnfMhagAuw0+FIW1c="; + nativeBuildInputs = [ pkg-config installShellFiles @@ -35,8 +37,6 @@ rustPlatform.buildRustPackage rec { # Tests require network access to a test server doCheck = false; - cargoSha256 = "sha256-Zv7TTQw4UcuQBhEdjD5nwcE1LonUHLUFf9BVhRWWuDo="; - postInstall = '' installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1 ''; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Command line tool that performs HTTP requests defined in a simple plain text format."; homepage = "https://hurl.dev/"; - changelog = "https://github.com/Orange-OpenSource/hurl/raw/${version}/CHANGELOG.md"; + changelog = "https://github.com/Orange-OpenSource/hurl/blob/${version}/CHANGELOG.md"; maintainers = with maintainers; [ eonpatapon figsoda ]; license = licenses.asl20; }; From 87f6b2102e54440d05801a911d2a98532e3dfab2 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Fri, 5 May 2023 10:26:29 -0400 Subject: [PATCH 12/17] Python311Packages.meraki: 1.32.1 -> 1.33.0 --- pkgs/development/python-modules/meraki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index 392684539cc8..58c130c3bd21 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.32.1"; + version = "1.33.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-3iZ9/d78nAnK2+Kv0+0tuvZcfSV6ZF6QRF3xYL3NqV4="; + hash = "sha256-uzrnKYCythDa+DK1X87zcL9O4cmjRDqxR2hXoN286KQ="; }; propagatedBuildInputs = [ From 9c2a0e84bb0f48e16decf44872e18875bd4b07a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 16:06:57 +0000 Subject: [PATCH 13/17] prowlarr: 1.3.2.3006 -> 1.4.1.3258 --- pkgs/servers/prowlarr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index fedd8b0b4955..b18d4e33956a 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -21,15 +21,15 @@ let }.${stdenv.hostPlatform.system} or unsupported; hash = { - aarch64-darwin = "sha256-pBhAWR0+UKUKDkXsSIyR+VAV5Kl1vhuoDUVpUqXojg8="; - aarch64-linux = "sha256-gNq2Cial4oSVNlPnFu7U7LSMpAhK5skdbYazob7kQuI="; - x86_64-darwin = "sha256-6QTBJacl/1/NAmbu0kBLung2KPfR/cuICHeIVpTmu6Y="; - x86_64-linux = "sha256-T7WQmKuvKB9B61Ku7vZ/fV+DlzA5KVlOOPmZzRpUvgY="; + aarch64-darwin = "sha256-Fk0JTHapmvf0FWDC/V+IoCDpjU0stVxo9XfAOXqMECM="; + aarch64-linux = "sha256-s2TP8t+87ZQka9q0AQBfxpBwryx/qNqXfxYojvJEaAU="; + x86_64-darwin = "sha256-nhWyAlc7vuM2c66lJ2e2sXFZlw7vWL9cKiDNrUS6LEs="; + x86_64-linux = "sha256-GbEQuTKCVfLd0oZbPKbVVbgGMi+eooBpc9zL2k/L3zY="; }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.3.2.3006"; + version = "1.4.1.3258"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; From 449672772579651498a07b14beebc5d4169545a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 May 2023 20:32:02 +0000 Subject: [PATCH 14/17] vkd3d: 1.7 -> 1.7.1 --- pkgs/development/libraries/vkd3d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vkd3d/default.nix b/pkgs/development/libraries/vkd3d/default.nix index f06efd6c1cb7..928cf2e78a23 100644 --- a/pkgs/development/libraries/vkd3d/default.nix +++ b/pkgs/development/libraries/vkd3d/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "vkd3d"; - version = "1.7"; + version = "1.7.1"; nativeBuildInputs = [ autoreconfHook pkg-config wine flex bison ]; buildInputs = [ vulkan-loader vulkan-headers spirv-headers ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "wine"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-s5YNA+CjWoYk1tkBYYGfOsI2eXtXPtd1oHVeFFJIWn8="; + sha256 = "sha256-4WUD6bRG/XwrOb5tl0ZyaaR0uy85eYXcb16eDeumOAQ="; }; meta = with lib; { From 36659ccc58e276cc9144b7c3c06f8c043bd49218 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 May 2023 02:22:43 +0000 Subject: [PATCH 15/17] cudatext: 1.193.0 -> 1.193.3 --- pkgs/applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 1b6dda1eeab3..61bfb75fb93f 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.193.0"; + version = "1.193.3"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-vMTE6oe11ajO+Dw5pcgXEKSl8LR+3GI4DHH5KxS3Msw="; + hash = "sha256-zkSdMXIfUT+QfRi7CT3JlVLAvtLGbOGAaQkYNMAIZeI="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 5b279d495cb0..ed409c971b46 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2023.05.04", - "hash": "sha256-VdjLHbgj5i7gEavnGLvPlBBlo5HPYUIBX78pkD2CbwI=" + "rev": "2023.05.07", + "hash": "sha256-B1+de0ze17GTAFuWxgmk95sdYiUmDGdeNTJmyy74Vmc=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.05.02", - "hash": "sha256-E3XBPzd8D8SMhjXOj16syzdMgryzOVPxnEuZwpO7Czw=" + "rev": "2023.05.07", + "hash": "sha256-ZdN+dUmM8DQ7nz0LqcCQt8ZoJH1wrhYRa+h0xj5F6PY=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", From ea4810f719e19a62684bae3c0e317d53821e5882 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 03:08:58 +0000 Subject: [PATCH 16/17] terraform-providers.argocd: 5.2.0 -> 5.3.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 9e2f4a6be243..64cdc428848a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -73,13 +73,13 @@ "vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M=" }, "argocd": { - "hash": "sha256-3WhbyMqIlncD7UmmfJBFrb9FmmbC/a4CWesmjo0jzoU=", + "hash": "sha256-PZ+fcLRU8nA+i93FXntIt0Mbauykifd9iCItwlPdsrk=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v5.2.0", + "rev": "v5.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-mKefDPwWPlUleoAkJpTvJwQeOb7pA80cZQ7fpwir6kk=" + "vendorHash": "sha256-+uWVo5UM2tuYXYn2eWf7yuAQ8THYvJSc5ZxD909bQSk=" }, "auth0": { "hash": "sha256-UHsGiMV81AfjxqTcWuLKXQM3o6F+STQcHdni3j8A5wM=", From 884ffbd847e015e0d6cb2767ba72f7e7320bf8ef Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 03:10:20 +0000 Subject: [PATCH 17/17] terraform-providers.thunder: 1.2.1 -> 1.2.2 --- .../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 64cdc428848a..552b23cf0a0a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1116,11 +1116,11 @@ "vendorHash": "sha256-vKIbswlWQUIPeaFRAMPGygM/UlWiRIr66NuTNfnpGpc=" }, "thunder": { - "hash": "sha256-amGtmE1i68K0ehhYBJ6wwcdUPuVGSWoVdYAb1PwhlAs=", + "hash": "sha256-CZjoWme/f1F5JzYlntEKL5ijRF/qR3h4ZTiv9vwzbJI=", "homepage": "https://registry.terraform.io/providers/a10networks/thunder", "owner": "a10networks", "repo": "terraform-provider-thunder", - "rev": "v1.2.1", + "rev": "v1.2.2", "spdx": "BSD-2-Clause", "vendorHash": null },