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 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", diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9e2f4a6be243..552b23cf0a0a 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=", @@ -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 }, 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; diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index fdb2b43d9735..675710744f64 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -14,8 +14,12 @@ looking-glass-obs = callPackage ./looking-glass-obs.nix { }; + obs-3d-effect = callPackage ./obs-3d-effect.nix { }; + 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 { }; @@ -32,6 +36,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 { }; @@ -40,6 +46,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-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" ]; + }; +} 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" ]; + }; +} 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" ]; + }; +} 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" ]; + }; +} 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; { 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 = [ 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"; diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index e53141be7014..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,8 +22,8 @@ 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; { inherit (src.meta) homepage; diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index 17aa6c5444da..5ebfcbec8286 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 @@ -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 ]; }; } 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" 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; };