From 20516a4556a8b4e91704e3cb2b4b6f912acfcbe7 Mon Sep 17 00:00:00 2001 From: Sokhibjon Orzikulov Date: Sun, 3 Nov 2024 23:49:27 +0500 Subject: [PATCH] fix: moved nix ovveride to nixpkgs module --- modules/nixos/nixpkgs.nix | 13 +++++++++++++ nixos/kolyma-1/services/mail.nix | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/nixos/nixpkgs.nix b/modules/nixos/nixpkgs.nix index 5d3894f..015e72a 100644 --- a/modules/nixos/nixpkgs.nix +++ b/modules/nixos/nixpkgs.nix @@ -18,6 +18,19 @@ # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default + # Broken wasm-bindgen + (final: prev: { + stalwart-mail = final.unstable.stalwart-mail.overrideAttrs (old: { + passthru.webadmin = final.unstable.stalwart-mail.webadmin.override { + wasm-bindgen-cli = final.unstable.wasm-bindgen-cli.override { + version = "0.2.93"; + hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0="; + cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ="; + }; + }; + }); + }) + # Or define it inline, for example: # (final: prev: { # hi = final.hello.overrideAttrs (oldAttrs: { diff --git a/nixos/kolyma-1/services/mail.nix b/nixos/kolyma-1/services/mail.nix index bbb33a0..41420fa 100644 --- a/nixos/kolyma-1/services/mail.nix +++ b/nixos/kolyma-1/services/mail.nix @@ -21,19 +21,6 @@ in "mail/users/misskey" = secret-management; }; - # Broken wasm-bindgen - nixpkgs.config.packageOverrides = pkgs: { - stalwart-mail = pkgs.unstable.stalwart-mail.overrideAttrs (old: { - passthru.webadmin = pkgs.unstable.stalwart-mail.webadmin.override { - wasm-bindgen-cli = pkgs.unstable.wasm-bindgen-cli.override { - version = "0.2.93"; - hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0="; - cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ="; - }; - }; - }); - }; - services.stalwart-mail = { enable = true; package = pkgs.stalwart-mail;