From 8e0e8bc1450f35a88eaad52c148e11f620c8d1f9 Mon Sep 17 00:00:00 2001 From: Eli Kogan-Wang Date: Thu, 2 Nov 2023 15:52:34 +0100 Subject: [PATCH] remove relative path input --- flake.lock | 23 +++++++++++------------ flake.nix | 7 ++----- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 149c64ed..0382983f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,9 +2,7 @@ "nodes": { "flake-utils": { "inputs": { - "systems": [ - "systems" - ] + "systems": "systems" }, "locked": { "lastModified": 1694529238, @@ -138,21 +136,22 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "poetry2nix": "poetry2nix", - "systems": "systems" + "poetry2nix": "poetry2nix" } }, "systems": { - "flake": false, "locked": { - "lastModified": 1, - "narHash": "sha256-ZHILufSPRwngc+5GNWTpJUXH7n1RuxvkAv7S0ScwYhQ=", - "path": "./flake.systems.nix", - "type": "path" + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" }, "original": { - "path": "./flake.systems.nix", - "type": "path" + "owner": "nix-systems", + "repo": "default", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index c9f02c33..b092c18c 100644 --- a/flake.nix +++ b/flake.nix @@ -8,10 +8,7 @@ nixos-generators.url = "github:nix-community/nixos-generators"; nixos-generators.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware"; - systems.url = "path:./flake.systems.nix"; - systems.flake = false; flake-utils.url = "github:numtide/flake-utils"; - flake-utils.inputs.systems.follows = "systems"; poetry2nix = { url = "github:nix-community/poetry2nix/1.42.1"; inputs.nixpkgs.follows = "nixpkgs"; @@ -19,9 +16,9 @@ }; }; - outputs = inputs@{ self, nixpkgs, home-manager, poetry2nix, flake-utils, systems, ... }: + outputs = inputs@{ self, nixpkgs, home-manager, poetry2nix, flake-utils, ... }: let - eachSystem = nixpkgs.lib.genAttrs (import systems); + eachSystem = nixpkgs.lib.genAttrs (import ./flake.systems.nix); in rec { formatter = eachSystem (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt);