yippie ?? probably

beh-10257 · Oct 22, 2024 · 143b7c9 · 143b7c9
1 parent e5b4a75
commit 143b7c9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/packaging/nix/flake.lock b/packaging/nix/flake.lock
diff --git 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
@@ -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
@@ -2,6 +2,9 @@
 buildFHSEnv {
   name = "umu-run";
   version = "${version}";
+  targetPkgs = pkgs: ([
+    package
+  ]);
   runScript = writeShellScript "umu-run-shell" ''
     ${package}/bin/umu "$@"
   '';