From 344db7696c0592c06077423a52a81ff634308636 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Sat, 23 Dec 2023 02:43:45 +0100 Subject: [PATCH] Might this work? --- flake.lock | 62 ++++++++++++------------------------------------------ flake.nix | 4 +++- 2 files changed, 17 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index de31fda..1be6103 100644 --- a/flake.lock +++ b/flake.lock @@ -19,7 +19,7 @@ "crane": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nickel", "nixpkgs" @@ -43,7 +43,7 @@ "crane_2": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nickel", "topiary", @@ -177,11 +177,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -248,24 +248,6 @@ "inputs": { "systems": "systems_5" }, - "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_6" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -280,9 +262,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1694529238, @@ -339,7 +321,7 @@ "nickel": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nix-input": "nix-input", "nixpkgs": [ "nixpkgs" @@ -509,7 +491,6 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", "nickel": "nickel", "nixpkgs": "nixpkgs_3", "uiua": "uiua" @@ -598,7 +579,7 @@ }, "rust-overlay_4": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_2" }, "locked": { @@ -732,26 +713,11 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "topiary": { "inputs": { "advisory-db": "advisory-db", "crane": "crane_2", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nix-filter": "nix-filter", "nixpkgs": [ "nickel", @@ -776,7 +742,7 @@ "uiua": { "inputs": { "crane": "crane_3", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 7ab64f4..e698320 100644 --- a/flake.nix +++ b/flake.nix @@ -15,12 +15,14 @@ let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; in { - packages = { + packages = rec { uiua = uiua.packages.${system}.default; nickel = nickel.packages.${system}.default; + default = nickel; }; hydraJobs = { inherit (self) packages; + default = packages; }; }; }