From 9ea1a70495513feefc1bd42c2c1a7d8b15900af3 Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Thu, 14 Aug 2025 22:41:16 +0100 Subject: [PATCH 1/4] 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 = { From 77698bd2ef9c422d6c4af96ec662bfc0178b28ab Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Thu, 14 Aug 2025 22:42:31 +0100 Subject: [PATCH 2/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager-unstable': 'github:nix-community/home-manager/91586008a23c01cc32894ee187dca8c0a7bd20a4' (2025-08-10) → 'github:nix-community/home-manager/279ca5addcdcfa31ac852b3ecb39fc372684f426' (2025-08-13) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/fc756aa6f5d3e2e5666efcf865d190701fef150a' (2025-08-08) → 'github:NixOS/nixpkgs/3385ca0cd7e14c1a1eb80401fe011705ff012323' (2025-08-13) • Updated input 'nixpkgs-small': 'github:NixOS/nixpkgs/c5f08b62ed75415439d48152c2a784e36909b1bc' (2025-08-09) → 'github:NixOS/nixpkgs/20a42bc21e54ac69d390af482945da2ed0f818c4' (2025-08-14) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054' (2025-08-09) → 'github:NixOS/nixpkgs/005433b926e16227259a1843015b5b2b7f7d1fc3' (2025-08-12) • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/641d909c4a7538f1539da9240dedb1755c907e40' (2025-08-10) → 'github:NixOS/nixpkgs/1a341e3c908f4a3105e737bd13af0318dc06fbe3' (2025-08-14) • Updated input 'randomcat': 'github:randomnetcat/nix-configs/5ec76d807da16b1ecd8aaf230cbb88b140810e67' (2025-08-10) → 'github:randomnetcat/nix-configs/724c16b15be0eccc0b49c0c345185ecbcf9a1b98' (2025-08-14) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index c9b2cae..e454fa9 100644 --- a/flake.lock +++ b/flake.lock @@ -141,11 +141,11 @@ ] }, "locked": { - "lastModified": 1754842705, - "narHash": "sha256-2vvncPLsBWV6dRM5LfGHMGYZ+vzqRDqSPBzxPAS0R/A=", + "lastModified": 1755121891, + "narHash": "sha256-UtYkukiGnPRJ5rpd4W/wFVrLMh8fqtNkqHTPgHEtrqU=", "owner": "nix-community", "repo": "home-manager", - "rev": "91586008a23c01cc32894ee187dca8c0a7bd20a4", + "rev": "279ca5addcdcfa31ac852b3ecb39fc372684f426", "type": "github" }, "original": { @@ -193,11 +193,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754689972, - "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", + "lastModified": 1755078291, + "narHash": "sha256-Hu/gTDoi4uy6TAKISPHQusSMy8U6xUbLSDjKBYdhDIY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", + "rev": "3385ca0cd7e14c1a1eb80401fe011705ff012323", "type": "github" }, "original": { @@ -224,11 +224,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1754767907, - "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", + "lastModified": 1755152343, + "narHash": "sha256-6NhwGvii7Fh54oSg08iREp2LouDIpy9cZr2DHpbpzaA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", + "rev": "20a42bc21e54ac69d390af482945da2ed0f818c4", "type": "github" }, "original": { @@ -240,11 +240,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", "type": "github" }, "original": { @@ -256,11 +256,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1754800730, - "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", + "lastModified": 1755166611, + "narHash": "sha256-sk8pK8kWz4IE4ErAjKE1d8tMChY6VQR32U4yS68FIog=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "641d909c4a7538f1539da9240dedb1755c907e40", + "rev": "1a341e3c908f4a3105e737bd13af0318dc06fbe3", "type": "github" }, "original": { @@ -296,11 +296,11 @@ "randomcat": { "flake": false, "locked": { - "lastModified": 1754792812, - "narHash": "sha256-AyHt1K+Y3e7Ss5ycNYC47tt+QRTmQJDd3NVudmWhBtQ=", + "lastModified": 1755137299, + "narHash": "sha256-D9ouBQscZhecaTJ/Q6OJ1ZB4oek4HFbCuijN6i9XTXg=", "owner": "randomnetcat", "repo": "nix-configs", - "rev": "5ec76d807da16b1ecd8aaf230cbb88b140810e67", + "rev": "724c16b15be0eccc0b49c0c345185ecbcf9a1b98", "type": "github" }, "original": { From 2f619e92dcf36bef626355ed808075b01d2cd160 Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Fri, 15 Aug 2025 10:02:23 +0100 Subject: [PATCH 3/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager-unstable': 'github:nix-community/home-manager/279ca5addcdcfa31ac852b3ecb39fc372684f426' (2025-08-13) → 'github:nix-community/home-manager/11626a4383b458f8dc5ea3237eaa04e8ab1912f3' (2025-08-15) • Updated input 'nixpkgs-small': 'github:NixOS/nixpkgs/20a42bc21e54ac69d390af482945da2ed0f818c4' (2025-08-14) → 'github:NixOS/nixpkgs/5d35709e6ca20589ba8f60ffd50ca73021cec7c7' (2025-08-14) • Updated input 'randomcat': 'github:randomnetcat/nix-configs/724c16b15be0eccc0b49c0c345185ecbcf9a1b98' (2025-08-14) → 'github:randomnetcat/nix-configs/210dfc9f7a5503379cb7270ef677cedbfff26cc0' (2025-08-15) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index e454fa9..8003ac8 100644 --- a/flake.lock +++ b/flake.lock @@ -141,11 +141,11 @@ ] }, "locked": { - "lastModified": 1755121891, - "narHash": "sha256-UtYkukiGnPRJ5rpd4W/wFVrLMh8fqtNkqHTPgHEtrqU=", + "lastModified": 1755229570, + "narHash": "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=", "owner": "nix-community", "repo": "home-manager", - "rev": "279ca5addcdcfa31ac852b3ecb39fc372684f426", + "rev": "11626a4383b458f8dc5ea3237eaa04e8ab1912f3", "type": "github" }, "original": { @@ -224,11 +224,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1755152343, - "narHash": "sha256-6NhwGvii7Fh54oSg08iREp2LouDIpy9cZr2DHpbpzaA=", + "lastModified": 1755203481, + "narHash": "sha256-tvQYQ2mPvWX1tD/Saq8tfhH8qIGxXu18vo1vO0B+Z6A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20a42bc21e54ac69d390af482945da2ed0f818c4", + "rev": "5d35709e6ca20589ba8f60ffd50ca73021cec7c7", "type": "github" }, "original": { @@ -296,11 +296,11 @@ "randomcat": { "flake": false, "locked": { - "lastModified": 1755137299, - "narHash": "sha256-D9ouBQscZhecaTJ/Q6OJ1ZB4oek4HFbCuijN6i9XTXg=", + "lastModified": 1755223743, + "narHash": "sha256-B2+qqeYg542ZiOkMnIFgO9lMQjfCKNqHBJt0neaMdYM=", "owner": "randomnetcat", "repo": "nix-configs", - "rev": "724c16b15be0eccc0b49c0c345185ecbcf9a1b98", + "rev": "210dfc9f7a5503379cb7270ef677cedbfff26cc0", "type": "github" }, "original": { From 3bc4563613690357110b6e66ade80e6112bb9de6 Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Fri, 15 Aug 2025 12:33:32 +0100 Subject: [PATCH 4/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/005433b926e16227259a1843015b5b2b7f7d1fc3' (2025-08-12) → 'github:NixOS/nixpkgs/fbcf476f790d8a217c3eab4e12033dc4a0f6d23c' (2025-08-14) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8003ac8..9bf524f 100644 --- a/flake.lock +++ b/flake.lock @@ -240,11 +240,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": {