From 21fa57545bb0313f5336f33de28138666739e8b0 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sun, 16 Mar 2025 12:20:25 +0100
Subject: [PATCH] flake.nix: Update lix
---
flake.lock | 82 ++++++++++++++++++++++++------------------------------
flake.nix | 10 +++++--
2 files changed, 45 insertions(+), 47 deletions(-)
diff --git a/flake.lock b/flake.lock
index 257c57e..037e12f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -201,11 +201,11 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1726560853,
- "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@@ -254,22 +254,25 @@
},
"hydra": {
"inputs": {
- "lix": "lix",
+ "lix": [
+ "lix"
+ ],
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1733503045,
- "narHash": "sha256-VoMam8Zzbk+X6dIYwH2f9NqItL6g9YDhQvGybzSl8xQ=",
- "ref": "refs/heads/main",
- "rev": "eccf01d4fef67f87b6383f96c73781bd08b686ac",
- "revCount": 4230,
+ "lastModified": 1737885770,
+ "narHash": "sha256-neRDOoeJj4svdSAxXW8ZJOYWQzzOCRYppkaLaHPfs3A=",
+ "ref": "lix-2.92",
+ "rev": "7b3d065a13b21ec8109a250ac6148553bda52d5e",
+ "revCount": 4233,
"type": "git",
"url": "https://git.lix.systems/lix-project/hydra.git"
},
"original": {
+ "ref": "lix-2.92",
"type": "git",
"url": "https://git.lix.systems/lix-project/hydra.git"
}
@@ -279,64 +282,52 @@
"flake-compat": "flake-compat",
"nix2container": "nix2container",
"nixpkgs": [
- "hydra",
"nixpkgs"
],
"nixpkgs-regression": "nixpkgs-regression",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
- "lastModified": 1732112222,
- "narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=",
- "ref": "refs/heads/main",
- "rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff",
- "revCount": 16513,
+ "lastModified": 1741509550,
+ "narHash": "sha256-O7+c7MYOvKnGhE5qwRqV+q0NePEtiz6spM1Mfu/Heck=",
+ "ref": "release-2.92",
+ "rev": "0d1f794178d42bfa1ef40ecb80be514139779184",
+ "revCount": 16641,
"type": "git",
- "url": "https://git.lix.systems/lix-project/lix"
+ "url": "https://git.lix.systems/lix-project/lix.git"
},
"original": {
+ "ref": "release-2.92",
"type": "git",
- "url": "https://git.lix.systems/lix-project/lix"
+ "url": "https://git.lix.systems/lix-project/lix.git"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile",
- "lix": "lix_2",
+ "lix": [
+ "lix"
+ ],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1732605668,
- "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=",
- "ref": "stable",
- "rev": "96824d606a6656650bbe436366bc89d5ee3a6573",
- "revCount": 113,
+ "lastModified": 1741892773,
+ "narHash": "sha256-8oUT6D7VlsuLkms3zBsUaPBUoxucmFq62QdtyVpjq0Y=",
+ "ref": "release-2.92",
+ "rev": "ed7a2fa83145868ecb830d6b3c73ebfd81a9e911",
+ "revCount": 130,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module.git"
},
"original": {
- "ref": "stable",
+ "ref": "release-2.92",
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module.git"
}
},
- "lix_2": {
- "flake": false,
- "locked": {
- "lastModified": 1729298361,
- "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
- "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
- "type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
- },
- "original": {
- "type": "tarball",
- "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
- }
- },
"mitel-ommclient2": {
"inputs": {
"nixpkgs": [
@@ -373,11 +364,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
- "lastModified": 1732351635,
- "narHash": "sha256-H94CcQ3yamG5+RMxtxXllR02YIlxQ5WD/8PcolO9yEA=",
+ "lastModified": 1737237917,
+ "narHash": "sha256-xd3/Wr4aPc2MY61qyQ6qQ8AGoG3H/DDcJWziP4EhhXY=",
"ref": "refs/heads/main",
- "rev": "dfc286ca3dc49118c30d8d6205d6d6af76c62b7a",
- "revCount": 617,
+ "rev": "6482bee40b89ab2c28d2e988848aa9ae0429d78c",
+ "revCount": 621,
"type": "git",
"url": "https://git.lix.systems/lix-project/nix-eval-jobs"
},
@@ -579,11 +570,11 @@
"pre-commit-hooks": {
"flake": false,
"locked": {
- "lastModified": 1726745158,
- "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
+ "lastModified": 1733318908,
+ "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
+ "rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
"type": "github"
},
"original": {
@@ -621,6 +612,7 @@
"fieldpoc": "fieldpoc",
"harmonia": "harmonia",
"hydra": "hydra",
+ "lix": "lix",
"lix-module": "lix-module",
"nixos-exporter": "nixos-exporter",
"nixos-hardware": "nixos-hardware",
diff --git a/flake.nix b/flake.nix
index 0a2791a..9525d32 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,11 +25,17 @@
inputs.nixpkgs.follows = "nixpkgs";
};
hydra = {
- url = "git+https://git.lix.systems/lix-project/hydra.git";
+ url = "git+https://git.lix.systems/lix-project/hydra.git?ref=lix-2.92";
+ inputs.lix.follows = "lix";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+ lix = {
+ url = "git+https://git.lix.systems/lix-project/lix.git?ref=release-2.92";
inputs.nixpkgs.follows = "nixpkgs";
};
lix-module = {
- url = "git+https://git.lix.systems/lix-project/nixos-module.git?ref=stable";
+ url = "git+https://git.lix.systems/lix-project/nixos-module.git?ref=release-2.92";
+ inputs.lix.follows = "lix";
inputs.nixpkgs.follows = "nixpkgs";
};
fieldpoc.url = "git+https://git.clerie.de/clerie/fieldpoc.git";