From b474165b61a8597b20b94138d1c565658e42df8e Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Wed, 26 Mar 2025 16:59:12 +0200
Subject: [PATCH 1/2] flatpak-xdg-utils: init at 1.0.6

---
 pkgs/by-name/fl/flatpak-xdg-utils/package.nix | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/fl/flatpak-xdg-utils/package.nix

diff --git a/pkgs/by-name/fl/flatpak-xdg-utils/package.nix b/pkgs/by-name/fl/flatpak-xdg-utils/package.nix
new file mode 100644
index 000000000000..6ca52f1f2144
--- /dev/null
+++ b/pkgs/by-name/fl/flatpak-xdg-utils/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  fetchFromGitHub,
+  glib,
+  meson,
+  ninja,
+  nix-update-script,
+  pkg-config,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "flatpak-xdg-utils";
+  version = "1.0.6";
+
+  src = fetchFromGitHub {
+    owner = "flatpak";
+    repo = "flatpak-xdg-utils";
+    tag = finalAttrs.version;
+    hash = "sha256-j5A5msgKjQSIvCvFSZGL8QfwH+SJGJ4S3PPCHOmM/bk=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    glib
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/flatpak/flatpak-xdg-utils/releases/tag/${finalAttrs.version}";
+    description = "Commandline utilities for use inside Flatpak sandboxes";
+    homepage = "https://flatpak.org/";
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ michaelgrahamevans ];
+    platforms = lib.platforms.linux;
+  };
+})

From 1d2cd5bfbbbfeed118a8a4909c5436bf3de10bea Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Wed, 26 Mar 2025 16:59:51 +0200
Subject: [PATCH 2/2] warehouse: init at 2.0.2

---
 pkgs/by-name/wa/warehouse/package.nix | 72 +++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 pkgs/by-name/wa/warehouse/package.nix

diff --git a/pkgs/by-name/wa/warehouse/package.nix b/pkgs/by-name/wa/warehouse/package.nix
new file mode 100644
index 000000000000..7fd50af13e08
--- /dev/null
+++ b/pkgs/by-name/wa/warehouse/package.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  blueprint-compiler,
+  desktop-file-utils,
+  fetchFromGitHub,
+  flatpak,
+  flatpak-xdg-utils,
+  glib,
+  gobject-introspection,
+  gtk4,
+  libadwaita,
+  meson,
+  ninja,
+  nix-update-script,
+  pkg-config,
+  python3,
+  stdenv,
+  wrapGAppsHook4,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "warehouse";
+  version = "2.0.2";
+
+  src = fetchFromGitHub {
+    owner = "flattool";
+    repo = "warehouse";
+    tag = finalAttrs.version;
+    hash = "sha256-EcpHFS0EczUDFs0A/7IuNs1082hsuuS0J6wxSq47vaQ=";
+  };
+
+  nativeBuildInputs = [
+    blueprint-compiler
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    flatpak
+    flatpak-xdg-utils
+    glib
+    gtk4
+    libadwaita
+    (python3.withPackages (
+      ps: with ps; [
+        pygobject3
+      ]
+    ))
+  ];
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --suffix PATH : "${lib.makeBinPath [ flatpak-xdg-utils ]}"
+    )
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/flattool/warehouse/releases/tag/${finalAttrs.version}";
+    description = "Manage all things Flatpak";
+    homepage = "https://github.com/flattool/warehouse";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "warehouse";
+    maintainers = with lib.maintainers; [ michaelgrahamevans ];
+    platforms = lib.platforms.linux;
+  };
+})