diff --git a/machines/gerd/services/stalwart/stalwart.nix b/machines/gerd/services/stalwart/stalwart.nix index f27af6d..f2435c4 100644 --- a/machines/gerd/services/stalwart/stalwart.nix +++ b/machines/gerd/services/stalwart/stalwart.nix @@ -25,12 +25,6 @@ in { services.stalwart-mail = { enable = true; openFirewall = true; - - package = pkgs.stalwart-mail.overrideAttrs (old: { - patches = old.patches ++ [ - ./patches/stalwart-cli-dns-records.patch - ]; - }); settings = { lookup.default.hostname = svc_domain; diff --git a/shared/sources/default.nix b/shared/sources/default.nix index 1a51376..e07d00f 100644 --- a/shared/sources/default.nix +++ b/shared/sources/default.nix @@ -11,17 +11,7 @@ in sources // { # tmp teeworlds fetchpatch to inject secrets (pkgs.fetchpatch { url = "https://github.com/NixOS/nixpkgs/pull/334590.patch"; - sha256 = "sha256-5Uf/jLV0CJFbWyPmkpF4kEVISvoG+fujvTAFIR0a2ek="; - }) - # stalwart-mail - # (pkgs.fetchpatch { - # url = "https://github.com/NixOS/nixpkgs/pull/333507.patch"; - # sha256 = "sha256-HAbfKQRnOjdK/rJ5wuePw4hEVQoFz9N0YujxBxROGo0="; - # }) - # element 1.11.76 - (pkgs.fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/337906.patch"; - sha256 = "sha256-35ZTSIYmKmOcgQfWS+Ze6PdEHCaB2yn1q0/1nEt0Rh0="; + sha256 = "sha256-kP5wYYxR+sSGBla9d4+iGUu1SHA4q2UkLuebhZUhAxo="; }) ]; }; diff --git a/shared/sources/sources.json b/shared/sources/sources.json index 3b067be..21494f9 100644 --- a/shared/sources/sources.json +++ b/shared/sources/sources.json @@ -17,10 +17,10 @@ "homepage": "", "owner": "nix-community", "repo": "disko", - "rev": "511388d837178979de66d14ca4a2ebd5f7991cd3", - "sha256": "1r3bzixpirkingic4w79dznszcxzj7y3pgds3mpg9yilmp0q0ahr", + "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", + "sha256": "16zjxysjhk3sgd8b4x5mvx9ilnq35z3zfpkv1la33sqkr8xh1amn", "type": "tarball", - "url": "https://github.com/nix-community/disko/archive/511388d837178979de66d14ca4a2ebd5f7991cd3.tar.gz", + "url": "https://github.com/nix-community/disko/archive/e55f9a8678adc02024a4877c2a403e3f6daf24fe.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "impermanence": { @@ -29,10 +29,10 @@ "homepage": "", "owner": "nix-community", "repo": "impermanence", - "rev": "c7f5b394397398c023000cf843986ee2571a1fd7", - "sha256": "0znd8asz61l1dm5qnjcqcznjr138ywwwkpqyla571s9z0s3jybvv", + "rev": "63f4d0443e32b0dd7189001ee1894066765d18a5", + "sha256": "0xnshgwfg834dm9l14p2w3wmhjysjpqpgfk37im0vrk1qgva19g2", "type": "tarball", - "url": "https://github.com/nix-community/impermanence/archive/c7f5b394397398c023000cf843986ee2571a1fd7.tar.gz", + "url": "https://github.com/nix-community/impermanence/archive/63f4d0443e32b0dd7189001ee1894066765d18a5.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { @@ -41,10 +41,10 @@ "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", - "sha256": "1b47065q41ar9585ra4akb4s4kjwcs3p3g4chrpps8704vz7nx0s", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "sha256": "0s6h7r9jin9sd8l85hdjwl3jsvzkddn3blggy78w4f21qa3chymz", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/71e91c409d1e654808b2621f28a327acfdad8dc2.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/574d1eac1c200690e27b8eb4e24887f8df7ac27c.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }