diff --git a/flake.lock b/flake.lock index 429d372..d9f9b6f 100644 --- a/flake.lock +++ b/flake.lock @@ -3,19 +3,16 @@ "amarth-services": { "inputs": { "clan-core": "clan-core", - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "amarth-services", - "clan-core", - "nixpkgs" - ] + "devshell": "devshell", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1758130572, - "narHash": "sha256-OB5KCrv3X1x2aTT9tE/6w2H/FD8EZurh7debKLtDyBM=", + "lastModified": 1758132307, + "narHash": "sha256-qO40PUZ6OJnBGPWA4wXG0TnKAcgM+CQhroKHFle8O88=", "ref": "refs/heads/main", - "rev": "7e0a5243647dceeb09ff3095938282370f4047d4", - "revCount": 10, + "rev": "bf272f660796f765c2919a2e4a75441556604d18", + "revCount": 12, "type": "git", "url": "https://git.amarth.cloud/amarth/services" }, @@ -28,21 +25,27 @@ "inputs": { "data-mesher": "data-mesher", "disko": "disko", - "flake-parts": "flake-parts", + "flake-parts": [ + "amarth-services", + "flake-parts" + ], "nix-darwin": "nix-darwin", "nix-select": "nix-select", "nixos-facter-modules": "nixos-facter-modules", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "amarth-services", + "nixpkgs" + ], "sops-nix": "sops-nix", "systems": "systems", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1757912940, - "narHash": "sha256-Xypz7pxa1L09GooMueosv0CRW4Cx5/gdtvSPBrnXf6M=", - "rev": "93280a9f987bbe689c74f1ea21d0c2fa4645c359", + "lastModified": 1758121565, + "narHash": "sha256-y37cz5A+EFMBvWi0/S+wrkTMHGQnDb7cifqZoIfSRHE=", + "rev": "b7798f54666fe61d8b16b5c45c39fac97e2d2e60", "type": "tarball", - "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/93280a9f987bbe689c74f1ea21d0c2fa4645c359.tar.gz" + "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/b7798f54666fe61d8b16b5c45c39fac97e2d2e60.tar.gz" }, "original": { "type": "tarball", @@ -137,7 +140,25 @@ }, "devshell": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1741473158, + "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", + "owner": "numtide", + "repo": "devshell", + "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_2": { + "inputs": { + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1741473158, @@ -200,7 +221,6 @@ "inputs": { "nixpkgs-lib": [ "amarth-services", - "clan-core", "nixpkgs" ] }, @@ -219,27 +239,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "amarth-services", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -268,11 +267,11 @@ ] }, "locked": { - "lastModified": 1757430124, - "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", + "lastModified": 1758102940, + "narHash": "sha256-wwqf3+A8EiqwWpcAaPN20QXJLlpGPpwtLTrzgnngI2o=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", + "rev": "ebd0bfc11fc2b5cff37401e9b3703881ad5fabbd", "type": "github" }, "original": { @@ -360,18 +359,37 @@ }, "nixpkgs": { "locked": { - "lastModified": 315532800, - "narHash": "sha256-h8Sx4S+/0FpodZji6W9lHzwY5BcuUG85Aj3GfhvGC2o=", - "rev": "a650b5d0de99158323597f048667c4d914243224", - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre845298.a650b5d0de99/nixexprs.tar.xz" + "lastModified": 1722073938, + "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_2": { + "locked": { + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1722073938, "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", @@ -387,7 +405,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1757745802, "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", @@ -407,9 +425,9 @@ "inputs": { "amarth-services": "amarth-services", "clan-core": "clan-core_2", - "devshell": "devshell", - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_3" + "devshell": "devshell_2", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_4" } }, "sops-nix": { @@ -421,11 +439,11 @@ ] }, "locked": { - "lastModified": 1757449901, - "narHash": "sha256-qwN8nYdSRnmmyyi+uR6m4gXnVktmy5smG1MOrSFD8PI=", + "lastModified": 1758007585, + "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3b4a369df9dd6ee171a7ea4448b50e2528faf850", + "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a8fabd8..e096edf 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ outputs = inputs@{ flake-parts, ... }: - flake-parts.lib.mkFlake { inherit inputs; } ({ self, pkgs, ... }: { + flake-parts.lib.mkFlake { inherit inputs; } ({ ... }: { systems = [ "x86_64-linux" ];