From a60f41df08682ef21c0bf9a233106af7b054cf15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Feb 2023 19:52:55 +0100 Subject: [PATCH] Bump matemat --- flake.lock | 11 +++++------ flake.nix | 2 +- hosts/matemat/default.nix | 17 +++++++++++------ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 34e2d31e..80bd44c2 100644 --- a/flake.lock +++ b/flake.lock @@ -800,16 +800,15 @@ ] }, "locked": { - "lastModified": 1655412349, - "narHash": "sha256-EFJLSOCajkfLteSWaEv5b16Xp2YhKa4CVdkC9ZjKowc=", - "ref": "nix", - "rev": "e7069228a87c42124e7762b1bfd663b684e24749", - "revCount": 405, + "lastModified": 1676226870, + "narHash": "sha256-h065ecNWjwwASqsbDo/E7QPfXL/6CIBkDp2h2bf1hnY=", + "ref": "refs/heads/master", + "rev": "e0085cabf38177e057de803f46f230a35d4c22bd", + "revCount": 407, "type": "git", "url": "https://gitea.c3d2.de/C3D2/yammat.git" }, "original": { - "ref": "nix", "type": "git", "url": "https://gitea.c3d2.de/C3D2/yammat.git" } diff --git a/flake.nix b/flake.nix index 44212961..07f389c6 100644 --- a/flake.nix +++ b/flake.nix @@ -208,7 +208,7 @@ }; }; yammat = { - url = "git+https://gitea.c3d2.de/C3D2/yammat.git?ref=nix"; + url = "git+https://gitea.c3d2.de/C3D2/yammat.git"; inputs.nixpkgs.follows = "nixos"; }; zentralwerk = { diff --git a/hosts/matemat/default.nix b/hosts/matemat/default.nix index 9309c0d1..240f84fb 100644 --- a/hosts/matemat/default.nix +++ b/hosts/matemat/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, lib, options, pkgs, ... }: { c3d2.deployment.server = "server10"; @@ -32,12 +32,17 @@ }; }; - postgresql = { - package = pkgs.postgresql_15; - upgrade.stopServices = [ "yammat" ]; - }; + postgresql = { + package = pkgs.postgresql_15; + upgrade.stopServices = [ "yammat" ]; + }; - yammat.enable = true; + yammat = { + enable = true; + config = lib.mkOptionDefault '' + copyright_link: "https://gitea.c3d2.de/c3d2/yammat" + ''; + }; }; programs.msmtp = {