From 1fbfed816256e7506d94d2fdc13adace63ae4555 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 16 Jul 2024 03:59:38 +0200 Subject: [PATCH] flake: rename 'nix' input to 'lix' For consistency with other Lix forks of Nix ecosystems projects, e.g. nix-eval-jobs. --- flake.lock | 16 ++++++++-------- flake.nix | 9 +++++---- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index a92371a9..fe2c6b6b 100644 --- a/flake.lock +++ b/flake.lock @@ -16,7 +16,7 @@ "type": "github" } }, - "nix": { + "lix": { "inputs": { "flake-compat": "flake-compat", "nix2container": "nix2container", @@ -27,17 +27,17 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1720733512, - "narHash": "sha256-vq9CLDvqSSvH4L7YhDa0ihTOrAry4jntKiuoNb5n98M=", + "lastModified": 1721091462, + "narHash": "sha256-0cmEeoOiB91BviTJHzIyxkY+Gxv3O8ZnnExVAoXEFGI=", "ref": "refs/heads/main", - "rev": "4b109ec1a8fc4550150f56f0f46f2f41d844bda8", - "revCount": 15950, + "rev": "6b4d46e9e0e1dd80e0977684ab20d14bcd1a6bc3", + "revCount": 15967, "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" + "url": "https://git.lix.systems/lix-project/lix" }, "original": { "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" + "url": "https://git.lix.systems/lix-project/lix" } }, "nix2container": { @@ -106,7 +106,7 @@ }, "root": { "inputs": { - "nix": "nix", + "lix": "lix", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 7797e8f4..4478254f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,15 +2,16 @@ description = "A Nix-based continuous build system"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; - inputs.nix.url = "git+https://git@git.lix.systems/lix-project/lix"; - inputs.nix.inputs.nixpkgs.follows = "nixpkgs"; - outputs = { self, nixpkgs, nix }: + inputs.lix.url = "git+https://git.lix.systems/lix-project/lix"; + inputs.lix.inputs.nixpkgs.follows = "nixpkgs"; + + outputs = { self, nixpkgs, lix }: let systems = [ "x86_64-linux" "aarch64-linux" ]; forEachSystem = nixpkgs.lib.genAttrs systems; - overlayList = [ self.overlays.default nix.overlays.default ]; + overlayList = [ self.overlays.default lix.overlays.default ]; pkgsBySystem = forEachSystem (system: import nixpkgs { inherit system;