diff options
Diffstat (limited to 'pkgs/applications')
9 files changed, 25 insertions, 19 deletions
diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index d009522f5c976..e9d6e5795c5a1 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "24.06.1"; + version = "24.06.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - hash = "sha256-H4PCZ1WwNg34WSDXgmH6pUPBglXafLTFfIzvmWiyeCw="; + hash = "sha256-/Rk95fAAquPrKwRchIgU8p9dpwvEV25ku1rknbJNlJc="; }; patches = [ diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index 95889ffff4d51..4cbd7a8f00c9b 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -79,11 +79,11 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DXRT_FEATURE_SERVICE=${if serviceSupport then "ON" else "OFF"}" - "-DXRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH=ON" - "-DXRT_HAVE_TRACY=ON" - "-DXRT_FEATURE_TRACING=ON" - "-DXRT_HAVE_STEAM=ON" + (lib.cmakeBool "XRT_FEATURE_SERVICE" serviceSupport) + (lib.cmakeBool "XRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH" true) + (lib.cmakeBool "XRT_HAVE_TRACY" true) + (lib.cmakeBool "XRT_FEATURE_TRACING" true) + (lib.cmakeBool "XRT_HAVE_STEAM" true) ]; buildInputs = [ diff --git a/pkgs/applications/misc/hcl2json/default.nix b/pkgs/applications/misc/hcl2json/default.nix index 39073ee81b0fd..e8d90c9e16974 100644 --- a/pkgs/applications/misc/hcl2json/default.nix +++ b/pkgs/applications/misc/hcl2json/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { description = "Convert hcl2 to json"; homepage = "https://github.com/tmccombs/hcl2json"; license = licenses.asl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; mainProgram = "hcl2json"; }; } diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index e0832ff2459c6..ce92193727357 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source RGB lighting control"; homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB"; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; platforms = platforms.linux; mainProgram = "openrgb"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index bbcfc835071c8..54d4e2417f695 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-BWZaa1+3EUG11RmZjjbwG2UPZhlCpW3X9rkpiWrjgzM="; + hash_darwin = "sha256-154JPXP5qCM94zQRkRSvPKk6RGIhani7FUwOXgIwUZ0="; hash_darwin_aarch64 = - "sha256-wkUIFolVdvcnEQKKehKCyD5GS5Q42fVFKj/iHtiIj8I="; - hash_linux = "sha256-owTmkkgMcmuuhGv23uNjFjBdC49IJt+v6rjWu7xuchQ="; - version = "126.0.6478.62"; + "sha256-HButB8+2DRiaazyBiT3643sBLaauRAZ1rvmEtt8Whac="; + hash_linux = "sha256-6P9K6XTByonHaZYvOP+jTGizkmVdS8Ryn8UwV4BMGdQ="; + version = "126.0.6478.126"; }; deps = { gn = { @@ -15,8 +15,8 @@ version = "2024-05-13"; }; }; - hash = "sha256-sXP+/KXDoy3QnRoa9acGbsXKVCPspyNGtZTLMHBqxvw="; - version = "126.0.6478.114"; + hash = "sha256-Z0QeUG4ykNqdlxXYgLteJQ0jS8apC5kwW5hwlUnhod0="; + version = "126.0.6478.126"; }; ungoogled-chromium = { deps = { diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index d32445c6455c3..5199400cae9eb 100644 --- a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -94,7 +94,7 @@ let mainProgram = "nomad-autoscaler"; homepage = "https://github.com/hashicorp/nomad-autoscaler"; license = licenses.mpl20; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; }; diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index b47ba39f0ae5e..7c44bebcb0f04 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/michaelrsweet/pappl"; license = licenses.asl20; platforms = platforms.linux; # should also work for darwin, but requires additional work - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 4be42e97344a6..3e387f34a7341 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -78,7 +78,6 @@ buildPythonApplication rec { changelog = "https://github.com/nicolargo/glances/blob/v${version}/NEWS.rst"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ - jonringer primeos koral ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index e059412e17fa1..cf88fd3b18c3f 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -61,10 +61,17 @@ stdenv.mkDerivation (finalAttrs: { --replace "libvulkan.so.1" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" ''; - # Support 32bit Vulkan applications by linking in the 32bit Vulkan layer + # Support 32bit Vulkan applications by linking in the 32bit Vulkan layer and + # the wrapper executables. Note that vkcapture and glcapture are themselves + # wrapper scripts that simply exec gamecapture and print a warning but because + # they take gamecapture from PATH, we must link them to the 32 bit gamecapture + # directly. postInstall = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' ln -s ${obs-vkcapture32}/share/vulkan/implicit_layer.d/obs_vkcapture_32.json \ "$out/share/vulkan/implicit_layer.d/" + for bin in ${obs-vkcapture32}/bin/* ; do + ln -s ${obs-vkcapture32}/bin/obs-gamecapture "$out/bin/$(basename "$bin")32" + done ''; meta = with lib; { |