From 2a6467db52b2165971d1c114bd5e2941b256626d Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Thu, 13 Mar 2025 13:08:14 -0400 Subject: [PATCH] flake: unpin hydra nixpkgs --- flake.lock | 38 ++++++++++++++++++++++++++------------ flake.nix | 2 +- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 50b4b9d..be2f75e 100644 --- a/flake.lock +++ b/flake.lock @@ -455,9 +455,7 @@ "hydra": { "inputs": { "lix": "lix", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1741782909, @@ -583,11 +581,11 @@ ] }, "locked": { - "lastModified": 1739192059, - "narHash": "sha256-r40TUIL6zij0kWBpqKyI7O2brT3Myaa3aAGamkZEvfc=", - "rev": "3bca42eb0049772d9079f29f25186575f8e5a4ae", + "lastModified": 1741807280, + "narHash": "sha256-pulMy3FT5TR8CS+lVm2yoaGTh1Ed9WwHlfogqaE0bT0=", + "rev": "40601ea3abdbf8923a63c69d974dd519fe34c532", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3bca42eb0049772d9079f29f25186575f8e5a4ae.tar.gz?rev=3bca42eb0049772d9079f29f25186575f8e5a4ae" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/40601ea3abdbf8923a63c69d974dd519fe34c532.tar.gz?rev=40601ea3abdbf8923a63c69d974dd519fe34c532" }, "original": { "type": "tarball", @@ -776,16 +774,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1741600792, + "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -822,6 +820,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": [ @@ -1007,7 +1021,7 @@ "nix-minecraft": "nix-minecraft", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "old-stable": "old-stable", "private": "private", diff --git a/flake.nix b/flake.nix index d676c13..8f6a1ba 100644 --- a/flake.nix +++ b/flake.nix @@ -109,7 +109,7 @@ #hydra.inputs.lix.follows = "lix"; hydra.inputs.nix-eval-jobs.inputs.flake-parts.follows = "flake-parts"; hydra.inputs.nix-eval-jobs.inputs.treefmt-nix.follows = "treefmt-nix"; - hydra.inputs.nixpkgs.follows = "nixpkgs"; + #hydra.inputs.nixpkgs.follows = "nixpkgs"; lix-module.inputs.flake-utils.follows = "flake-utils"; lix-module.inputs.lix.follows = "lix"; lix-module.inputs.nixpkgs.follows = "nixpkgs";