From cdbeffffec759c781fd20ea6453f93970b3a4b15 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Wed, 4 Sep 2024 10:50:09 -0500 Subject: [PATCH] follows --- flake.lock | 25 +++---------------------- flake.nix | 5 ++++- lib/default.nix | 4 ++-- 3 files changed, 9 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 146200f..818032d 100644 --- a/flake.lock +++ b/flake.lock @@ -556,27 +556,6 @@ "type": "github" } }, - "nim2nix_2": { - "inputs": { - "nixpkgs": [ - "utils", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724878933, - "narHash": "sha256-VP0+Lal3jJJqDH1EzQX73rP9Ue8ZTIyAErJvDz6PQSg=", - "owner": "daylinmorgan", - "repo": "nim2nix", - "rev": "5153c772e4c6a4f5645efa85ce536fe1c5063ebb", - "type": "github" - }, - "original": { - "owner": "daylinmorgan", - "repo": "nim2nix", - "type": "github" - } - }, "nix-eval-jobs": { "inputs": { "flake-parts": "flake-parts", @@ -1091,7 +1070,9 @@ }, "utils": { "inputs": { - "nim2nix": "nim2nix_2", + "nim2nix": [ + "nim2nix" + ], "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 8774b4a..bd568d1 100644 --- a/flake.nix +++ b/flake.nix @@ -33,13 +33,16 @@ hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git"; utils.url = "git+https://git.dayl.in/daylin/utils.git"; + utils.inputs = { + nixpkgs.follows = "nixpkgs"; + nim2nix.follows = "nim2nix"; + }; hyprman.inputs.nixpkgs.follows = "nixpkgs"; f1multiviewer.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; pixi.inputs.nixpkgs.follows = "nixpkgs"; roc.inputs.nixpkgs.follows = "nixpkgs"; tsm.inputs.nixpkgs.follows = "nixpkgs"; - utils.inputs.nixpkgs.follows = "nixpkgs"; zls.inputs.nixpkgs.follows = "nixpkgs"; zls.inputs.zig-overlay.follows = "zig-overlay"; zig-overlay.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/lib/default.nix b/lib/default.nix index 96b1288..b0061ef 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -29,9 +29,9 @@ let packages = forAllSystems ( pkgs: rec { - default = oizys-cli; + default = oizys-nim; oizys-nim = pkgs.callPackage ../pkgs/oizys-nim { }; - oizys-cli = pkgs.callPackage ../pkgs/oizys { }; + oizys-go = pkgs.callPackage ../pkgs/oizys { }; iso = mkIso.config.system.build.isoImage; roc = (pkgsFromSystem pkgs.system "roc").full; }