From 6b4d8b2e71742bbf37a3a838918dc0af1c267d7e Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sat, 23 Nov 2024 14:23:11 +0700 Subject: [PATCH] :ambulance: pin clan-core revision because of clan-vars vs clan-facts --- flake.lock | 36 ++++++++++++++++++++---------------- flake.nix | 2 +- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 2f23b13..bfbf921 100644 --- a/flake.lock +++ b/flake.lock @@ -81,15 +81,16 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1732311754, - "narHash": "sha256-iwOnUIYlBPdWNoBa01v5khGsFtsogQuAviG8n7kPORA=", + "lastModified": 1730374010, + "narHash": "sha256-nEw0d7gbH5vFdr+ps5zlRywzaQ6zjbHFoQLjYyHhIeg=", "ref": "refs/heads/main", - "rev": "0261d5905303090b0300042a06ae417953958e7a", - "revCount": 4841, + "rev": "1bd3af310ea074d0ea9de6233376476c6ca9149a", + "revCount": 4535, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, "original": { + "rev": "1bd3af310ea074d0ea9de6233376476c6ca9149a", "type": "git", "url": "https://git.clan.lol/clan/clan-core" } @@ -145,11 +146,11 @@ ] }, "locked": { - "lastModified": 1731746438, - "narHash": "sha256-f3SSp1axoOk0NAI7oFdRzbxG2XPBSIXC+/DaAXnvS1A=", + "lastModified": 1730045523, + "narHash": "sha256-W5Avk1THhZALXITHGazKfZbIZ5+Bc4nSYvAYHUn96EU=", "owner": "nix-community", "repo": "disko", - "rev": "cb64993826fa7a477490be6ccb38ba1fa1e18fa8", + "rev": "89e458a3bb3693e769bfb2b2447c3fe72092d498", "type": "github" }, "original": { @@ -632,11 +633,11 @@ }, "nixos-facter-modules": { "locked": { - "lastModified": 1731843871, - "narHash": "sha256-aIy8m4jjr/BFXzniNzoH16sF7HEFV/01/5b3FhtUHrw=", + "lastModified": 1730026316, + "narHash": "sha256-AzP+trH/ykBJGTx3twkpuwbkhFSmsY1PJDQtRmK4k4c=", "owner": "numtide", "repo": "nixos-facter-modules", - "rev": "5a1c2a28589e34f8a44d46dd1909cfacf928cb1a", + "rev": "15b6531d44aa6f0bbd2fd8309cd2a6d7f183ba32", "type": "github" }, "original": { @@ -1108,14 +1109,17 @@ "nixpkgs": [ "clan-core", "nixpkgs" + ], + "nixpkgs-stable": [ + "clan-core" ] }, "locked": { - "lastModified": 1731862312, - "narHash": "sha256-NVUTFxKrJp/hjehlF1IvkPnlRYg/O9HFVutbxOM8zNM=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "472741cf3fee089241ac9ea705bb2b9e0bfa2978", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { @@ -1361,11 +1365,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1729242555, + "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 843e710..1b582af 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ clan-core.inputs.flake-parts.follows = "flake-parts"; clan-core.inputs.nixpkgs.follows = "nixpkgs"; - clan-core.url = "git+https://git.clan.lol/clan/clan-core"; + clan-core.url = "git+https://git.clan.lol/clan/clan-core?rev=1bd3af310ea074d0ea9de6233376476c6ca9149a"; # last time clan was using facts instead of vars clan-fact-generators.inputs.clan-core.follows = "clan-core"; clan-fact-generators.url = "github:mrvandalo/clan-fact-generators"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";