diff options
| author | sils <sils@sils.li> | 2024-02-15 20:01:06 +0100 |
|---|---|---|
| committer | sils <sils@sils.li> | 2024-02-15 20:14:52 +0100 |
| commit | 37f71c496d816aa42f7cf1c7a8924e3914533740 (patch) | |
| tree | 78e3144ea4a0dd021dc092bf14201bf9a0e8b601 | |
| parent | chore(version): v0.23.0 (diff) | |
| download | nixos-server-37f71c496d816aa42f7cf1c7a8924e3914533740.tar.gz nixos-server-37f71c496d816aa42f7cf1c7a8924e3914533740.zip | |
fix: update mastodon
This uses the mastodon package from nixos-unstable-small because backporting of a security release failed and we can't afford to wait.
| -rw-r--r-- | flake.lock | 17 | ||||
| -rw-r--r-- | flake.nix | 7 | ||||
| -rw-r--r-- | system/services/mastodon/default.nix | 3 |
3 files changed, 25 insertions, 2 deletions
diff --git a/flake.lock b/flake.lock index 07f9ff2..aab5060 100644 --- a/flake.lock +++ b/flake.lock @@ -256,6 +256,22 @@ "type": "indirect" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1707970662, + "narHash": "sha256-YT9KHhP6t/MucCe1nR6QScO78yAoNJnzAn8kHtP2KBo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f893cc7daacb331292b4bb7788846329b5fe79da", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, "ragenix": { "inputs": { "agenix": [ @@ -298,6 +314,7 @@ "impermanence": "impermanence", "invidious-router-flake": "invidious-router-flake", "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", "ragenix": "ragenix", "rust-overlay": "rust-overlay", "simple-nixos-mailserver": "simple-nixos-mailserver", diff --git a/flake.nix b/flake.nix index 4956365..a8812c8 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11-small"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; # inputs for following systems = { @@ -77,6 +78,7 @@ outputs = { self, nixpkgs, + nixpkgs-unstable, # modules simple-nixos-mailserver, impermanence, @@ -89,10 +91,13 @@ } @ attrs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; + pkgs-unstable = nixpkgs-unstable.legacyPackages.${system}; in { nixosConfigurations."server1" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = attrs; + specialArgs = attrs // { + inherit pkgs-unstable; + }; modules = [ ./hosts/server1/configuration.nix simple-nixos-mailserver.nixosModule diff --git a/system/services/mastodon/default.nix b/system/services/mastodon/default.nix index cb53c60..160f2cf 100644 --- a/system/services/mastodon/default.nix +++ b/system/services/mastodon/default.nix @@ -1,8 +1,9 @@ -{config, ...}: let +{config, pkgs-unstable, ...}: let emailAddress = "mastodon@vhack.eu"; in { services.mastodon = { enable = true; + package = pkgs-unstable.mastodon; localDomain = "vhack.eu"; smtp = { authenticate = true; |