From 2e95e5ea603908e61da3194de93bc742e56c8d1d Mon Sep 17 00:00:00 2001 From: beh-10257 Date: Tue, 22 Oct 2024 19:24:34 +0100 Subject: [PATCH] cleaning things up --- packaging/nix/flake.lock | 7 +++---- packaging/nix/flake.nix | 4 ---- packaging/nix/umu-launcher.nix | 3 +-- packaging/nix/umu-run.nix | 6 +++--- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/packaging/nix/flake.lock b/packaging/nix/flake.lock index eae06f112..de41ba11a 100644 --- a/packaging/nix/flake.lock +++ b/packaging/nix/flake.lock @@ -2,18 +2,17 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1728836740, - "narHash": "sha256-Xma14OOPGm7skFP5X5mQrHWTpN24VVqx+6pJVGNtnwE=", + "lastModified": 1729428082, + "narHash": "sha256-xb4/Y+Y7ZlkQaA5rXnrXplDzdt2Jfgdmar3+qkb56UA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6572a49f3c8ba5e1e3aba47c3e86a9c313fa8171", + "rev": "ca30f584e18024baf39c395001262ed936f27ebd", "type": "github" }, "original": { "owner": "NixOS", "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "6572a49f3c8ba5e1e3aba47c3e86a9c313fa8171", "type": "github" } }, diff --git a/packaging/nix/flake.nix b/packaging/nix/flake.nix index b924f7c25..1e3781aab 100644 --- a/packaging/nix/flake.nix +++ b/packaging/nix/flake.nix @@ -6,10 +6,6 @@ owner = "NixOS"; repo = "nixpkgs"; ref = "nixpkgs-unstable"; - #ref = "nixpkgs-unstable"; - #rev = "16a8db078642abcacbeaab8ce4c5267857f18ff2"; - #borked - rev = "6572a49f3c8ba5e1e3aba47c3e86a9c313fa8171"; }; }; outputs = { self, nixpkgs }: diff --git a/packaging/nix/umu-launcher.nix b/packaging/nix/umu-launcher.nix index 3dc7b91d5..fe0635605 100644 --- a/packaging/nix/umu-launcher.nix +++ b/packaging/nix/umu-launcher.nix @@ -1,8 +1,7 @@ {pyth1 ,python3Packages , umu-launcher, pkgs,version, ...}: python3Packages.buildPythonPackage { - version = "${version}"; pname = "umu-launcher"; - #version = "1.1.3-${umu-launcher.shortRev}"; + version = "${version}"; src = umu-launcher; pyproject = false; depsBuildBuild = [ diff --git a/packaging/nix/umu-run.nix b/packaging/nix/umu-run.nix index ac3263ce0..daac4282c 100644 --- a/packaging/nix/umu-run.nix +++ b/packaging/nix/umu-run.nix @@ -2,9 +2,9 @@ buildFHSEnv { name = "umu-run"; version = "${version}"; - #targetPkgs = pkgs: ([ - # package - #]); + targetPkgs = pkgs: ([ + package + ]); runScript = writeShellScript "umu-run-shell" '' ${package}/bin/umu "$@" '';