From 5c6e3b27156ba08a2401903faf95bd34636f39b6 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 27 Sep 2024 13:07:31 +0200 Subject: [PATCH] feat: introduce cutting edge Lix Signed-off-by: Raito Bezarius --- flake.lock | 90 ++++++++++++++++++++++++++++++++++++++++++ flake.nix | 3 ++ modules/nix-daemon.nix | 3 +- 3 files changed, 95 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 4803a0e..bc922a9 100644 --- a/flake.lock +++ b/flake.lock @@ -163,6 +163,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -271,6 +287,47 @@ "type": "github" } }, + "lix": { + "inputs": { + "flake-compat": "flake-compat_3", + "nix2container": "nix2container", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1727301466, + "narHash": "sha256-357IEOtI+QZy9NzmKhU0vAS7aY528Uvh2n/gXQFgRpY=", + "ref": "refs/changes/46/1946/1", + "rev": "2c74949780830b5cfcd913ef24514dc8e7db5f14", + "revCount": 16269, + "type": "git", + "url": "https://gerrit.lix.systems/lix" + }, + "original": { + "ref": "refs/changes/46/1946/1", + "type": "git", + "url": "https://gerrit.lix.systems/lix" + } + }, + "nix2container": { + "flake": false, + "locked": { + "lastModified": 1720642556, + "narHash": "sha256-qsnqk13UmREKmRT7c8hEnz26X3GFFyIQrqx4EaRc1Is=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "3853e5caf9ad24103b13aa6e0e8bcebb47649fe4", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1719069430, @@ -302,6 +359,22 @@ "type": "github" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1711460390, @@ -349,6 +422,22 @@ "type": "github" } }, + "pre-commit-hooks": { + "flake": false, + "locked": { + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -358,6 +447,7 @@ "flake-parts": "flake-parts", "flake-registry": "flake-registry", "home-manager": "home-manager_2", + "lix": "lix", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nur": "nur", diff --git a/flake.nix b/flake.nix index 08162f8..e83aea8 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,9 @@ # To update all inputs: # $ nix flake update --recreate-lock-file inputs = { + lix.url = "git+https://gerrit.lix.systems/lix?ref=refs/changes/46/1946/1"; + lix.inputs.nixpkgs.follows = "nixpkgs"; + disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/nix-daemon.nix b/modules/nix-daemon.nix index 209374a..499fdac 100644 --- a/modules/nix-daemon.nix +++ b/modules/nix-daemon.nix @@ -58,7 +58,8 @@ in gc.randomizedDelaySec = "1800"; # A much better choice. - package = pkgs.lix; + # Raito: We use this machine as a testing bed for cutting edge Lix features. + package = inputs.lix.packages.x86_64-linux.default; # should be enough? nrBuildUsers = 128;