From 24b375099da0bae5906198385b49b15821849443 Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Fri, 10 Oct 2025 15:13:44 +0200 Subject: [PATCH] update nixpkgs, lix pins --- flake.lock | 101 ++++++++++++++++++++++++++++++++++++++++++----------- flake.nix | 2 +- 2 files changed, 82 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 2f618b1e8..0cd111892 100644 --- a/flake.lock +++ b/flake.lock @@ -53,16 +53,17 @@ "inputs": { "flake-compat": "flake-compat", "nix2container": "nix2container", - "nixpkgs": "nixpkgs", + "nix_2_18": "nix_2_18", + "nixpkgs": "nixpkgs_2", "nixpkgs-regression": "nixpkgs-regression", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1739846668, - "narHash": "sha256-B0+90JxZ7m+NVTb82Y8/R5OvKJrJhFDO2LtIxM7JNfw=", + "lastModified": 1759921757, + "narHash": "sha256-Ehc6T61Ntmxq/o1+9J2WttwjAoA86KW3z0rhGTg6GYA=", "ref": "refs/heads/main", - "rev": "0069c59eda80e89ef4e42f7629cb15b051b6cadd", - "revCount": 17430, + "rev": "5e2412ea7e3a8725355a07bed1f3cccc5506edcf", + "revCount": 18412, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -83,11 +84,11 @@ ] }, "locked": { - "lastModified": 1738176840, - "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=", + "lastModified": 1756511062, + "narHash": "sha256-IgD1JR7scSEwlK/YAbmrcTWpAYT30LPldCUHdzXkaMs=", "ref": "refs/heads/main", - "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e", - "revCount": 133, + "rev": "3f09a5eb772e02d98bb8878ab687d5b721f00d16", + "revCount": 162, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -96,6 +97,22 @@ "url": "https://git.lix.systems/lix-project/nixos-module" } }, + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, "nix2container": { "flake": false, "locked": { @@ -112,18 +129,46 @@ "type": "github" } }, - "nixpkgs": { + "nix_2_18": { + "inputs": { + "flake-compat": [ + "lix", + "flake-compat" + ], + "lowdown-src": "lowdown-src", + "nixpkgs": "nixpkgs", + "nixpkgs-regression": [ + "lix", + "nixpkgs-regression" + ] + }, "locked": { - "lastModified": 1733348545, - "narHash": "sha256-b4JrUmqT0vFNx42aEN9LTWOHomkTKL/ayLopflVf81U=", + "lastModified": 1730375271, + "narHash": "sha256-RrOFlDGmRXcVRV2p2HqHGqvzGNyWoD0Dado/BNlJ1SI=", "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9ecb50d2fae8680be74c08bb0a995c5383747f89", + "repo": "nix", + "rev": "0f665ff6779454f2117dcc32e44380cda7f45523", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11-small", + "ref": "2.18.9", + "repo": "nix", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1705033721, + "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05-small", "repo": "nixpkgs", "type": "github" } @@ -146,16 +191,32 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739758141, - "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", + "lastModified": 1758391731, + "narHash": "sha256-UuwQoPWv13DVKMveeev+F0OC/N95AOmAz6SzCuGhxjQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c618e28f70257593de75a7044438efc1c1fc0791", + "rev": "3f00d36f15e16e0471d9ca1e8f88958941fa970a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1759735786, + "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -180,7 +241,7 @@ "inputs": { "lix": "lix", "lix-module": "lix-module", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" } }, "systems": { diff --git a/flake.nix b/flake.nix index 1208e0384..98ff02ec4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; lix.url = "git+https://git.lix.systems/lix-project/lix"; lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module";