From 143b7c9a63c6a5605562e01206b82cef11470ca5 Mon Sep 17 00:00:00 2001
From: beh-10257 <beh-10257@users.noreply.github.com>
Date: Tue, 22 Oct 2024 14:38:18 +0100
Subject: [PATCH] yippie ?? probably

---
 packaging/nix/flake.lock       | 9 ++++-----
 packaging/nix/flake.nix        | 5 +++--
 packaging/nix/umu-launcher.nix | 8 --------
 packaging/nix/umu-run.nix      | 3 +++
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/packaging/nix/flake.lock b/packaging/nix/flake.lock
index 22da1832d..de41ba11a 100644
--- a/packaging/nix/flake.lock
+++ b/packaging/nix/flake.lock
@@ -2,18 +2,17 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728836203,
-        "narHash": "sha256-adZzJp5rrGW+BBUMEP2j+ZjG8k6miQuUZKT+Npc4HWI=",
+        "lastModified": 1729428082,
+        "narHash": "sha256-xb4/Y+Y7ZlkQaA5rXnrXplDzdt2Jfgdmar3+qkb56UA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "16a8db078642abcacbeaab8ce4c5267857f18ff2",
+        "rev": "ca30f584e18024baf39c395001262ed936f27ebd",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "master",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
-        "rev": "16a8db078642abcacbeaab8ce4c5267857f18ff2",
         "type": "github"
       }
     },
diff --git a/packaging/nix/flake.nix b/packaging/nix/flake.nix
index 28d36fe62..43e344e76 100644
--- a/packaging/nix/flake.nix
+++ b/packaging/nix/flake.nix
@@ -5,8 +5,9 @@
       type = "github";
       owner = "NixOS";
       repo = "nixpkgs";
-      ref = "master";
-      rev = "16a8db078642abcacbeaab8ce4c5267857f18ff2";
+      ref = "nixpkgs-unstable";
+      #ref = "nixpkgs-unstable";
+      #rev = "16a8db078642abcacbeaab8ce4c5267857f18ff2";
     };
   };
   outputs = { self, nixpkgs }:
diff --git a/packaging/nix/umu-launcher.nix b/packaging/nix/umu-launcher.nix
index 1880f5797..3dc7b91d5 100644
--- a/packaging/nix/umu-launcher.nix
+++ b/packaging/nix/umu-launcher.nix
@@ -12,14 +12,6 @@ python3Packages.buildPythonPackage {
     pkgs.git
     pkgs.python3Packages.installer
     pkgs.hatch
-    #(pkgs.hatch.overrideAttrs (prev: {
-    #  disabledTests = prev.disabledTests ++ [
-    #    "test_field_readme"
-    #    "test_field_string"
-    #    "test_field_complex"
-    #    "test_plugin_dependencies_unmet"
-    #  ];
-    #}))
     pkgs.python3Packages.build
   ];
   propagatedBuildInputs = [
diff --git a/packaging/nix/umu-run.nix b/packaging/nix/umu-run.nix
index c61912970..daac4282c 100644
--- a/packaging/nix/umu-run.nix
+++ b/packaging/nix/umu-run.nix
@@ -2,6 +2,9 @@
 buildFHSEnv {
   name = "umu-run";
   version = "${version}";
+  targetPkgs = pkgs: ([
+    package
+  ]);
   runScript = writeShellScript "umu-run-shell" ''
     ${package}/bin/umu "$@"
   '';