Merge remote-tracking branch 'origin/master' into staging-next

2 files changed, 51 insertions, 2 deletions

diff --git a/pkgs/tools/graphics/findimagedupes/default.nix b/pkgs/tools/graphics/findimagedupes/default.nix
index 19a80434be1e9..461919beb6fe4 100644
--- a/pkgs/tools/graphics/findimagedupes/default.nix
+++ b/pkgs/tools/graphics/findimagedupes/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "findimagedupes";
-  version = "2.19.1";
+  version = "2.20.1";
 
   # fetching this from GitHub does not contain the correct version number
   src = fetchurl {
     url = "http://www.jhnc.org/findimagedupes/findimagedupes-${version}.tar.gz";
-    sha256 = "sha256-5NBPoXNZays5wzpQYar4uZZb0P/zB7fdecE+SjkJjcI=";
+    sha256 = "sha256-VYqSnOD/Ntr0RnktJ/R0t+Z8+NRExA2mAHT2unPt9/o=";
   };
 
   # Work around the "unpacker appears to have produced no directories"
diff --git a/pkgs/tools/graphics/vkmark/default.nix b/pkgs/tools/graphics/vkmark/default.nix
new file mode 100644
index 0000000000000..2923c786507ee
--- /dev/null
+++ b/pkgs/tools/graphics/vkmark/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, meson
+, ninja
+, vulkan-headers
+, vulkan-loader
+, mesa
+, wayland-protocols
+, wayland
+, glm
+, assimp
+, libxcb
+, xcbutilwm
+}:
+
+stdenv.mkDerivation rec {
+  pname = "vkmark";
+  version = "unstable-2022-09-09";
+
+  src = fetchFromGitHub {
+    owner = "vkmark";
+    repo = "vkmark";
+    rev = "30d2cd37f0566589d90914501fc7c51a4e51f559";
+    sha256 = "sha256-/awEJbmSiNJT71bijI5mrJkKN4DhRNxXO/qYpQECFnA=";
+  };
+
+  nativeBuildInputs = [ meson ninja pkg-config ];
+  buildInputs = [
+    vulkan-headers
+    vulkan-loader
+    mesa
+    glm
+    assimp
+    libxcb
+    xcbutilwm
+    wayland
+    wayland-protocols
+  ];
+
+  meta = with lib; {
+    description = "An extensible Vulkan benchmarking suite";
+    homepage = "https://github.com/vkmark/vkmark";
+    license = with licenses; [ lgpl21Plus ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ muscaln ];
+  };
+}