diff --git a/flake.lock b/flake.lock index 67433af..f4fe056 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ ] }, "locked": { - "lastModified": 1716896577, - "narHash": "sha256-51wgh3tp2WwaDtgTPxQH7RMQ2wmTXCkhCEtmaZfWF1Y=", + "lastModified": 1717638331, + "narHash": "sha256-ikwAuKry4EGsKjp7+7Du5bKFvx7mrNch67iczo//YQg=", "owner": "Mic92", "repo": "buildbot-nix", - "rev": "7358c456cd6f383aac527dfca5ac93d05a57cacd", + "rev": "46a33f9b2ad1cb836721b2eea0629ed23b86cb61", "type": "github" }, "original": { @@ -43,15 +43,15 @@ ] }, "locked": { - "lastModified": 1716901339, - "narHash": "sha256-LGlFJ0+bydJdbvLLkfUx95mYMNHewyN3daq+UfhhRLs=", - "rev": "52584662a8b8217e11b6e057bcca1846b4cb2934", + "lastModified": 1717670559, + "narHash": "sha256-vXqsEImk9EjnwiZ+Xm/8dLP0xE1OmeEmSRjhajuJxfE=", + "rev": "b19ac7e490ad5a76b0bf11d815b01a8b69bf4ead", "type": "tarball", - "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/52584662a8b8217e11b6e057bcca1846b4cb2934.tar.gz" + "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/b19ac7e490ad5a76b0bf11d815b01a8b69bf4ead.tar.gz" }, "original": { "type": "tarball", - "url": "https://git.clan.lol/clan/clan-core/archive/main.tar.gz" + "url": "https://git.clan.lol/clan/clan-core/archive/synapse.tar.gz" } }, "disko": { @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1716394172, - "narHash": "sha256-B+pNhV8GFeCj9/MoH+qtGqKbgv6fU4hGaw2+NoYYtB0=", + "lastModified": 1717177033, + "narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=", "owner": "nix-community", "repo": "disko", - "rev": "23c63fb09334c3e8958b57e2ddc3870b75b9111d", + "rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c", "type": "github" }, "original": { @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -112,11 +112,11 @@ }, "nixos-2311": { "locked": { - "lastModified": 1715818734, - "narHash": "sha256-WvAJWCwPj/6quKcsgsvQYyZRxV8ho/yUzj0HZQ34DVU=", + "lastModified": 1717017538, + "narHash": "sha256-S5kltvDDfNQM3xx9XcvzKEOyN2qk8Sa+aSOLqZ+1Ujc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "95742536dc6debb5a8b8b78b27001c38f369f1e7", + "rev": "64e468fd2652105710d86cd2ae3e65a5a6d58dec", "type": "github" }, "original": { @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1716123454, - "narHash": "sha256-U2o4UPM/UsEyIX2p11+YEQgR9HY3PmjZ2mRl/x5e4xo=", + "lastModified": 1716210724, + "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "a63e0c83dd83fe28cc571b97129e13373436bd82", + "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", "type": "github" }, "original": { @@ -157,11 +157,11 @@ ] }, "locked": { - "lastModified": 1716132123, - "narHash": "sha256-rATSWbPaKQfZGaemu0tHL2xfCzVIVwpuTjk+KSBC+k4=", + "lastModified": 1717040312, + "narHash": "sha256-yI/en4IxuCEClIUpIs3QTyYCCtmSPLOhwLJclfNwdeg=", "owner": "nix-community", "repo": "nixos-images", - "rev": "8c9cab8c44434c12dafc465fbf61a710c5bceb08", + "rev": "47bfb55316e105390dd761e0b6e8e0be09462b67", "type": "github" }, "original": { @@ -172,11 +172,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716715802, - "narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=", + "lastModified": 1717459389, + "narHash": "sha256-I8/plBsua4/NZ5bKgj+z7/ThiWuud1YFwLsn1QQ5PgE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2dd4e18cc1c7314e24154331bae07df76eb582f", + "rev": "3b01abcc24846ae49957b30f4345bab4b3f1d14b", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1716087663, - "narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=", + "lastModified": 1717297459, + "narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5", + "rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075", "type": "github" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1716771198, - "narHash": "sha256-vRDCDuFMvkvCjGT/N9K2lxG1E61vvq3TiU/4ZM36p8k=", + "lastModified": 1717635218, + "narHash": "sha256-1fd4myxpeHrdBuXyjQqEp1lqq1CJeuPXPk67TlD6UKA=", "owner": "numtide", "repo": "srvos", - "rev": "5d4550de420ee501d7fa0e6cd9031cd00354554c", + "rev": "5e0d94f2b3608f2d01208e27d4a4db5a0e85b069", "type": "github" }, "original": { @@ -247,11 +247,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1717278143, + "narHash": "sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "3eb96ca1ae9edf792a8e0963cc92fddfa5a87706", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e576194..53aef2c 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ # Use the version of nixpkgs that has been tested to work with SrvOS srvos.inputs.nixpkgs.follows = "nixpkgs"; - clan-core.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; + clan-core.url = "https://git.clan.lol/clan/clan-core/archive/synapse.tar.gz"; clan-core.inputs.flake-parts.follows = "flake-parts"; clan-core.inputs.nixpkgs.follows = "nixpkgs"; clan-core.inputs.treefmt-nix.follows = "treefmt-nix"; diff --git a/modules/web01/default.nix b/modules/web01/default.nix index b4b7fba..d1d7b3a 100644 --- a/modules/web01/default.nix +++ b/modules/web01/default.nix @@ -8,7 +8,7 @@ ./homepage.nix ./postfix.nix ./jobs.nix - #./matrix-synapse.nix + ./matrix-synapse.nix ../dev.nix self.inputs.clan-core.clanModules.zt-tcp-relay ]; diff --git a/targets/flake-module.nix b/targets/flake-module.nix index b4718c5..c4a3c3c 100644 --- a/targets/flake-module.nix +++ b/targets/flake-module.nix @@ -1,7 +1,7 @@ { self, inputs, ... }: { flake = inputs.clan-core.lib.buildClan { - clanName = "infra"; + meta.name = "infra"; directory = self; # Make flake available in modules specialArgs = {