Merge master into staging-next

2 files changed, 78 insertions, 3 deletions

diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix
new file mode 100644
index 0000000000000..7ae618736ca19
--- /dev/null
+++ b/pkgs/applications/graphics/gnome-decoder/default.nix
@@ -0,0 +1,76 @@
+{ lib
+, clangStdenv
+, fetchFromGitLab
+, libclang
+, rustPlatform
+, meson
+, ninja
+, pkg-config
+, glib
+, gtk4
+, libadwaita
+, zbar
+, sqlite
+, pipewire
+, gstreamer
+, gst-plugins-base
+, gst-plugins-bad
+, wrapGAppsHook4
+, appstream-glib
+, desktop-file-utils
+}:
+
+clangStdenv.mkDerivation rec {
+  pname = "gnome-decoder";
+  version = "0.3.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "World";
+    repo = "decoder";
+    rev = version;
+    hash = "sha256-WJIOaYSesvLmOzF1Q6o6aLr4KJanXVaNa+r+2LlpKHQ=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    name = "${pname}-${version}";
+    hash = "sha256-RMHVrv/0q42qFUXyd5BSymzx+BxiyqTX0Jzmxnlhyr4=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+    appstream-glib
+    desktop-file-utils
+  ] ++ (with rustPlatform; [
+    rust.cargo
+    rust.rustc
+    cargoSetupHook
+  ]);
+
+  buildInputs = [
+    glib
+    gtk4
+    libadwaita
+    zbar
+    sqlite
+    pipewire
+    gstreamer
+    gst-plugins-base
+    gst-plugins-bad
+  ];
+
+  LIBCLANG_PATH = "${libclang.lib}/lib";
+
+  meta = with lib; {
+    description = "Scan and Generate QR Codes";
+    homepage = "https://gitlab.gnome.org/World/decoder";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    mainProgram = "decoder";
+    maintainers = with maintainers; [ zendo ];
+  };
+}
diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix
index 6b991e8dd398e..4b421b41d9a3d 100644
--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "hydrus";
-  version = "497";
+  version = "500";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "hydrusnetwork";
     repo = "hydrus";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-dQ6a3jys6V1ihT6q8FUaX7jOA1ZDZdX5EUy03ILk7vM=";
+    sha256 = "sha256-gsOto37++++ucpDC0ri3HhROp7v6qlHENjFvsbuyM6k=";
   };
 
   nativeBuildInputs = [
@@ -33,7 +33,6 @@ python3Packages.buildPythonPackage rec {
     html5lib
     lxml
     lz4
-    nose
     numpy
     opencv4
     pillow