From 9ea1a70495513feefc1bd42c2c1a7d8b15900af3 Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Thu, 14 Aug 2025 22:41:16 +0100 Subject: [PATCH] flake: Fiddle with Lix versions to work around bug --- flake.lock | 13 ++++++++----- flake.nix | 7 +++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 755c11c..c9b2cae 100644 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1753223229, - "narHash": "sha256-tkT4aCZZE6IEmjYotOzKKa2rV3pGpH3ZREeQn7ACgdU=", - "rev": "7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a", + "lastModified": 1753306924, + "narHash": "sha256-jLCEW0FvjFhC+c4RHzH+xbkSOxrnpFHnhjOw6sudhx0=", + "rev": "1a4393d0aac31aba21f5737ede1b171e11336d77", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a.tar.gz?rev=7ac20fc47cf2f1b7469c7a2f379e5a3a51a6789a" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1a4393d0aac31aba21f5737ede1b171e11336d77.tar.gz?rev=1a4393d0aac31aba21f5737ede1b171e11336d77" }, "original": { "type": "tarball", @@ -172,7 +172,9 @@ "inputs": { "flake-utils": "flake-utils_2", "flakey-profile": "flakey-profile", - "lix": "lix", + "lix": [ + "lix" + ], "nixpkgs": [ "nixpkgs" ] @@ -314,6 +316,7 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", + "lix": "lix", "lix-module": "lix-module", "nixpkgs": "nixpkgs", "nixpkgs-small": "nixpkgs-small", diff --git a/flake.nix b/flake.nix index 7c5e3fb..ea9e4f1 100644 --- a/flake.nix +++ b/flake.nix @@ -4,11 +4,18 @@ nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-25.05-small"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + + lix = { + # use unreleased 2.93 branch due to https://git.lix.systems/lix-project/lix/issues/943 until lix cuts a new 2.93.x release + url = "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz"; + flake = false; + }; lix-module = { # lix haven't figured out automatic updates yet: https://git.lix.systems/lix-project/nixos-module/issues/39 url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-1.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.lix.follows = "lix"; }; home-manager = {