From 524dd5bb6494be3159038f3e294678fc7e8eaa64 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Mon, 17 Jul 2023 15:12:12 -0700 Subject: [PATCH] Why not? --- flake.lock | 138 ++++++++++++++++++++++++++++++++++++++++++- flake.nix | 8 +++ systems/sumireko.nix | 2 + 3 files changed, 147 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index a449f446..1c85bf5b 100644 --- a/flake.lock +++ b/flake.lock @@ -17,6 +17,63 @@ "type": "github" } }, + "artemiscli": { + "inputs": { + "artemiscore": "artemiscore", + "flake-utils": [ + "utils" + ], + "nixpkgs": [ + "nixpkgs" + ], + "poetry2nix": "poetry2nix", + "std": [ + "std" + ] + }, + "locked": { + "lastModified": 1689631745, + "narHash": "sha256-Gy0EyiOWoyXfcRwWibtufCPWGQsQiPaEnSqqhz4HYGo=", + "ref": "refs/heads/kittywitch/multitenancy", + "rev": "f40065132e524311e73a2d6d596fef14b263b6bf", + "revCount": 160, + "type": "git", + "url": "file:///Users/kat/src/work/metaflow-cli-plugin" + }, + "original": { + "type": "git", + "url": "file:///Users/kat/src/work/metaflow-cli-plugin" + } + }, + "artemiscore": { + "inputs": { + "flake-utils": [ + "artemiscli", + "flake-utils" + ], + "nixpkgs": [ + "artemiscli", + "nixpkgs" + ], + "poetry2nix": [ + "artemiscli", + "poetry2nix" + ] + }, + "locked": { + "lastModified": 1689629642, + "narHash": "sha256-nAPpRqQvGjrt+D5zFGL0bsgd+rCNdLExV8BEAVMyaJs=", + "ref": "refs/heads/kittywitch/multitenancy", + "rev": "923245fbe00b158fd23a5bad04a225da0c4657a7", + "revCount": 82, + "type": "git", + "url": "file:///Users/kat/src/work/metaflow-core-plugin" + }, + "original": { + "type": "git", + "url": "file:///Users/kat/src/work/metaflow-core-plugin" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -96,6 +153,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -143,6 +218,28 @@ "type": "indirect" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "artemiscli", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688870561, + "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -210,6 +307,29 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "artemiscli", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1689512738, + "narHash": "sha256-p2hKM6WYl4dJ6C6qmf8kct2PYJRNii3eAoRUhWjkGdU=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "e7a88dfc2c5aa0c660a3ec4661a695c1c2380a8a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "pypi-deps-db": { "flake": false, "locked": { @@ -229,6 +349,7 @@ "root": { "inputs": { "arcexprs": "arcexprs", + "artemiscli": "artemiscli", "darwin": "darwin", "deploy-rs": "deploy-rs", "empty": "empty", @@ -346,6 +467,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tree": { "inputs": { "nixpkgs": [ @@ -371,7 +507,7 @@ }, "utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1689068808, diff --git a/flake.nix b/flake.nix index 430a305c..b214e4d3 100644 --- a/flake.nix +++ b/flake.nix @@ -100,6 +100,14 @@ url = "github:arcnmx/nixexprs/master"; flake = false; }; + artemiscli = { + url = "/Users/kat/src/work/metaflow-cli-plugin"; + inputs = { + flake-utils.follows = "utils"; + nixpkgs.follows = "nixpkgs"; + std.follows = "std"; + }; + }; }; outputs = inputs: import ./outputs.nix {inherit inputs;}; } diff --git a/systems/sumireko.nix b/systems/sumireko.nix index 65d6028e..baa253bf 100644 --- a/systems/sumireko.nix +++ b/systems/sumireko.nix @@ -2,6 +2,7 @@ _: let hostConfig = { tree, pkgs, + inputs, ... }: { imports = with tree; [ @@ -39,6 +40,7 @@ _: let ''; environment.systemPackages = with pkgs; [ + inputs.artemiscli.packages.aarch64-darwin.artemiscli fd # fd, better fine! ripgrep # rg, better grep! deadnix # dead-code scanner